From 15b01f246c4e9d270745cb9010f1c2ef97dfc0f3 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 8 Nov 2005 20:38:10 +0000 Subject: [PATCH] issue #5604 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7031 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- ChangeLog | 2 ++ channels/chan_local.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7910683fdc..3d0d95cf16 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-11-08 Kevin P. Fleming + * channels/chan_local.c (local_call): move channel variables from incoming to outgoing instead of inheriting them (issue #5604) + * many files: add explicit include of stdio.h (issue #5650) 2005-11-07 Kevin P. Fleming diff --git a/channels/chan_local.c b/channels/chan_local.c index 6a4cc0c1f6..6dec650abc 100755 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -345,7 +345,9 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout) strncpy(p->chan->language, p->owner->language, sizeof(p->chan->language) - 1); strncpy(p->chan->accountcode, p->owner->accountcode, sizeof(p->chan->accountcode) - 1); p->chan->cdrflags = p->owner->cdrflags; - ast_channel_inherit_variables(p->owner, p->chan); + /* move the channel variables from the incoming channel to the outgoing channel */ + AST_LIST_HEAD_SET_NOLOCK(&p->chan->varshead, AST_LIST_FIRST(&p->owner->varshead)); + AST_LIST_HEAD_INIT_NOLOCK(&p->owner->varshead); p->launchedpbx = 1; /* Start switch on sub channel */