- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

[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

[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

[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

[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

[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

[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

[commit] r13432 - freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill
by FreeSWITCH SVN 26 May '09

26 May '09

Author: dschreiber Date: Tue May 26 00:50:41 2009 New Revision: 13432 Log: Added feature mod_nibblebill to check balance and transfer the caller to an alternate dialplan context & extension if they deplete their funds. Modified: freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/mod_nibblebill.c Modified: freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/mod_nibblebill.c ============================================================================== --- freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/mod_nibblebill.c (original) +++ freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/mod_nibblebill.c Tue May 26 00:50:41 2009 @@ -56,8 +56,8 @@ /* Defaults */ #ifdef SWITCH_HAVE_ODBC -/*static char SQL_LOOKUP[] = "SELECT %s FROM %s WHERE %s=\"%s\"";*/ -static char SQL_SAVE[] = "UPDATE %s SET %s=%s-%f WHERE %s=%s"; +static char SQL_LOOKUP[] = "SELECT %s FROM %s WHERE %s='%s'"; +static char SQL_SAVE[] = "UPDATE %s SET %s=%s-%f WHERE %s='%s'"; #endif typedef struct @@ -73,7 +73,7 @@ typedef struct nibblebill_results { - float funds; + float balance; float percall_max; /* Overrides global on a per-user level */ float lowbal_amt; /* ditto */ @@ -117,6 +117,8 @@ #endif } globals; +static void nibblebill_pause(switch_core_session_t *session); + /************************** * Setup FreeSWITCH Macros * **************************/ @@ -141,14 +143,14 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_nobal_action, globals.nobal_action); #ifdef SWITCH_HAVE_ODBC -/*static int nibblebill_callback(void *pArg, int argc, char **argv, char **columnNames) +static int nibblebill_callback(void *pArg, int argc, char **argv, char **columnNames) { nibblebill_results_t *cbt = (nibblebill_results_t *) pArg; - cbt->funds = atof(argv[0]); + cbt->balance = atof(argv[0]); return 0; -}*/ +} #endif static switch_status_t load_config(void) @@ -271,6 +273,37 @@ } +static void transfer_call(switch_core_session_t *session, char *destination) +{ + char *argv[4] = { 0 }; + + switch_separate_string(destination, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + + const char *uuid; + switch_channel_t *channel = switch_core_session_get_channel(session); + /* Find the uuid of our B leg. If it exists, transfer it first */ + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { + /* Make sure we are in the media path on B leg */ + switch_ivr_media(uuid, SMF_REBRIDGE); + + /* Get info on the B leg */ + switch_core_session_t *b_session; + if ((b_session = switch_core_session_locate(uuid))) { + /* Transfer the B leg */ + switch_ivr_session_transfer(b_session, argv[0], argv[1], argv[2]); + switch_core_session_rwunlock(b_session); + } + } + + /* Make sure we are in the media path on A leg */ + uuid = switch_core_session_get_uuid(session); + switch_ivr_media(uuid, SMF_REBRIDGE); + + /* Transfer the A leg */ + switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]); +} + + /* At this time, billing never succeeds if you don't have a database. */ static switch_status_t bill_event(float billamount, const char *billaccount) { @@ -300,6 +333,36 @@ } +static float get_balance(const char *billaccount) +{ +#ifdef SWITCH_HAVE_ODBC + char sql[1024] = ""; + nibblebill_results_t pdata; + float balance = 0.00; + + memset(&pdata, 0, sizeof(pdata)); + snprintf(sql, 1024, SQL_LOOKUP, globals.db_column_cash, globals.db_table, globals.db_column_account, billaccount); + + if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, nibblebill_callback, &pdata) != SWITCH_ODBC_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error running this query: [%s]\n", sql); +#endif + /* TODO: Return -1 for safety */ + + return -1.00; +#ifdef SWITCH_HAVE_ODBC + } else { + /* Successfully retrieved! */ + balance = pdata.balance; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Retrieved current balance for account %s (balance = %f)\n", billaccount, balance); + } + +#endif + return balance; +} + + + /* This is where we actually charge the guy This can be called anytime a call is in progress or at the end of a call before the session is destroyed */ static switch_status_t do_billing(switch_core_session_t *session) @@ -426,6 +489,20 @@ /* Save this location, but only if the channel/session are not hungup (otherwise, we're done) */ if (channel && switch_channel_get_state(channel) != CS_HANGUP) { switch_channel_set_private(channel, "_nibble_data_", nibble_data); + + /* See if this person has enough money left to continue the call */ + float balance; + balance = get_balance(billaccount); + if (balance < globals.nobal_amt) { + /* Not enough money - reroute call to nobal location */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount); + + /* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */ + /* in nibblebill checking the call again in the routing process for an allowed balance! */ + /* If you intend to give the user the option to re-up their balance, you must clear & resume billing once the balance is updated! */ + nibblebill_pause(session); + transfer_call(session, globals.nobal_action); + } } /* Done changing - release lock */ @@ -648,6 +725,7 @@ } + #define APP_SYNTAX "pause | resume | reset | adjust <amount> | heartbeat <seconds> | check" SWITCH_STANDARD_APP(nibblebill_app_function) {

1 0

[commit] r13431 - freeswitch/trunk/src
by FreeSWITCH SVN 24 May '09

24 May '09

Author: brian Date: Sun May 24 14:11:36 2009 New Revision: 13431 Log: clean up 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 Sun May 24 14:11:36 2009 @@ -446,7 +446,6 @@ 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); - rtp_session->zrtp_mitm_tries = 0; if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) { if (zrtp_session_info.sas_is_ready) { @@ -512,6 +511,7 @@ 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); + rtp_session->zrtp_mitm_tries = 0; break; case ZRTP_EVENT_NO_ZRTP: break; @@ -2260,7 +2260,7 @@ if (zrtp_on && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM) && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV)) { frame->extra_data = rtp_session->zrtp_ctx; switch_set_flag(frame, SFF_ZRTP); - if (rtp_session->zrtp_mitm_tries > 1) { + if (rtp_session->zrtp_mitm_tries > 10) { switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM); rtp_session->zrtp_mitm_tries = 0; } @@ -2692,8 +2692,11 @@ #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); - switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM); - rtp_session->zrtp_mitm_tries = 0; + 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++; } #endif

1 0

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

23 May '09

Author: brian Date: Fri May 22 20:50:56 2009 New Revision: 13430 Log: needs more testing 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 Fri May 22 20:50:56 2009 @@ -498,7 +498,8 @@ SWITCH_RTP_FLAG_AUTOFLUSH = (1 << 21), 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_RECV = (1 << 24), + SWITCH_ZRTP_FLAG_SECURE_MITM = (1 << 25) } 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 Fri May 22 20:50:56 2009 @@ -216,6 +216,7 @@ zrtp_session_t *zrtp_session; zrtp_profile_t *zrtp_profile; zrtp_stream_t *zrtp_ctx; + int zrtp_mitm_tries; #endif #ifdef RTP_DEBUG_WRITE_DELTA @@ -433,6 +434,9 @@ static void zrtp_event_callback(zrtp_stream_t *stream, unsigned event) { 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); + zrtp_session_info_t zrtp_session_info; switch (event) { @@ -441,42 +445,76 @@ 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); + rtp_session->zrtp_mitm_tries = 0; 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_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"); + 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); + } + } 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"); + + 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); + } + } 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_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); break; case ZRTP_EVENT_NO_ZRTP: break; - case ZRTP_EVENT_LOCAL_SAS_UPDATED: - break; default: break; } @@ -1064,14 +1102,22 @@ #ifdef ENABLE_ZRTP if (zrtp_on) { + int initiator = 0; + 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); + + if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) { + initiator = 1; + } + 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; + rtp_session->zrtp_profile->allowclear = 0; 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)) { + if (zrtp_status_ok != zrtp_session_init(zrtp_global, rtp_session->zrtp_profile, zid, initiator, &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); rtp_session->zrtp_session = NULL; @@ -1083,9 +1129,12 @@ 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); + + if (switch_true(switch_channel_get_variable(channel, "zrtp_enrollment"))) { + zrtp_stream_registration_start(rtp_session->zrtp_ctx, rtp_session->ssrc); + } else { + zrtp_stream_start(rtp_session->zrtp_ctx, rtp_session->ssrc); + } } #endif @@ -2207,6 +2256,18 @@ frame->ssrc = ntohl(rtp_session->recv_msg.header.ssrc); 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)) { + frame->extra_data = rtp_session->zrtp_ctx; + switch_set_flag(frame, SFF_ZRTP); + if (rtp_session->zrtp_mitm_tries > 1) { + switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM); + rtp_session->zrtp_mitm_tries = 0; + } + rtp_session->zrtp_mitm_tries++; + } +#endif + if (bytes < 0) { frame->datalen = 0; return bytes == -2 ? SWITCH_STATUS_TIMEOUT : SWITCH_STATUS_GENERR; @@ -2628,6 +2689,13 @@ return (int) bytes; } +#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); + switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM); + rtp_session->zrtp_mitm_tries = 0; + } +#endif fwd = (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && switch_test_flag(frame, SFF_RAW_RTP)) ? 1 : 0;

1 0