May 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13302 - freeswitch/trunk/src
by FreeSWITCH SVN 14 May '09

14 May '09

Author: mikej Date: Thu May 14 09:58:58 2009 New Revision: 13302 Log: FSBUILD-159 Modified: freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu May 14 09:58:58 2009 @@ -725,6 +725,8 @@ switch_byte_t *sendbuf = NULL; uint32_t sendlen = 0; + switch_assert(read_frame); + if (switch_test_flag(read_frame, SFF_CNG)) { sendlen = bpf; switch_assert(sendlen <= SWITCH_RECOMMENDED_BUFFER_SIZE);

1 0

[commit] r13301 - freeswitch/trunk/src
by FreeSWITCH SVN 14 May '09

14 May '09

Author: anthm Date: Thu May 14 08:48:11 2009 New Revision: 13301 Log: FSCORE-367 Modified: freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu May 14 08:48:11 2009 @@ -638,7 +638,7 @@ { switch_status_t status = SWITCH_STATUS_SUCCESS; switch_channel_t *channel = switch_core_session_get_channel(session); - switch_frame_t *read_frame; + switch_frame_t *read_frame = NULL; int stream_id = 0; switch_event_t *event; switch_unicast_conninfo_t *conninfo = NULL;

1 0

[commit] r13300 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 14 May '09

14 May '09

Author: silik0n Date: Wed May 13 21:57:21 2009 New Revision: 13300 Log: MODAPP-276 Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Wed May 13 21:57:21 2009 @@ -44,7 +44,6 @@ typedef struct easyroute_results{ char limit[16]; - char destnum[16]; char dialstring[256]; char group[16]; char acctcode[17]; @@ -323,7 +322,7 @@ } route_lookup(destnum, &results, noat, seperator); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "EASY ROUTE DEST: [%s]\n", results.dialstring); - switch_channel_set_variable(channel, "easy_destnum", results.destnum); + switch_channel_set_variable(channel, "easy_destnum", destnum); switch_channel_set_variable(channel, "easy_dialstring", results.dialstring); switch_channel_set_variable(channel, "easy_group", results.group); switch_channel_set_variable(channel, "easy_limit", results.limit);

1 0

[commit] r13299 - freeswitch/trunk/src/mod/endpoints/mod_opal
by FreeSWITCH SVN 14 May '09

14 May '09

Author: robertj Date: Wed May 13 21:15:50 2009 New Revision: 13299 Log: Applied patch for blind transfer, thanks Peter Olsson Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Wed May 13 21:15:50 2009 @@ -997,7 +997,7 @@ { char transfer_to[128] = ""; switch_set_string(transfer_to, msg->string_arg); - TransferConnection(transfer_to); + GetCall().Transfer(transfer_to); break; }

1 0

[commit] r13298 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 14 May '09

14 May '09

Author: brian Date: Wed May 13 20:41:54 2009 New Revision: 13298 Log: MODAPP-273 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Wed May 13 20:41:54 2009 @@ -1807,6 +1807,7 @@ char *mydata = NULL; switch_input_args_t args = { 0 }; switch_channel_t *channel = switch_core_session_get_channel(session); + switch_status_t status; if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) { const char *lang; @@ -1825,7 +1826,22 @@ switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "" ); - switch_ivr_phrase_macro(session, macro, mdata, lang, &args); + status = switch_ivr_phrase_macro(session, macro, mdata, lang, &args); + } else { + status = SWITCH_STATUS_NOOP; + } + + switch (status) { + case SWITCH_STATUS_SUCCESS: + case SWITCH_STATUS_BREAK: + switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "PHRASE PLAYED"); + break; + case SWITCH_STATUS_NOOP: + switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "NOTHING"); + break; + default: + switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "UNKNOWN ERROR"); + break; } }

1 0

[commit] r13297 - freeswitch/trunk/src/mod/languages/mod_lua
by FreeSWITCH SVN 14 May '09

14 May '09

