From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 10 Dec 2009 16:30:22 +0000 (+0000)
Subject: Merged revisions 234129 via svnmerge from
X-Git-Tag: 1.6.0.21-rc1~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e83b09f323334f2d8425bc53f7e14fe28107294;p=thirdparty%2Fasterisk.git

Merged revisions 234129 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r234129 | tilghman | 2009-12-10 10:24:26 -0600 (Thu, 10 Dec 2009) | 16 lines

  Merged revisions 234095 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    When we receive no response at all to our INVITE, allow the channel to be destroyed.
    (closes issue #15627)
     Reported by: falves11
     Patches:
           20091209__issue15627__1.6.0.diff.txt uploaded by tilghman (license 14)
           20091209__issue15627__1.4.diff.txt uploaded by tilghman (license 14)
     Tested by: falves11
    Review: https://reviewboard.asterisk.org/r/446/
    (closes issue #15716)
    Reported by: dant
    (closes issue #16270)
    Reported by: corruptor
    (closes issue #15356)
    Reported by: falves11
    (issue #16382)
    Reported by: lftsy
  ........
................


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index baa0e4822a..ea3955aee6 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4523,6 +4523,9 @@ static int auto_congest(const void *arg)
 			ast_queue_control(p->owner, AST_CONTROL_CONGESTION);
 			ast_channel_unlock(p->owner);
 		}
+
+		/* Give the channel a chance to act before we proceed with destruction */
+		sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
 	}
 	sip_pvt_unlock(p);
 	return 0;
@@ -5186,19 +5189,20 @@ static int sip_hangup(struct ast_channel *ast)
 		if (needcancel) {	/* Outgoing call, not up */
 			if (ast_test_flag(&p->flags[0], SIP_OUTGOING)) {
 				/* stop retransmitting an INVITE that has not received a response */
-				struct sip_pkt *cur;
-				for (cur = p->packets; cur; cur = cur->next) {
-					__sip_semi_ack(p, cur->seqno, cur->is_resp, cur->method ? cur->method : find_sip_method(cur->data));
-				}
-
 				/* if we can't send right now, mark it pending */
 				if (p->invitestate == INV_CALLING) {
 					/* We can't send anything in CALLING state */
 					ast_set_flag(&p->flags[0], SIP_PENDINGBYE);
-					/* Do we need a timer here if we don't hear from them at all? */
+					__sip_pretend_ack(p);
+					/* Do we need a timer here if we don't hear from them at all? Yes we do or else we will get hung dialogs and those are no fun. */
 					sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
 					append_history(p, "DELAY", "Not sending cancel, waiting for timeout");
 				} else {
+					struct sip_pkt *cur;
+
+					for (cur = p->packets; cur; cur = cur->next) {
+						__sip_semi_ack(p, cur->seqno, cur->is_resp, cur->method ? cur->method : find_sip_method(cur->data));
+					}
 					p->invitestate = INV_CANCELLED;
 					/* Send a new request: CANCEL */
 					transmit_request(p, SIP_CANCEL, p->lastinvite, XMIT_RELIABLE, FALSE);