[asterisk-commits] oej: branch oej/teapot-1.8 r402889 - in /team/oej/teapot-1.8: channels/ patches/

[SVN commits to the Asterisk project]

Author: oej
Date: Tue Nov 19 05:25:01 2013
New Revision: 402889

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402889
Log:
Ok, let's try again

Modified:
    team/oej/teapot-1.8/channels/chan_sip.c
    team/oej/teapot-1.8/patches/414-incoming.diff

Modified: team/oej/teapot-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/teapot-1.8/channels/chan_sip.c?view=diff&rev=402889&r1=402888&r2=402889
==============================================================================
--- team/oej/teapot-1.8/channels/chan_sip.c (original)
+++ team/oej/teapot-1.8/channels/chan_sip.c Tue Nov 19 05:25:01 2013
@@ -21215,6 +21215,8 @@
 		}
 		break;
 
+	case 414: /* Bad request URI */
+	case 493: /* Undecipherable */
 	case 404: /* Not found */
 		xmitres = transmit_request(p, SIP_ACK, seqno, XMIT_UNRELIABLE, FALSE);
 		if (p->owner && !req->ignore) {
@@ -22179,6 +22181,15 @@
 				handle_response_invite(p, resp, rest, req, seqno);
 			else
 				ast_log(LOG_WARNING, "Host '%s' does not implement '%s'\n", ast_sockaddr_stringify(&p->sa), msg);
+			break;
+		case 400: /* Bad Request */
+		case 414: /* Request URI too long */
+		case 493: /* Undecipherable */
+			if (sipmethod == SIP_INVITE) {
+				handle_response_invite(p, resp, rest, req, seqno);
+			} else {
+				ast_log(LOG_WARNING, "Bad request to '%s': '%s'\n", ast_sockaddr_stringify(&p->sa), msg);
+			}
 			break;
 		default:
 			if ((resp >= 300) && (resp < 700)) {

Modified: team/oej/teapot-1.8/patches/414-incoming.diff
URL: http://svnview.digium.com/svn/asterisk/team/oej/teapot-1.8/patches/414-incoming.diff?view=diff&rev=402889&r1=402888&r2=402889
==============================================================================
--- team/oej/teapot-1.8/patches/414-incoming.diff (original)
+++ team/oej/teapot-1.8/patches/414-incoming.diff Tue Nov 19 05:25:01 2013
@@ -2,22 +2,16 @@
 ===================================================================
 --- channels/chan_sip.c	(revision 402886)
 +++ channels/chan_sip.c	(working copy)
-@@ -21119,6 +21119,14 @@
- 			sip_queue_hangup_cause(p, hangup_sip2cause(resp));
+@@ -21113,6 +21113,8 @@
  		}
  		break;
-+	case 400: /* Bad request */
+ 
 +	case 414: /* Bad request URI */
 +	case 493: /* Undecipherable */
-+		stop_media_flows(p); /* Immediately stop RTP, VRTP and UDPTL as applicable */
-+		if (p->owner && !req->ignore) {
-+			sip_queue_hangup_cause(p, hangup_sip2cause(resp));
-+		}
-+		break;
- 
- 	case 481: /* Call leg does not exist */
- 		/* Could be REFER caused INVITE with replaces */
-@@ -22010,6 +22018,15 @@
+ 	case 404: /* Not found */
+ 		xmitres = transmit_request(p, SIP_ACK, seqno, XMIT_UNRELIABLE, FALSE);
+ 		if (p->owner && !req->ignore) {
+@@ -22010,6 +22012,15 @@
  			else
  				ast_log(LOG_WARNING, "Host '%s' does not implement '%s'\n", ast_sockaddr_stringify(&p->sa), msg);
  			break;
@@ -26,7 +20,7 @@
 +		case 493: /* Undecipherable */
 +			if (sipmethod == SIP_INVITE) {
 +				handle_response_invite(p, resp, rest, req, seqno);
-+			}Â else {
++			} else {
 +				ast_log(LOG_WARNING, "Bad request to '%s': '%s'\n", ast_sockaddr_stringify(&p->sa), msg);
 +			}
 +			break;