- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13429 - freeswitch/trunk/src
by FreeSWITCH SVN 22 May '09

22 May '09

Author: brian Date: Fri May 22 16:33:15 2009 New Revision: 13429 Log: adding back options, build skew DAMN YOU. Also adding zrtp_sas1_string and zrtp_sas2_string variables. 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 Fri May 22 16:33:15 2009 @@ -433,6 +433,7 @@ static void zrtp_event_callback(zrtp_stream_t *stream, unsigned event) { switch_rtp_t *rtp_session = zrtp_stream_get_userdata(stream); + zrtp_session_info_t zrtp_session_info; switch (event) { case ZRTP_EVENT_IS_SECURE_DONE: @@ -440,8 +441,27 @@ 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); + if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) { + if (zrtp_session_info.sas_is_ready) { + 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_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); + } + } break; case ZRTP_EVENT_IS_CLIENT_ENROLLMENT: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Enrolled complete!\n"); + break; + case ZRTP_EVENT_USER_ALREADY_ENROLLED: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "User already enrolled!\n"); + break; + case ZRTP_EVENT_NEW_USER_ENROLLED: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "New user enrolled!\n"); + break; + case ZRTP_EVENT_USER_UNENROLLED: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "User unenrolled!\n"); break; case ZRTP_EVENT_IS_CLEAR: break; @@ -1048,7 +1068,9 @@ zrtp_profile_defaults(rtp_session->zrtp_profile, zrtp_global); rtp_session->zrtp_profile->allowclear = 1; - + rtp_session->zrtp_profile->disclose_bit = 0; + rtp_session->zrtp_profile->cache_ttl = -1; + if (zrtp_status_ok != zrtp_session_init(zrtp_global, rtp_session->zrtp_profile, zid, 1, &rtp_session->zrtp_session)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! zRTP INIT Failed\n"); zrtp_session_down(rtp_session->zrtp_session); @@ -1061,7 +1083,8 @@ abort(); } zrtp_stream_set_userdata(rtp_session->zrtp_ctx, rtp_session); - + /* used for mitm registration coming soom */ + /* zrtp_stream_registration_start(rtp_session->zrtp_ctx, rtp_session->ssrc); */ zrtp_stream_start(rtp_session->zrtp_ctx, rtp_session->ssrc); } #endif

1 0

[commit] r13428 - freeswitch/trunk/src
by FreeSWITCH SVN 22 May '09

22 May '09

Author: brian Date: Fri May 22 15:17:07 2009 New Revision: 13428 Log: remove these for now 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 Fri May 22 15:17:07 2009 @@ -71,7 +71,6 @@ static zrtp_global_t *zrtp_global; static zrtp_zid_t zid = { "FreeSWITCH01" }; static int zrtp_on = 0; -#define SECRET_NEVER_EXPIRES 0xFFFFFFFF #endif #ifdef _MSC_VER @@ -1049,8 +1048,6 @@ zrtp_profile_defaults(rtp_session->zrtp_profile, zrtp_global); rtp_session->zrtp_profile->allowclear = 1; - rtp_session->zrtp_profile->cache_ttl = SECRET_NEVER_EXPIRES; - rtp_session->zrtp_profile->disclose_bit = 0; if (zrtp_status_ok != zrtp_session_init(zrtp_global, rtp_session->zrtp_profile, zid, 1, &rtp_session->zrtp_session)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! zRTP INIT Failed\n");

1 0

[commit] r13427 - freeswitch/trunk/src
by FreeSWITCH SVN 22 May '09

22 May '09

Author: brian Date: Fri May 22 15:07:14 2009 New Revision: 13427 Log: can't flush because you have a chance of dumping zrtp control frames 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 Fri May 22 15:07:14 2009 @@ -439,8 +439,6 @@ case ZRTP_EVENT_IS_SECURE_DONE: break; case ZRTP_EVENT_IS_SECURE: - /* Flush buffer just in case we have packets that aren't encrypted */ - rtp_flush_read_buffer(rtp_session, SWITCH_RTP_FLUSH_ONCE); switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND); switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV); break; @@ -453,8 +451,6 @@ case ZRTP_EVENT_IS_PENDINGSECURE: break; case ZRTP_EVENT_IS_PENDINGCLEAR: - /* Flush buffer just in case we have packets that are encrypted */ - rtp_flush_read_buffer(rtp_session, SWITCH_RTP_FLUSH_ONCE); switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND); switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV); break;