Author: brian Date: Wed May 13 20:36:32 2009 New Revision: 13297 Log: MODLANG-111 Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Wed May 13 20:36:32 2009 @@ -213,7 +213,7 @@ if (!switch_strlen_zero(globals.xml_handler)) { lua_State *L = lua_init(); char *mycmd = strdup(globals.xml_handler); - const char *str; + char *str; switch_assert(mycmd); @@ -240,8 +240,8 @@ lua_parse_and_execute(L, mycmd); lua_getfield(L, LUA_GLOBALSINDEX, "XML_STRING"); - str = lua_tostring(L, 1); - + str = strdup( lua_tostring(L, 1) ); + if (str) { if (switch_strlen_zero(str)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Result\n"); @@ -252,6 +252,7 @@ lua_uninit(L); free(mycmd); + free(str); } return xml;

1 0

[commit] r13296 - freeswitch/trunk/src
by FreeSWITCH SVN 14 May '09

14 May '09

Author: anthm Date: Wed May 13 19:57:52 2009 New Revision: 13296 Log: more_calls=true Modified: freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Wed May 13 19:57:52 2009 @@ -35,9 +35,9 @@ #include <stdio.h> #include "private/switch_core_pvt.h" -#if defined(DARWIN) +//#if defined(DARWIN) #define DISABLE_1MS_COND -#endif +//#endif #ifndef UINT32_MAX #define UINT32_MAX 0xffffffff

1 0

[commit] r13295 - in freeswitch/trunk: conf/dialplan src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 14 May '09

14 May '09

Author: brian Date: Wed May 13 19:15:06 2009 New Revision: 13295 Log: sigh, polycom srtp will work now Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed May 13 19:15:06 2009 @@ -87,15 +87,6 @@  </condition> -  - <condition field="${sip_secure_media}" expression="^true$" break="never"/> - <condition field="${sip_user_agent}" expression="^PolycomSound(Point|Station)IP-S(S|P)IP_\d{3,4}-UA\/((3).(\d).(\d).(\d{4}))$" break="never"> - <action application="set" data="sip_secure_media=false"/> - <action application="log" data="crit Your phone is a Polycom running 3.x firmware that is known broken for SRTP."/> - </condition> - <condition> <action application="hash" data="insert/${domain_name}-spymap/${caller_id_number}/${uuid}"/> <action application="hash" data="insert/${domain_name}-last_dial/${caller_id_number}/${destination_number}"/> 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 Wed May 13 19:15:06 2009 @@ -3372,6 +3372,9 @@ } if (is_ok) { + if (tech_pvt->local_crypto_key) { + sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 0); + } nua_respond(tech_pvt->nh, SIP_200_OK, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), 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 May 13 19:15:06 2009 @@ -2805,11 +2805,26 @@ const char *a = switch_stristr("AES", tech_pvt->remote_crypto_key); const char *b = switch_stristr("AES", crypto); + /* Change our key every time we can */ + 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); + sofia_glue_build_crypto(tech_pvt, atoi(crypto), AES_CM_128_HMAC_SHA1_32, SWITCH_RTP_CRYPTO_SEND); + switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_SEND, atoi(crypto), tech_pvt->crypto_type, + tech_pvt->local_raw_key, SWITCH_RTP_KEY_LEN); + } else if (switch_stristr(SWITCH_RTP_CRYPTO_KEY_80, crypto)) { + switch_channel_set_variable(tech_pvt->channel, SOFIA_HAS_CRYPTO_VARIABLE, SWITCH_RTP_CRYPTO_KEY_80); + sofia_glue_build_crypto(tech_pvt, atoi(crypto), AES_CM_128_HMAC_SHA1_80, SWITCH_RTP_CRYPTO_SEND); + switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_SEND, atoi(crypto), tech_pvt->crypto_type, + tech_pvt->local_raw_key, SWITCH_RTP_KEY_LEN); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Crypto Setup Failed!.\n"); + } + 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; - + if (switch_rtp_ready(tech_pvt->rtp_session) && sofia_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_RECV, tech_pvt->crypto_tag,

1 0

[commit] r13294 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 13 May '09

13 May '09

