diff options
| author | Walter Doekes <walter+asterisk@wjd.nu> | 2014-10-12 08:17:08 +0000 |
|---|---|---|
| committer | Walter Doekes <walter+asterisk@wjd.nu> | 2014-10-12 08:17:08 +0000 |
| commit | 9e72c74db50025a0b7c6795c34fcf94baabe00ac (patch) | |
| tree | 11e19ff92233035da6ad5d5ea3eaa4e9e7bfd1a5 /channels | |
| parent | c0ac87410648955f7630a850d849c274483b82e4 (diff) | |
chan_sip: Fix so asterisk won't send reINVITE after a BYE.
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
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 068636e00..7084ef82a 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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; } |