- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

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

28 May '09

Author: brian Date: Thu May 28 14:50:17 2009 New Revision: 13490 Log: clean up Modified: freeswitch/trunk/docs/phrase/phrase_en.xml Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Thu May 28 14:50:17 2009 @@ -312,7 +312,7 @@ <prompt phrase="Your call has been terminated." filename="misc-your_call_has_been_terminated.wav"/> </misc> <zrtp> -  +  <prompt phrase="Algol" filename="Algol.wav"/> <prompt phrase="Apollo" filename="Apollo.wav"/> <prompt phrase="Athens" filename="Athens.wav"/> @@ -826,22 +826,21 @@ <prompt phrase="woodlark" filename="woodlark.wav"/> <prompt phrase="yesteryear" filename="yesteryear.wav"/>  - <prompt phrase="Something's wrong" filename="zrtp-somethings_wrong.wav"/> + <prompt phrase="Welcome to the ZRTP security enrollment agent." filename="zrtp-enroll_welcome.wav"/> <prompt phrase="You must check the authentication string with your partner. If it doesn't match, it indicates the presence of a wire tapper." filename="zrtp-check_sas.wav"/> - <prompt phrase="Welcome to the PBX ZRTP security enrollment agent." filename="zrtp-enroll_welcome.wav" - <prompt phrase="Only phones that are recognized by this PBX as SIP-registered to this PBX can be configured to trust this PBX to relay ZRTP secured calls. Your phone is not SIP-registered with this PBX, so this call will have no effect. Thank you, goodbye." filename="zrtp-enroll_not_sip_registered.wav"/> - <prompt phrase="Your phone indicates that it already trusts this PBX to relay ZRTP secured calls, so you do not need to do anything more. Thank you for calling. Goodbye." filename="zrtp-enroll_already_enrolled.wav"/> - <prompt phrase="Only phones equipped with the ZRTP protocol can use this extension. Your phone is not a ZRTP-enable phone, so this call will have no effect. Thank you for calling. Goodbye." filename="zrtp-enroll_notzrtp.wav"/> - <prompt phrase="This PBX is equipped to handle ZRTP encrypted phone calls. You must decide if you want to allow this PBX to be in a position to intercept and possibly monitor your secure phone calls. If you trust this PBX to relay ZRTP secured calls, press the appropriate button on your phone to enroll and bind this PBX to your phone. You may hang up after you've done this." filename="zrtp-enroll_confirmed.wav"/> - <prompt phrase="NULL" filename="zrtp-event_secure.wav"/>  - <prompt phrase="Call is secure. Verbally compare this authentication code with your partner." filename="zrtp-is_secure.wav"/> + <prompt phrase="Only phones that are authenticated can be configured to trust this system to relay ZRTP secured calls. Your phone is not authenticated with this system, so this call will have no effect." filename="zrtp-enroll_not_sip_registered.wav"/> + <prompt phrase="Your phone indicates that it already trusts this system to relay ZRTP secured calls, so you do not need to do anything more." filename="zrtp-enroll_already_enrolled.wav"/> + <prompt phrase="Only phones equipped with the ZRTP protocol can use this extension. Your phone is not a ZRTP-enable phone, so this call will have no effect." filename="zrtp-enroll_notzrtp.wav"/> + <prompt phrase="This system is equipped to handle ZRTP encrypted phone calls. You must decide if you want to allow this system to be in a position to intercept and possibly monitor your secure phone calls. You may hang up after you've done this." filename="zrtp-enroll_confirmed.wav"/> + <prompt phrase="Verbally compare this authentication code with your partner." filename="zrtp-is_secure.wav"/> <prompt phrase="Authentication code is now unverified." filename="zrtp-is_unverified.wav"/> <prompt phrase="Authentication code is now verified." filename="zrtp-is_verified.wav"/> - <prompt phrase="Press clear." filename="zrtp-press_clear.wav"/> + <prompt phrase="Thank you for calling. Goodbye." filename="zrtp-thankyou_goodbye.wav"/> + <prompt phrase="Something's wrong" filename="zrtp-somethings_wrong.wav"/> <prompt phrase="Error." filename="zrtp-status_error.wav"/> <prompt phrase="Call is not secure." filename="zrtp-status_notsecure.wav"/> <prompt phrase="Call is secure." filename="zrtp-status_secure.wav"/> <prompt phrase="Securing call." filename="zrtp-status_securing.wav"/> - </zrtp> + </zrtp> </en> </language>

1 0

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

28 May '09

Author: brian Date: Thu May 28 14:38:32 2009 New Revision: 13489 Log: minor 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 Thu May 28 14:38:32 2009 @@ -71,6 +71,7 @@ static zrtp_global_t *zrtp_global; static zrtp_zid_t zid = { "FreeSWITCH01" }; static int zrtp_on = 0; +#define ZRTP_MITM_TRIES 30 #endif #ifdef _MSC_VER @@ -509,6 +510,7 @@ 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); @@ -516,6 +518,7 @@ rtp_session->zrtp_mitm_tries = 0; break; case ZRTP_EVENT_NO_ZRTP: + switch_channel_set_variable(channel, "zrtp_secure_media_confirmed", "false"); break; default: break; @@ -2275,7 +2278,7 @@ if (zrtp_session_info.sas_is_ready) { frame->extra_data = rtp_session->zrtp_ctx; switch_set_flag(frame, SFF_ZRTP); - if (rtp_session->zrtp_mitm_tries > 30) { + if (rtp_session->zrtp_mitm_tries > ZRTP_MITM_TRIES) { zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid, &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1); switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV); @@ -2712,12 +2715,14 @@ if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) { if (zrtp_session_info.sas_is_ready) { - if (zrtp_status_ok == zrtp_resolve_mitm_call(frame->extra_data, rtp_session->zrtp_ctx)) { + if (rtp_session->zrtp_mitm_tries > ZRTP_MITM_TRIES) { + switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND); + } else 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_SEND); zrtp_verified_set(zrtp_global, &rtp_session->zrtp_session->zid, &rtp_session->zrtp_session->peer_zid, zrtp_session_info.sas_is_verified^1); + rtp_session->zrtp_mitm_tries++; } - rtp_session->zrtp_mitm_tries++; } } }

