提交 637cd993 authored 作者: Michael Jerris's avatar Michael Jerris

FS-7650: #resolve [mod_verto] Fix crash when making a call from a verto user…

FS-7650: #resolve [mod_verto] Fix crash when making a call from a verto user with profile-variables in their user profile
上级 35551d1d
...@@ -3243,8 +3243,6 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock ...@@ -3243,8 +3243,6 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock
err = 1; goto cleanup; err = 1; goto cleanup;
} }
switch_ivr_set_user(session, jsock->uid);
channel = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
switch_channel_set_direction(channel, SWITCH_CALL_DIRECTION_INBOUND); switch_channel_set_direction(channel, SWITCH_CALL_DIRECTION_INBOUND);
...@@ -3319,6 +3317,8 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock ...@@ -3319,6 +3317,8 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock
} }
switch_ivr_set_user(session, jsock->uid);
switch_channel_set_profile_var(channel, "callee_id_name", remote_caller_id_name); switch_channel_set_profile_var(channel, "callee_id_name", remote_caller_id_name);
switch_channel_set_profile_var(channel, "callee_id_number", remote_caller_id_number); switch_channel_set_profile_var(channel, "callee_id_number", remote_caller_id_number);
......
...@@ -3274,7 +3274,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_set_user_xml(switch_core_session_t *s ...@@ -3274,7 +3274,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_set_user_xml(switch_core_session_t *s
} }
} }
if ((x_params = switch_xml_child(x_user, "profile-variables"))) { if (switch_channel_get_caller_profile(channel) && (x_params = switch_xml_child(x_user, "profile-variables"))) {
for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) { for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) {
const char *var = switch_xml_attr(x_param, "name"); const char *var = switch_xml_attr(x_param, "name");
const char *val = switch_xml_attr(x_param, "value"); const char *val = switch_xml_attr(x_param, "value");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论