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

If you're hanging up channels, be sure we clean it up...

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6712 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-10-04 17:41:30 +00:00
parent 1406f660b6
commit 3f285f03e1
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pbx.c
View File

@@ -4999,12 +4999,16 @@ int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout
ast_mutex_unlock(&chan->lock); ast_mutex_unlock(&chan->lock);
if (ast_pbx_run(chan)) { if (ast_pbx_run(chan)) {
ast_log(LOG_ERROR, "Unable to run PBX on %s\n", chan->name); ast_log(LOG_ERROR, "Unable to run PBX on %s\n", chan->name);
if (channel)
*channel = NULL;
ast_hangup(chan); ast_hangup(chan);
res = -1; res = -1;
} }
} else { } else {
if (ast_pbx_start(chan)) { if (ast_pbx_start(chan)) {
ast_log(LOG_ERROR, "Unable to start PBX on %s\n", chan->name); ast_log(LOG_ERROR, "Unable to start PBX on %s\n", chan->name);
if (channel)
*channel = NULL;
ast_hangup(chan); ast_hangup(chan);
res = -1; res = -1;
} }
@@ -5020,6 +5024,8 @@ int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout
ast_cdr_failed(chan->cdr); ast_cdr_failed(chan->cdr);
} }
if (channel)
*channel = NULL;
ast_hangup(chan); ast_hangup(chan);
} }
} }
@@ -5079,6 +5085,8 @@ int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout
if (ast_pthread_create(&as->p, &attr, async_wait, as)) { if (ast_pthread_create(&as->p, &attr, async_wait, as)) {
ast_log(LOG_WARNING, "Failed to start async wait\n"); ast_log(LOG_WARNING, "Failed to start async wait\n");
free(as); free(as);
if (channel)
*channel = NULL;
ast_hangup(chan); ast_hangup(chan);
res = -1; res = -1;
goto outgoing_exten_cleanup; goto outgoing_exten_cleanup;