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

[mod_conference] move conference name assignment 

Move the assignment of conference name ahead of conference_video_parse_layouts() to fix the conference_name unable to pass to xml_curl gateway URL.
This commit is contained in:
James J. Ye 2021-08-18 14:18:26 +08:00
parent 717b9eec0a
commit 5f05812939
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3185,6 +3185,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
conference->tts_voice = switch_core_strdup(conference->pool, tts_voice); conference->tts_voice = switch_core_strdup(conference->pool, tts_voice);
} }
conference->name = switch_core_strdup(conference->pool, name);
conference->video_layout_conf = switch_core_strdup(conference->pool, video_layout_conf); conference->video_layout_conf = switch_core_strdup(conference->pool, video_layout_conf);
conference->comfort_noise_level = comfort_noise_level; conference->comfort_noise_level = comfort_noise_level;
conference->pin_retries = pin_retries; conference->pin_retries = pin_retries;
@ -3548,9 +3549,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
/* its going to be 0 by default, set to a value otherwise so this should be safe */ /* its going to be 0 by default, set to a value otherwise so this should be safe */
conference->max_members = max_members; conference->max_members = max_members;
conference->announce_count = announce_count; conference->announce_count = announce_count;
conference->name = switch_core_strdup(conference->pool, name);
if ((name_domain = strchr(conference->name, '@'))) { if ((name_domain = strchr(conference->name, '@'))) {
name_domain++; name_domain++;
conference->domain = switch_core_strdup(conference->pool, name_domain); conference->domain = switch_core_strdup(conference->pool, name_domain);