diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-10 16:30:32 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-10 16:30:32 +0000 |
commit | beb80d7f04bdf4cdd9a9c3b05fce5b7db4fd32bf (patch) | |
tree | db644330d78994073d5d89a1fd2159b848b7b379 | |
parent | 72eb4be808ce91b65d8eaa65427331226528150b (diff) |
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
........
r234095 | tilghman | 2009-12-10 10:08:20 -0600 (Thu, 10 Dec 2009) | 9 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@234132 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_sip.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 2472af8f4..38130dd92 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4971,6 +4971,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); dialog_unref(p, "unreffing arg passed into auto_congest callback (p->initid)"); @@ -5633,19 +5636,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->str)); - } - /* 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->str)); + } p->invitestate = INV_CANCELLED; /* Send a new request: CANCEL */ transmit_request(p, SIP_CANCEL, p->lastinvite, XMIT_RELIABLE, FALSE); |