Merged revisions 65683 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r65683 | kpfleming | 2007-05-23 16:51:56 -0400 (Wed, 23 May 2007) | 10 lines

Merged revisions 65682 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r65682 | kpfleming | 2007-05-23 16:46:22 -0400 (Wed, 23 May 2007) | 2 lines

ensure that variables are set on a newly created channel before we start a PBX on it

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65684 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 42ad3630f818895a637abb6005b79af9279009f7..5c27c9eca78cd8dfe9586787de26f2084eb4e19d 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4289,15 +4289,17 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit
                pbx_builtin_setvar_helper(tmp, "SIPCALLID", i->callid);
        if (i->rtp)
                ast_jb_configure(tmp, &global_jbconf);
+
+       /* Set channel variables for this call from configuration */
+       for (v = i->chanvars ; v ; v = v->next)
+               pbx_builtin_setvar_helper(tmp, v->name, v->value);
+
        if (state != AST_STATE_DOWN && ast_pbx_start(tmp)) {
                ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
                tmp->hangupcause = AST_CAUSE_SWITCH_CONGESTION;
                ast_hangup(tmp);
                tmp = NULL;
        }
-       /* Set channel variables for this call from configuration */
-       for (v = i->chanvars ; v ; v = v->next)
-               pbx_builtin_setvar_helper(tmp,v->name,v->value);
 
        if (!ast_test_flag(&i->flags[0], SIP_NO_HISTORY))
                append_history(i, "NewChan", "Channel %s - from %s", tmp->name, i->callid);