From fb8d0a544d8a975ba7c482133c14e6f9c87ed1a9 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Fri, 2 Dec 2005 00:26:12 +0000 Subject: [PATCH] allow variables to exist on both 'halves' of the Local channel (issue #5810) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7270 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_local.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/channels/chan_local.c b/channels/chan_local.c index 6dec650abc..f843fd95d5 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -320,6 +320,8 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout) { struct local_pvt *p = ast->tech_pvt; int res; + struct ast_var_t *varptr = NULL, *new; + size_t len, namelen; ast_mutex_lock(&p->lock); if (p->owner->cid.cid_num) @@ -345,9 +347,22 @@ 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; - /* 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); + + /* copy the channel variables from the incoming channel to the outgoing channel */ + /* Note that due to certain assumptions, they MUST be in the same order */ + AST_LIST_TRAVERSE(&p->owner->varshead, varptr, entries) { + namelen = strlen(varptr->name); + len = sizeof(struct ast_var_t) + namelen + strlen(varptr->value) + 2; + new = malloc(len); + if (new) { + memcpy(new, varptr, len); + new->value = &(new->name[0]) + namelen + 1; + AST_LIST_INSERT_TAIL(&p->chan->varshead, new, entries); + } else { + ast_log(LOG_ERROR, "Out of memory!\n"); + } + } + p->launchedpbx = 1; /* Start switch on sub channel */