- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13449 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Tue May 26 21:16:22 2009 New Revision: 13449 Log: don't leak Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Tue May 26 21:16:22 2009 @@ -339,27 +339,32 @@ char *seperator = NULL; int noat = 0; easyroute_results_t results; + switch_status_t status = SWITCH_STATUS_SUCCESS; if (session) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This function cannot be called from the dialplan.\n"); - return SWITCH_STATUS_FALSE; + status = SWITCH_STATUS_FALSE; + goto done; } #ifndef SWITCH_HAVE_ODBC stream->write_function(stream, "mod_easyroute requires you enable core odbc support\n"); - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; + goto done; #endif if (!cmd || !(mydata = strdup(cmd))) { stream->write_function(stream, "Usage: easyroute <number>\n"); - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; + goto done; } if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { destnum = argv[0]; if (argc < 1 || argc > 3){ stream->write_function(stream, "Invalid Input!\n"); - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; + goto done; } if (argc == 2) { if (!strcasecmp(argv[1], "noat")) { @@ -374,7 +379,8 @@ if (!route_lookup(destnum, &results, noat, seperator) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "No Match!\n"); - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; + goto done; } if (argc != 2){ stream->write_function(stream, "Number \tLimit \tGroup \tAcctCode \tDialstring\n"); @@ -392,15 +398,17 @@ stream->write_function(stream, "%s", results.acctcode); } else { stream->write_function(stream, "Invalid Input!\n"); - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; + goto done; } } } else { stream->write_function(stream, "Invalid Input!\n"); } - return SWITCH_STATUS_SUCCESS; - + done: + switch_safe_free(mydata); + return status; } SWITCH_MODULE_LOAD_FUNCTION(mod_easyroute_load)

1 0

