kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 12:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix leaking sip channels

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1591 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-10-01 04:43:43 +00:00
parent 80f05b38b0
commit d3e0c54f7d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_sip.c
View File

@@ -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[]) 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 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; struct sip_pvt *cur;
int numchans = 0; int numchans = 0;
if (argc != 3) if (argc != 3)
@@ -4095,7 +4095,7 @@ static int sip_show_channels(int fd, int argc, char *argv[])
cur->ocseq, cur->icseq, cur->ocseq, cur->icseq,
0, 0,
0, 0,
ast_getformatname(cur->owner ? cur->owner->nativeformats : 0) ); ast_getformatname(cur->owner ? cur->owner->nativeformats : 0), cur->needdestroy ? "(d)" : "" );
numchans++; numchans++;
} }
cur = cur->next; cur = cur->next;
@@ -5278,7 +5278,7 @@ restartsearch:
sip = iflist; sip = iflist;
while(sip) { while(sip) {
ast_mutex_lock(&sip->lock); ast_mutex_lock(&sip->lock);
if (sip->needdestroy && !sip->packets) { if (sip->needdestroy && (!sip->packets || (sip->packets->retransid == -1))) {
ast_mutex_unlock(&sip->lock); ast_mutex_unlock(&sip->lock);
__sip_destroy(sip, 1); __sip_destroy(sip, 1);
goto restartsearch; goto restartsearch;