kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-08-29 09:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow variables to exist on both 'halves' of the Local channel (issue #5810)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7270 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-12-02 00:26:12 +00:00
parent acaf8c9cc9
commit fb8d0a544d
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
channels/chan_local.c
View File

@@ -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 */