1 0

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

22 May '09

Author: anthm Date: Fri May 22 13:19:55 2009 New Revision: 13426 Log: add some stuff for zrtp Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_frame.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core_memory.c freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Fri May 22 13:19:55 2009 @@ -448,6 +448,11 @@ */ #define switch_core_destroy_memory_pool(p) switch_core_perform_destroy_memory_pool(p, __FILE__, __SWITCH_FUNC__, __LINE__) + +SWITCH_DECLARE(void) switch_core_memory_pool_set_data(switch_memory_pool_t *pool, const char *key, void *data); +SWITCH_DECLARE(void *) switch_core_memory_pool_get_data(switch_memory_pool_t *pool, const char *key); + + /*! \brief Start the session's state machine \param session the session on which to start the state machine Modified: freeswitch/trunk/src/include/switch_frame.h ============================================================================== --- freeswitch/trunk/src/include/switch_frame.h (original) +++ freeswitch/trunk/src/include/switch_frame.h Fri May 22 13:19:55 2009 @@ -46,9 +46,11 @@ /*! the originating source of the frame */ const char *source; /*! the raw packet */ - void *packet; + void *packet; /*! the size of the raw packet when applicable */ uint32_t packetlen; + /*! the extra frame data */ + void *extra_data; /*! the frame data */ void *data; /*! the size of the buffer that is in use */ Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri May 22 13:19:55 2009 @@ -920,7 +920,8 @@ SFF_PLC = (1 << 3), SFF_RFC2833 = (1 << 4), SFF_PROXY_PACKET = (1 << 5), - SFF_DYNAMIC = (1 << 6) + SFF_DYNAMIC = (1 << 6), + SFF_ZRTP = (1 << 7) } switch_frame_flag_enum_t; typedef uint32_t switch_frame_flag_t; Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Fri May 22 13:19:55 2009 @@ -304,6 +304,20 @@ return duped; } +SWITCH_DECLARE(void) switch_core_memory_pool_set_data(switch_memory_pool_t *pool, const char *key, void *data) +{ + apr_pool_userdata_set(data, key, NULL, pool); +} + +SWITCH_DECLARE(void *) switch_core_memory_pool_get_data(switch_memory_pool_t *pool, const char *key) +{ + void *data = NULL; + + apr_pool_userdata_get(&data, key, pool); + + return data; +} + SWITCH_DECLARE(void) switch_core_memory_pool_tag(switch_memory_pool_t *pool, const char *tag) { apr_pool_tag(pool, tag); Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri May 22 13:19:55 2009 @@ -1206,6 +1206,8 @@ session = switch_core_alloc(usepool, sizeof(*session)); session->pool = usepool; + + switch_core_memory_pool_set_data(session->pool, "__session", session); if (switch_channel_alloc(&session->channel, direction, session->pool) != SWITCH_STATUS_SUCCESS) { abort();

1 0

[commit] r13425 - freeswitch/trunk/src
by FreeSWITCH SVN 22 May '09

22 May '09

Author: brian Date: Fri May 22 11:35:37 2009 New Revision: 13425 Log: adding buffer flush 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 Fri May 22 11:35:37 2009 @@ -439,6 +439,8 @@ case ZRTP_EVENT_IS_SECURE_DONE: break; case ZRTP_EVENT_IS_SECURE: + /* Flush buffer just in case we have packets that aren't encrypted */ + rtp_flush_read_buffer(rtp_session, SWITCH_RTP_FLUSH_ONCE); switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND); switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV); break; @@ -451,6 +453,8 @@ case ZRTP_EVENT_IS_PENDINGSECURE: break; case ZRTP_EVENT_IS_PENDINGCLEAR: + /* Flush buffer just in case we have packets that are encrypted */ + rtp_flush_read_buffer(rtp_session, SWITCH_RTP_FLUSH_ONCE); switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND); switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV); break;

1 0

[commit] r13424 - freeswitch/trunk/src
by FreeSWITCH SVN 22 May '09

22 May '09

