October 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9951 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 11 Oct '08

11 Oct '08

Author: brian Date: Fri Oct 10 20:59:45 2008 New Revision: 9951 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/features.xml freeswitch/trunk/conf/dialplan/public.xml Log: polish up configs more Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Oct 10 20:59:45 2008 @@ -79,9 +79,7 @@ <action application="set" data="use_profile=${cond(${acl($${local_ip_v4} rfc1918)} == true ? nat : default)}"/> <anti-action application="set" data="use_profile=${cond(${acl(${network_addr} rfc1918)} == true ? nat : default)}"/> </condition> -  +  <condition field="${numbering_plan}" expression="^$" break="never"> <action application="set_user" data="default@${domain_name}"/> </condition> @@ -147,7 +145,7 @@ </extension> <extension name="call_return"> - <condition field="destination_number" expression="^\*69$|^869$"> + <condition field="destination_number" expression="^\*69$|^869$|^lcr$"> <action application="transfer" data="${db(select/${domain_name}-call_return/${caller_id_number})}"/> </condition> </extension> @@ -228,7 +226,6 @@ <anti-action application="db" data="insert/${domain_name}-last_dial/${called_party_callgroup}/${uuid}"/> <anti-action application="bridge" data="user/${dialed_extension}@${domain_name}"/> <anti-action application="answer"/> -  <anti-action application="sleep" data="1000"/> <anti-action application="voicemail" data="default ${domain_name} ${dialed_extension}"/> </condition> @@ -264,7 +261,6 @@ <extension name="nb_conferences"> <condition field="destination_number" expression="^(30\d{2})$"> <action application="answer"/> -  <action application="conference" data="$1-${domain_name}@default"/> </condition> </extension> @@ -272,7 +268,6 @@ <extension name="wb_conferences"> <condition field="destination_number" expression="^(31\d{2})$"> <action application="answer"/> -  <action application="conference" data="$1-${domain_name}@wideband"/> </condition> </extension> @@ -280,7 +275,6 @@ <extension name="uwb_conferences"> <condition field="destination_number" expression="^(32\d{2})$"> <action application="answer"/> -  <action application="conference" data="$1-${domain_name}@ultrawideband"/> </condition> </extension> @@ -330,7 +324,6 @@ <extension name="rtp_multicast_page"> <condition field="destination_number" expression="^pagegroup$|^7243"> <action application="answer"/> -  <action application="esf_page_group"/> </condition> </extension> @@ -506,7 +499,6 @@ <extension name="delay_echo"> <condition field="destination_number" expression="^9995$"> <action application="answer"/> -  <action application="delay_echo" data="5000"/> </condition> </extension> @@ -514,7 +506,6 @@ <extension name="echo"> <condition field="destination_number" expression="^9996$"> <action application="answer"/> -  <action application="echo"/> </condition> </extension> @@ -522,7 +513,6 @@ <extension name="milliwatt"> <condition field="destination_number" expression="^9997$"> <action application="answer"/> -  <action application="playback" data="tone_stream://%(10000,0,1004);loops=-1"/> </condition> </extension> @@ -546,7 +536,6 @@ <action application="execute_extension" data="is_secure XML features"/> <action application="playback" data="$${hold_music}"/> <anti-action application="answer"/> -  <anti-action application="playback" data="$${hold_music}"/> </condition> </extension> Modified: freeswitch/trunk/conf/dialplan/features.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/features.xml (original) +++ freeswitch/trunk/conf/dialplan/features.xml Fri Oct 10 20:59:45 2008 @@ -7,7 +7,6 @@ <condition field="destination_number" expression="^dx$"> <action application="answer"/> <action application="read" data="11 11 'tone_stream://%(10000,0,350,440)' digits 5000 #"/> -  <action application="execute_extension" data="is_transfer XML features"/> </condition> </extension> @@ -16,11 +15,10 @@ <condition field="destination_number" expression="^is_transfer$"/> <condition field="${digits}" expression="^(\d+)$"> <action application="transfer" data="-bleg ${digits} XML default"/> - <anti-action application="eval" data="w00t"/> + <anti-action application="eval" data="cancel transfer"/> </condition> </extension> -  <extension name="cf"> <condition field="destination_number" expression="^cf$"> @@ -44,7 +42,6 @@ <condition field="${sip_via_protocol}" expression="tls"/> <condition field="${sip_secure_media_confirmed}" expression="^true$"> <action application="sleep" data="1000"/> -  <action application="playback" data="misc/call_secured.wav"/> <anti-action application="eval" data="not_secure"/> </condition> Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Fri Oct 10 20:59:45 2008 @@ -19,7 +19,6 @@ <action application="deflect" data="${destination_number}"/> </condition> </extension> -  <extension name="set_domain" continue="true"> <condition field="${domain_name}" expression="^$"/> @@ -42,12 +47,6 @@ </condition> </extension> - <extension name="call_debug" continue="true"> - <condition field="${call_debug}" expression="^true$" break="never"> - <action application="info"/> - </condition> - </extension> - <extension name="public_extensions"> <condition field="destination_number" expression="^(10[01][0-9])$"> <action application="transfer" data="$1 XML default"/> @@ -58,7 +57,6 @@ You can place files in the public directory to get included. --> <X-PRE-PROCESS cmd="include" data="public/*.xml"/> - <!-- If you have made it this far lets challenge the caller and if they authenticate lets try what they dialed in the default context. (commented out by default)

