[asterisk-commits] oej: trunk r42536 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Sat Sep  9 07:25:18 2006
New Revision: 42536

URL: http://svn.digium.com/view/asterisk?rev=42536&view=rev
Log:
importing rev 42535 from 1.2 (which by mistake was actually imported from svn trunk)
- Maybe the first circular commit?

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

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

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=42536&r1=42535&r2=42536&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Sat Sep  9 07:25:18 2006
@@ -11189,14 +11189,13 @@
 {
 	if (ast_test_flag(&p->flags[0], SIP_PENDINGBYE)) {
 		/* if we can't BYE, then this is really a pending CANCEL */
-		if (!ast_test_flag(&p->flags[0], SIP_CAN_BYE)) {
+		if (!ast_test_flag(&p->flags[0], 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. */
-		} else {
+		else 
 			transmit_request_with_auth(p, SIP_BYE, 0, 1, 1);
-			ast_clear_flag(&p->flags[0], SIP_CAN_BYE);	
-		}
+		ast_clear_flag(&p->flags[0], SIP_PENDINGBYE);	
 		sip_scheddestroy(p, SIP_TRANS_TIMEOUT);
 	} else if (ast_test_flag(&p->flags[0], SIP_NEEDREINVITE)) {
 		if (option_debug)