diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-04-11 18:22:21 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-04-11 18:22:21 +0000 |
| commit | 1163e9c9275c62c3a35acc1745d453b1d775f9e7 (patch) | |
| tree | 189885442f7328ef9707c60ce6fc1539025adba9 | |
| parent | 3b56bbd02031337344620da75797b2497e2edf81 (diff) | |
Fix zombie *8# channels in SIP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@832 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | channels/chan_sip.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 917f3fc27..3ae3c6ad2 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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 (ast_pbx_start(c)) { 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(&p->lock); ast_hangup(c); + ast_pthread_mutex_lock(&p->lock); transmit_response_reliable(p, "503 Unavailable", req); c = NULL; } } 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); p->alreadygone = 1; + /* Unlock locks so ast_hangup can do its magic */ ast_pthread_mutex_unlock(&c->lock); + ast_pthread_mutex_unlock(&p->lock); ast_hangup(c); + ast_pthread_mutex_lock(&p->lock); + c = NULL; } else { ast_pthread_mutex_unlock(&c->lock); + ast_pthread_mutex_unlock(&p->lock); ast_hangup(c); + ast_pthread_mutex_lock(&p->lock); c = NULL; } break; @@ -4414,7 +4423,7 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc return -1; } if (!p->lastinvite && !strlen(p->randdata)) - sip_destroy(p); + p->needdestroy = 1; } else if (!strcasecmp(cmd, "SIP/2.0")) { while(*e && (*e < 33)) e++; if (sscanf(e, "%i %n", &respid, &len) != 1) { |