[asterisk-commits] oej: branch 1.2 r42535 - /branches/1.2/channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Sat Sep  9 07:14:03 2006
New Revision: 42535

URL: http://svn.digium.com/view/asterisk?rev=42535&view=rev
Log:
- Reset proper flag
- Don't delete SIP dialog prematurely
Strangely enough imported from svn trunk... It's confusing here in Greenland.

(Committing from 36.000 feet above Greenland, on the way to asterisk at von
http://www.pulver.com/asterisk )

Modified:
    branches/1.2/channels/chan_sip.c

Modified: branches/1.2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_sip.c?rev=42535&r1=42534&r2=42535&view=diff
==============================================================================
--- branches/1.2/channels/chan_sip.c (original)
+++ branches/1.2/channels/chan_sip.c Sat Sep  9 07:14:03 2006
@@ -9572,16 +9572,14 @@
 {
 	if (ast_test_flag(p, SIP_PENDINGBYE)) {
 		/* if we can't BYE, then this is really a pending CANCEL */
-		if (!ast_test_flag(p, SIP_CAN_BYE)) {
+		if (!ast_test_flag(p, SIP_CAN_BYE))
 			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, 32000);
-		} else {
+		else 
 			transmit_request_with_auth(p, SIP_BYE, 0, 1, 1);
-			ast_set_flag(p, SIP_NEEDDESTROY);	
-			ast_clear_flag(p, SIP_NEEDREINVITE);	
-		}
+		ast_clear_flag(p, SIP_PENDINGBYE);	
+		sip_scheddestroy(p, 32000);
 	} else if (ast_test_flag(p, SIP_NEEDREINVITE)) {
 		ast_log(LOG_DEBUG, "Sending pending reinvite on '%s'\n", p->callid);
 		/* Didn't get to reinvite yet, so do it now */