diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-05-04 19:11:25 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-05-04 19:11:25 +0000 |
| commit | 5d7c4bb03e33da0be5f91f34313498f3773ef1e3 (patch) | |
| tree | 6b28979729f7e9ea49043ca3e54b7889d188209f /channels | |
| parent | 3047e6772d30c76768a9cf9cce54714cad2c7f6d (diff) | |
strlen fixes and don't destroy SIP channels that still have pending things on them (bug #1552 et al)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2890 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_sip.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 46fcd9c8c..c4e948159 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -651,6 +651,8 @@ static int __sip_semi_ack(struct sip_pvt *p, int seqno, int resp) if (cur->retransid > -1) ast_sched_del(sched, cur->retransid); cur->retransid = -1; + /* Schedule destruction in 15000ms just in case */ + sip_scheddestroy(p, 15000); res = 0; break; } @@ -6173,7 +6175,7 @@ restartsearch: sip = iflist; while(sip) { ast_mutex_lock(&sip->lock); - if (sip->needdestroy && (!sip->packets || (sip->packets->retransid == -1))) { + if (sip->needdestroy && !sip->packets) { ast_mutex_unlock(&sip->lock); __sip_destroy(sip, 1); goto restartsearch; |