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 zombie *8# channels in SIP

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-04-11 18:22:21 +00:00
parent c3098625ea
commit 7cabdde1ce
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
channels/chan_sip.c
View File

@@ -4229,20 +4229,29 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc
if (strcmp(p->exten, ast_pickup_ext())) { if (strcmp(p->exten, ast_pickup_ext())) {
if (ast_pbx_start(c)) { if (ast_pbx_start(c)) {
ast_log(LOG_WARNING, "Failed to start PBX :(\n"); ast_log(LOG_WARNING, "Failed to start PBX :(\n");
/* Unlock locks so ast_hangup can do its magic */
ast_pthread_mutex_unlock(&c->lock); ast_pthread_mutex_unlock(&c->lock);
ast_pthread_mutex_unlock(&p->lock);
ast_hangup(c); ast_hangup(c);
ast_pthread_mutex_lock(&p->lock);
transmit_response_reliable(p, "503 Unavailable", req); transmit_response_reliable(p, "503 Unavailable", req);
c = NULL; c = NULL;
} }
} else if (ast_pickup_call(c)) { } else if (ast_pickup_call(c)) {
ast_log(LOG_WARNING, "Nothing to pick up\n"); ast_log(LOG_NOTICE, "Nothing to pick up\n");
transmit_response_reliable(p, "503 Unavailable", req); transmit_response_reliable(p, "503 Unavailable", req);
p->alreadygone = 1; p->alreadygone = 1;
/* Unlock locks so ast_hangup can do its magic */
ast_pthread_mutex_unlock(&c->lock); ast_pthread_mutex_unlock(&c->lock);
ast_pthread_mutex_unlock(&p->lock);
ast_hangup(c); ast_hangup(c);
ast_pthread_mutex_lock(&p->lock);
c = NULL;
} else { } else {
ast_pthread_mutex_unlock(&c->lock); ast_pthread_mutex_unlock(&c->lock);
ast_pthread_mutex_unlock(&p->lock);
ast_hangup(c); ast_hangup(c);
ast_pthread_mutex_lock(&p->lock);
c = NULL; c = NULL;
} }
break; break;
@@ -4414,7 +4423,7 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc
return -1; return -1;
} }
if (!p->lastinvite && !strlen(p->randdata)) if (!p->lastinvite && !strlen(p->randdata))
sip_destroy(p); p->needdestroy = 1;
} else if (!strcasecmp(cmd, "SIP/2.0")) { } else if (!strcasecmp(cmd, "SIP/2.0")) {
while(*e && (*e < 33)) e++; while(*e && (*e < 33)) e++;
if (sscanf(e, "%i %n", &respid, &len) != 1) { if (sscanf(e, "%i %n", &respid, &len) != 1) {