[commit] r13448 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Tue May 26 21:07:20 2009 New Revision: 13448 Log: fix more tiny leaks Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue May 26 21:07:20 2009 @@ -2198,7 +2198,7 @@ switch_caller_profile_t *outbound_profile, switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags) { - char *group; + char *group = NULL; switch_call_cause_t cause = SWITCH_CAUSE_NONE; char *template = NULL, *dest = NULL; switch_originate_flag_t myflags = SOF_NONE; @@ -2223,7 +2223,6 @@ goto done; } - if (var_event && (skip=switch_event_get_header(var_event, "group_recurse_variables")) && switch_false(skip)) { if ((var = switch_event_get_header(var_event, SWITCH_CALL_TIMEOUT_VARIABLE)) || (var = switch_event_get_header(var_event, "leg_timeout"))) { @@ -2232,8 +2231,6 @@ var_event = NULL; } - - template = switch_mprintf("${group_call(%s@%s)}", group, domain); if (session) { @@ -2293,6 +2290,7 @@ } switch_safe_free(template); + switch_safe_free(group); if (cause == SWITCH_CAUSE_NONE) { cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; @@ -2616,7 +2614,7 @@ if (to) { const char *v; switch_stream_handle_t stream = { 0 }; - char *cmd, *arg; + char *cmd = NULL, *arg; if (!(v = switch_core_get_variable(to))) { v = to;

1 0

[commit] r13447 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Tue May 26 20:58:19 2009 New Revision: 13447 Log: fix another leak Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue May 26 20:58:19 2009 @@ -1154,7 +1154,7 @@ SWITCH_STANDARD_API(chat_api_function) { - char *lbuf, *argv[5]; + char *lbuf = NULL, *argv[5]; int argc = 0; if (!switch_strlen_zero(cmd) && (lbuf = strdup(cmd)) @@ -1170,6 +1170,7 @@ stream->write_function(stream, "Invalid"); } + switch_safe_free(lbuf); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r13446 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Tue May 26 20:57:16 2009 New Revision: 13446 Log: fix leak Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue May 26 20:57:16 2009 @@ -1099,7 +1099,7 @@ SWITCH_STANDARD_API(presence_api_function) { switch_event_t *event; - char *lbuf, *argv[4]; + char *lbuf = NULL , *argv[4]; int argc = 0; switch_event_types_t type = SWITCH_EVENT_PRESENCE_IN; int need = 4; @@ -1138,18 +1138,18 @@ switch_event_fire(&event); } stream->write_function(stream, "Event Sent"); - switch_safe_free(lbuf); } else { goto error; } + switch_safe_free(lbuf); return SWITCH_STATUS_SUCCESS; error: + switch_safe_free(lbuf); stream->write_function(stream, "Invalid: presence %s", PRESENCE_USAGE); return SWITCH_STATUS_SUCCESS; - } SWITCH_STANDARD_API(chat_api_function)

1 0

[commit] r13445 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Tue May 26 20:52:48 2009 New Revision: 13445 Log: you can call 9999 from a zrtp endpoint and enroll this should be replaced with an IVR to explain it a bit but most of the work happens client side at this point Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue May 26 20:52:48 2009 @@ -596,6 +596,8 @@ <action application="answer"/> <action application="execute_extension" data="is_secure XML features"/> <action application="playback" data="$${hold_music}"/> +  + <anti-action application="set" data="zrtp_enrollment=true"/> <anti-action application="answer"/> <anti-action application="playback" data="$${hold_music}"/> </condition>

1 0

[commit] r13444 - freeswitch/trunk/src
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Tue May 26 20:48:43 2009 New Revision: 13444 Log: mark verified Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue May 26 20:48:43 2009 @@ -2266,7 +2266,9 @@ if (zrtp_session_info.sas_is_ready) { frame->extra_data = rtp_session->zrtp_ctx; switch_set_flag(frame, SFF_ZRTP); - if (rtp_session->zrtp_mitm_tries > 20) { + if (rtp_session->zrtp_mitm_tries > 30) { + zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid, + &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1); switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV); } rtp_session->zrtp_mitm_tries++; @@ -2704,6 +2706,8 @@ if (zrtp_session_info.sas_is_ready) { if (zrtp_status_ok == zrtp_resolve_mitm_call(frame->extra_data, rtp_session->zrtp_ctx)) { switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND); + zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid, + &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1); } rtp_session->zrtp_mitm_tries++; }

1 0

[commit] r13443 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Tue May 26 20:40:11 2009 New Revision: 13443 Log: fix mitm to be more reliable Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue May 26 20:40:11 2009 @@ -499,7 +499,8 @@ SWITCH_RTP_FLAG_STICKY_FLUSH = (1 << 22), SWITCH_ZRTP_FLAG_SECURE_SEND = (1 << 23), SWITCH_ZRTP_FLAG_SECURE_RECV = (1 << 24), - SWITCH_ZRTP_FLAG_SECURE_MITM = (1 << 25) + SWITCH_ZRTP_FLAG_SECURE_MITM_SEND = (1 << 25), + SWITCH_ZRTP_FLAG_SECURE_MITM_RECV = (1 << 26) } switch_rtp_flag_enum_t; typedef uint32_t switch_rtp_flag_t; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue May 26 20:40:11 2009 @@ -445,7 +445,8 @@ case ZRTP_EVENT_IS_SECURE: switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND); switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV); - switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM); + switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND); + switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV); if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) { if (zrtp_session_info.sas_is_ready) { @@ -510,7 +511,8 @@ case ZRTP_EVENT_IS_PENDINGCLEAR: switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND); switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV); - switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM); + switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND); + switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV); rtp_session->zrtp_mitm_tries = 0; break; case ZRTP_EVENT_NO_ZRTP: @@ -2257,13 +2259,19 @@ frame->m = rtp_session->recv_msg.header.m ? SWITCH_TRUE : SWITCH_FALSE; #ifdef ENABLE_ZRTP - if (zrtp_on && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM)) { - frame->extra_data = rtp_session->zrtp_ctx; - switch_set_flag(frame, SFF_ZRTP); - if (rtp_session->zrtp_mitm_tries > 10) { - switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM); + if (zrtp_on && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV)) { + zrtp_session_info_t zrtp_session_info; + + if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) { + if (zrtp_session_info.sas_is_ready) { + frame->extra_data = rtp_session->zrtp_ctx; + switch_set_flag(frame, SFF_ZRTP); + if (rtp_session->zrtp_mitm_tries > 20) { + switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV); + } + rtp_session->zrtp_mitm_tries++; + } } - rtp_session->zrtp_mitm_tries++; } #endif @@ -2689,12 +2697,17 @@ } #ifdef ENABLE_ZRTP - if (zrtp_on && switch_test_flag(frame, SFF_ZRTP)) { - - if (zrtp_status_ok == zrtp_resolve_mitm_call(frame->extra_data, rtp_session->zrtp_ctx)) { - switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM); + if (zrtp_on && switch_test_flag(frame, SFF_ZRTP) && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND)) { + zrtp_session_info_t zrtp_session_info; + + if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) { + if (zrtp_session_info.sas_is_ready) { + if (zrtp_status_ok == zrtp_resolve_mitm_call(frame->extra_data, rtp_session->zrtp_ctx)) { + switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND); + } + rtp_session->zrtp_mitm_tries++; + } } - rtp_session->zrtp_mitm_tries++; } #endif

