- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

28 May '09

Author: brian Date: Thu May 28 17:46:17 2009 New Revision: 13492 Log: Update CID on Polycom when doing an Attended transfer, Make send_display work with Polycom and others, add patch with mods from SFSIP-111 HOME RUN. 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 17:46:17 2009 @@ -175,6 +175,22 @@ return SWITCH_STATUS_SUCCESS; } +char * generate_pai_str(switch_core_session_t *session) +{ + private_object_t *tech_pvt = (private_object_t *) switch_core_session_get_private(session); + const char *callee_name = NULL, *callee_number = NULL; + + if (!(callee_name = switch_channel_get_variable(tech_pvt->channel, "callee_id_name"))) { + callee_name = ""; + } + + if (!(callee_number = switch_channel_get_variable(tech_pvt->channel, "callee_id_number"))) { + callee_number = tech_pvt->caller_profile->destination_number; + } + + return switch_core_session_sprintf(tech_pvt->session, "P-Asserted-Identity: \"%s\" <%s>", callee_name, callee_number); +} + /* map QSIG cause codes to SIP from RFC4497 section 8.4.1 */ static int hangup_cause_to_sip(switch_call_cause_t cause) { @@ -523,7 +539,7 @@ switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return status; } - + sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 0); if (sofia_glue_activate_rtp(tech_pvt, 0) != SWITCH_STATUS_SUCCESS) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); @@ -555,6 +571,7 @@ nua_respond(tech_pvt->nh, SIP_200_OK, NUTAG_AUTOANSWER(0), TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), + SIPTAG_HEADER_STR(generate_pai_str(session)), NUTAG_SESSION_TIMER(session_timeout), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SIPTAG_CALL_INFO_STR(switch_channel_get_variable(tech_pvt->channel, SOFIA_SIP_HEADER_PREFIX "call_info")), @@ -1231,8 +1248,17 @@ { if (!switch_strlen_zero(msg->string_arg)) { char message[256] = ""; - snprintf(message, sizeof(message), "From:\r\nTo: \"%s\"\r\n", msg->string_arg); - nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); + 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); + 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); + nua_update(tech_pvt->nh, + TAG_IF(!switch_strlen_zero(message), SIPTAG_HEADER_STR(message)), + TAG_END()); + } } } break; @@ -1387,7 +1413,7 @@ case SWITCH_MESSAGE_INDICATE_RINGING: if (!switch_channel_test_flag(channel, CF_RING_READY) && !sofia_test_flag(tech_pvt, TFLAG_BYE) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) { - nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); + nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SIPTAG_HEADER_STR(generate_pai_str(session)), TAG_END()); switch_channel_mark_ring_ready(channel); } break; @@ -1463,6 +1489,7 @@ SIP_183_SESSION_PROGRESS, NUTAG_AUTOANSWER(0), TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), + SIPTAG_HEADER_STR(generate_pai_str(session)), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), 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 17:46:17 2009 @@ -5050,23 +5050,29 @@ switch_channel_t *channel = switch_core_session_get_channel(bleg); const char *ua = switch_channel_get_variable(channel, "sip_user_agent"); - if (ua && !switch_stristr("snom", ua)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "If you were using a Snom phone, we would have updated the caller id display on your phone for you!\n"); - return; - } - a_tech_pvt = (private_object_t *) switch_core_session_get_private(aleg); b_tech_pvt = (private_object_t *) switch_core_session_get_private(bleg); if (b_tech_pvt && a_tech_pvt && a_tech_pvt->caller_profile) { switch_caller_profile_t *acp = a_tech_pvt->caller_profile; - - if (switch_strlen_zero(acp->caller_id_name)) { - snprintf(message, sizeof(message), "From:\r\nTo: %s\r\n", acp->caller_id_number); + + if (ua && switch_stristr("snom", ua)) { + if (switch_strlen_zero(acp->caller_id_name)) { + snprintf(message, sizeof(message), "From:\r\nTo: %s\r\n", acp->caller_id_number); + } else { + snprintf(message, sizeof(message), "From:\r\nTo: \"%s\" %s\r\n", acp->caller_id_name, acp->caller_id_number); + } + nua_info(b_tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); } else { - snprintf(message, sizeof(message), "From:\r\nTo: \"%s\" %s\r\n", acp->caller_id_name, acp->caller_id_number); + if (switch_strlen_zero(acp->caller_id_name)) { + snprintf(message, sizeof(message), "P-Asserted-Identity: \"%s\" <%s>", acp->caller_id_number, acp->caller_id_number); + } else { + 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)), + TAG_END()); } - nua_info(b_tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); } } }

