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

[Freeswitch-svn] [commit] r13452 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Tue May 26 21:38:39 2009 New Revision: 13452 Log: clean up Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue May 26 21:38:39 2009 @@ -541,6 +541,7 @@ } stun_ip = strdup(cmd); + switch_assert(stun_ip); if ((p = strchr(stun_ip, ':'))) { int iport;

1 0

[Freeswitch-svn] [commit] r13451 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Tue May 26 21:21:56 2009 New Revision: 13451 Log: audit 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 21:21:56 2009 @@ -4282,7 +4282,6 @@ switch_safe_free(lbuf); return status; - } /* generate an outbound call from the conference */ @@ -5364,7 +5363,6 @@ switch_copy_string(name, to, sizeof(name)); } - if (!(conference = conference_find(name))) { switch_core_chat_send(proto, CONF_CHAT_PROTO, to, hint && strchr(hint, '/') ? hint : from, "", "Conference not active.", NULL, NULL); return SWITCH_STATUS_FALSE;

1 0

[Freeswitch-svn] [commit] r13450 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 27 May '09

27 May '09

Author: brian Date: Tue May 26 21:18:56 2009 New Revision: 13450 Log: audit Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Tue May 26 21:18:56 2009 @@ -1337,7 +1337,7 @@ char msg_count[80] = ""; callback_t cbt = { 0 }; char sql[256]; - char *myid; + char *myid = NULL; cbt.buf = msg_count; cbt.len = sizeof(msg_count); @@ -1371,7 +1371,6 @@ if (myid != id_in) { free(myid); } - } #define VM_STARTSAMPLES 1024 * 32 @@ -4004,7 +4003,6 @@ return SWITCH_STATUS_SUCCESS; } - SWITCH_MODULE_LOAD_FUNCTION(mod_voicemail_load) { switch_application_interface_t *app_interface;

1 0

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

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

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

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

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

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

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