chan_sip: Fix so asterisk won't send reINVITE after a BYE.
authorWalter Doekes <walter+asterisk@wjd.nu>
Sun, 12 Oct 2014 08:17:08 +0000 (08:17 +0000)
committerWalter Doekes <walter+asterisk@wjd.nu>
Sun, 12 Oct 2014 08:17:08 +0000 (08:17 +0000)
After a reINVITE glare situation, Asterisk would re-send the reINVITE
even though the call had been hung up in the mean time.  This patch
unschedules the reinvite when handling the BYE.

ASTERISK-22791 #close
Reported by: Paolo Compagnini
Tested by: Paolo Compagnini

Review: https://reviewboard.asterisk.org/r/4056/
(testcase is in review r4055)
........

Merged revisions 425296 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 425297 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 425298 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 425299 from http://svn.asterisk.org/svn/asterisk/branches/13

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

channels/chan_sip.c

index 068636e..7084ef8 100644 (file)
@@ -26524,6 +26524,10 @@ static int handle_request_bye(struct sip_pvt *p, struct sip_request *req)
                transmit_response(p, "200 OK", req);
        }
 
+       /* Destroy any pending invites so we won't try to do another
+        * scheduled reINVITE. */
+       AST_SCHED_DEL_UNREF(sched, p->waitid, dialog_unref(p, "decrement refcount from sip_destroy because waitid won't be scheduled"));
+
        return 1;
 }