Author: brian Date: Fri May 22 00:33:21 2009 New Revision: 13424 Log: adding more options to zrtp Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri May 22 00:33:21 2009 @@ -1157,10 +1157,12 @@ if (switch_test_flag((&runtime), SCF_USE_SQL)) { switch_core_sqldb_start(runtime.memory_pool); } + switch_scheduler_task_thread_start(); + switch_rtp_init(runtime.memory_pool); + runtime.running = 1; - switch_scheduler_task_thread_start(); runtime.initiated = switch_time_now(); switch_scheduler_add_task(switch_epoch_time_now(NULL), heartbeat_callback, "heartbeat", "core", 0, NULL, SSHF_NONE | SSHF_NO_DEL); Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri May 22 00:33:21 2009 @@ -59,8 +59,6 @@ #define RTP_MAGIC_NUMBER 42 #define MAX_SRTP_ERRS 10 - - static switch_port_t START_PORT = RTP_START_PORT; static switch_port_t END_PORT = RTP_END_PORT; static switch_port_t NEXT_PORT = RTP_START_PORT; @@ -73,7 +71,7 @@ static zrtp_global_t *zrtp_global; static zrtp_zid_t zid = { "FreeSWITCH01" }; static int zrtp_on = 0; - +#define SECRET_NEVER_EXPIRES 0xFFFFFFFF #endif #ifdef _MSC_VER @@ -414,17 +412,13 @@ } #ifdef ENABLE_ZRTP -static void zrtp_security_event_callback(zrtp_stream_t *stream, unsigned event) +SWITCH_STANDARD_SCHED_FUNC(zrtp_cache_save_callback) { - switch_rtp_t *rtp_session = zrtp_stream_get_userdata(stream); - zrtp_session_info_t zrtp_session_info; - zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info); + zrtp_status_t status = zrtp_status_ok; - switch (event) { - default: - zrtp_log_print_sessioninfo(&zrtp_session_info); - break; - } + status = zrtp_def_cache_store(zrtp_global); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Saving ZRTP cache: %s\n", zrtp_status_ok == status ? "OK" : "FAIL"); + task->runtime = switch_epoch_time_now(NULL) + 900; } static int zrtp_send_rtp_callback(const zrtp_stream_t* stream, char* rtp_packet, unsigned int rtp_packet_length) @@ -437,7 +431,7 @@ return status; } -static void zrtp_protocol_event_callback(zrtp_stream_t *stream, unsigned event) +static void zrtp_event_callback(zrtp_stream_t *stream, unsigned event) { switch_rtp_t *rtp_session = zrtp_stream_get_userdata(stream); @@ -510,12 +504,13 @@ if (zrtp_on) { zrtp_config_defaults(&zrtp_config); strcpy(zrtp_config.client_id, "FreeSWITCH"); + zrtp_config.is_mitm = 1; zrtp_config.lic_mode = ZRTP_LICENSE_MODE_ACTIVE; switch_snprintf(zrtp_cache_path, sizeof(zrtp_cache_path), "%s%szrtp.dat", SWITCH_GLOBAL_dirs.db_dir, SWITCH_PATH_SEPARATOR); zrtp_zstrcpyc( ZSTR_GV(zrtp_config.def_cache_path), zrtp_cache_path); - zrtp_config.cb.event_cb.on_zrtp_protocol_event = zrtp_protocol_event_callback; + zrtp_config.cb.event_cb.on_zrtp_protocol_event = zrtp_event_callback; zrtp_config.cb.misc_cb.on_send_packet = zrtp_send_rtp_callback; - zrtp_config.cb.event_cb.on_zrtp_security_event = zrtp_security_event_callback; + zrtp_config.cb.event_cb.on_zrtp_security_event = zrtp_event_callback; zrtp_log_set_log_engine(zrtp_logger); zrtp_log_set_level(4); @@ -524,6 +519,7 @@ } memcpy(zid, zid_string, 12); + switch_scheduler_add_task(switch_epoch_time_now(NULL) + 900, zrtp_cache_save_callback, "zrtp_cache_save", "core", 0, NULL, SSHF_NONE | SSHF_NO_DEL); } #endif srtp_init(); @@ -559,6 +555,10 @@ #ifdef ENABLE_ZRTP if (zrtp_on) { + zrtp_status_t status = zrtp_status_ok; + + status = zrtp_def_cache_store(zrtp_global); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Saving ZRTP cache: %s\n", zrtp_status_ok == status ? "OK" : "FAIL"); zrtp_down(zrtp_global); } #endif @@ -1049,6 +1049,8 @@ zrtp_profile_defaults(rtp_session->zrtp_profile, zrtp_global); rtp_session->zrtp_profile->allowclear = 1; + rtp_session->zrtp_profile->cache_ttl = SECRET_NEVER_EXPIRES; + rtp_session->zrtp_profile->disclose_bit = 0; if (zrtp_status_ok != zrtp_session_init(zrtp_global, rtp_session->zrtp_profile, zid, 1, &rtp_session->zrtp_session)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! zRTP INIT Failed\n");

