Merged revisions 65076 via svnmerge from
authorOlle Johansson <oej@edvina.net>
Fri, 18 May 2007 15:20:39 +0000 (15:20 +0000)
committerOlle Johansson <oej@edvina.net>
Fri, 18 May 2007 15:20:39 +0000 (15:20 +0000)
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.

........

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

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

channels/chan_sip.c

index dd4479f..cdb2487 100644 (file)
@@ -12752,10 +12752,15 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru
                        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);