- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13502 - freeswitch/trunk/src
by FreeSWITCH SVN 29 May '09

29 May '09

Author: brian Date: Thu May 28 21:08:24 2009 New Revision: 13502 Log: FSRTP-2 with mods Modified: freeswitch/trunk/src/switch_core_sqldb.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Thu May 28 21:08:24 2009 @@ -387,6 +387,18 @@ } break; } + case SWITCH_EVENT_CALL_SECURE: + { + const char *type = switch_event_get_header_nil(event, "secure_type"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Secure Type: %s\n", type); + if (switch_strlen_zero(type)) { + break; + } + sql = switch_mprintf("update channels set secure='%s' where uuid='%s'", + type, + switch_event_get_header_nil(event, "caller-unique-id")); + break; + } default: break; } @@ -454,7 +466,8 @@ " read_codec VARCHAR(255),\n" " read_rate VARCHAR(255),\n" " write_codec VARCHAR(255),\n" - " write_rate VARCHAR(255)\n" + " write_rate VARCHAR(255),\n" + " secure VARCHAR(255)\n" ");\ncreate index uuindex on channels (uuid);\n"; char create_calls_sql[] = "CREATE TABLE calls (\n" Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu May 28 21:08:24 2009 @@ -437,6 +437,7 @@ switch_rtp_t *rtp_session = zrtp_stream_get_userdata(stream); switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session"); switch_channel_t *channel = switch_core_session_get_channel(session); + switch_event_t *fsevent = NULL; zrtp_session_info_t zrtp_session_info; @@ -460,6 +461,12 @@ } } } + if (switch_event_create(&fsevent, SWITCH_EVENT_CALL_SECURE) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(fsevent, SWITCH_STACK_BOTTOM, "secure_type", "zrtp:%s:%s", + rtp_session->zrtp_session->sas1.buffer, rtp_session->zrtp_session->sas2.buffer); + switch_event_add_header_string(fsevent, SWITCH_STACK_BOTTOM, "caller-unique-id", switch_channel_get_uuid(channel)); + switch_event_fire(&fsevent); + } break; case ZRTP_EVENT_IS_CLIENT_ENROLLMENT: @@ -909,6 +916,9 @@ srtp_policy_t *policy; err_status_t stat; switch_status_t status = SWITCH_STATUS_SUCCESS; + switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session"); + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_event_t *fsevent = NULL; if (direction >= SWITCH_RTP_CRYPTO_MAX || keylen > SWITCH_RTP_MAX_CRYPTO_LEN) { return SWITCH_STATUS_FALSE; @@ -996,6 +1006,13 @@ break; } + if (switch_event_create(&fsevent, SWITCH_EVENT_CALL_SECURE) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(fsevent, SWITCH_STACK_BOTTOM, "secure_type", "srtp:%s", switch_channel_get_variable(channel, "sip_has_crypto")); + switch_event_add_header_string(fsevent, SWITCH_STACK_BOTTOM, "caller-unique-id", switch_channel_get_uuid(channel)); + switch_event_fire(&fsevent); + } + + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r13501 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 29 May '09

29 May '09

Author: brian Date: Thu May 28 20:23:53 2009 New Revision: 13501 Log: clean up config Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Thu May 28 20:23:53 2009 @@ -3,11 +3,11 @@   <menu name="demo_ivr" - greet-long="phrase:demo_ivr_main_menu" - greet-short="phrase:demo_ivr_main_menu_short" - invalid-sound="ivr/ivr-that_was_an_invalid_entry.wav" - exit-sound="voicemail/vm-goodbye.wav" - timeout ="10000" + greet-long="phrase:demo_ivr_main_menu" + greet-short="phrase:demo_ivr_main_menu_short" + invalid-sound="ivr/ivr-that_was_an_invalid_entry.wav" + exit-sound="voicemail/vm-goodbye.wav" + timeout="10000" inter-digit-timeout="2000" max-failures="3" max-timeouts="3"

1 0

[commit] r13500 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 29 May '09

29 May '09

Author: brian Date: Thu May 28 20:09:33 2009 New Revision: 13500 Log: you know this is just one example of the crazy things you can do with FreeSWITCH 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 Thu May 28 20:09:33 2009 @@ -287,6 +287,14 @@ <extension name="freeswitch_public_conf_via_sip"> <condition field="destination_number" expression="^9(888|1616|3232)$"> <action application="export" data="hold_music=silence"/> +  +  <action application="bridge" data="sofia/${use_profile}/$1(a)conference.freeswitch.org"/> </condition> </extension>

1 0

[commit] r13499 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 29 May '09

29 May '09

