[asterisk-commits] file: trunk r57478 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Fri Mar  2 11:09:18 2007
New Revision: 57478

URL: http://svn.digium.com/view/asterisk?view=rev&rev=57478
Log:
Merged revisions 57477 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r57477 | file | 2007-03-02 12:06:52 -0500 (Fri, 02 Mar 2007) | 10 lines

Merged revisions 57475 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r57475 | file | 2007-03-02 12:02:46 -0500 (Fri, 02 Mar 2007) | 2 lines

If a SIP message comes in and goes to a method handler that requires additional values that may not be present then send back an error.

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=57478&r1=57477&r2=57478
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Mar  2 11:09:18 2007
@@ -15324,6 +15324,12 @@
 		}
 	}
 
+	if (!e && (p->method == SIP_INVITE || p->method == SIP_SUBSCRIBE || p->method == SIP_REGISTER || p->method == SIP_NOTIFY)) {
+		transmit_response(p, "503 Server error", req);
+		sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
+		return -1;
+	}
+
 	/* Handle various incoming SIP methods in requests */
 	switch (p->method) {
 	case SIP_OPTIONS: