May 2009 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [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

[Freeswitch-svn] [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

[Freeswitch-svn] [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

[Freeswitch-svn] [commit] r13439 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 26 May '09

26 May '09

Author: mikej Date: Tue May 26 17:27:10 2009 New Revision: 13439 Log: sofia-sip: subscription-state subexp-params missing (SFSIP-148) Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue May 26 17:27:10 2009 @@ -1 +1 @@ -Tue May 19 12:24:21 CDT 2009 +Tue May 26 17:22:34 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c Tue May 26 17:27:10 2009 @@ -672,7 +672,7 @@ if (ss == NULL || nua_substate_make(ss->ss_substate) != nu->nu_substate) { if (nu->nu_substate == nua_substate_terminated) - expires = nu->nu_expires > now ? "noresource" : "timeout"; + expires = nu->nu_expires > now ? "reason=noresource" : "reason=timeout"; ss = sip_subscription_state_format(home, "%s;%s", nua_substate_name(nu->nu_substate),

1 0

[Freeswitch-svn] [commit] r13438 - freeswitch/trunk/src
by FreeSWITCH SVN 26 May '09

26 May '09

Author: anthm Date: Tue May 26 13:04:22 2009 New Revision: 13438 Log: properly detect unterminated Modified: freeswitch/trunk/src/switch_utils.c freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue May 26 13:04:22 2009 @@ -261,7 +261,7 @@ } } - return (char *) e; + return (e && *e == close) ? (char *) e : NULL; } SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size_t len) Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue May 26 13:04:22 2009 @@ -1132,7 +1132,7 @@ return &root->xml; } -static char *expand_vars(char *buf, char *ebuf, switch_size_t elen, switch_size_t *newlen) +static char *expand_vars(char *buf, char *ebuf, switch_size_t elen, switch_size_t *newlen, const char **err) { char *var, *val; char *rp = buf; @@ -1161,6 +1161,8 @@ } } continue; + } else if (err) { + *err = "unterminated ${var}"; } } @@ -1267,7 +1269,8 @@ switch_size_t cur = 0, ml = 0; char *q, *cmd, buf[2048], ebuf[8192]; char *tcmd, *targ; - + int line = 0; + if ((read_fd = open(file, O_RDONLY, 0)) < 0) { const char *reason = strerror(errno); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldnt open %s (%s)\n", file, reason); @@ -1280,7 +1283,13 @@ while ((cur = switch_fd_read_line(read_fd, buf, sizeof(buf))) > 0) { char *arg, *e; - char *bp = expand_vars(buf, ebuf, sizeof(ebuf), &cur); + const char *err = NULL; + char *bp = expand_vars(buf, ebuf, sizeof(ebuf), &cur, &err); + line++; + + if (err && stderr) { + fprintf(stderr, "Error [%s] in line %s line %d\n", err, file, line); + } /* we ignore <include> or </include> for the sake of validators as well as <?xml version="1.0"?> type stuff */ if (strstr(buf, "<include>") || strstr(buf, "</include>") || strstr(buf, "<?")) {

1 0

[Freeswitch-svn] [commit] r13437 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 26 May '09

26 May '09

Author: brian Date: Tue May 26 12:38:22 2009 New Revision: 13437 Log: thank god this was pointed out AFTER pre8 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 12:38:22 2009 @@ -231,7 +231,7 @@  <extension name="operator"> - <condition field="destination_number" expression="^operator$|^0$"> + <condition field="destination_number" expression="^(operator|0)$"> <action application="set" data="transfer_ringback=$${hold_music}"/> <action application="transfer" data="1000 XML features"/> </condition>

1 0

[Freeswitch-svn] [commit] r13436 - freeswitch/trunk/src
by FreeSWITCH SVN 26 May '09

26 May '09

Author: brian Date: Tue May 26 11:26:56 2009 New Revision: 13436 Log: this hsould make sure the secure mitm has a chance over latent connections 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 11:26:56 2009 @@ -2257,12 +2257,11 @@ 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) && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV)) { + 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); - rtp_session->zrtp_mitm_tries = 0; } rtp_session->zrtp_mitm_tries++; } @@ -2690,9 +2689,9 @@ } #ifdef ENABLE_ZRTP - if (zrtp_on && switch_test_flag(frame, SFF_ZRTP) && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND)) { + if (zrtp_on && switch_test_flag(frame, SFF_ZRTP)) { - if (zrtp_status_ok == zrtp_resolve_mitm_call(frame->extra_data, rtp_session->zrtp_ctx) || rtp_session->zrtp_mitm_tries > 10) { + 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); } rtp_session->zrtp_mitm_tries++;

1 0

[Freeswitch-svn] [commit] r13435 - freeswitch/trunk/src
by FreeSWITCH SVN 26 May '09

26 May '09

Author: brian Date: Tue May 26 11:14:22 2009 New Revision: 13435 Log: doh 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 11:14:22 2009 @@ -2692,7 +2692,7 @@ #ifdef ENABLE_ZRTP if (zrtp_on && switch_test_flag(frame, SFF_ZRTP) && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND)) { - if (zrtp_status_ok == zrtp_resolve_mitm_call(frame->extra_data, rtp_session->zrtp_ctx) || rtp_session->zrtp_mitm_tries < 10) { + if (zrtp_status_ok == zrtp_resolve_mitm_call(frame->extra_data, rtp_session->zrtp_ctx) || rtp_session->zrtp_mitm_tries > 10) { switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM); } rtp_session->zrtp_mitm_tries++;

1 0

[Freeswitch-svn] [commit] r13434 - freeswitch/trunk/src
by FreeSWITCH SVN 26 May '09

26 May '09

Author: brian Date: Tue May 26 11:13:35 2009 New Revision: 13434 Log: should giv eup a tsome point 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 11:13:35 2009 @@ -2692,7 +2692,7 @@ #ifdef ENABLE_ZRTP if (zrtp_on && switch_test_flag(frame, SFF_ZRTP) && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND)) { - if (zrtp_status_ok == zrtp_resolve_mitm_call(frame->extra_data, rtp_session->zrtp_ctx)) { + if (zrtp_status_ok == zrtp_resolve_mitm_call(frame->extra_data, rtp_session->zrtp_ctx) || rtp_session->zrtp_mitm_tries < 10) { switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM); } rtp_session->zrtp_mitm_tries++;

1 0

[Freeswitch-svn] [commit] r13433 - freeswitch/trunk/src
by FreeSWITCH SVN 26 May '09

26 May '09

Author: brian Date: Tue May 26 11:01:59 2009 New Revision: 13433 Log: tweak 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 11:01:59 2009 @@ -2691,10 +2691,9 @@ #ifdef ENABLE_ZRTP if (zrtp_on && switch_test_flag(frame, SFF_ZRTP) && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND)) { - zrtp_resolve_mitm_call(frame->extra_data, rtp_session->zrtp_ctx); - if (rtp_session->zrtp_mitm_tries > 10) { + + 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); - rtp_session->zrtp_mitm_tries = 0; } rtp_session->zrtp_mitm_tries++; }

1 0