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

[mod_conference] expose custom data from a channel in the conference ESL events and the conference API list command

This commit is contained in:
Hristo Trendev 2021-03-25 07:26:08 +00:00
parent e2cba43533
commit 341f24ec40
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mod/applications/mod_conference/conference_member.c
View File

@ -236,6 +236,7 @@ void conference_member_update_status_field(conference_member_t *member)
switch_status_t conference_member_add_event_data(conference_member_t *member, switch_event_t *event) switch_status_t conference_member_add_event_data(conference_member_t *member, switch_event_t *event)
{ {
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
const char *v;
if (!member) if (!member)
return status; return status;
@ -255,7 +256,9 @@ switch_status_t conference_member_add_event_data(conference_member_t *member, sw
} }
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Video", "%s", switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Video", "%s",
switch_channel_test_flag(switch_core_session_get_channel(member->session), CF_VIDEO) ? "true" : "false" ); switch_channel_test_flag(switch_core_session_get_channel(member->session), CF_VIDEO) ? "true" : "false" );
if ((v = switch_channel_get_variable_dup(channel, "conference_custom_channel_data", SWITCH_FALSE, -1))) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Conference-Custom-Channel-Data", v);
}
} }
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Hear", "%s", conference_utils_member_test_flag(member, MFLAG_CAN_HEAR) ? "true" : "false" ); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Hear", "%s", conference_utils_member_test_flag(member, MFLAG_CAN_HEAR) ? "true" : "false" );

9
src/mod/applications/mod_conference/mod_conference.c
View File

@ -1237,6 +1237,7 @@ void conference_xlist(conference_obj_t *conference, switch_xml_t x_conference, i
switch_channel_t *channel; switch_channel_t *channel;
switch_caller_profile_t *profile; switch_caller_profile_t *profile;
char *uuid; char *uuid;
const char *custom_chan_data;
//char *name; //char *name;
uint32_t count = 0; uint32_t count = 0;
switch_xml_t x_tag; switch_xml_t x_tag;
@ -1300,6 +1301,10 @@ void conference_xlist(conference_obj_t *conference, switch_xml_t x_conference, i
switch_snprintf(i, sizeof(i), "%d", member->volume_out_level); switch_snprintf(i, sizeof(i), "%d", member->volume_out_level);
add_x_tag(x_member, "volume_out", i, toff++); add_x_tag(x_member, "volume_out", i, toff++);
if ((custom_chan_data = switch_channel_get_variable_dup(channel, "conference_custom_channel_data", SWITCH_FALSE, -1))) {
add_x_tag(x_member, "custom_channel_data", custom_chan_data, toff++);
}
x_flags = switch_xml_add_child_d(x_member, "flags", count++); x_flags = switch_xml_add_child_d(x_member, "flags", count++);
switch_assert(x_flags); switch_assert(x_flags);
@ -1401,6 +1406,7 @@ void conference_jlist(conference_obj_t *conference, cJSON *json_conferences)
switch_channel_t *channel; switch_channel_t *channel;
switch_caller_profile_t *profile; switch_caller_profile_t *profile;
char *uuid; char *uuid;
const char *custom_chan_data;
switch_bool_t hold = conference_utils_member_test_flag(member, MFLAG_HOLD); switch_bool_t hold = conference_utils_member_test_flag(member, MFLAG_HOLD);
cJSON_AddItemToObject(json_conference_members, "member", json_conference_member = cJSON_CreateObject()); cJSON_AddItemToObject(json_conference_members, "member", json_conference_member = cJSON_CreateObject());
@ -1434,6 +1440,9 @@ void conference_jlist(conference_obj_t *conference, cJSON *json_conferences)
cJSON_AddNumberToObject(json_conference_member, "volume_out", member->volume_out_level); cJSON_AddNumberToObject(json_conference_member, "volume_out", member->volume_out_level);
cJSON_AddNumberToObject(json_conference_member, "output-volume", member->volume_out_level); cJSON_AddNumberToObject(json_conference_member, "output-volume", member->volume_out_level);
cJSON_AddNumberToObject(json_conference_member, "input-volume", member->volume_in_level); cJSON_AddNumberToObject(json_conference_member, "input-volume", member->volume_in_level);
if ((custom_chan_data = switch_channel_get_variable_dup(channel, "conference_custom_channel_data", SWITCH_FALSE, -1))) {
cJSON_AddStringToObject(json_conference_member, "custom_channel_data", custom_chan_data);
}
ADDBOOL(json_conference_member_flags, "can_hear", !hold && conference_utils_member_test_flag(member, MFLAG_CAN_HEAR)); ADDBOOL(json_conference_member_flags, "can_hear", !hold && conference_utils_member_test_flag(member, MFLAG_CAN_HEAR));
ADDBOOL(json_conference_member_flags, "can_see", !hold && conference_utils_member_test_flag(member, MFLAG_CAN_SEE)); ADDBOOL(json_conference_member_flags, "can_see", !hold && conference_utils_member_test_flag(member, MFLAG_CAN_SEE));
ADDBOOL(json_conference_member_flags, "can_speak", !hold && conference_utils_member_test_flag(member, MFLAG_CAN_SPEAK)); ADDBOOL(json_conference_member_flags, "can_speak", !hold && conference_utils_member_test_flag(member, MFLAG_CAN_SPEAK));