Author: anthm Date: Wed May 13 11:34:39 2009 New Revision: 13294 Log: allow socket app to operate without pre_answer (please test) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_ivr.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 Wed May 13 11:34:39 2009 @@ -1401,7 +1401,7 @@ if (!sofia_test_flag(tech_pvt, TFLAG_ANS) && !sofia_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) { sofia_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Asked to send early media by %s\n", msg->from); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, msg->_file, msg->_func, msg->_line, NULL, SWITCH_LOG_INFO, "Sending early media\n"); /* Transmit 183 Progress with SDP */ if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Wed May 13 11:34:39 2009 @@ -432,10 +432,6 @@ launch_listener_thread(listener); - if (switch_channel_pre_answer(channel) != SWITCH_STATUS_SUCCESS) { - return; - } - while(switch_channel_ready(channel) && !switch_test_flag(listener, LFLAG_CONNECTED)) { switch_cond_next(); } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed May 13 11:34:39 2009 @@ -642,40 +642,23 @@ int stream_id = 0; switch_event_t *event; switch_unicast_conninfo_t *conninfo = NULL; - uint32_t rate; - uint32_t bpf; + uint32_t rate = 0; + uint32_t bpf = 0; const char *to; int timeout = 0; time_t expires = 0; - switch_codec_implementation_t read_impl = {0}; - switch_core_session_get_read_impl(session, &read_impl); + if (switch_channel_test_flag(channel, CF_CONTROLLED)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot park channels that are under control already.\n"); return SWITCH_STATUS_FALSE; } - if (!switch_channel_test_flag(channel, CF_ANSWERED)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Careful, Channel is unanswered. Pre-answering...\n"); - if ((status = switch_channel_pre_answer(channel)) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot establish media.\n"); - return SWITCH_STATUS_FALSE; - } - } - if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_get_state(channel) == CS_RESET) { return SWITCH_STATUS_FALSE; } - if (!switch_channel_media_ready(channel)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot park channels that have no read codec.\n"); - return SWITCH_STATUS_FALSE; - } - - rate = read_impl.actual_samples_per_second; - bpf = read_impl.decoded_bytes_per_packet; - if ((to = switch_channel_get_variable(channel, "park_timeout"))) { if ((timeout = atoi(to)) < 0) { timeout = 0; @@ -693,20 +676,36 @@ switch_event_fire(&event); } - while (switch_channel_media_ready(channel) && switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_CONTROLLED) - && switch_channel_test_flag(channel, CF_PARK)) { - - if ((status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, stream_id)) == SWITCH_STATUS_SUCCESS) { - if (!SWITCH_READ_ACCEPTABLE(status)) { - break; - } + while (switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_CONTROLLED) && switch_channel_test_flag(channel, CF_PARK)) { + + if (!rate && switch_channel_media_ready(channel)) { + switch_core_session_get_read_impl(session, &read_impl); + rate = read_impl.actual_samples_per_second; + bpf = read_impl.decoded_bytes_per_packet; + } + + if (rate) { + status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, stream_id); + } else { + switch_yield(20000); + status = SWITCH_STATUS_SUCCESS; + } + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } else { if (expires && switch_epoch_time_now(NULL) >= expires) { switch_channel_hangup(channel, SWITCH_CAUSE_RECOVERY_ON_TIMER_EXPIRE); break; } if (switch_channel_test_flag(channel, CF_UNICAST)) { + if (!switch_channel_media_ready(channel)) { + if (switch_channel_pre_answer(channel) != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } + } + if (!conninfo) { if (!(conninfo = switch_channel_get_private(channel, "unicast"))) { switch_channel_clear_flag(channel, CF_UNICAST);

1 0

[commit] r13293 - freeswitch/trunk/libs/esl/perl
by FreeSWITCH SVN 13 May '09

13 May '09

Author: brian Date: Wed May 13 11:23:13 2009 New Revision: 13293 Log: adding info example Added: freeswitch/trunk/libs/esl/perl/info.pl Added: freeswitch/trunk/libs/esl/perl/info.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/perl/info.pl Wed May 13 11:23:13 2009 @@ -0,0 +1,15 @@ +#!/usr/bin/perl + +require ESL; + +my $con = ESL::ESLconnection->new("localhost", "8021", "ClueCon"); +my $e = ESL::ESLevent->new("SEND_INFO"); + +#my $e = $con->sendEvent("MESSAGE_WAITING"); + +$e->addHeader("Content-Type", "text/xml"); +$e->addHeader("to-uri", 'sip:1002@dev.bkw.org'); +$e->addHeader("from-uri", 'sip:1234@dev.bkw.org'); +$e->addHeader("profile", 'external'); + +$con->sendEvent($e);

1 0