mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-18 15:49:56 +00:00
automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8818 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user