[svn-commits] tilghman: branch 1.4 r234095 - /branches/1.4/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Dec 10 10:08:20 2009
New Revision: 234095

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=234095
Log:
When we receive no response at all to our INVITE, allow the channel to be destroyed.
(closes issue #15627, closes issue #15716, closes issue #16270, closes issue #15356, issue #16382)
 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/

Modified:
    branches/1.4/channels/chan_sip.c

Modified: branches/1.4/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=234095&r1=234094&r2=234095
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Thu Dec 10 10:08:20 2009
@@ -3116,6 +3116,9 @@
 			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);
 	}
 	ast_mutex_unlock(&p->lock);
 	return 0;
@@ -3759,18 +3762,19 @@
 			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, ast_test_flag(cur, FLAG_RESPONSE), 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);
+					__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 {
+					for (cur = p->packets; cur; cur = cur->next) {
+						__sip_semi_ack(p, cur->seqno, ast_test_flag(cur, FLAG_RESPONSE), 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);