[asterisk-commits] file: branch 1.4 r44819 - /branches/1.4/channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Tue Oct 10 12:21:44 2006
New Revision: 44819

URL: http://svn.digium.com/view/asterisk?rev=44819&view=rev
Log:
Move some stuff around so that a NOTIFY dialog won't hang around until the end of the world under certain circumstances

Modified:
    branches/1.4/channels/chan_sip.c

Modified: branches/1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_sip.c?rev=44819&r1=44818&r2=44819&view=diff
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Tue Oct 10 12:21:44 2006
@@ -12455,9 +12455,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 */
@@ -12558,8 +12556,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 */