1 0

[commit] r13423 - freeswitch/trunk/src
by FreeSWITCH SVN 21 May '09

21 May '09

Author: anthm Date: Thu May 21 18:47:04 2009 New Revision: 13423 Log: fix typo Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Thu May 21 18:47:04 2009 @@ -1002,7 +1002,7 @@ (switch_channel_test_flag(peer_channel, CF_ANSWERED) && state < CS_HANGUP)) { if (switch_true(switch_channel_get_variable(caller_channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE))) { switch_ivr_park_session(session); - } else if ((var = switch_channel_get_variable(caller_channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE))) { + } else if ((var = switch_channel_get_variable(caller_channel, SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE))) { transfer_after_bridge(session, var); } else if (switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel));

1 0

[commit] r13422 - freeswitch/trunk/src
by FreeSWITCH SVN 21 May '09

21 May '09

Author: mikej Date: Thu May 21 17:37:15 2009 New Revision: 13422 Log: allow switching from secure to clear and back now 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 21 17:37:15 2009 @@ -418,14 +418,11 @@ { switch_rtp_t *rtp_session = zrtp_stream_get_userdata(stream); zrtp_session_info_t zrtp_session_info; + zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info); switch (event) { - case ZRTP_EVENT_IS_SECURE: - zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info); - zrtp_log_print_sessioninfo(&zrtp_session_info); - - break; default: + zrtp_log_print_sessioninfo(&zrtp_session_info); break; } } @@ -452,11 +449,19 @@ switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV); break; case ZRTP_EVENT_IS_CLIENT_ENROLLMENT: + break; case ZRTP_EVENT_IS_CLEAR: + break; case ZRTP_EVENT_IS_INITIATINGSECURE: + break; case ZRTP_EVENT_IS_PENDINGSECURE: + break; 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); + break; case ZRTP_EVENT_NO_ZRTP: + break; case ZRTP_EVENT_LOCAL_SAS_UPDATED: break; default: @@ -1038,12 +1043,12 @@ switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); } - rtp_session->ready = 1; - *new_rtp_session = rtp_session; #ifdef ENABLE_ZRTP if (zrtp_on) { rtp_session->zrtp_profile = switch_core_alloc(rtp_session->pool, sizeof(*rtp_session->zrtp_profile)); zrtp_profile_defaults(rtp_session->zrtp_profile, zrtp_global); + + rtp_session->zrtp_profile->allowclear = 1; if (zrtp_status_ok != zrtp_session_init(zrtp_global, rtp_session->zrtp_profile, zid, 1, &rtp_session->zrtp_session)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! zRTP INIT Failed\n"); @@ -1062,6 +1067,9 @@ } #endif + rtp_session->ready = 1; + *new_rtp_session = rtp_session; + return SWITCH_STATUS_SUCCESS; } @@ -1851,6 +1859,7 @@ break; case zrtp_status_drop: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat); + break; case zrtp_status_fail: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat); ret = -1; @@ -2440,8 +2449,10 @@ break; case zrtp_status_drop: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat); + break; case zrtp_status_fail: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat); + break; default: break; } @@ -2704,8 +2715,10 @@ break; case zrtp_status_drop: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat); + break; case zrtp_status_fail: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat); + break; default: break; }

1 0

[commit] r13421 - freeswitch/trunk/src
by FreeSWITCH SVN 21 May '09

21 May '09

Author: mikej Date: Thu May 21 17:17:39 2009 New Revision: 13421 Log: core: fix handle leak in switch_thread_self on windows (FSCORE-371) 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 21 17:17:39 2009 @@ -71,7 +71,11 @@ SWITCH_DECLARE(switch_thread_id_t) switch_thread_self(void) { +#ifndef WIN32 return apr_os_thread_current(); +#else + return (GetCurrentThreadId()); +#endif } SWITCH_DECLARE(void) switch_pool_clear(switch_memory_pool_t *p)

1 0

[commit] r13420 - freeswitch/trunk/libs/apr/build
by FreeSWITCH SVN 21 May '09

21 May '09

Author: mikej Date: Thu May 21 16:55:25 2009 New Revision: 13420 Log: remove generated file Removed: freeswitch/trunk/libs/apr/build/config.sub

1 0