[svn-commits] oej: trunk r42531 - /trunk/channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: oej
Date: Sat Sep  9 07:01:59 2006
New Revision: 42531

URL: http://svn.digium.com/view/asterisk?rev=42531&view=rev
Log:
Don't destroy pvt prematurely. Wait for answer or timeout.

Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=42531&r1=42530&r2=42531&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Sat Sep  9 07:01:59 2006
@@ -11193,12 +11193,11 @@
 			transmit_request_with_auth(p, SIP_CANCEL, p->ocseq, 1, 0);
 			/* Actually don't destroy us yet, wait for the 487 on our original 
 			   INVITE, but do set an autodestruct just in case we never get it. */
-			sip_scheddestroy(p, SIP_TRANS_TIMEOUT);
 		} else {
 			transmit_request_with_auth(p, SIP_BYE, 0, 1, 1);
-			ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);	
 			ast_clear_flag(&p->flags[0], SIP_CAN_BYE);	
 		}
+		sip_scheddestroy(p, SIP_TRANS_TIMEOUT);
 	} else if (ast_test_flag(&p->flags[0], SIP_NEEDREINVITE)) {
 		if (option_debug)
 			ast_log(LOG_DEBUG, "Sending pending reinvite on '%s'\n", p->callid);