Author: brian Date: Thu May 28 20:08:30 2009 New Revision: 13499 Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu May 28 20:08:30 2009 @@ -1251,7 +1251,7 @@ const char *ua = switch_channel_get_variable(tech_pvt->channel, "sip_user_agent"); if (ua && switch_stristr("snom", ua)) { - snprintf(message, sizeof(message), "From:\r\nTo: \"%s\"\r\n", msg->string_arg); + snprintf(message, sizeof(message), "From:\r\nTo: \"%s\" %s\r\n", msg->string_arg, tech_pvt->caller_profile->destination_number); nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); } else { snprintf(message, sizeof(message), "P-Asserted-Identity: \"%s\" <%s>", msg->string_arg, tech_pvt->caller_profile->destination_number);

1 0

[commit] r13498 - freeswitch/trunk/src/mod/applications/mod_cidlookup
by FreeSWITCH SVN 29 May '09

29 May '09

Author: brian Date: Thu May 28 19:14:34 2009 New Revision: 13498 Log: fix Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c (original) +++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Thu May 28 19:14:34 2009 @@ -255,7 +255,7 @@ static char *check_cache(switch_memory_pool_t *pool, const char *number) { char *cmd; - char *name; + char *name = NULL; switch_stream_handle_t stream = { 0 }; SWITCH_STANDARD_STREAM(stream);

1 0

[commit] r13497 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 28 May '09

28 May '09

Author: brian Date: Thu May 28 18:39:46 2009 New Revision: 13497 Log: doh this is the right way for this Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu May 28 18:39:46 2009 @@ -1256,7 +1256,7 @@ } else { snprintf(message, sizeof(message), "P-Asserted-Identity: \"%s\" <%s>", msg->string_arg, tech_pvt->caller_profile->destination_number); nua_update(tech_pvt->nh, - SIPTAG_HEADER_STR(message), + TAG_IF(!switch_strlen_zero_buf(message), SIPTAG_HEADER_STR(message)), TAG_END()); } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu May 28 18:39:46 2009 @@ -5070,7 +5070,7 @@ snprintf(message, sizeof(message), "P-Asserted-Identity: \"%s\" <%s>", acp->caller_id_name, acp->caller_id_number); } nua_update(b_tech_pvt->nh, - SIPTAG_HEADER_STR(message), + TAG_IF(!switch_strlen_zero_buf(message), SIPTAG_HEADER_STR(message)), TAG_END()); } }

1 0

[commit] r13496 - freeswitch/trunk/src
by FreeSWITCH SVN 28 May '09

28 May '09

Author: anthm Date: Thu May 28 18:31:27 2009 New Revision: 13496 Log: add more ridiculous timeout to socket send Modified: freeswitch/trunk/src/switch_apr.c Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Thu May 28 18:31:27 2009 @@ -683,11 +683,11 @@ need = req - wrote; status = apr_socket_send(sock, buf + wrote, &need); if (status == SWITCH_STATUS_BREAK || status == 730035) { - if (++to_count > 10000) { + if (++to_count > 10000000) { status = SWITCH_STATUS_FALSE; break; } - switch_cond_next(); + switch_yield(10000); } else { to_count = 0; }

1 0

[commit] r13495 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 28 May '09

28 May '09

Author: brian Date: Thu May 28 18:10:17 2009 New Revision: 13495 Log: picky compilers Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu May 28 18:10:17 2009 @@ -5070,7 +5070,7 @@ snprintf(message, sizeof(message), "P-Asserted-Identity: \"%s\" <%s>", acp->caller_id_name, acp->caller_id_number); } nua_update(b_tech_pvt->nh, - TAG_IF(!switch_strlen_zero(message), SIPTAG_HEADER_STR(message)), + SIPTAG_HEADER_STR(message), TAG_END()); } }

1 0

[commit] r13494 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 28 May '09

28 May '09

Author: brian Date: Thu May 28 18:08:43 2009 New Revision: 13494 Log: picky compilers Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu May 28 18:08:43 2009 @@ -1256,7 +1256,7 @@ } else { snprintf(message, sizeof(message), "P-Asserted-Identity: \"%s\" <%s>", msg->string_arg, tech_pvt->caller_profile->destination_number); nua_update(tech_pvt->nh, - TAG_IF(!switch_strlen_zero(message), SIPTAG_HEADER_STR(message)), + SIPTAG_HEADER_STR(message), TAG_END()); } }

1 0

[commit] r13493 - freeswitch/trunk/src
by FreeSWITCH SVN 28 May '09

28 May '09

