diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2007-05-23 20:08:59 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2007-05-23 20:08:59 +0000 |
| commit | 61a53d859eaafcb05e316b5b4992ab453ad4383a (patch) | |
| tree | c450b83b2d8d2274e0c9cc208e4612a95561db6d | |
| parent | 33215616d4052b08e2fa72f59b397e7a1dd8581d (diff) | |
Merged revisions 65677 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r65677 | kpfleming | 2007-05-23 16:07:59 -0400 (Wed, 23 May 2007) | 10 lines
Merged revisions 65676 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r65676 | kpfleming | 2007-05-23 16:06:13 -0400 (Wed, 23 May 2007) | 2 lines
if we are going to set variables on a newly created channel, it should be done *before* we start the PBX on it
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_iax2.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 8f6b37351..5cbe6fd32 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -3475,6 +3475,10 @@ static struct ast_channel *ast_iax2_new(int callno, int state, int capability) tmp->adsicpe = AST_ADSI_UNAVAILABLE; i->owner = tmp; i->capability = capability; + + for (v = i->vars ; v ; v = v->next) + pbx_builtin_setvar_helper(tmp, v->name, v->value); + if (state != AST_STATE_DOWN) { if (ast_pbx_start(tmp)) { ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name); @@ -3484,9 +3488,6 @@ static struct ast_channel *ast_iax2_new(int callno, int state, int capability) } } - for (v = i->vars ; v ; v = v->next) - pbx_builtin_setvar_helper(tmp, v->name, v->value); - ast_module_ref(ast_module_info->self); return tmp; } |