[svn-commits] wdoekes: branch 11 r425297 - in /branches/11: ./ channels/chan_sip.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sun Oct 12 03:13:11 CDT 2014
Author: wdoekes
Date: Sun Oct 12 03:13:07 2014
New Revision: 425297
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=425297
Log:
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
Modified:
branches/11/ (props changed)
branches/11/channels/chan_sip.c
Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Modified: branches/11/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/channels/chan_sip.c?view=diff&rev=425297&r1=425296&r2=425297
==============================================================================
--- branches/11/channels/chan_sip.c (original)
+++ branches/11/channels/chan_sip.c Sun Oct 12 03:13:07 2014
@@ -26851,6 +26851,10 @@
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;
}
More information about the svn-commits
mailing list