diff options
author | Steve Murphy <murf@digium.com> | 2007-04-10 05:41:34 +0000 |
---|---|---|
committer | Steve Murphy <murf@digium.com> | 2007-04-10 05:41:34 +0000 |
commit | ecaf7819337745bba5fd6a4a3a031ba2c77da331 (patch) | |
tree | 9a564f15ac25870f7fe98c097760dd5729177206 /main/pbx.c | |
parent | be874b92d36bb654b80ecd74ea494d7ea5850b81 (diff) |
Merged revisions 60989 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r60989 | murf | 2007-04-09 12:32:07 -0600 (Mon, 09 Apr 2007) | 1 line
This is a big improvement over the current CDR fixes. It may still need refinement, but this won't have as many folks bothered.
This also adds the mods from 1.4/r.61136;
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pbx.c')
-rw-r--r-- | main/pbx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/pbx.c b/main/pbx.c index 2ce76054d..ef9567850 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -4573,7 +4573,7 @@ int ast_async_goto(struct ast_channel *chan, const char *context, const char *ex /* In order to do it when the channel doesn't really exist within the PBX, we have to make a new channel, masquerade, and start the PBX at the new location */ - struct ast_channel *tmpchan = ast_channel_alloc(0, chan->_state, 0, 0, "AsyncGoto/%s", chan->name); + struct ast_channel *tmpchan = ast_channel_alloc(0, chan->_state, 0, 0, chan->accountcode, chan->exten, chan->context, chan->amaflags, "AsyncGoto/%s", chan->name); if (chan->cdr) { tmpchan->cdr = ast_cdr_dup(chan->cdr); } @@ -4934,7 +4934,7 @@ static void *async_wait(void *data) static int ast_pbx_outgoing_cdr_failed(void) { /* allocate a channel */ - struct ast_channel *chan = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, 0); + struct ast_channel *chan = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, 0); if (!chan) return -1; /* failure */ @@ -5053,7 +5053,7 @@ int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout /* create a fake channel and execute the "failed" extension (if it exists) within the requested context */ /* check if "failed" exists */ if (ast_exists_extension(chan, context, "failed", 1, NULL)) { - chan = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "OutgoingSpoolFailed"); + chan = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "OutgoingSpoolFailed"); if (chan) { if (!ast_strlen_zero(context)) ast_copy_string(chan->context, context, sizeof(chan->context)); |