diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-28 14:01:17 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-28 14:01:17 +0000 |
commit | c5c57efc1054d66c575d60029c8f22158ad2e32d (patch) | |
tree | 312bbd930b28236fe2525ac5998ec31de4f10157 /channels | |
parent | 99b8770feb6cc6aeb82d7cdce8941efe1fa27b3a (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@8818 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 809380368..2c45421f5 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1327,7 +1327,6 @@ static int __sip_autodestruct(void *data) { struct sip_pvt *p = data; - p->autokillid = -1; /* If this is a subscription, tell the phone that we got a timeout */ if (p->subscribed) { @@ -1337,6 +1336,10 @@ static int __sip_autodestruct(void *data) append_history(p, "Subscribestatus", "timeout"); return 10000; /* Reschedule this destruction so that we know that it's gone */ } + + /* This scheduled event is now considered done. */ + p->autokillid = -1; + ast_log(LOG_DEBUG, "Auto destroying call '%s'\n", p->callid); append_history(p, "AutoDestroy", ""); if (p->owner) { |