[svn-commits] wdoekes: branch 1.8 r425296 - /branches/1.8/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: wdoekes
Date: Sun Oct 12 03:10:51 2014
New Revision: 425296

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=425296
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)

Modified:
    branches/1.8/channels/chan_sip.c

Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=425296&r1=425295&r2=425296
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Sun Oct 12 03:10:51 2014
@@ -24743,6 +24743,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;
 }