From 5f058129394d16fe68d40b5a8d8f8dd7d9445876 Mon Sep 17 00:00:00 2001 From: "James J. Ye" Date: Wed, 18 Aug 2021 14:18:26 +0800 Subject: [PATCH] [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. --- src/mod/applications/mod_conference/mod_conference.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 498de9fefc..22146bacfc 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -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->name = switch_core_strdup(conference->pool, name); conference->video_layout_conf = switch_core_strdup(conference->pool, video_layout_conf); conference->comfort_noise_level = comfort_noise_level; 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 */ conference->max_members = max_members; conference->announce_count = announce_count; - - conference->name = switch_core_strdup(conference->pool, name); - + if ((name_domain = strchr(conference->name, '@'))) { name_domain++; conference->domain = switch_core_strdup(conference->pool, name_domain);