1 0

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

28 May '09

Author: mcollins Date: Thu May 28 14:25:20 2009 New Revision: 13488 Log: Add ZRTP phrases to phrase_en.xml Modified: freeswitch/trunk/docs/phrase/phrase_en.xml Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Thu May 28 14:25:20 2009 @@ -311,5 +311,537 @@ <prompt phrase="Your call will be terminated in..." filename="misc-your_call_will_be_terminated_in.wav"/> <prompt phrase="Your call has been terminated." filename="misc-your_call_has_been_terminated.wav"/> </misc> + <zrtp> +  + <prompt phrase="Algol" filename="Algol.wav"/> + <prompt phrase="Apollo" filename="Apollo.wav"/> + <prompt phrase="Athens" filename="Athens.wav"/> + <prompt phrase="Atlantic" filename="Atlantic.wav"/> + <prompt phrase="Aztec" filename="Aztec.wav"/> + <prompt phrase="Babylon" filename="Babylon.wav"/> + <prompt phrase="Belfast" filename="Belfast.wav"/> + <prompt phrase="Bradbury" filename="Bradbury.wav"/> + <prompt phrase="Brazilian" filename="Brazilian.wav"/> + <prompt phrase="Burbank" filename="Burbank.wav"/> + <prompt phrase="Burlington" filename="Burlington.wav"/> + <prompt phrase="Camelot" filename="Camelot.wav"/> + <prompt phrase="Capricorn" filename="Capricorn.wav"/> + <prompt phrase="Cherokee" filename="Cherokee.wav"/> + <prompt phrase="Chicago" filename="Chicago.wav"/> + <prompt phrase="Christmas" filename="Christmas.wav"/> + <prompt phrase="Dakota" filename="Dakota.wav"/> + <prompt phrase="December" filename="December.wav"/> + <prompt phrase="Dupont" filename="Dupont.wav"/> + <prompt phrase="Eskimo" filename="Eskimo.wav"/> + <prompt phrase="Galveston" filename="Galveston.wav"/> + <prompt phrase="Geiger" filename="Geiger.wav"/> + <prompt phrase="Hamilton" filename="Hamilton.wav"/> + <prompt phrase="Istanbul" filename="Istanbul.wav"/> + <prompt phrase="Jamaica" filename="Jamaica.wav"/> + <prompt phrase="Jupiter" filename="Jupiter.wav"/> + <prompt phrase="Medusa" filename="Medusa.wav"/> + <prompt phrase="Mohawk" filename="Mohawk.wav"/> + <prompt phrase="Montana" filename="Montana.wav"/> + <prompt phrase="Neptune" filename="Neptune.wav"/> + <prompt phrase="Norwegian" filename="Norwegian.wav"/> + <prompt phrase="Oakland" filename="Oakland.wav"/> + <prompt phrase="October" filename="October.wav"/> + <prompt phrase="Ohio" filename="Ohio.wav"/> + <prompt phrase="Orlando" filename="Orlando.wav"/> + <prompt phrase="Pacific" filename="Pacific.wav"/> + <prompt phrase="Pandora" filename="Pandora.wav"/> + <prompt phrase="Pegasus" filename="Pegasus.wav"/> + <prompt phrase="Pluto" filename="Pluto.wav"/> + <prompt phrase="Saturday" filename="Saturday.wav"/> + <prompt phrase="Scotland" filename="Scotland.wav"/> + <prompt phrase="Trojan" filename="Trojan.wav"/> + <prompt phrase="Virginia" filename="Virginia.wav"/> + <prompt phrase="Vulcan" filename="Vulcan.wav"/> + <prompt phrase="Waterloo" filename="Waterloo.wav"/> + <prompt phrase="Wichita" filename="Wichita.wav"/> + <prompt phrase="Wilmington" filename="Wilmington.wav"/> + <prompt phrase="Wyoming" filename="Wyoming.wav"/> + <prompt phrase="Yucatan" filename="Yucatan.wav"/> + <prompt phrase="Zulu" filename="Zulu.wav"/> + <prompt phrase="aardvark" filename="aardvark.wav"/> + <prompt phrase="absurd" filename="absurd.wav"/> + <prompt phrase="accrue" filename="accrue.wav"/> + <prompt phrase="acme" filename="acme.wav"/> + <prompt phrase="adrift" filename="adrift.wav"/> + <prompt phrase="adroitness" filename="adroitness.wav"/> + <prompt phrase="adult" filename="adult.wav"/> + <prompt phrase="adviser" filename="adviser.wav"/> + <prompt phrase="afflict" filename="afflict.wav"/> + <prompt phrase="aftermath" filename="aftermath.wav"/> + <prompt phrase="aggregate" filename="aggregate.wav"/> + <prompt phrase="ahead" filename="ahead.wav"/> + <prompt phrase="aimless" filename="aimless.wav"/> + <prompt phrase="alkali" filename="alkali.wav"/> + <prompt phrase="allow" filename="allow.wav"/> + <prompt phrase="almighty" filename="almighty.wav"/> + <prompt phrase="alone" filename="alone.wav"/> + <prompt phrase="ammo" filename="ammo.wav"/> + <prompt phrase="amulet" filename="amulet.wav"/> + <prompt phrase="amusement" filename="amusement.wav"/> + <prompt phrase="ancient" filename="ancient.wav"/> + <prompt phrase="antenna" filename="antenna.wav"/> + <prompt phrase="apple" filename="apple.wav"/> + <prompt phrase="applicant" filename="applicant.wav"/> + <prompt phrase="armistice" filename="armistice.wav"/> + <prompt phrase="article" filename="article.wav"/> + <prompt phrase="artist" filename="artist.wav"/> + <prompt phrase="assume" filename="assume.wav"/> + <prompt phrase="asteroid" filename="asteroid.wav"/> + <prompt phrase="atlas" filename="atlas.wav"/> + <prompt phrase="atmosphere" filename="atmosphere.wav"/> + <prompt phrase="autopsy" filename="autopsy.wav"/> + <prompt phrase="baboon" filename="baboon.wav"/> + <prompt phrase="backfield" filename="backfield.wav"/> + <prompt phrase="backward" filename="backward.wav"/> + <prompt phrase="backwater" filename="backwater.wav"/> + <prompt phrase="banjo" filename="banjo.wav"/> + <prompt phrase="barbecue" filename="barbecue.wav"/> + <prompt phrase="beaming" filename="beaming.wav"/> + <prompt phrase="bedlamp" filename="bedlamp.wav"/> + <prompt phrase="beehive" filename="beehive.wav"/> + <prompt phrase="beeswax" filename="beeswax.wav"/> + <prompt phrase="befriend" filename="befriend.wav"/> + <prompt phrase="belowground" filename="belowground.wav"/> + <prompt phrase="berserk" filename="berserk.wav"/> + <prompt phrase="bifocals" filename="bifocals.wav"/> + <prompt phrase="billiard" filename="billiard.wav"/> + <prompt phrase="bison" filename="bison.wav"/> + <prompt phrase="blackjack" filename="blackjack.wav"/> + <prompt phrase="blockade" filename="blockade.wav"/> + <prompt phrase="blowtorch" filename="blowtorch.wav"/> + <prompt phrase="bluebird" filename="bluebird.wav"/> + <prompt phrase="bodyguard" filename="bodyguard.wav"/> + <prompt phrase="bombast" filename="bombast.wav"/> + <prompt phrase="bookseller" filename="bookseller.wav"/> + <prompt phrase="bookshelf" filename="bookshelf.wav"/> + <prompt phrase="borderline" filename="borderline.wav"/> + <prompt phrase="bottomless" filename="bottomless.wav"/> + <prompt phrase="brackish" filename="brackish.wav"/> + <prompt phrase="bravado" filename="bravado.wav"/> + <prompt phrase="breadline" filename="breadline.wav"/> + <prompt phrase="breakaway" filename="breakaway.wav"/> + <prompt phrase="breakup" filename="breakup.wav"/> + <prompt phrase="brickyard" filename="brickyard.wav"/> + <prompt phrase="briefcase" filename="briefcase.wav"/> + <prompt phrase="businessman" filename="businessman.wav"/> + <prompt phrase="butterfat" filename="butterfat.wav"/> + <prompt phrase="button" filename="button.wav"/> + <prompt phrase="buzzard" filename="buzzard.wav"/> + <prompt phrase="candidate" filename="candidate.wav"/> + <prompt phrase="cannonball" filename="cannonball.wav"/> + <prompt phrase="caravan" filename="caravan.wav"/> + <prompt phrase="caretaker" filename="caretaker.wav"/> + <prompt phrase="celebrate" filename="celebrate.wav"/> + <prompt phrase="cellulose" filename="cellulose.wav"/> + <prompt phrase="cement" filename="cement.wav"/> + <prompt phrase="certify" filename="certify.wav"/> + <prompt phrase="chairlift" filename="chairlift.wav"/> + <prompt phrase="chambermaid" filename="chambermaid.wav"/> + <prompt phrase="chatter" filename="chatter.wav"/> + <prompt phrase="checkup" filename="checkup.wav"/> + <prompt phrase="chisel" filename="chisel.wav"/> + <prompt phrase="choking" filename="choking.wav"/> + <prompt phrase="chopper" filename="chopper.wav"/> + <prompt phrase="clamshell" filename="clamshell.wav"/> + <prompt phrase="classic" filename="classic.wav"/> + <prompt phrase="classroom" filename="classroom.wav"/> + <prompt phrase="cleanup" filename="cleanup.wav"/> + <prompt phrase="clergyman" filename="clergyman.wav"/> + <prompt phrase="clockwork" filename="clockwork.wav"/> + <prompt phrase="cobra" filename="cobra.wav"/> + <prompt phrase="coherence" filename="coherence.wav"/> + <prompt phrase="combustion" filename="combustion.wav"/> + <prompt phrase="commando" filename="commando.wav"/> + <prompt phrase="commence" filename="commence.wav"/> + <prompt phrase="company" filename="company.wav"/> + <prompt phrase="component" filename="component.wav"/> + <prompt phrase="concert" filename="concert.wav"/> + <prompt phrase="concurrent" filename="concurrent.wav"/> + <prompt phrase="confidence" filename="confidence.wav"/> + <prompt phrase="conformist" filename="conformist.wav"/> + <prompt phrase="congregate" filename="congregate.wav"/> + <prompt phrase="consensus" filename="consensus.wav"/> + <prompt phrase="consulting" filename="consulting.wav"/> + <prompt phrase="corporate" filename="corporate.wav"/> + <prompt phrase="corrosion" filename="corrosion.wav"/> + <prompt phrase="councilman" filename="councilman.wav"/> + <prompt phrase="cowbell" filename="cowbell.wav"/> + <prompt phrase="crackdown" filename="crackdown.wav"/> + <prompt phrase="cranky" filename="cranky.wav"/> + <prompt phrase="crossover" filename="crossover.wav"/> + <prompt phrase="crowfoot" filename="crowfoot.wav"/> + <prompt phrase="crucial" filename="crucial.wav"/> + <prompt phrase="crucifix" filename="crucifix.wav"/> + <prompt phrase="crumpled" filename="crumpled.wav"/> + <prompt phrase="crusade" filename="crusade.wav"/> + <prompt phrase="cubic" filename="cubic.wav"/> + <prompt phrase="cumbersome" filename="cumbersome.wav"/> + <prompt phrase="customer" filename="customer.wav"/> + <prompt phrase="dashboard" filename="dashboard.wav"/> + <prompt phrase="deadbolt" filename="deadbolt.wav"/> + <prompt phrase="decadence" filename="decadence.wav"/> + <prompt phrase="decimal" filename="decimal.wav"/> + <prompt phrase="deckhand" filename="deckhand.wav"/> + <prompt phrase="designing" filename="designing.wav"/> + <prompt phrase="detector" filename="detector.wav"/> + <prompt phrase="detergent" filename="detergent.wav"/> + <prompt phrase="determine" filename="determine.wav"/> + <prompt phrase="dictator" filename="dictator.wav"/> + <prompt phrase="dinosaur" filename="dinosaur.wav"/> + <prompt phrase="direction" filename="direction.wav"/> + <prompt phrase="disable" filename="disable.wav"/> + <prompt phrase="disbelief" filename="disbelief.wav"/> + <prompt phrase="disruptive" filename="disruptive.wav"/> + <prompt phrase="distortion" filename="distortion.wav"/> + <prompt phrase="document" filename="document.wav"/> + <prompt phrase="dogsled" filename="dogsled.wav"/> + <prompt phrase="dragnet" filename="dragnet.wav"/> + <prompt phrase="drainage" filename="drainage.wav"/> + <prompt phrase="dreadful" filename="dreadful.wav"/> + <prompt phrase="drifter" filename="drifter.wav"/> + <prompt phrase="dropper" filename="dropper.wav"/> + <prompt phrase="drumbeat" filename="drumbeat.wav"/> + <prompt phrase="drunken" filename="drunken.wav"/> + <prompt phrase="dwelling" filename="dwelling.wav"/> + <prompt phrase="eating" filename="eating.wav"/> + <prompt phrase="edict" filename="edict.wav"/> + <prompt phrase="egghead" filename="egghead.wav"/> + <prompt phrase="eightball" filename="eightball.wav"/> + <prompt phrase="embezzle" filename="embezzle.wav"/> + <prompt phrase="enchanting" filename="enchanting.wav"/> + <prompt phrase="endorse" filename="endorse.wav"/> + <prompt phrase="endow" filename="endow.wav"/> + <prompt phrase="enlist" filename="enlist.wav"/> + <prompt phrase="enrollment" filename="enrollment.wav"/> + <prompt phrase="enterprise" filename="enterprise.wav"/> + <prompt phrase="equation" filename="equation.wav"/> + <prompt phrase="equipment" filename="equipment.wav"/> + <prompt phrase="erase" filename="erase.wav"/> + <prompt phrase="escapade" filename="escapade.wav"/> + <prompt phrase="escape" filename="escape.wav"/> + <prompt phrase="everyday" filename="everyday.wav"/> + <prompt phrase="examine" filename="examine.wav"/> + <prompt phrase="exceed" filename="exceed.wav"/> + <prompt phrase="existence" filename="existence.wav"/> + <prompt phrase="exodus" filename="exodus.wav"/> + <prompt phrase="eyeglass" filename="eyeglass.wav"/> + <prompt phrase="eyetooth" filename="eyetooth.wav"/> + <prompt phrase="facial" filename="facial.wav"/> + <prompt phrase="fallout" filename="fallout.wav"/> + <prompt phrase="fascinate" filename="fascinate.wav"/> + <prompt phrase="filament" filename="filament.wav"/> + <prompt phrase="finicky" filename="finicky.wav"/> + <prompt phrase="flagpole" filename="flagpole.wav"/> + <prompt phrase="flatfoot" filename="flatfoot.wav"/> + <prompt phrase="flytrap" filename="flytrap.wav"/> + <prompt phrase="forever" filename="forever.wav"/> + <prompt phrase="fortitude" filename="fortitude.wav"/> + <prompt phrase="fracture" filename="fracture.wav"/> + <prompt phrase="framework" filename="framework.wav"/> + <prompt phrase="freedom" filename="freedom.wav"/> + <prompt phrase="frequency" filename="frequency.wav"/> + <prompt phrase="frighten" filename="frighten.wav"/> + <prompt phrase="gadgetry" filename="gadgetry.wav"/> + <prompt phrase="gazelle" filename="gazelle.wav"/> + <prompt phrase="getaway" filename="getaway.wav"/> + <prompt phrase="glitter" filename="glitter.wav"/> + <prompt phrase="glossary" filename="glossary.wav"/> + <prompt phrase="glucose" filename="glucose.wav"/> + <prompt phrase="goggles" filename="goggles.wav"/> + <prompt phrase="goldfish" filename="goldfish.wav"/> + <prompt phrase="gossamer" filename="gossamer.wav"/> + <prompt phrase="graduate" filename="graduate.wav"/> + <prompt phrase="gravity" filename="gravity.wav"/> + <prompt phrase="gremlin" filename="gremlin.wav"/> + <prompt phrase="guidance" filename="guidance.wav"/> + <prompt phrase="guitarist" filename="guitarist.wav"/> + <prompt phrase="hamburger" filename="hamburger.wav"/> + <prompt phrase="hamlet" filename="hamlet.wav"/> + <prompt phrase="handiwork" filename="handiwork.wav"/> + <prompt phrase="hazardous" filename="hazardous.wav"/> + <prompt phrase="headwaters" filename="headwaters.wav"/> + <prompt phrase="hemisphere" filename="hemisphere.wav"/> + <prompt phrase="hesitate" filename="hesitate.wav"/> + <prompt phrase="hideaway" filename="hideaway.wav"/> + <prompt phrase="highchair" filename="highchair.wav"/> + <prompt phrase="hockey" filename="hockey.wav"/> + <prompt phrase="holiness" filename="holiness.wav"/> + <prompt phrase="hurricane" filename="hurricane.wav"/> + <prompt phrase="hydraulic" filename="hydraulic.wav"/> + <prompt phrase="impartial" filename="impartial.wav"/> + <prompt phrase="impetus" filename="impetus.wav"/> + <prompt phrase="inception" filename="inception.wav"/> + <prompt phrase="indigo" filename="indigo.wav"/> + <prompt phrase="indoors" filename="indoors.wav"/> + <prompt phrase="indulge" filename="indulge.wav"/> + <prompt phrase="inertia" filename="inertia.wav"/> + <prompt phrase="infancy" filename="infancy.wav"/> + <prompt phrase="inferno" filename="inferno.wav"/> + <prompt phrase="informant" filename="informant.wav"/> + <prompt phrase="insincere" filename="insincere.wav"/> + <prompt phrase="insurgent" filename="insurgent.wav"/> + <prompt phrase="integrate" filename="integrate.wav"/> + <prompt phrase="intention" filename="intention.wav"/> + <prompt phrase="inventive" filename="inventive.wav"/> + <prompt phrase="inverse" filename="inverse.wav"/> + <prompt phrase="involve" filename="involve.wav"/> + <prompt phrase="island" filename="island.wav"/> + <prompt phrase="jawbone" filename="jawbone.wav"/> + <prompt phrase="keyboard" filename="keyboard.wav"/> + <prompt phrase="kickoff" filename="kickoff.wav"/> + <prompt phrase="kiwi" filename="kiwi.wav"/> + <prompt phrase="klaxon" filename="klaxon.wav"/> + <prompt phrase="leprosy" filename="leprosy.wav"/> + <prompt phrase="letterhead" filename="letterhead.wav"/> + <prompt phrase="liberty" filename="liberty.wav"/> + <prompt phrase="locale" filename="locale.wav"/> + <prompt phrase="lockup" filename="lockup.wav"/> + <prompt phrase="maritime" filename="maritime.wav"/> + <prompt phrase="matchmaker" filename="matchmaker.wav"/> + <prompt phrase="maverick" filename="maverick.wav"/> + <prompt phrase="megaton" filename="megaton.wav"/> + <prompt phrase="merit" filename="merit.wav"/> + <prompt phrase="microscope" filename="microscope.wav"/> + <prompt phrase="microwave" filename="microwave.wav"/> + <prompt phrase="midsummer" filename="midsummer.wav"/> + <prompt phrase="millionaire" filename="millionaire.wav"/> + <prompt phrase="minnow" filename="minnow.wav"/> + <prompt phrase="miracle" filename="miracle.wav"/> + <prompt phrase="miser" filename="miser.wav"/> + <prompt phrase="misnomer" filename="misnomer.wav"/> + <prompt phrase="molasses" filename="molasses.wav"/> + <prompt phrase="molecule" filename="molecule.wav"/> + <prompt phrase="monument" filename="monument.wav"/> + <prompt phrase="mosquito" filename="mosquito.wav"/> + <prompt phrase="mural" filename="mural.wav"/> + <prompt phrase="music" filename="music.wav"/> + <prompt phrase="narrative" filename="narrative.wav"/> + <prompt phrase="nebula" filename="nebula.wav"/> + <prompt phrase="necklace" filename="necklace.wav"/> + <prompt phrase="newborn" filename="newborn.wav"/> + <prompt phrase="newsletter" filename="newsletter.wav"/> + <prompt phrase="nightbird" filename="nightbird.wav"/> + <prompt phrase="obtuse" filename="obtuse.wav"/> + <prompt phrase="offload" filename="offload.wav"/> + <prompt phrase="onlooker" filename="onlooker.wav"/> + <prompt phrase="optic" filename="optic.wav"/> + <prompt phrase="opulent" filename="opulent.wav"/> + <prompt phrase="orca" filename="orca.wav"/> + <prompt phrase="outfielder" filename="outfielder.wav"/> + <prompt phrase="pandemic" filename="pandemic.wav"/> + <prompt phrase="paperweight" filename="paperweight.wav"/> + <prompt phrase="paragon" filename="paragon.wav"/> + <prompt phrase="paragraph" filename="paragraph.wav"/> + <prompt phrase="paramount" filename="paramount.wav"/> + <prompt phrase="passenger" filename="passenger.wav"/> + <prompt phrase="payday" filename="payday.wav"/> + <prompt phrase="peachy" filename="peachy.wav"/> + <prompt phrase="pedigree" filename="pedigree.wav"/> + <prompt phrase="penetrate" filename="penetrate.wav"/> + <prompt phrase="perceptive" filename="perceptive.wav"/> + <prompt phrase="performance" filename="performance.wav"/> + <prompt phrase="pharmacy" filename="pharmacy.wav"/> + <prompt phrase="pheasant" filename="pheasant.wav"/> + <prompt phrase="phonetic" filename="phonetic.wav"/> + <prompt phrase="photograph" filename="photograph.wav"/> + <prompt phrase="physique" filename="physique.wav"/> + <prompt phrase="pioneer" filename="pioneer.wav"/> + <prompt phrase="playhouse" filename="playhouse.wav"/> + <prompt phrase="pocketful" filename="pocketful.wav"/> + <prompt phrase="politeness" filename="politeness.wav"/> + <prompt phrase="positive" filename="positive.wav"/> + <prompt phrase="potato" filename="potato.wav"/> + <prompt phrase="preclude" filename="preclude.wav"/> + <prompt phrase="prefer" filename="prefer.wav"/> + <prompt phrase="preshrunk" filename="preshrunk.wav"/> + <prompt phrase="printer" filename="printer.wav"/> + <prompt phrase="processor" filename="processor.wav"/> + <prompt phrase="provincial" filename="provincial.wav"/> + <prompt phrase="prowler" filename="prowler.wav"/> + <prompt phrase="proximate" filename="proximate.wav"/> + <prompt phrase="puberty" filename="puberty.wav"/> + <prompt phrase="publisher" filename="publisher.wav"/> + <prompt phrase="pupil" filename="pupil.wav"/> + <prompt phrase="puppy" filename="puppy.wav"/> + <prompt phrase="pyramid" filename="pyramid.wav"/> + <prompt phrase="python" filename="python.wav"/> + <prompt phrase="quadrant" filename="quadrant.wav"/> + <prompt phrase="quantity" filename="quantity.wav"/> + <prompt phrase="quiver" filename="quiver.wav"/> + <prompt phrase="quota" filename="quota.wav"/> + <prompt phrase="racketeer" filename="racketeer.wav"/> + <prompt phrase="ragtime" filename="ragtime.wav"/> + <prompt phrase="ratchet" filename="ratchet.wav"/> + <prompt phrase="rebellion" filename="rebellion.wav"/> + <prompt phrase="rebirth" filename="rebirth.wav"/> + <prompt phrase="recipe" filename="recipe.wav"/> + <prompt phrase="recover" filename="recover.wav"/> + <prompt phrase="reform" filename="reform.wav"/> + <prompt phrase="regain" filename="regain.wav"/> + <prompt phrase="reindeer" filename="reindeer.wav"/> + <prompt phrase="rematch" filename="rematch.wav"/> + <prompt phrase="repay" filename="repay.wav"/> + <prompt phrase="repellent" filename="repellent.wav"/> + <prompt phrase="replica" filename="replica.wav"/> + <prompt phrase="reproduce" filename="reproduce.wav"/> + <prompt phrase="resistor" filename="resistor.wav"/> + <prompt phrase="responsive" filename="responsive.wav"/> + <prompt phrase="retouch" filename="retouch.wav"/> + <prompt phrase="retraction" filename="retraction.wav"/> + <prompt phrase="retrieval" filename="retrieval.wav"/> + <prompt phrase="retrospect" filename="retrospect.wav"/> + <prompt phrase="revenge" filename="revenge.wav"/> + <prompt phrase="revenue" filename="revenue.wav"/> + <prompt phrase="revival" filename="revival.wav"/> + <prompt phrase="revolver" filename="revolver.wav"/> + <prompt phrase="reward" filename="reward.wav"/> + <prompt phrase="rhythm" filename="rhythm.wav"/> + <prompt phrase="ribcage" filename="ribcage.wav"/> + <prompt phrase="ringbolt" filename="ringbolt.wav"/> + <prompt phrase="robust" filename="robust.wav"/> + <prompt phrase="rocker" filename="rocker.wav"/> + <prompt phrase="ruffled" filename="ruffled.wav"/> + <prompt phrase="sailboat" filename="sailboat.wav"/> + <prompt phrase="sandalwood" filename="sandalwood.wav"/> + <prompt phrase="sardonic" filename="sardonic.wav"/> + <prompt phrase="savagery" filename="savagery.wav"/> + <prompt phrase="sawdust" filename="sawdust.wav"/> + <prompt phrase="scallion" filename="scallion.wav"/> + <prompt phrase="scavenger" filename="scavenger.wav"/> + <prompt phrase="scenic" filename="scenic.wav"/> + <prompt phrase="scorecard" filename="scorecard.wav"/> + <prompt phrase="seabird" filename="seabird.wav"/> + <prompt phrase="select" filename="select.wav"/> + <prompt phrase="sensation" filename="sensation.wav"/> + <prompt phrase="sentence" filename="sentence.wav"/> + <prompt phrase="shadow" filename="shadow.wav"/> + <prompt phrase="shamrock" filename="shamrock.wav"/> + <prompt phrase="showgirl" filename="showgirl.wav"/> + <prompt phrase="skullcap" filename="skullcap.wav"/> + <prompt phrase="skydive" filename="skydive.wav"/> + <prompt phrase="slingshot" filename="slingshot.wav"/> + <prompt phrase="slowdown" filename="slowdown.wav"/> + <prompt phrase="snapline" filename="snapline.wav"/> + <prompt phrase="snapshot" filename="snapshot.wav"/> + <prompt phrase="snowcap" filename="snowcap.wav"/> + <prompt phrase="snowslide" filename="snowslide.wav"/> + <prompt phrase="sociable" filename="sociable.wav"/> + <prompt phrase="solo" filename="solo.wav"/> + <prompt phrase="southward" filename="southward.wav"/> + <prompt phrase="souvenir" filename="souvenir.wav"/> + <prompt phrase="soybean" filename="soybean.wav"/> + <prompt phrase="spaniel" filename="spaniel.wav"/> + <prompt phrase="spearhead" filename="spearhead.wav"/> + <prompt phrase="specialist" filename="specialist.wav"/> + <prompt phrase="speculate" filename="speculate.wav"/> + <prompt phrase="spellbind" filename="spellbind.wav"/> + <prompt phrase="spheroid" filename="spheroid.wav"/> + <prompt phrase="spigot" filename="spigot.wav"/> + <prompt phrase="spindle" filename="spindle.wav"/> + <prompt phrase="spyglass" filename="spyglass.wav"/> + <prompt phrase="stagehand" filename="stagehand.wav"/> + <prompt phrase="stagnate" filename="stagnate.wav"/> + <prompt phrase="stairway" filename="stairway.wav"/> + <prompt phrase="standard" filename="standard.wav"/> + <prompt phrase="stapler" filename="stapler.wav"/> + <prompt phrase="steamship" filename="steamship.wav"/> + <prompt phrase="sterling" filename="sterling.wav"/> + <prompt phrase="stethoscope" filename="stethoscope.wav"/> + <prompt phrase="stockman" filename="stockman.wav"/> + <prompt phrase="stopwatch" filename="stopwatch.wav"/> + <prompt phrase="stormy" filename="stormy.wav"/> + <prompt phrase="stupendous" filename="stupendous.wav"/> + <prompt phrase="sugar" filename="sugar.wav"/> + <prompt phrase="supportive" filename="supportive.wav"/> + <prompt phrase="surmount" filename="surmount.wav"/> + <prompt phrase="surrender" filename="surrender.wav"/> + <prompt phrase="suspense" filename="suspense.wav"/> + <prompt phrase="suspicious" filename="suspicious.wav"/> + <prompt phrase="sweatband" filename="sweatband.wav"/> + <prompt phrase="swelter" filename="swelter.wav"/> + <prompt phrase="sympathy" filename="sympathy.wav"/> + <prompt phrase="tactics" filename="tactics.wav"/> + <prompt phrase="talon" filename="talon.wav"/> + <prompt phrase="tambourine" filename="tambourine.wav"/> + <prompt phrase="tapeworm" filename="tapeworm.wav"/> + <prompt phrase="telephone" filename="telephone.wav"/> + <prompt phrase="tempest" filename="tempest.wav"/> + <prompt phrase="therapist" filename="therapist.wav"/> + <prompt phrase="tiger" filename="tiger.wav"/> + <prompt phrase="tissue" filename="tissue.wav"/> + <prompt phrase="tobacco" filename="tobacco.wav"/> + <prompt phrase="tolerance" filename="tolerance.wav"/> + <prompt phrase="tomorrow" filename="tomorrow.wav"/> + <prompt phrase="tonic" filename="tonic.wav"/> + <prompt phrase="topmost" filename="topmost.wav"/> + <prompt phrase="torpedo" filename="torpedo.wav"/> + <prompt phrase="tracker" filename="tracker.wav"/> + <prompt phrase="tradition" filename="tradition.wav"/> + <prompt phrase="transit" filename="transit.wav"/> + <prompt phrase="trauma" filename="trauma.wav"/> + <prompt phrase="travesty" filename="travesty.wav"/> + <prompt phrase="treadmill" filename="treadmill.wav"/> + <prompt phrase="trombonist" filename="trombonist.wav"/> + <prompt phrase="trouble" filename="trouble.wav"/> + <prompt phrase="truncated" filename="truncated.wav"/> + <prompt phrase="tumor" filename="tumor.wav"/> + <prompt phrase="tunnel" filename="tunnel.wav"/> + <prompt phrase="tycoon" filename="tycoon.wav"/> + <prompt phrase="typewriter" filename="typewriter.wav"/> + <prompt phrase="ultimate" filename="ultimate.wav"/> + <prompt phrase="uncut" filename="uncut.wav"/> + <prompt phrase="undaunted" filename="undaunted.wav"/> + <prompt phrase="underfoot" filename="underfoot.wav"/> + <prompt phrase="unearth" filename="unearth.wav"/> + <prompt phrase="unicorn" filename="unicorn.wav"/> + <prompt phrase="unify" filename="unify.wav"/> + <prompt phrase="universe" filename="universe.wav"/> + <prompt phrase="unravel" filename="unravel.wav"/> + <prompt phrase="unwind" filename="unwind.wav"/> + <prompt phrase="upcoming" filename="upcoming.wav"/> + <prompt phrase="uproot" filename="uproot.wav"/> + <prompt phrase="upset" filename="upset.wav"/> + <prompt phrase="upshot" filename="upshot.wav"/> + <prompt phrase="vacancy" filename="vacancy.wav"/> + <prompt phrase="vagabond" filename="vagabond.wav"/> + <prompt phrase="vapor" filename="vapor.wav"/> + <prompt phrase="vertigo" filename="vertigo.wav"/> + <prompt phrase="village" filename="village.wav"/> + <prompt phrase="virus" filename="virus.wav"/> + <prompt phrase="visitor" filename="visitor.wav"/> + <prompt phrase="vocalist" filename="vocalist.wav"/> + <prompt phrase="voyager" filename="voyager.wav"/> + <prompt phrase="waffle" filename="waffle.wav"/> + <prompt phrase="wallet" filename="wallet.wav"/> + <prompt phrase="warranty" filename="warranty.wav"/> + <prompt phrase="watchword" filename="watchword.wav"/> + <prompt phrase="wayside" filename="wayside.wav"/> + <prompt phrase="whimsical" filename="whimsical.wav"/> + <prompt phrase="willow" filename="willow.wav"/> + <prompt phrase="woodlark" filename="woodlark.wav"/> + <prompt phrase="yesteryear" filename="yesteryear.wav"/> +  + <prompt phrase="Something's wrong" filename="zrtp-somethings_wrong.wav"/> + <prompt phrase="You must check the authentication string with your partner. If it doesn't match, it indicates the presence of a wire tapper." filename="zrtp-check_sas.wav"/> + <prompt phrase="Welcome to the PBX ZRTP security enrollment agent." filename="zrtp-enroll_welcome.wav" + <prompt phrase="Only phones that are recognized by this PBX as SIP-registered to this PBX can be configured to trust this PBX to relay ZRTP secured calls. Your phone is not SIP-registered with this PBX, so this call will have no effect. Thank you, goodbye." filename="zrtp-enroll_not_sip_registered.wav"/> + <prompt phrase="Your phone indicates that it already trusts this PBX to relay ZRTP secured calls, so you do not need to do anything more. Thank you for calling. Goodbye." filename="zrtp-enroll_already_enrolled.wav"/> + <prompt phrase="Only phones equipped with the ZRTP protocol can use this extension. Your phone is not a ZRTP-enable phone, so this call will have no effect. Thank you for calling. Goodbye." filename="zrtp-enroll_notzrtp.wav"/> + <prompt phrase="This PBX is equipped to handle ZRTP encrypted phone calls. You must decide if you want to allow this PBX to be in a position to intercept and possibly monitor your secure phone calls. If you trust this PBX to relay ZRTP secured calls, press the appropriate button on your phone to enroll and bind this PBX to your phone. You may hang up after you've done this." filename="zrtp-enroll_confirmed.wav"/> + <prompt phrase="NULL" filename="zrtp-event_secure.wav"/>  + <prompt phrase="Call is secure. Verbally compare this authentication code with your partner." filename="zrtp-is_secure.wav"/> + <prompt phrase="Authentication code is now unverified." filename="zrtp-is_unverified.wav"/> + <prompt phrase="Authentication code is now verified." filename="zrtp-is_verified.wav"/> + <prompt phrase="Press clear." filename="zrtp-press_clear.wav"/> + <prompt phrase="Error." filename="zrtp-status_error.wav"/> + <prompt phrase="Call is not secure." filename="zrtp-status_notsecure.wav"/> + <prompt phrase="Call is secure." filename="zrtp-status_secure.wav"/> + <prompt phrase="Securing call." filename="zrtp-status_securing.wav"/> + </zrtp> </en> </language>