1 0

[commit] r13442 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 26 May '09

26 May '09

Author: brian Date: Tue May 26 18:52:10 2009 New Revision: 13442 Log: add conference wait-mod flags and member moderator flag to delay starting a conference until someone with a moderator flag has joined Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue May 26 18:52:10 2009 @@ -627,13 +627,14 @@ switch_clear_flag(conference, CFLAG_WAIT_MOD); } - if (conference->count > 1 && (!switch_test_flag(conference, CFLAG_WAIT_MOD))) { - if (conference->moh_sound) { + if (conference->count > 1) { + if (conference->moh_sound && !switch_test_flag(conference, CFLAG_WAIT_MOD)) { /* stop MoH if any */ conference_stop_file(conference, FILE_STOP_ASYNC); } if (conference->enter_sound) { - conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 1); + conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), + switch_test_flag(conference, CFLAG_WAIT_MOD) ? 0 : 1); } } @@ -650,7 +651,7 @@ if (conference->count >= conference->announce_count && conference->announce_count > 1) { switch_snprintf(msg, sizeof(msg), "There are %d callers", conference->count); conference_member_say(member, msg, CONF_DEFAULT_LEADIN); - } else if (conference->count == 1 && !conference->perpetual_sound) { + } else if (conference->count == 1 && !conference->perpetual_sound && !switch_test_flag(conference, CFLAG_WAIT_MOD)) { /* as long as its not a bridge_to conference, announce if person is alone */ if (!switch_test_flag(conference, CFLAG_BRIDGE_TO)) { if (conference->alone_sound) { @@ -788,7 +789,7 @@ if (conference->exit_sound) { conference_play_file(conference, conference->exit_sound, 0, switch_core_session_get_channel(member->session), 0); } - if (conference->count == 1 && conference->alone_sound) { + if (conference->count == 1 && conference->alone_sound && !switch_test_flag(conference, CFLAG_WAIT_MOD)) { conference_stop_file(conference, FILE_STOP_ASYNC); conference_play_file(conference, conference->alone_sound, 0, switch_core_session_get_channel(member->session), 1); } @@ -4558,7 +4559,7 @@ return status; } -static void set_mflags(char *flags, member_flag_t *f) +static void set_mflags(const char *flags, member_flag_t *f) { if (flags) { char *dup = strdup(flags); @@ -4600,7 +4601,7 @@ -static void set_cflags(char *flags, member_flag_t *f) +static void set_cflags(const char *flags, member_flag_t *f) { if (flags) { char *dup = strdup(flags); @@ -4844,7 +4845,7 @@ char *bridgeto = NULL; char *profile_name = NULL; switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL; - char *flags_str; + const char *flags_str; member_flag_t mflags = 0; switch_core_session_message_t msg = { 0 }; uint8_t rl = 0, isbr = 0; @@ -4874,12 +4875,13 @@ if ((flags_str = strstr(mydata, flags_prefix))) { char *p; - - *flags_str = '\0'; + *((char *)flags_str) = '\0'; flags_str += strlen(flags_prefix); if ((p = strchr(flags_str, '}'))) { *p = '\0'; } + } else { + flags_str = switch_channel_get_variable(channel, "conference_member_flags"); } /* is this a bridging conference ? */

1 0

[commit] r13441 - freeswitch/trunk/conf/jingle_profiles
by FreeSWITCH SVN 26 May '09

26 May '09

Author: brian Date: Tue May 26 18:11:35 2009 New Revision: 13441 Log: conf fix Modified: freeswitch/trunk/conf/jingle_profiles/client.xml Modified: freeswitch/trunk/conf/jingle_profiles/client.xml ============================================================================== --- freeswitch/trunk/conf/jingle_profiles/client.xml (original) +++ freeswitch/trunk/conf/jingle_profiles/client.xml Tue May 26 18:11:35 2009 @@ -9,7 +9,7 @@ <param name="context" value="public"/> <param name="message" value="Jingle all the way"/> <param name="rtp-ip" value="$${bind_server_ip}"/> -  +  <param name="auto-login" value="true"/>  <param name="sasl" value="plain"/>

1 0

[commit] r13440 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 26 May '09

26 May '09

Author: anthm Date: Tue May 26 17:48:43 2009 New Revision: 13440 Log: update Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue May 26 17:48:43 2009 @@ -148,7 +148,8 @@ MFLAG_RESTART = (1 << 12), MFLAG_MINTWO = (1 << 13), MFLAG_MUTE_DETECT = (1 << 14), - MFLAG_DIST_DTMF = (1 << 15) + MFLAG_DIST_DTMF = (1 << 15), + MFLAG_MOD = (1 << 16) } member_flag_t; typedef enum { @@ -159,6 +160,7 @@ CFLAG_LOCKED = (1 << 4), CFLAG_ANSWERED = (1 << 5), CFLAG_BRIDGE_TO = (1 << 6), + CFLAG_WAIT_MOD = (1 << 7) } conf_flag_t; typedef enum { @@ -621,7 +623,11 @@ switch_event_fire(&event); } - if (conference->count > 1) { + if (switch_test_flag(conference, CFLAG_WAIT_MOD) && switch_test_flag(member, MFLAG_MOD)) { + switch_clear_flag(conference, CFLAG_WAIT_MOD); + } + + if (conference->count > 1 && (!switch_test_flag(conference, CFLAG_WAIT_MOD))) { if (conference->moh_sound) { /* stop MoH if any */ conference_stop_file(conference, FILE_STOP_ASYNC); @@ -1853,7 +1859,8 @@ } /* skip frames that are not actual media or when we are muted or silent */ - if ((switch_test_flag(member, MFLAG_TALKING) || energy_level == 0) && switch_test_flag(member, MFLAG_CAN_SPEAK)) { + if ((switch_test_flag(member, MFLAG_TALKING) || energy_level == 0) && switch_test_flag(member, MFLAG_CAN_SPEAK) && + !switch_test_flag(member->conference, CFLAG_WAIT_MOD)) { switch_audio_resampler_t *read_resampler = member->read_resampler; void *data; uint32_t datalen; @@ -4578,6 +4585,8 @@ *f |= MFLAG_MUTE_DETECT; } else if (!strcasecmp(argv[i], "dist-dtmf")) { *f |= MFLAG_DIST_DTMF; + } else if (!strcasecmp(argv[i], "moderator")) { + *f |= MFLAG_MOD; } else if (!strcasecmp(argv[i], "endconf")) { *f |= MFLAG_ENDCONF; } else if (!strcasecmp(argv[i], "mintwo")) { @@ -4589,6 +4598,35 @@ } } + + +static void set_cflags(char *flags, member_flag_t *f) +{ + if (flags) { + char *dup = strdup(flags); + char *p; + char *argv[10] = { 0 }; + int i, argc = 0; + + for(p = dup; p && *p; p++) { + if (*p == ',') { + *p = '|'; + } + } + + argc = switch_separate_string(dup, '|', argv, (sizeof(argv) / sizeof(argv[0]))); + + for(i = 0; i < argc && argv[i]; i++) { + if (!strcasecmp(argv[i], "wait-mod")) { + *f |= CFLAG_WAIT_MOD; + } + } + + free(dup); + } +} + + static void clear_eflags(char *events, uint32_t *f) { char buf[512] = ""; @@ -5483,6 +5521,7 @@ char *caller_id_number = NULL; char *caller_controls = NULL; char *member_flags = NULL; + char *conference_flags = NULL; char *perpetual_sound = NULL; char *moh_sound = NULL; uint32_t max_members = 0; @@ -5570,6 +5609,8 @@ is_unlocked_sound = val; } else if (!strcasecmp(var, "member-flags") && !switch_strlen_zero(val)) { member_flags = val; + } else if (!strcasecmp(var, "conference-flags") && !switch_strlen_zero(val)) { + conference_flags = val; } else if (!strcasecmp(var, "kicked-sound") && !switch_strlen_zero(val)) { kicked_sound = val; } else if (!strcasecmp(var, "pin") && !switch_strlen_zero(val)) { @@ -5691,6 +5732,10 @@ set_mflags(member_flags, &conference->mflags); } + if (conference_flags) { + set_cflags(conference_flags, &conference->flags); + } + if (sound_prefix) { conference->sound_prefix = switch_core_strdup(conference->pool, sound_prefix); }

1 0