chan_sip: Fix dialog leak resulting from missing ACK to re-INVITE.
authorWalter Doekes <walter+asterisk@wjd.nu>
Fri, 10 Oct 2014 07:34:50 +0000 (07:34 +0000)
committerWalter Doekes <walter+asterisk@wjd.nu>
Fri, 10 Oct 2014 07:34:50 +0000 (07:34 +0000)
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
........

Merged revisions 425070 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 425071 from http://svn.asterisk.org/svn/asterisk/branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@425072 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index cb02d31..068636e 100644 (file)
@@ -4101,6 +4101,11 @@ static int retrans_pkt(const void *data)
                                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) {