aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-05-18 16:24:42 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-05-18 16:24:42 +0000
commit0e1b23b7d9562609bfea7ce25263027959edd1ad (patch)
tree46a46fa6359f8069106451a337f7544dc9c7bdcc
parenteb145314dd46edf8d0e5eb3a336f0982dd148f3d (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@65120 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 308b02ede..8188168a8 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9969,10 +9969,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().
*/
transmit_request(p, SIP_ACK, seqno, 0, 0);
- if (p->owner && !ignore)
+ if (p->owner && !ignore) {
ast_queue_hangup(p->owner);
- else if (!ignore)
+ append_history(p, "Hangup", "Got 487 on CANCEL request from us. Queued AST hangup request");
+ } else if (!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, SIP_NEEDDESTROY);
+ ast_set_flag(p, SIP_ALREADYGONE);
+ }
break;
case 491: /* Pending */
/* we have to wait a while, then retransmit */