1 0

[commit] r9950 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: anthm Date: Fri Oct 10 19:17:18 2008 New Revision: 9950 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: actually send bye on error condition 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 Fri Oct 10 19:17:18 2008 @@ -2166,11 +2166,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending CANCEL to orphan call.\n"); nua_cancel(nh, TAG_END()); } - - nua_handle_bind(nh, NULL); - nua_handle_destroy(nh); } - } }

1 0

[commit] r9949 - freeswitch/trunk/src
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: anthm Date: Fri Oct 10 19:09:15 2008 New Revision: 9949 Modified: freeswitch/trunk/src/switch_rtp.c Log: tweak Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Oct 10 19:09:15 2008 @@ -975,14 +975,15 @@ SWITCH_DECLARE(void) switch_rtp_break(switch_rtp_t *rtp_session) { - int o = 42; - switch_size_t len = sizeof(o); - switch_assert(rtp_session != NULL); switch_mutex_lock(rtp_session->flag_mutex); + switch_set_flag(rtp_session, SWITCH_RTP_FLAG_BREAK); + if (rtp_session->sock_input) { - switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); - switch_socket_sendto(rtp_session->sock_input, rtp_session->local_addr, 0, (void *) &o, &len); + char o[8] = "PING..."; + switch_size_t len = sizeof(o); + + switch_socket_sendto(rtp_session->sock_input, rtp_session->local_addr, 0, (void *) o, &len); } switch_mutex_unlock(rtp_session->flag_mutex); }

1 0

