From ad863d2e7e82aff39bda83b44fbfc4110f140f81 Mon Sep 17 00:00:00 2001 From: hehe Date: Wed, 8 Mar 2023 15:43:40 +0530 Subject: [PATCH 1/2] conference name supporting + in it --- .../applications/mod_conference/mod_conference.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 619cd8c4a6..4adbc28769 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -1901,6 +1901,7 @@ SWITCH_STANDARD_APP(conference_function) char *flags_prefix = "+flags{"; char *bridgeto = NULL; char *profile_name = NULL; + char *profile_name_and_pin = NULL; switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL; const char *flags_str, *v_flags_str; const char *cflags_str, *v_cflags_str; @@ -1995,18 +1996,20 @@ SWITCH_STANDARD_APP(conference_function) while (*conference_name == ' ') { conference_name++; } + /* Supporting + in the conference name ? */ + if ((profile_name_and_pin = strrchr(conference_name, '@'))) { + *profile_name_and_pin++ = '\0'; + } else { + profile_name_and_pin = "default"; + } /* is there a conference pin ? */ - if ((dpin = strchr(conference_name, '+'))) { + if ((dpin = strchr(profile_name_and_pin, '+'))) { *dpin++ = '\0'; } else dpin = ""; /* is there profile specification ? */ - if ((profile_name = strrchr(conference_name, '@'))) { - *profile_name++ = '\0'; - } else { - profile_name = "default"; - } + profile_name = profile_name_and_pin; #if 0 if (0) { From 479322e94ec643536e6379a18cf461bb1e44527f Mon Sep 17 00:00:00 2001 From: hehe Date: Wed, 8 Mar 2023 22:24:28 +0530 Subject: [PATCH 2/2] logging change --- src/mod/applications/mod_conference/mod_conference.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 4adbc28769..4191900ecb 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -1996,7 +1996,7 @@ SWITCH_STANDARD_APP(conference_function) while (*conference_name == ' ') { conference_name++; } - /* Supporting + in the conference name ? */ + /* checking for pin only after profile_name */ if ((profile_name_and_pin = strrchr(conference_name, '@'))) { *profile_name_and_pin++ = '\0'; } else {