Move evaluation of set_var options in pjsip to the end of channel initialization.

This allows for set_var to override certain defaults such as caller ID and codec
values. This also fixes a test suite regression. The "set_var" test suite test attempted
to use set_var to override caller ID, but a recent change caused that to no longer work.
........

Merged revisions 421565 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 421566 from http://svn.asterisk.org/svn/asterisk/branches/13

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

diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c
index ac7543c3e4230faa7367f60bbe7f1b6baf835624..0c535d703f0a413e1f92cbd91e08deca10a69ed5 100644 (file)
--- a/channels/chan_pjsip.c
+++ b/channels/chan_pjsip.c
@@ -402,12 +402,6 @@ static struct ast_channel *chan_pjsip_new(struct ast_sip_session *session, int s
                return NULL;
        }
 
-       for (var = session->endpoint->channel_vars; var; var = var->next) {
-               char buf[512];
-               pbx_builtin_setvar_helper(chan, var->name, ast_get_encoded_str(
-                                                 var->value, buf, sizeof(buf)));
-       }
-
        ast_channel_stage_snapshot(chan);
 
        ast_channel_tech_pvt_set(chan, channel);
@@ -459,6 +453,12 @@ static struct ast_channel *chan_pjsip_new(struct ast_sip_session *session, int s
                ast_channel_zone_set(chan, zone);
        }
 
+       for (var = session->endpoint->channel_vars; var; var = var->next) {
+               char buf[512];
+               pbx_builtin_setvar_helper(chan, var->name, ast_get_encoded_str(
+                                                 var->value, buf, sizeof(buf)));
+       }
+
        ast_channel_stage_snapshot_done(chan);
        ast_channel_unlock(chan);