diff options
author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-19 18:12:44 +0000 |
---|---|---|
committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-19 18:12:44 +0000 |
commit | 08461ee928994202c8acc56afe57540d29899a8a (patch) | |
tree | 88bbe9b2e76538f3cb57381bf9fb2cb0d74cc7b0 | |
parent | b54d09e9a3779b7878ec0898e8467300f4996b68 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@70061 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channel.c | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -2940,10 +2940,20 @@ void ast_channel_inherit_variables(const struct ast_channel *parent, struct ast_ static void clone_variables(struct ast_channel *original, struct ast_channel *clone) { + struct ast_var_t *current, *newvar; /* Append variables from clone channel into original channel */ /* XXX Is this always correct? We have to in order to keep MACROS working XXX */ if (AST_LIST_FIRST(&clone->varshead)) AST_LIST_APPEND_LIST(&original->varshead, &clone->varshead, entries); + AST_LIST_HEAD_INIT_NOLOCK(&clone->varshead); + + /* then, dup the varshead list into the clone */ + + AST_LIST_TRAVERSE(&original->varshead, current, entries) { + newvar = ast_var_assign(current->name, current->value); + if (newvar) + AST_LIST_INSERT_TAIL(&clone->varshead, newvar, entries); + } } /*--- ast_do_masquerade: Masquerade a channel */ @@ -3125,7 +3135,6 @@ int ast_do_masquerade(struct ast_channel *original) /* Drop group from original */ ast_app_group_update(clone, original); clone_variables(original, clone); - AST_LIST_HEAD_INIT_NOLOCK(&clone->varshead); /* Presense of ADSI capable CPE follows clone */ original->adsicpe = clone->adsicpe; /* Bridge remains the same */ |