January 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7261 - in freeswitch/trunk/src: . include
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: mikej Date: Thu Jan 17 00:52:50 2008 New Revision: 7261 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/switch_utils.c Log: use unsigned more consistently Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Jan 17 00:52:50 2008 @@ -304,7 +304,7 @@ \param arraylen the max number of elements in the array \return the number of elements added to the array */ -SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char **array, int arraylen); +SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char **array, unsigned int arraylen); SWITCH_DECLARE(switch_bool_t) switch_is_number(const char *str); SWITCH_DECLARE(char *) switch_strip_spaces(const char *str); Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Thu Jan 17 00:52:50 2008 @@ -1072,7 +1072,7 @@ } /* Separate a string using a delimiter that is not a space */ -static unsigned int separate_string_char_delim(char *buf, char delim, char **array, int arraylen) +static unsigned int separate_string_char_delim(char *buf, char delim, char **array, unsigned int arraylen) { enum tokenizer_state { START, @@ -1082,7 +1082,7 @@ unsigned int count = 0; char *ptr = buf; int inside_quotes = 0; - int i; + unsigned int i; while (*ptr && count < arraylen) { switch (state) { @@ -1113,7 +1113,7 @@ } /* Separate a string using a delimiter that is a space */ -static unsigned int separate_string_blank_delim(char *buf, char **array, int arraylen) +static unsigned int separate_string_blank_delim(char *buf, char **array, unsigned int arraylen) { enum tokenizer_state { START, @@ -1125,7 +1125,7 @@ unsigned int count = 0; char *ptr = buf; int inside_quotes = 0; - int i; + unsigned int i; while (*ptr && count < arraylen) { switch (state) { @@ -1170,7 +1170,7 @@ return count; } -SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char **array, int arraylen) +SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char **array, unsigned int arraylen) { if (!buf || !array || !arraylen) { return 0;

1 0

[commit] r7260 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: anthm Date: Wed Jan 16 23:16:04 2008 New Revision: 7260 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Log: spec followers finish last Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Jan 16 23:16:04 2008 @@ -370,17 +370,20 @@ SWITCH_RTP_FLAG_IO = (1 << 1), SWITCH_RTP_FLAG_USE_TIMER = (1 << 2), SWITCH_RTP_FLAG_TIMER_RECLOCK = (1 << 3), - SWITCH_RTP_FLAG_SECURE = (1 << 4), - SWITCH_RTP_FLAG_AUTOADJ = (1 << 5), - SWITCH_RTP_FLAG_RAW_WRITE = (1 << 6), - SWITCH_RTP_FLAG_GOOGLEHACK = (1 << 7), - SWITCH_RTP_FLAG_VAD = (1 << 8), - SWITCH_RTP_FLAG_BREAK = (1 << 9), - SWITCH_RTP_FLAG_MINI = (1 << 10), - SWITCH_RTP_FLAG_DATAWAIT = (1 << 11), - SWITCH_RTP_FLAG_BUGGY_2833 = (1 << 12), - SWITCH_RTP_FLAG_PASS_RFC2833 = (1 << 13), - SWITCH_RTP_FLAG_AUTO_CNG = (1 << 14) + SWITCH_RTP_FLAG_SECURE_SEND = (1 << 4), + SWITCH_RTP_FLAG_SECURE_RECV = (1 << 5), + SWITCH_RTP_FLAG_AUTOADJ = (1 << 6), + SWITCH_RTP_FLAG_RAW_WRITE = (1 << 7), + SWITCH_RTP_FLAG_GOOGLEHACK = (1 << 8), + SWITCH_RTP_FLAG_VAD = (1 << 9), + SWITCH_RTP_FLAG_BREAK = (1 << 10), + SWITCH_RTP_FLAG_MINI = (1 << 11), + SWITCH_RTP_FLAG_DATAWAIT = (1 << 12), + SWITCH_RTP_FLAG_BUGGY_2833 = (1 << 13), + SWITCH_RTP_FLAG_PASS_RFC2833 = (1 << 14), + SWITCH_RTP_FLAG_AUTO_CNG = (1 << 15), + SWITCH_RTP_FLAG_SECURE_SEND_RESET = (1 << 16), + SWITCH_RTP_FLAG_SECURE_RECV_RESET = (1 << 17) } switch_rtp_flag_t; /*! Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Jan 16 23:16:04 2008 @@ -82,15 +82,16 @@ tech_pvt->session_id++; switch_snprintf(buf, sizeof(buf), - "v=0\n" - "o=FreeSWITCH %010u %010u IN IP4 %s\n" - "s=FreeSWITCH\n" - "c=IN IP4 %s\n" "t=0 0\n" - "a=%s\n" - "m=audio %d RTP/AVP", tech_pvt->owner_id, tech_pvt->session_id, ip, ip, sr, port); + "v=0\n" + "o=FreeSWITCH %010u %010u IN IP4 %s\n" + "s=FreeSWITCH\n" + "c=IN IP4 %s\n" "t=0 0\n" + "a=%s\n" + "m=audio %d RTP/%sAVP", tech_pvt->owner_id, tech_pvt->session_id, ip, ip, sr, port, + (!switch_strlen_zero(tech_pvt->local_crypto_key) && switch_test_flag(tech_pvt, TFLAG_SECURE)) ? "S" : "" + ); - if (tech_pvt->rm_encoding) { switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->pt); } else if (tech_pvt->num_codecs) { @@ -184,9 +185,38 @@ switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", ptime); } + if (!switch_strlen_zero(tech_pvt->local_crypto_key) && switch_test_flag(tech_pvt, TFLAG_SECURE)) { switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=crypto:%s\n", tech_pvt->local_crypto_key); - switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=encryption:optional\n"); + //switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=encryption:optional\n"); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "m=audio %d RTP/AVP", port); + + if (tech_pvt->rm_encoding) { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->pt); + } else if (tech_pvt->num_codecs) { + int i; + int already_did[128] = { 0 }; + for (i = 0; i < tech_pvt->num_codecs; i++) { + const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; + + if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO) { + continue; + } + + if (imp->ianacode < 128) { + if (already_did[imp->ianacode]) { + continue; + } + + already_did[imp->ianacode] = 1; + } + + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", imp->ianacode); + } + } + + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "\na=crypto:%s\n", tech_pvt->local_crypto_key); + } if (switch_test_flag(tech_pvt, TFLAG_VIDEO) && tech_pvt->video_rm_encoding) { @@ -1455,6 +1485,7 @@ switch_channel_t *channel = NULL; const char *val; const char *crypto = NULL; + int got_crypto = 0; tech_pvt = switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); @@ -1542,30 +1573,40 @@ if (m->m_type == sdp_media_audio) { sdp_rtpmap_t *map; - + for (a = m->m_attributes; a; a = a->a_next) { if (!strcasecmp(a->a_name, "ptime") && a->a_value) { ptime = atoi(a->a_value); - } else if (!strcasecmp(a->a_name, "crypto") && a->a_value) { + } else if (!got_crypto && !strcasecmp(a->a_name, "crypto") && !switch_strlen_zero(a->a_value)) { crypto = a->a_value; int crypto_tag = atoi(crypto); + if (tech_pvt->remote_crypto_key) { if (crypto_tag && crypto_tag == tech_pvt->crypto_tag) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Existing key is still valid.\n"); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Change Remote key to [%s]\n", crypto); - tech_pvt->remote_crypto_key = switch_core_session_strdup(tech_pvt->session, crypto); - tech_pvt->crypto_tag = crypto_tag; - sofia_glue_add_crypto(tech_pvt, tech_pvt->remote_crypto_key, SWITCH_RTP_CRYPTO_RECV); - switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_RECV, tech_pvt->crypto_tag, - tech_pvt->crypto_type, tech_pvt->remote_raw_key, SWITCH_RTP_KEY_LEN); + const char *a = switch_stristr("AES", tech_pvt->remote_crypto_key); + const char *b = switch_stristr("AES", crypto); + + if (a && b && strncasecmp(a, b, 23)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Change Remote key to [%s]\n", crypto); + tech_pvt->remote_crypto_key = switch_core_session_strdup(tech_pvt->session, crypto); + tech_pvt->crypto_tag = crypto_tag; + sofia_glue_add_crypto(tech_pvt, tech_pvt->remote_crypto_key, SWITCH_RTP_CRYPTO_RECV); + switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_RECV, tech_pvt->crypto_tag, + tech_pvt->crypto_type, tech_pvt->remote_raw_key, SWITCH_RTP_KEY_LEN); + got_crypto++; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Ignoring unacceptable key\n"); + } } } else { tech_pvt->remote_crypto_key = switch_core_session_strdup(tech_pvt->session, crypto); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Remote Key [%s]\n", tech_pvt->remote_crypto_key); tech_pvt->crypto_tag = crypto_tag; - + got_crypto++; + if (switch_strlen_zero(tech_pvt->local_crypto_key)) { if (switch_stristr(SWITCH_RTP_CRYPTO_KEY_32, crypto)) { switch_channel_set_variable(tech_pvt->channel, SOFIA_HAS_CRYPTO_VARIABLE, SWITCH_RTP_CRYPTO_KEY_32); @@ -1577,6 +1618,16 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Crypto Setup Failed!.\n"); } } + + if (switch_rtp_ready(tech_pvt->rtp_session) && + !switch_strlen_zero(tech_pvt->local_crypto_key) && !switch_strlen_zero(tech_pvt->remote_crypto_key)) { + switch_set_flag_locked(tech_pvt, TFLAG_SECURE); + sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 1); + switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_RECV, tech_pvt->crypto_tag, + tech_pvt->crypto_type, tech_pvt->remote_raw_key, SWITCH_RTP_KEY_LEN); + switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_SEND, tech_pvt->crypto_tag, + tech_pvt->crypto_type, tech_pvt->local_raw_key, SWITCH_RTP_KEY_LEN); + } } } } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Jan 16 23:16:04 2008 @@ -495,10 +495,15 @@ switch_rtp_crypto_key_t *crypto_key; srtp_policy_t *policy; err_status_t stat; + switch_status_t status = SWITCH_STATUS_SUCCESS; crypto_key = switch_core_alloc(rtp_session->pool, sizeof(*crypto_key)); - policy = direction == SWITCH_RTP_CRYPTO_RECV ? &rtp_session->recv_policy : &rtp_session->send_policy; + if (direction == SWITCH_RTP_CRYPTO_RECV) { + policy = &rtp_session->recv_policy; + } else { + policy = &rtp_session->send_policy; + } crypto_key->type = type; @@ -509,7 +514,7 @@ memset(policy, 0, sizeof(*policy)); - switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_SECURE); + switch(crypto_key->type) { case AES_CM_128_HMAC_SHA1_80: @@ -532,21 +537,43 @@ switch(direction) { case SWITCH_RTP_CRYPTO_RECV: policy->ssrc.type = ssrc_any_inbound; - if ((stat = srtp_create(&rtp_session->recv_ctx, policy))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error allocating srtp [%d]\n", stat); - return SWITCH_STATUS_FALSE; + + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_RECV)) { + switch_set_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_RECV_RESET); + } else { + if ((stat = srtp_create(&rtp_session->recv_ctx, policy))) { + status = SWITCH_STATUS_FALSE; + } + + if (status == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activating Secure RTP RECV\n"); + switch_set_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_RECV); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error allocating srtp [%d]\n", stat); + return status; + } } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activating Secure RTP RECV\n"); break; case SWITCH_RTP_CRYPTO_SEND: policy->ssrc.type = ssrc_specific; policy->ssrc.value = rtp_session->ssrc; - if ((stat = srtp_create(&rtp_session->send_ctx, policy))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error allocating srtp [%d]\n", stat); - return SWITCH_STATUS_FALSE; + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_SEND)) { + switch_set_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_SEND_RESET); + } else { + if ((stat = srtp_create(&rtp_session->send_ctx, policy))) { + status = SWITCH_STATUS_FALSE; + } + + if (status == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activating Secure RTP SEND\n"); + switch_set_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_SEND); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error allocating srtp [%d]\n", stat); + return status; + } } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activating Secure RTP SEND\n"); + break; default: abort(); @@ -774,9 +801,20 @@ switch_rtp_disable_vad(*rtp_session); } - if (switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_SECURE)) { - srtp_dealloc((*rtp_session)->recv_ctx); + if (switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_SECURE_SEND)) { + switch_mutex_lock((*rtp_session)->flag_mutex); srtp_dealloc((*rtp_session)->send_ctx); + (*rtp_session)->send_ctx = NULL; + switch_clear_flag((*rtp_session), SWITCH_RTP_FLAG_SECURE_SEND); + switch_mutex_unlock((*rtp_session)->flag_mutex); + } + + if (switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_SECURE_RECV)) { + switch_mutex_lock((*rtp_session)->flag_mutex); + srtp_dealloc((*rtp_session)->recv_ctx); + (*rtp_session)->recv_ctx = NULL; + switch_clear_flag((*rtp_session), SWITCH_RTP_FLAG_SECURE_RECV); + switch_mutex_unlock((*rtp_session)->flag_mutex); } if ((*rtp_session)->timer.timer_interface) { @@ -970,12 +1008,26 @@ return -1; } - if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { + if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_RECV)) { int sbytes = (int) bytes; - err_status_t stat; + err_status_t stat = 0; + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_RECV_RESET)) { + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_SECURE_RECV_RESET); + srtp_dealloc(rtp_session->recv_ctx); + rtp_session->recv_ctx = NULL; + if ((stat = srtp_create(&rtp_session->recv_ctx, &rtp_session->recv_policy))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! RE-Activating Secure RTP RECV\n"); + return -1; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "RE-Activating Secure RTP RECV\n"); + rtp_session->srtp_errs = 0; + } + } stat = srtp_unprotect(rtp_session->recv_ctx, &rtp_session->recv_msg.header, &sbytes); + + if (stat && rtp_session->recv_msg.header.pt != rtp_session->te && rtp_session->recv_msg.header.pt != rtp_session->cng_pt) { if (++rtp_session->srtp_errs >= MAX_SRTP_ERRS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, @@ -1558,10 +1610,24 @@ send_msg->header.seq = htons(++rtp_session->seq); - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_SEND)) { int sbytes = (int) bytes; err_status_t stat; + + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_SEND_RESET)) { + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_SECURE_SEND_RESET); + srtp_dealloc(rtp_session->send_ctx); + rtp_session->send_ctx = NULL; + if ((stat = srtp_create(&rtp_session->send_ctx, &rtp_session->send_policy))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! RE-Activating Secure RTP SEND\n"); + return -1; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "RE-Activating Secure RTP SEND\n"); + } + } + + stat = srtp_protect(rtp_session->send_ctx, &send_msg->header, &sbytes); if (stat) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error: srtp protection failed with code %d\n", stat); @@ -1723,10 +1789,22 @@ bytes = rtp_header_len + datalen; - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_SEND)) { int sbytes = (int) bytes; err_status_t stat; + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_SEND_RESET)) { + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_SECURE_SEND_RESET); + srtp_dealloc(rtp_session->send_ctx); + rtp_session->send_ctx = NULL; + if ((stat = srtp_create(&rtp_session->send_ctx, &rtp_session->send_policy))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! RE-Activating Secure RTP SEND\n"); + return -1; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "RE-Activating Secure RTP SEND\n"); + } + } + stat = srtp_protect(rtp_session->send_ctx, &rtp_session->write_msg.header, &sbytes); if (stat) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error: srtp protection failed with code %d\n", stat);

1 0

[commit] r7259 - freeswitch/trunk/src
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: silik0n Date: Wed Jan 16 17:13:36 2008 New Revision: 7259 Modified: freeswitch/trunk/src/switch_ivr.c Log: on a transfer lets update the rdnis to the old number Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Jan 16 17:13:36 2008 @@ -28,6 +28,7 @@ * Neal Horman <neal at wanlink dot com> * Matt Klein <mklein(a)nmedia.net> * Michael Jerris <mike(a)jerris.com> + * Ken Rice <krice at suspicious dot org> * * switch_ivr.c -- IVR Library * @@ -916,9 +917,10 @@ new_profile = switch_caller_profile_clone(session, profile); - new_profile->dialplan = switch_core_strdup(profile->pool, dialplan); - new_profile->context = switch_core_strdup(profile->pool, context); - new_profile->destination_number = switch_core_strdup(profile->pool, extension); + new_profile->dialplan = switch_core_strdup(new_profile->pool, dialplan); + new_profile->context = switch_core_strdup(new_profile->pool, context); + new_profile->destination_number = switch_core_strdup(new_profile->pool, extension); + new_profile->rdnis = switch_core_strdup(new_profile->pool, profile->destination_number); switch_channel_set_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE, NULL);

1 0

[commit] r7258 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: silik0n Date: Wed Jan 16 16:52:07 2008 New Revision: 7258 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: get rid of the arbitrary channel variable and lets put it in RDNIS in the the transfer function so its consistant on all transfers Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Wed Jan 16 16:52:07 2008 @@ -622,7 +622,6 @@ switch_channel_set_variable(channel, "limit_realm", realm); switch_channel_set_variable(channel, "limit_id", id); switch_channel_set_variable(channel, "limit_max", argv[2]); - switch_channel_set_variable(channel, "limit_orignal_destination", switch_channel_get_variable(channel, "destination_number")); cbt.buf = buf; cbt.len = sizeof(buf);

1 0

[commit] r7257 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: silik0n Date: Wed Jan 16 16:45:40 2008 New Revision: 7257 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: contributors tweak Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Wed Jan 16 16:45:40 2008 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Ken Rice <krice at suspicious dot org * * mod_limit.c -- Resource Limit Module *

1 0

[commit] r7256 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: silik0n Date: Wed Jan 16 16:44:28 2008 New Revision: 7256 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: small mod to mod limit... Add Optional user setable transfer destination number example usage: <application="limit" data="<realm> <id> <max> [transfer_destination_number]"/> existing functionality is not changed... if limit is exceeded and transfer_destination_number is not specified call will still be redirected to limit_exceeded Also add new channel variable limit_original_destination which is set to the destination_number before mod_limit does its thing Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Wed Jan 16 16:44:28 2008 @@ -568,8 +568,9 @@ } -#define LIMIT_USAGE "<realm> <id> <max>" +#define LIMIT_USAGE "<realm> <id> <max> [transfer_destination_number]" #define LIMIT_DESC "limit access to an extension" +static char *limit_def_xfer_exten="limit_exceeded"; SWITCH_STANDARD_APP(limit_function) { @@ -579,6 +580,7 @@ char *sql = NULL; char *realm = NULL; char *id = NULL; + char *xfer_exten = NULL; int max = 0, got = 0; char buf[80] = ""; callback_t cbt = { 0 }; @@ -606,6 +608,12 @@ id = argv[1]; max = atoi(argv[2]); + if (argc == 4) { + xfer_exten = argv[3]; + } else { + xfer_exten = limit_def_xfer_exten; + } + if (max < 0) { max = 0; } @@ -613,6 +621,7 @@ switch_channel_set_variable(channel, "limit_realm", realm); switch_channel_set_variable(channel, "limit_id", id); switch_channel_set_variable(channel, "limit_max", argv[2]); + switch_channel_set_variable(channel, "limit_orignal_destination", switch_channel_get_variable(channel, "destination_number")); cbt.buf = buf; cbt.len = sizeof(buf); @@ -621,7 +630,7 @@ got = atoi(buf); if (got + 1 > max) { - switch_ivr_session_transfer(session, "limit_exceeded", NULL, NULL); + switch_ivr_session_transfer(session, xfer_exten, NULL, NULL); goto done; }

1 0

[commit] r7255 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: brian Date: Wed Jan 16 16:29:03 2008 New Revision: 7255 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: woops Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Wed Jan 16 16:29:03 2008 @@ -46,7 +46,7 @@   - <param name="tls" value="true"/> + <param name="tls" value="false"/>  <param name="tls-bind-params" value="transport=tls"/>

1 0

[commit] r7254 - in freeswitch/trunk: conf/dialplan conf/sip_profiles src/mod/endpoints/mod_sofia
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: anthm Date: Wed Jan 16 16:28:20 2008 New Revision: 7254 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: tweak to srtp to support polycoms Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Jan 16 16:28:20 2008 @@ -52,7 +52,7 @@ <condition field="${call_debug}" expression="^true$" break="never"> <action application="info"/> </condition> - <condition field="${sip_has_crypto}" expression="^AES_CM_128_HMAC_SHA1_32$" break="never"> + <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$" break="never"> <action application="set" data="sip_secure_media=true"/> </condition> <condition> @@ -236,6 +236,13 @@ </condition> </extension> + <extension name="echo"> + <condition field="destination_number" expression="^9996$"> + <action application="answer"/> + <action application="echo"/> + </condition> + </extension> + <extension name="milliwatt"> <condition field="destination_number" expression="^9997$"> <action application="answer"/> @@ -251,7 +258,7 @@ </extension> <extension name="hold_music"> - <condition field="${sip_has_crypto}" expression="^AES_CM_128_HMAC_SHA1_32$" break="never"> + <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$" break="never"> <action application="answer"/> <action application="execute_extension" data="is_secure XML default"/> </condition> Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Wed Jan 16 16:28:20 2008 @@ -46,7 +46,7 @@   - <param name="tls" value="false"/> + <param name="tls" value="true"/>  <param name="tls-bind-params" value="transport=tls"/>  @@ -54,7 +54,7 @@  <param name="tls-cert-dir" value="$${base_dir}/conf/ssl"/>  - <param name="tls-version" value="sslv23"/> + <param name="tls-version" value="tlsv1"/>   Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Wed Jan 16 16:28:20 2008 @@ -345,6 +345,7 @@ char *gateway_name; char *local_crypto_key; char *remote_crypto_key; + int crypto_tag; unsigned char local_raw_key[SWITCH_RTP_MAX_CRYPTO_LEN]; unsigned char remote_raw_key[SWITCH_RTP_MAX_CRYPTO_LEN]; switch_rtp_crypto_key_type_t crypto_send_type; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Jan 16 16:28:20 2008 @@ -1352,7 +1352,8 @@ if (tech_pvt->remote_crypto_key && switch_test_flag(tech_pvt, TFLAG_SECURE)) { sofia_glue_add_crypto(tech_pvt, tech_pvt->remote_crypto_key, SWITCH_RTP_CRYPTO_RECV); switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_SEND, 1, tech_pvt->crypto_type, tech_pvt->local_raw_key, SWITCH_RTP_KEY_LEN); - switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_RECV, 1, tech_pvt->crypto_type, tech_pvt->remote_raw_key, SWITCH_RTP_KEY_LEN); + switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_RECV, tech_pvt->crypto_tag, + tech_pvt->crypto_type, tech_pvt->remote_raw_key, SWITCH_RTP_KEY_LEN); switch_channel_set_variable(tech_pvt->channel, SOFIA_SECURE_MEDIA_CONFIRMED_VARIABLE, "true"); } @@ -1547,11 +1548,23 @@ ptime = atoi(a->a_value); } else if (!strcasecmp(a->a_name, "crypto") && a->a_value) { crypto = a->a_value; + int crypto_tag = atoi(crypto); + if (tech_pvt->remote_crypto_key) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Already have a key\n"); + if (crypto_tag && crypto_tag == tech_pvt->crypto_tag) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Existing key is still valid.\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Change Remote key to [%s]\n", crypto); + tech_pvt->remote_crypto_key = switch_core_session_strdup(tech_pvt->session, crypto); + tech_pvt->crypto_tag = crypto_tag; + sofia_glue_add_crypto(tech_pvt, tech_pvt->remote_crypto_key, SWITCH_RTP_CRYPTO_RECV); + switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_RECV, tech_pvt->crypto_tag, + tech_pvt->crypto_type, tech_pvt->remote_raw_key, SWITCH_RTP_KEY_LEN); + } } else { tech_pvt->remote_crypto_key = switch_core_session_strdup(tech_pvt->session, crypto); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Remote Key [%s]\n", tech_pvt->remote_crypto_key); + tech_pvt->crypto_tag = crypto_tag; if (switch_strlen_zero(tech_pvt->local_crypto_key)) { if (switch_stristr(SWITCH_RTP_CRYPTO_KEY_32, crypto)) {

1 0

[commit] r7253 - freeswitch/trunk/docs
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: silik0n Date: Wed Jan 16 15:32:04 2008 New Revision: 7253 Modified: freeswitch/trunk/docs/AUTHORS Log: cleaning up Modified: freeswitch/trunk/docs/AUTHORS ============================================================================== --- freeswitch/trunk/docs/AUTHORS (original) +++ freeswitch/trunk/docs/AUTHORS Wed Jan 16 15:32:04 2008 @@ -19,7 +19,7 @@ Brian K. West - For countless hours of work on BSD and Mac support, finding countless bugs, and moral support. Xcode project files. Joshua Colp - For his help making mod_exosip possible (which we are now getting rid of but oh well), - and for just being a swell guy! (until he backstabbed us, c'est la vie) + and for just being a swell guy! Michal "cypromis" Bielicki (michal.bielicki AT voiceworks.pl) - Solaris porting, and autotools enhancements, debian, rpm and solaris packaging. James Martelletti <james(a)nerdc0re.com> - All around cool guy (mod_syslog) Johny Kadarisman <jkr888(a)gmail.com>

1 0

[commit] r7252 - freeswitch/trunk/docs
by Freeswitch SVN 16 Jan '08

16 Jan '08

Author: silik0n Date: Wed Jan 16 15:29:22 2008 New Revision: 7252 Modified: freeswitch/trunk/docs/AUTHORS Log: tweak Modified: freeswitch/trunk/docs/AUTHORS ============================================================================== --- freeswitch/trunk/docs/AUTHORS (original) +++ freeswitch/trunk/docs/AUTHORS Wed Jan 16 15:29:22 2008 @@ -27,7 +27,7 @@ Stefan Knoblich - Various patches and support. Thanks. Justin Unger - <justinunger at gmail dot com> Lots of help with patches and SIP testing. Thanks! Paul D. Tinsley - Various patches and support. <pdt at jackhammer.org> - Ken Rice - <krice AT suspicious.org> - xmlcdr, sofia improvements, load testing. + Ken Rice - <krice AT suspicious.org> - xmlcdr, sofia improvements, load testing, 1 liners here and there. Neal Horman <neal at wanlink dot com> - conference improvements, switch_ivr menu additions and other tweaks. Johny Kadarisman <jkr888 at gmail.com> - mod_python fixups. Michael Murdock <mike at mmurdock dot org> - testing, documentation, bug finding and usability enhancements.

1 0