Author: brian Date: Thu May 28 17:54:51 2009 New Revision: 13493 Log: MORE FUN, clean up and consistent code 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 Thu May 28 17:54:51 2009 @@ -71,7 +71,7 @@ static zrtp_global_t *zrtp_global; static zrtp_zid_t zid = { "FreeSWITCH01" }; static int zrtp_on = 0; -#define ZRTP_MITM_TRIES 30 +#define ZRTP_MITM_TRIES 50 #endif #ifdef _MSC_VER @@ -441,85 +441,93 @@ zrtp_session_info_t zrtp_session_info; switch (event) { - case ZRTP_EVENT_IS_SECURE_DONE: - break; 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_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) { - - switch_channel_set_variable(channel, "zrtp_secure_media_confirmed", "true"); - switch_channel_set_variable(channel, "zrtp_sas1_string", rtp_session->zrtp_session->sas1.buffer); - switch_channel_set_variable(channel, "zrtp_sas2_string", rtp_session->zrtp_session->sas2.buffer); - - zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid, - &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1); - + { + 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_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) { + + switch_channel_set_variable(channel, "zrtp_secure_media_confirmed", "true"); + switch_channel_set_variable(channel, "zrtp_sas1_string", rtp_session->zrtp_session->sas1.buffer); + switch_channel_set_variable(channel, "zrtp_sas2_string", rtp_session->zrtp_session->sas2.buffer); + + zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid, + &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1); + + } } } break; - case ZRTP_EVENT_IS_CLIENT_ENROLLMENT: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Enrolled complete!\n"); - switch_channel_set_variable(channel, "zrtp_enroll_complete", "true"); + case ZRTP_EVENT_IS_CLIENT_ENROLLMENT: + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Enrolled complete!\n"); + switch_channel_set_variable(channel, "zrtp_enroll_complete", "true"); + } break; - case ZRTP_EVENT_USER_ALREADY_ENROLLED: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "User already enrolled!\n"); - switch_channel_set_variable(channel, "zrtp_already_enrolled", "true"); - if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) { - if (zrtp_session_info.sas_is_ready) { - zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid, - &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1); + case ZRTP_EVENT_USER_ALREADY_ENROLLED: + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "User already enrolled!\n"); + switch_channel_set_variable(channel, "zrtp_already_enrolled", "true"); + + if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) { + if (zrtp_session_info.sas_is_ready) { + zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid, + &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1); + } } } break; + case ZRTP_EVENT_NEW_USER_ENROLLED: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "New user enrolled!\n"); - switch_channel_set_variable(channel, "zrtp_new_user_enrolled", "true"); + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "New user enrolled!\n"); + switch_channel_set_variable(channel, "zrtp_new_user_enrolled", "true"); - if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) { - if (zrtp_session_info.sas_is_ready) { - zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid, - &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1); + if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) { + if (zrtp_session_info.sas_is_ready) { + zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid, + &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1); + } } } break; + case ZRTP_EVENT_USER_UNENROLLED: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "User unenrolled!\n"); - switch_channel_set_variable(channel, "zrtp_user_unenrolled", "true"); - - if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) { - if (zrtp_session_info.sas_is_ready) { - zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid, - &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1); + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "User unenrolled!\n"); + switch_channel_set_variable(channel, "zrtp_user_unenrolled", "true"); + + if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) { + if (zrtp_session_info.sas_is_ready) { + zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid, + &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1); + } } } break; - case ZRTP_EVENT_IS_CLEAR: - break; - case ZRTP_EVENT_IS_INITIATINGSECURE: - break; - case ZRTP_EVENT_LOCAL_SAS_UPDATED: - break; - case ZRTP_EVENT_REMOTE_SAS_UPDATED: - break; - case ZRTP_EVENT_IS_PENDINGSECURE: - break; + case ZRTP_EVENT_IS_PENDINGCLEAR: - switch_channel_set_variable(channel, "zrtp_secure_media_confirmed", "false"); - 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_SEND); - switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV); - rtp_session->zrtp_mitm_tries = 0; + { + switch_channel_set_variable(channel, "zrtp_secure_media_confirmed", "false"); + 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_SEND); + switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV); + rtp_session->zrtp_mitm_tries = 0; + } break; + case ZRTP_EVENT_NO_ZRTP: - switch_channel_set_variable(channel, "zrtp_secure_media_confirmed", "false"); + { + switch_channel_set_variable(channel, "zrtp_secure_media_confirmed", "false"); + } break; + default: break; } @@ -1113,7 +1121,7 @@ const char *zrtp_enabled = switch_channel_get_variable(channel, "zrtp_secure_media"); const char *srtp_enabled = switch_channel_get_variable(channel, "sip_secure_media"); - if (switch_true(srtp_enabled)) { + if (switch_true(srtp_enabled) && switch_true(zrtp_enabled)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "You can not have ZRTP and SRTP enabled simultaneously, ZRTP will be disabled for this call!\n"); switch_channel_set_variable(channel, "zrtp_secure_media", NULL); zrtp_enabled = NULL;

1 0