]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
During check_pendings, if the dialog is terminated with a CANCEL, change the invitest...
authorDavid Vossel <dvossel@digium.com>
Wed, 22 Sep 2010 16:49:56 +0000 (16:49 +0000)
committerDavid Vossel <dvossel@digium.com>
Wed, 22 Sep 2010 16:49:56 +0000 (16:49 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@288343 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index aac35178e995e929ca0c5ebf083a490bc902aade..b9996c1a52c3fc95390fa12be4293831c2bfba85 100644 (file)
@@ -13104,11 +13104,12 @@ 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 (p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA)
+               if (p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA) {
+                       p->invitestate = INV_CANCELLED;
                        transmit_request(p, SIP_CANCEL, p->lastinvite, XMIT_RELIABLE, FALSE);
                        /* 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 {
                        /* We have a pending outbound invite, don't send someting
                                new in-transaction */
                        if (p->pendinginvite)