[svn-commits] file: trunk r44820 - in /trunk: ./ channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: file
Date: Tue Oct 10 12:23:14 2006
New Revision: 44820

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

........
r44819 | file | 2006-10-10 13:21:44 -0400 (Tue, 10 Oct 2006) | 2 lines

Move some stuff around so that a NOTIFY dialog won't hang around until the end of the world under certain circumstances

........

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?rev=44820&r1=44819&r2=44820&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Oct 10 12:23:14 2006
@@ -12405,9 +12405,7 @@
 		/* We don't understand this event. */
 		/* Here's room to implement incoming voicemail notifications :-) */
 		transmit_response(p, "489 Bad event", req);
-		if (!p->lastinvite) 
-			sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
-		return -1;
+		res = -1;
 	} else {
 		/* Save nesting depth for now, since there might be other events we will
 			support in the future */
@@ -12508,8 +12506,12 @@
 		
 		/* Confirm that we received this packet */
 		transmit_response(p, "200 OK", req);
-		return res;
 	};
+
+	if (!p->lastinvite)
+		sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
+
+	return res;
 }
 
 /*! \brief Handle incoming OPTIONS request */