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

Merge pull request #1505 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-11100 to master 

* commit '320f7d6b8cf469e44fcb5f3ad85ed085eab1b09a':
  FS-11100 [mod_conference] export variables for conference_outcall_bg
This commit is contained in:
Mike Jerris 2018-04-09 14:58:55 +00:00
parent cde77d0c96 320f7d6b8c
commit 890b558c9f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/applications/mod_conference/conference_loop.c
View File

@ -1332,6 +1332,10 @@ void conference_loop_output(conference_member_t *member)
int to = 60;
int wait_sec = 2;
int loops = 0;
switch_event_t *var_event;
switch_event_create(&var_event, SWITCH_EVENT_CHANNEL_DATA);
switch_channel_process_export(channel, NULL, var_event, "conference_auto_outcall_export_vars");
if (ann && !switch_channel_test_app_flag_key("conference_silent", channel, CONF_SILENT_REQ)) {
member->conference->special_announce = switch_core_strdup(member->conference->pool, ann);
@ -1363,9 +1367,11 @@ void conference_loop_output(conference_member_t *member)
}
for (x = 0; x < argc; x++) {
char *dial_str = switch_mprintf("%s%s", switch_str_nil(prefix), argv[x]);
switch_event_t *event = NULL;
switch_event_dup(&event, var_event);
switch_assert(dial_str);
conference_outcall_bg(member->conference, NULL, NULL, dial_str, to, switch_str_nil(flags), cid_name, cid_num, NULL,
profile, &member->conference->cancel_cause, NULL);
profile, &member->conference->cancel_cause, &event);
switch_safe_free(dial_str);
}
switch_safe_free(cpstr);