diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2007-05-23 20:53:10 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2007-05-23 20:53:10 +0000 |
| commit | 5dc23536ec8d397adbe1481c598ef4806d1f8bd1 (patch) | |
| tree | 8f778be49499af44da0833903b504ed3edb07fc6 | |
| parent | 04da47df24ee0baa1732a7892369bfde7cfa3beb (diff) | |
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
| -rw-r--r-- | channels/chan_sip.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 42ad3630f..5c27c9eca 100644 --- 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); |