[commit] r9948 - freeswitch/trunk/src
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: anthm Date: Fri Oct 10 18:59:32 2008 New Revision: 9948 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: tweak Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Oct 10 18:59:32 2008 @@ -418,13 +418,13 @@ end: - switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); switch_core_session_reset(session_a, SWITCH_TRUE); switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a)); if (!inner_bridge) { switch_channel_clear_flag(chan_a, CF_BRIDGED); } + switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); switch_core_session_rwunlock(session_b); return NULL; } @@ -864,7 +864,7 @@ switch_channel_set_private(peer_channel, "_bridge_", b_leg); switch_channel_set_state(peer_channel, CS_EXCHANGE_MEDIA); audio_bridge_thread(NULL, (void *) a_leg); - + switch_channel_clear_flag(caller_channel, CF_ORIGINATOR); if (!switch_channel_test_flag(peer_channel, CF_TRANSFER) && switch_channel_get_state(peer_channel) == CS_EXCHANGE_MEDIA) {

1 0

[commit] r9947 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: mikej Date: Fri Oct 10 18:22:41 2008 New Revision: 9947 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add error handling for when we get response to a invite that we don't have a session for (session timer after session destroyed?) 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 Fri Oct 10 18:22:41 2008 @@ -2149,6 +2149,29 @@ } } } + + if (!session && (status == 180 || status == 183 || status == 200)) { + /* This should never happen. It means the sip stack thinks there is a call but FreeSWITCH does not */ + const char *callid = "n/a"; + + if (sip && sip->sip_call_id && sip->sip_call_id->i_id) callid = sip->sip_call_id->i_id; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "received response to invite with no matching session, destroying callid [%s]!\n", callid); + + if (nh) { + if (status == 200) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending BYE to orphan call.\n"); + nua_bye(nh, TAG_END()); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending CANCEL to orphan call.\n"); + nua_cancel(nh, TAG_END()); + } + + nua_handle_bind(nh, NULL); + nua_handle_destroy(nh); + } + + } }

1 0

[commit] r9946 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: brian Date: Fri Oct 10 17:38:07 2008 New Revision: 9946 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: doc inbound-reg-force-matching-username Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Fri Oct 10 17:38:07 2008 @@ -129,6 +129,8 @@   <param name="auth-calls" value="$${internal_auth_calls}"/> +  + <param name="inbound-reg-force-matching-username" value="true"/>  <param name="auth-all-packets" value="false"/>

1 0

[commit] r9945 - in freeswitch/trunk/src: . mod/applications/mod_voicemail
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: anthm Date: Fri Oct 10 16:30:05 2008 New Revision: 9945 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/switch_time.c Log: fix voicemail e-mail time Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Oct 10 16:30:05 2008 @@ -2222,8 +2222,10 @@ message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); - switch_time_exp_lt(&tm, switch_timestamp_now()); - switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm); + if (switch_strlen_zero(vm_timezone) || (switch_strftime_tz(vm_timezone, profile->date_fmt, date, sizeof(date)) != SWITCH_STATUS_SUCCESS)) { + switch_time_exp_lt(&tm, switch_timestamp_now()); + switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm); + } switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_current_folder", myfolder); switch_snprintf(tmpvar, sizeof(tmpvar), "%d", total_new_messages); @@ -2240,15 +2242,7 @@ switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_caller_id_name", caller_id_name); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_file_path", file_path); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_read_flags", read_flags); - - if (!switch_strlen_zero(vm_timezone)) { - char tz_date[80] = ""; - if ((switch_strftime_tz(vm_timezone, profile->date_fmt, tz_date, sizeof(tz_date)) == SWITCH_STATUS_SUCCESS) && !switch_strlen_zero_buf(tz_date)) { - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", tz_date); - } else { - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date); - } - } + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date); switch_snprintf(tmpvar, sizeof(tmpvar), "%d", priority); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_priority", tmpvar); Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Fri Oct 10 16:30:05 2008 @@ -572,10 +572,11 @@ tztime( &timep, tzdef, &tm ); tm2switchtime( &tm, &stm ); switch_strftime(date, &retsize, len, switch_strlen_zero(format) ? "%Y-%m-%d %T" : format, &stm); - return SWITCH_STATUS_SUCCESS; - } else { - return SWITCH_STATUS_FALSE; + if (!switch_strlen_zero_buf(date)) { + return SWITCH_STATUS_SUCCESS; + } } + return SWITCH_STATUS_FALSE; } SWITCH_MODULE_LOAD_FUNCTION(softtimer_load)

1 0

[commit] r9944 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: brian Date: Fri Oct 10 15:45:48 2008 New Revision: 9944 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: woops Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Oct 10 15:45:48 2008 @@ -236,7 +236,7 @@  <extension name="operator"> - <condition field="destination_number" expression="^operator|0$"> + <condition field="destination_number" expression="^operator$|^0$"> <action application="set" data="transfer_ringback=$${hold_music}"/> <action application="transfer" data="1000 XML features"/> </condition>

1 0

[commit] r9943 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: brian Date: Fri Oct 10 15:28:41 2008 New Revision: 9943 Modified: freeswitch/trunk/conf/dialplan/public.xml Log: logic bug in public context Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Fri Oct 10 15:28:41 2008 @@ -26,16 +26,16 @@ the outside of the switch. --> <extension name="outside_call" continue="true"> - <condition break="never"> + <condition> <action application="set" data="outside_call=true"/> </condition> </extension>  <extension name="set_domain" continue="true"> - <condition field="${domain_name}" expression="^$" break="never"/> - <condition field="source" expression="mod_sofia" break="never"/> - <condition field="${sip_req_params}" expression="domain_name=([A-Z-a-z0-9.]+)" break="never"> + <condition field="${domain_name}" expression="^$"/> + <condition field="source" expression="mod_sofia"/> + <condition field="${sip_req_params}" expression="domain_name=([A-Z-a-z0-9.]+)">  <action application="export" data="domain_name=$1"/> <anti-action application="export" data="domain_name=${sip_req_host}"/>

1 0

[commit] r9942 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: anthm Date: Fri Oct 10 15:28:07 2008 New Revision: 9942 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: punt 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 Fri Oct 10 15:28:07 2008 @@ -2228,7 +2228,9 @@ channel = switch_core_session_get_channel(session); tech_pvt = switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); - switch_assert(tech_pvt->nh != NULL); + if (!tech_pvt->nh) { + goto done; + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %s entering state [%s]\n", switch_channel_get_name(channel), nua_callstate_name(ss_state));

1 0