1 0

[commit] r13491 - freeswitch/trunk/docs
by FreeSWITCH SVN 28 May '09

28 May '09

Author: mcollins Date: Thu May 28 15:57:04 2009 New Revision: 13491 Log: Update ChangeLog through r13490 Modified: freeswitch/trunk/docs/ChangeLog Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Thu May 28 15:57:04 2009 @@ -1,6 +1,7 @@ freeswitch (1.0.4) add: TextMate bundle for FreeSWITCH - thanks mrene (r:12559-12560) + add: ZRTP Support please download your SDK from http://www.zfone.com and use build/buildzrtp.sh to build the lib. (r:13406) all: numerous code cleanups, removal of unused variables all: update numerous Doxygen comments build: fix mod_flite (FSBUILD-126/r:12153) @@ -59,6 +60,10 @@ build: fix mod_file_string dependencies on windows (r:13370) build: fix mod_pocketsphinx build error (JANITOR-1/r:13372) build: fix PTHREAD_MUTEX_RECURSIVE detection on SUSE 10 (r:13386,13390) + build: remove regression caused by r13362 (r:13401) + build: add mod_nibblebill (r:13462) + build: fix msvc build (r:13467/FSBUILD-165) + build: add siren to the default build and install (r:13470) config: default config, calling own extension no longer goes to voicemail (r:12596) config: default config, 1000-1019 uses $${default_password} instead of hard-coded 1234 (FSCONFIG-5/r:12838) config: tweak the configs to bind siptrace on and off to F10 and F11 (r:12938) @@ -68,6 +73,12 @@ config: add documention for dist-dtmf member flag in conference.conf.xml config: remove mailbox= attribute (r:13375) config: add default local stream (r:13376) + config: small regex adjustment so we can dial PSTN numbers that happen to have 4000 in them (r:13409) + config: you can call 9999 from a zrtp endpoint and enroll this should be replaced with an IVR to explain it a bit but most of the work happens client side at this point (r:13445) + config: add mod_nibblebill (r:13458) + config: clear up docs (r:13468) + config: clarify zrtp docs in vars.xml and give link on where to get more info (r:13469) + config: tweaks to codecs in default config (r:13485) core: fix suncc visibility support in libteletone (r:12154-12157) core: fix crash on FS shutdown with "..." (FSCORE-297/r:12173,12361,12402) core: add separate mutex for state related methods (r:12191) @@ -164,11 +175,31 @@ core: add configure checks for tm->tm_gmtoff and tm->tm_zone (FSBUILD-160/r:13362) core: Fix IVR key response broken when multiple files are played (MODAPP-280/r:13382) core: fixx off-by-one in xml preprocessor (r:13385) + core: fix windows pch (r:13392) + core: fix segfault on out of memory situation. (r:13398/FSCORE-366) + core: treat app::arg syntax in execute_on_answer as a broadcast request (r:13400) + core: use our own handler so it won't get overriden by anyone if zrtp is on (r:13411) + core: fix backslash getting removed from regex when using mod_xml_curl (r:13414/FSCORE-370) + core: fix handle leak in switch_thread_self on windows (r:13421/FSCORE-371) + core: allow switching from secure to clear and back (r:13422) + core: add more options to zrtp (r:13424) + core: add buffer flush (r:13425) + core: add some stuff for zrtp (r:13426) + core: can't flush because you have a chance of dumping zrtp control frames (r:13427) + core: add zrtp_sas1_string and zrtp_sas2_string variables (r:13429) + core: zrtp - this should make sure the secure mitm has a chance over latent connections (r:13436) + core: properly detect unterminated (r:13438) + core: zrtp - fix mitm to be more reliable (r:13443) + core: zrtp - mark verified (r:13444) + core: zrtp_secure_media=true will have to be set to true in order for your zrtp to work moving forward similar to how srtp_secure_media works.(r:13461) + core: prevent zrtp and srtp at the same time (r:13486) + core: add CALL_SECURE event (r:13487) docs: Fix filename references in phrase_en.xml (r:12976) docs: Update phrase_en.xml to include v1.0.8 sound prompts (r:13041) docs: Updates to phrase_es.xml (r:13067) docs: Latest revision of Spanish prompts file (r:13115) docs: switch_core.h doxygen update (r:13181) + docs: Add ZRTP phrases to phrase_en.xml (r:13488,13489,13490) formats: add mod_portaudio_stream to get audio from any dev (MODFORM-25/r:12178) fs_cli: fix solaris build (r:12160) ivr: make tts-engine and tts-voice valid attributes on the menu xml (r:12278) @@ -205,11 +236,17 @@ libesl: add INFO example for Perl (r:13293) libiksemel: let return 0 be a failure on read in iks to avoid cpu race (r:13123,13124,13133) libsndfile: add executable permissions to libs/libsndfile/src/create_symbols_file.py (FSBUILD-134/r:12535) + libsndfile: update to 1.0.19 (r:13415/LBSNDF-7) + libsofiasip: su.h - define su_family via struct sockaddr (r:12260) + libsofiasip: sip_parser.c - fixed sip_transport_d() (r:12261) libsofiasip: Fix compile time out-of-bounds error in su_uniqueid.c (SFSIP-136/r:12914) libsofiasip: make info work out of dialog (r:13087) libsofiasip: silence solaris warning from missing braces (SFSIP-132/r:13369) + libsofiasip: subscription-state subexp-params missing (r:13439/SFSIP-148) + libspandsp: update to snapshot 20090308 (r:12514) libspandsp: update to snapshot spandsp-20090421 (r:13086) libspandsp: update to snapshot spandsp-20090427 (r:13177) + libspandsp: update to spandsp-0.0.6pre12 (r:13311) libspeex: Add visibility support for suncc on solaris (r:13117,13118) libteletone: update api visibility macros for windows libtiff: add libtiff, v3.8.2 @@ -227,6 +264,7 @@ mod_commands: mod_commands: if no bind ip specified for stun fsapi command, use the guess ip (r:13140) mod_commands: add show channels like %foo% (no % in the string implies wrapped in %, no spaces allowed in match string (r:13193) mod_commands: Add max-sessions to status (MODAPP-254/r:13373) + mod_commands: remove double safe_free's (r:13453,13454,13455) mod_conference: fix read terminating on single digit when called from a meta-app inside a conference (MODAPP-226/r:12466) mod_conference: recording members should be invisible to commands (MODAPP-233/r:12582) mod_conference: add lock caller_control (r:12787) @@ -244,10 +282,13 @@ mod_conference: add execute_application to custom controls (r:13216) mod_conference: disallow spaces in conference names (MODAPP-219/r:13313) mod_console: Fix mod_console (missing FD_ZERO before FD_SET) (r:13126) + mod_conference: add conference wait-mod flags and member moderator flag to delay starting a conference until someone with a moderator flag has joined (r:13442) + mod_conference: add member-type header to relevant events (r:13471) mod_dahdi_codec: delay init of resources until the first time they are actually used to avoid unnecessary waste of resources in hardware codec (r:12962) mod_dahdi_codec: set mod_dahdi_codec dahdi transcoding device sockets to non-blocking to avoid hanging when there is no data and just return 0 bytes frame (MODCODEC-8/r:13257) mod_dahdi_codec: added proper waiting (up to 10ms) for the DAHDI transcoder output frame (r:13262) mod_dahdi_codec: return silence frame in dahdi codec when there is no output from the decoder (r:13265) + mod_dahdi_codec: add 30ms G729 codec in mod_dahdi_codec (r:13404) mod_dingaling: fix crash when unloading/reload mod_dingaling (LBDING-13/r:12612) mod_dingaling: fix no sound if phone picked up after 5th dingaling on Gtalk client (MODENDP-198/r:12641) mod_dingaling: fix core dump when calling Gtalk enabled FS using leg_timeout (MODENDP-199/r:12641) @@ -264,6 +305,8 @@ mod_dptools: add param dial-timeout to directory (MODAPP-271/r:13247) mod_dptools: add set current_application_response channel variable (MODAPP-273/r:13298) mod_dptools: fix SEGV in strncasecmp call (MODAPP-278/r:13317) + mod_dptools: fix leaks (r:13446, 13447, 13448) + mod_easyroute: fix leak (r:13449) mod_enum: fix enum_auto_route (MODAPP220/r:12243) mod_erlang_event: Bind to 0.0.0.0 instead of 127.0.0.1 by default; like most erlang nodes do. (r:12249) mod_erlang_event: Reply appropriately to net_adm:ping() (r:13066) @@ -318,6 +361,8 @@ mod_memcache: cleanup xml config handling (r:13050,13051) mod_nibblebill: mod_nibblebill question: DB Error while updating cash (MODAPP-229/r:12907) mod_nibblebill: Updated mod_nibblebill to work properly w/ postgres fields (r:13031) + mod_nibblebill: Added feature mod_nibblebill to check balance and transfer the caller to an alternate dialplan context & extension if they deplete their funds. (r:13432) + mod_nibblebill: cleanup, fix leak (r:13463) mod_opal: Fixed transmission of Q.931 Calling-Party-Number, and DisplayName on H.323 Setup (r:12347) mod_opal: allocate frame from session pool so it will not go out of scope (r:12811) mod_opal: disable visibility support broken in newer gcc (MODENDP-190/r:12923) @@ -409,6 +454,9 @@ mod_sofia: Allow sending the flush/reboot all the registration of a domain (MODENDP-187/r:13363) mod_sofia: Fix double re-register problem (SFSIP-143/r:13384) mod_sofia: make autoflush on bridge the default (r:13389) + mod_sofia: add contact-user profile param to override default contact username for a profile (r:13397/MODSOFIA-8) + mod_sofia: add proxy-follow-redirect flag (experimental) (r:13402) + mod_sofia: add proxy-follow-redirect flag (experimental) (r:13403) mod_spy: add new module, mod_spy (MODAPP-260/r:13035,13036) mod_syslog: Keep the indent string in memory (LOGGER-1/r:12852) mod_t38gateway: Introduction of the skeleton of a media bug implementing a T.38 gateway, so the @@ -428,10 +476,6 @@ mod_voicemail: add voicemail disk quota (MODAPP-173/r:13314) mod_voicemail: abolish mailbox attribute in users and use number-alias attribute instead (MODAPP-218/r:13377,13378,13379,13380,13381) mod_xml_curl: fix data fetch (MODXMLINT-48/r:12586) - sofia-sip: su.h - define su_family via struct sockaddr (r:12260) - sofia-sip: sip_parser.c - fixed sip_transport_d() (r:12261) - spandsp: update to snapshot 20090308 (r:12514) - spandsp: update to spandsp-0.0.6pre12 support: Add print_list gdb macro (r:12687)

1 0