importing rev 42535 from 1.2 (which by mistake was actually imported from svn trunk)
authorOlle Johansson <oej@edvina.net>
Sat, 9 Sep 2006 12:25:18 +0000 (12:25 +0000)
committerOlle Johansson <oej@edvina.net>
Sat, 9 Sep 2006 12:25:18 +0000 (12:25 +0000)
- Maybe the first circular commit?

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42536 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 468da78..d419b2f 100644 (file)
@@ -11189,14 +11189,13 @@ static void check_pendings(struct sip_pvt *p)
 {
        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_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. */
                        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);
                        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)
                sip_scheddestroy(p, SIP_TRANS_TIMEOUT);
        } else if (ast_test_flag(&p->flags[0], SIP_NEEDREINVITE)) {
                if (option_debug)