diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-08 21:07:12 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-08 21:07:12 +0000 |
| commit | 41290c3a71374eb07651e9195fd4b7db3fa8ab4c (patch) | |
| tree | 1deb652d456db7e43293a52bc3d9b3b9f58db294 /main | |
| parent | efbb507962a0e6b365905832b945989b2f78b7aa (diff) | |
Merged revisions 141807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r141807 | russell | 2008-09-08 16:05:01 -0500 (Mon, 08 Sep 2008) | 15 lines
Merged revisions 141806 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r141806 | russell | 2008-09-08 16:02:36 -0500 (Mon, 08 Sep 2008) | 7 lines
When doing an async goto, detect if the channel is already in the middle of a
masquerade. This can happen when chan_local is trying to optimize itself out.
If this happens, fail the async goto instead of bursting into flames.
(closes issue #13435)
Reported by: geoff2010
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@141808 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/main/pbx.c b/main/pbx.c index 5eb255014..5ff9396f5 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -6461,17 +6461,23 @@ int ast_async_goto(struct ast_channel *chan, const char *context, const char *ex S_OR(context, chan->context), S_OR(exten, chan->exten), priority); /* Masquerade into temp channel */ - ast_channel_masquerade(tmpchan, chan); - - /* Grab the locks and get going */ - ast_channel_lock(tmpchan); - ast_do_masquerade(tmpchan); - ast_channel_unlock(tmpchan); - /* Start the PBX going on our stolen channel */ - if (ast_pbx_start(tmpchan)) { - ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmpchan->name); + if (ast_channel_masquerade(tmpchan, chan)) { + /* Failed to set up the masquerade. It's probably chan_local + * in the middle of optimizing itself out. Sad. :( */ ast_hangup(tmpchan); + tmpchan = NULL; res = -1; + } else { + /* Grab the locks and get going */ + ast_channel_lock(tmpchan); + ast_do_masquerade(tmpchan); + ast_channel_unlock(tmpchan); + /* Start the PBX going on our stolen channel */ + if (ast_pbx_start(tmpchan)) { + ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmpchan->name); + ast_hangup(tmpchan); + res = -1; + } } } } |