[asterisk-commits] oej: trunk r65077 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Fri May 18 10:20:39 2007
New Revision: 65077

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65077
Log:
Merged revisions 65076 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r65076 | oej | 2007-05-18 17:18:13 +0200 (Fri, 18 May 2007) | 13 lines

Merged revisions 65075 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r65075 | oej | 2007-05-18 17:12:09 +0200 (Fri, 18 May 2007) | 5 lines

Issue 9235 - part of the problem, maybe not all. Please retry with this patch (and no
other patch) if you have problems with hanging SIP channels. Thank you.

A special Thank You to WeBRainstorm that gave me access to his system.

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=65077&r1=65076&r2=65077
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri May 18 10:20:39 2007
@@ -12752,10 +12752,15 @@
 			This transaction is already scheduled to be killed by sip_hangup().
 		*/
 		xmitres = transmit_request(p, SIP_ACK, seqno, XMIT_UNRELIABLE, FALSE);
-		if (p->owner && !ast_test_flag(req, SIP_PKT_IGNORE))
+		if (p->owner && !ast_test_flag(req, SIP_PKT_IGNORE)) {
 			ast_queue_hangup(p->owner);
-		else if (!ast_test_flag(req, SIP_PKT_IGNORE))
+			append_history(p, "Hangup", "Got 487 on CANCEL request from us. Queued AST hangup request");
+ 		} else if (!ast_test_flag(req, SIP_PKT_IGNORE)) {
 			update_call_counter(p, DEC_CALL_LIMIT);
+			append_history(p, "Hangup", "Got 487 on CANCEL request from us on call without owner. Killing this dialog.");
+			ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);	
+			sip_alreadygone(p);
+		}
 		break;
 	case 488: /* Not acceptable here */
 		xmitres = transmit_request(p, SIP_ACK, seqno, XMIT_UNRELIABLE, FALSE);