1 0

[commit] r13487 - in freeswitch/trunk: libs/esl/src libs/esl/src/include src src/include
by FreeSWITCH SVN 28 May '09

28 May '09

Author: anthm Date: Thu May 28 12:50:06 2009 New Revision: 13487 Log: add CALL_SECURE event Modified: freeswitch/trunk/libs/esl/src/esl_event.c freeswitch/trunk/libs/esl/src/include/esl_event.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/libs/esl/src/esl_event.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_event.c (original) +++ freeswitch/trunk/libs/esl/src/esl_event.c Thu May 28 12:50:06 2009 @@ -123,6 +123,7 @@ "SERVER_DISCONNECTED", "SEND_INFO", "RECV_INFO", + "CALL_SECURE", "ALL" }; Modified: freeswitch/trunk/libs/esl/src/include/esl_event.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_event.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_event.h Thu May 28 12:50:06 2009 @@ -111,6 +111,7 @@ ESL_EVENT_SERVER_DISCONNECTED, ESL_EVENT_SEND_INFO, ESL_EVENT_RECV_INFO, + ESL_EVENT_CALL_SECURE, ESL_EVENT_ALL } esl_event_types_t; Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu May 28 12:50:06 2009 @@ -1268,6 +1268,7 @@ SWITCH_EVENT_SERVER_DISCONNECTED, SWITCH_EVENT_SEND_INFO, SWITCH_EVENT_RECV_INFO, + SWITCH_EVENT_CALL_SECURE, SWITCH_EVENT_ALL } switch_event_types_t; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Thu May 28 12:50:06 2009 @@ -177,6 +177,7 @@ "SERVER_DISCONNECTED", "SEND_INFO", "RECV_INFO", + "CALL_SECURE", "ALL" };

