From: Terry Wilson Date: Tue, 3 Jul 2012 17:07:20 +0000 (+0000) Subject: More improvements to re-INVITEs timing out after a provisional response X-Git-Tag: 11.0.0-beta1~167 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=474b023ad434b2a77373435f35a7e36cf6ffcfa8;p=thirdparty%2Fasterisk.git More improvements to re-INVITEs timing out after a provisional response There is no need to call check_pendings() on a final response to an INVITE when destroying the scheduler entry as it will be done later during normal processing. (issue ASTERISK-19992) ........ Merged revisions 369579 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 369580 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369581 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 6da7e630e1..04af933fc6 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -21315,9 +21315,6 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest p->ongoing_reinvite = 0; if (p->reinviteid > -1) { AST_SCHED_DEL_UNREF(sched, p->reinviteid, dialog_unref(p, "unref dialog for reinvite timeout because of a final response")); - /* Since we got a final response to the reinvite, but were relying on the reinvite_timeout - * function to clean up after the reinvite, we need to make sure and call check_pendings */ - check_pendings(p); } }