kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-9549 #resolve [Add userVariables to DMTF and INFO messages]

This commit is contained in:
Anthony Minessale 2016-09-20 13:57:34 -05:00
parent 9b76bc2fd1
commit eb4d24b68c
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/mod/endpoints/mod_verto/mod_verto.c
View File

@ -3232,6 +3232,31 @@ static switch_bool_t verto__attach_func(const char *method, cJSON *params, jsock
return SWITCH_FALSE; return SWITCH_FALSE;
} }
static void parse_user_vars(cJSON *obj, switch_core_session_t *session)
{
cJSON *json_ptr;
switch_assert(obj);
switch_assert(session);
if ((json_ptr = cJSON_GetObjectItem(obj, "userVariables"))) {
cJSON * i;
switch_channel_t *channel = switch_core_session_get_channel(session);
for(i = json_ptr->child; i; i = i->next) {
char *varname = switch_core_session_sprintf(session, "verto_dvar_%s", i->string);
if (i->type == cJSON_True) {
switch_channel_set_variable(channel, varname, "true");
} else if (i->type == cJSON_False) {
switch_channel_set_variable(channel, varname, "false");
} else if (!zstr(i->string) && !zstr(i->valuestring)) {
switch_channel_set_variable(channel, varname, i->valuestring);
}
}
}
}
static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t *jsock, cJSON **response) static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t *jsock, cJSON **response)
{ {
cJSON *msg = NULL, *dialog = NULL; cJSON *msg = NULL, *dialog = NULL;
@ -3247,6 +3272,8 @@ static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t
if ((session = switch_core_session_locate(call_id))) { if ((session = switch_core_session_locate(call_id))) {
parse_user_vars(dialog, session);
if ((dtmf = cJSON_GetObjectCstr(params, "dtmf"))) { if ((dtmf = cJSON_GetObjectCstr(params, "dtmf"))) {
verto_pvt_t *tech_pvt = switch_core_session_get_private_class(session, SWITCH_PVT_SECONDARY); verto_pvt_t *tech_pvt = switch_core_session_get_private_class(session, SWITCH_PVT_SECONDARY);
char *send = switch_mprintf("~%s", dtmf); char *send = switch_mprintf("~%s", dtmf);
@ -3353,7 +3380,7 @@ static switch_bool_t verto__info_func(const char *method, cJSON *params, jsock_t
static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock_t *jsock, cJSON **response) static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock_t *jsock, cJSON **response)
{ {
cJSON *obj = cJSON_CreateObject(), *screenShare = NULL, *dedEnc = NULL, *mirrorInput, *json_ptr = NULL, *bandwidth = NULL, *canvas = NULL; cJSON *obj = cJSON_CreateObject(), *screenShare = NULL, *dedEnc = NULL, *mirrorInput, *bandwidth = NULL, *canvas = NULL;
switch_core_session_t *session = NULL; switch_core_session_t *session = NULL;
switch_channel_t *channel; switch_channel_t *channel;
switch_event_t *var_event; switch_event_t *var_event;
@ -3493,21 +3520,7 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock
} }
} }
if ((json_ptr = cJSON_GetObjectItem(dialog, "userVariables"))) { parse_user_vars(dialog, session);
cJSON * i;
for(i = json_ptr->child; i; i = i->next) {
char *varname = switch_core_session_sprintf(session, "verto_dvar_%s", i->string);
if (i->type == cJSON_True) {
switch_channel_set_variable(channel, varname, "true");
} else if (i->type == cJSON_False) {
switch_channel_set_variable(channel, varname, "false");
} else if (!zstr(i->string) && !zstr(i->valuestring)) {
switch_channel_set_variable(channel, varname, i->valuestring);
}
}
}
switch_snprintf(name, sizeof(name), "verto.rtc/%s", destination_number); switch_snprintf(name, sizeof(name), "verto.rtc/%s", destination_number);
switch_channel_set_name(channel, name); switch_channel_set_name(channel, name);