1 0

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

28 May '09

Author: brian Date: Thu May 28 08:53:23 2009 New Revision: 13486 Log: keep you from doing both zrtp and srtp at the same time. 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 08:53:23 2009 @@ -1108,6 +1108,13 @@ 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); 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)) { + 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; + } if (switch_true(zrtp_enabled)) { if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {

1 0

[commit] r13485 - freeswitch/trunk/conf
by FreeSWITCH SVN 28 May '09

28 May '09

Author: brian Date: Wed May 27 23:08:09 2009 New Revision: 13485 Log: tweaks to codecs in default conifg Modified: freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Wed May 27 23:08:09 2009 @@ -84,7 +84,7 @@ H264 - H.264 Video --> - <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU,PCMA,GSM"/> + <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM"/> <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU,PCMA,GSM"/> <!--

1 0

[commit] r13484 - freeswitch/trunk/build
by FreeSWITCH SVN 27 May '09

27 May '09

Author: mikej Date: Wed May 27 18:39:29 2009 New Revision: 13484 Log: really the last test Modified: freeswitch/trunk/build/getsounds.sh.in Modified: freeswitch/trunk/build/getsounds.sh.in ============================================================================== --- freeswitch/trunk/build/getsounds.sh.in (original) +++ freeswitch/trunk/build/getsounds.sh.in Wed May 27 18:39:29 2009 @@ -33,4 +33,3 @@ fi exit 0 -

1 0

[commit] r13483 - freeswitch/trunk
by FreeSWITCH SVN 27 May '09

27 May '09

Author: mikej Date: Wed May 27 18:37:16 2009 New Revision: 13483 Log: last test Modified: freeswitch/trunk/Makefile.am Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Wed May 27 18:37:16 2009 @@ -492,5 +492,3 @@ coffee me_a_sandwich me_a_sammich: @echo "Who do you think I am? Make it yourself!" - -

1 0