diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-10-01 04:43:43 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-10-01 04:43:43 +0000 |
| commit | 6168e19e246d5b2c6deda096a6ba2112faac0921 (patch) | |
| tree | 400f9a481963909f50b5ca345ed7102c237a0317 | |
| parent | 78f943a63af2fbd2e31cd5dc7a062631dcf85498 (diff) | |
Fix leaking sip channels
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1591 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | channels/chan_sip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 315238924..0ac22f96e 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4079,7 +4079,7 @@ static int sip_show_registry(int fd, int argc, char *argv[]) static int sip_show_channels(int fd, int argc, char *argv[]) { #define FORMAT2 "%-15.15s %-10.10s %-11.11s %-11.11s %-7.7s %-6.6s %s\n" -#define FORMAT "%-15.15s %-10.10s %-11.11s %5.5d/%5.5d %-5.5dms %-4.4dms %-6.6s\n" +#define FORMAT "%-15.15s %-10.10s %-11.11s %5.5d/%5.5d %-5.5dms %-4.4dms %-6.6s%s\n" struct sip_pvt *cur; int numchans = 0; if (argc != 3) @@ -4095,7 +4095,7 @@ static int sip_show_channels(int fd, int argc, char *argv[]) cur->ocseq, cur->icseq, 0, 0, - ast_getformatname(cur->owner ? cur->owner->nativeformats : 0) ); + ast_getformatname(cur->owner ? cur->owner->nativeformats : 0), cur->needdestroy ? "(d)" : "" ); numchans++; } cur = cur->next; @@ -5278,7 +5278,7 @@ restartsearch: sip = iflist; while(sip) { ast_mutex_lock(&sip->lock); - if (sip->needdestroy && !sip->packets) { + if (sip->needdestroy && (!sip->packets || (sip->packets->retransid == -1))) { ast_mutex_unlock(&sip->lock); __sip_destroy(sip, 1); goto restartsearch; |