[asterisk-commits] wdoekes: branch 12 r425070 - in /branches/12: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: wdoekes
Date: Fri Oct 10 02:27:46 2014
New Revision: 425070

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=425070
Log:
chan_sip: Fix dialog leak resulting from missing ACK to re-INVITE.

If a device re-INVITEs at the same time as the dialog is hung up, and
if then the ACK to the re-INVITE never reaches Asterisk, chan_sip would
fail to destroy the dialog after a while.  This resulted in (most
prominently) file handle leaks.

(Patch reindented by me.)

ASTERISK-20784 #close
ASTERISK-15879 #close
Reported by: Torrey Searle, Nitesh Bansal
Patches:
  reinvite_ack_timeout.patch uploaded by Torrey Searle (License #5334)
  patch_asterisk_20784.txt uploaded by Nitesh Bansal (License #6418)

Reviewboard: https://reviewboard.asterisk.org/r/4052/
(testcase can be found at r4051)
........

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

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

Modified:
    branches/12/   (props changed)
    branches/12/channels/chan_sip.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/channels/chan_sip.c?view=diff&rev=425070&r1=425069&r2=425070
==============================================================================
--- branches/12/channels/chan_sip.c (original)
+++ branches/12/channels/chan_sip.c Fri Oct 10 02:27:46 2014
@@ -4156,6 +4156,11 @@
 				append_history(pkt->owner, "DialogKill", "Killing this failed dialog immediately");
 			}
 		}
+	} else if (pkt->owner->pendinginvite == pkt->seqno) {
+	       ast_log(LOG_WARNING, "Timeout on %s on non-critical invite transaction.\n", pkt->owner->callid);
+	       pkt->owner->invitestate = INV_TERMINATED;
+	       pkt->owner->pendinginvite = 0;
+	       check_pendings(pkt->owner);
 	}
 
 	if (pkt->method == SIP_BYE) {