From af51be05a63d499bebdf8796b4aca73d42949c39 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Mon, 20 Nov 2006 15:55:58 +0000 Subject: Merged revisions 47850 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r47850 | file | 2006-11-20 10:51:37 -0500 (Mon, 20 Nov 2006) | 2 lines Use a separate variable in the channel structure to store the context that the channel was dialed from. (issue #8382 reported by jiddings) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47851 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_dial.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/app_dial.c') diff --git a/apps/app_dial.c b/apps/app_dial.c index 905392273..c3cc26243 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -590,7 +590,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR | OPT_CALLEE_PARK | OPT_CALLER_PARK | DIAL_NOFORWARDHTML); - ast_copy_string(c->context, "", sizeof(c->context)); + ast_copy_string(c->dialcontext, "", sizeof(c->dialcontext)); ast_copy_string(c->exten, "", sizeof(c->exten)); } continue; @@ -625,7 +625,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR | OPT_CALLEE_PARK | OPT_CALLER_PARK | DIAL_NOFORWARDHTML); - ast_copy_string(c->context, "", sizeof(c->context)); + ast_copy_string(c->dialcontext, "", sizeof(c->dialcontext)); ast_copy_string(c->exten, "", sizeof(c->exten)); /* Setup early bridge if appropriate */ ast_channel_early_bridge(in, peer); @@ -1369,7 +1369,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags ast_app_group_set_channel(tmp->chan, outbound_group); /* Inherit context and extension */ - ast_copy_string(tmp->chan->context, chan->context, sizeof(tmp->chan->context)); + ast_copy_string(tmp->chan->dialcontext, chan->context, sizeof(tmp->chan->dialcontext)); ast_copy_string(tmp->chan->exten, chan->exten, sizeof(tmp->chan->exten)); /* Place the call, but don't wait on the answer */ -- cgit v1.2.3