December 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6933 - freeswitch/trunk/scripts/contrib/trixter/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: trixter Date: Fri Dec 21 00:21:52 2007 New Revision: 6933 Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml Log: removed cruft that may confuse people Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml Fri Dec 21 00:21:52 2007 @@ -48,23 +48,4 @@ </condition> </extension> - <extension name="callreturn"> - <condition field="${destination_number}" expression="^\*69$|^869$"> - <action application="transfer" data="${db(select/call_return/ata)}"/> - </condition> - </extension> - - <extension name="echo"> - <condition field="${destination_number}" expression="^\*\d+$"> - <action application="echo"/> - </condition> - </extension> - - <extension name="callme"> - <condition> - <action application="db" data="insert/call_return/ata/${caller_id_number}"/> - <action application="bridge" data="${sofia_contact(ata(a)192.168.5.100)}"/> - </condition> - </extension> - </context>

1 0

[commit] r6932 - freeswitch/trunk/scripts/contrib/trixter/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: trixter Date: Fri Dec 21 00:20:22 2007 New Revision: 6932 Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/README freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml Log: new format, 1 extension, optional enum now Dont read the readme, its evil no one should read the readme ever Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/README ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/README (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/README Fri Dec 21 00:20:22 2007 @@ -76,13 +76,18 @@ attempt to use a regexp unless it is indicated that it is a regexp. + +<variable name="use_enum" value="true"/>  -<variable name="default_gateway" value="asterlink.com"/> +<variable name="default_gateway" value="telco.com"/> Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml Fri Dec 21 00:20:22 2007 @@ -1,5 +1,8 @@  + +<variable name="use_enum" value="true"/> +  <variable name="default_gateway" value="asterlink.com"/> Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml Fri Dec 21 00:20:22 2007 @@ -1,7 +1,10 @@  + +<variable name="use_enum" value="true"/> +  -<variable name="default_gateway" value="asterlink.com"/> +<variable name="default_gateway" value="telco.com"/>  <variable name="default_country_code" value="31"/> Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml Fri Dec 21 00:20:22 2007 @@ -1,65 +1,70 @@ - -<context name="INT-Numbering-Plan"> - -  - <extension name="INT-International"> - <condition field="destination_number" expression="${default_international_regexp}"> - <action application="set" data="continue_on_fail=true"/> - <action application="set" data="hangup_after_bridge=true"/> - <action application="enum" data="$1"/> - <action application="bridge" data="${enum_auto_route}"/> - <action application="bridge" data="sofia/gateway/${default_gateway}/${default_international_prefix}$1"/> - </condition> - </extension> - -  - <extension name="INT-Domestic_out_of_area"> - <condition field="destination_number" expression="${default_domestic_regexp}"> - <action application="set" data="continue_on_fail=true"/> - <action application="set" data="hangup_after_bridge=true"/> - <action application="enum" data="${default_country_code}$1"/> - <action application="bridge" data="${enum_auto_route}"/> - <action application="bridge" data="sofia/gateway/${default_gateway}/${default_country_code}$1"/> - </condition> - </extension> - -  - <extension name="INT_Local"> - <condition field="destination_number" expression="${default_local_regexp}"> - <action application="set" data="continue_on_fail=true"/> - <action application="set" data="hangup_after_bridge=true"/> - <action application="enum" data="${default_country_code}${default_local_prefix}$1"/> - <action application="bridge" data="${enum_auto_route}"/> - <action application="bridge" data="sofia/gateway/${default_gateway}/${default_country_code}${default_local_prefix}$1"/> - </condition> - </extension> - -  - <extension name="INT_Emergency_Service"> - <condition field="destination_number" expression="${default_emergency_number}"> - <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/> - </condition> - </extension> +<context name="default"> + <extension name="localized-dialplan"> +  + <condition field="${destination_number}" expression="${default_emergency_number}" continue="true" break="never"> + <action application="export" data="nolocal:jitterbuffer_msec=180"/> + <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/> + </condition> +  + <condition field="${destination_number}" expression="${default_international_regexp}" continue="true" break="never"> + <action application="set" data="e164number=$1"/> + </condition> +  + <condition field="${destination_number}" expression="${default_domestic_regexp}" continue="true" break="never"> + <action application="set" data="e164number=${default_country_code}$1"/> + </condition> +  + <condition field="${destination_number}" expression="${default_local_regexp}" continue="true" break="never"> + <action application="set" data="e164number=${default_country_code}${default_local_prefix}$1"/> + </condition> + +  +  + <condition> + <action application="info"/> + <action application="export" data="nolocal:jitterbuffer_msec=180"/> + <action application="set" data="continue_on_fail=true"/> + <action application="set" data="hangup_after_bridge=true"/> + <action application="set" data="call_timeout=45"/> + <action application="set" data="hangup_after_bridge=true"/> + <action application="set" data="continue_on_fail=true"/> + </condition> + <condition field="${use_enum}" expression="^yes$" continue="true" break="never"> + <action application="enum" data="${e164number}"/> + <action application="bridge" data="${enum_auto_route}"/> + </condition> + <condition> + <action application="bridge" data="sofia/gateway/${default_gateway}/${e164number}"/> + </condition> + </extension> + + <extension name="callreturn"> + <condition field="${destination_number}" expression="^\*69$|^869$"> + <action application="transfer" data="${db(select/call_return/ata)}"/> + </condition> + </extension> + + <extension name="echo"> + <condition field="${destination_number}" expression="^\*\d+$"> + <action application="echo"/> + </condition> + </extension> + + <extension name="callme"> + <condition> + <action application="db" data="insert/call_return/ata/${caller_id_number}"/> + <action application="bridge" data="${sofia_contact(ata(a)192.168.5.100)}"/> + </condition> + </extension> + </context>

1 0

[commit] r6931 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: brian Date: Fri Dec 21 00:09:27 2007 New Revision: 6931 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: thats more like it Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Dec 21 00:09:27 2007 @@ -24,22 +24,16 @@ </extension> <extension name="global" continue="true"> - <condition field="${network_addr}" expression="false"> + <condition field="${network_addr}" expression="false" break="never"> <action application="set" data="use_profile=${cond(${is_lan_addr($${local_ip_v4})} == yes ? nat : default)}"/> <anti-action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> </condition> - </extension> - - <extension name="defaults" continue="true">  - <condition field="${numbering_plan}" expression="false"> + <condition field="${numbering_plan}" expression="false" break="never"> <action application="set_user" data="default@${domain}"/> </condition> - </extension> - - <extension name="info" continue="true"> <condition> <action application="info"/> <action application="db" data="insert/spymap/${caller_id_number}/${uuid}"/>

1 0

[commit] r6930 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: brian Date: Fri Dec 21 00:01:04 2007 New Revision: 6930 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: what was I thinking Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Dec 21 00:01:04 2007 @@ -24,16 +24,22 @@ </extension> <extension name="global" continue="true"> - <condition field="${network_addr}" expression="^"> + <condition field="${network_addr}" expression="false"> <action application="set" data="use_profile=${cond(${is_lan_addr($${local_ip_v4})} == yes ? nat : default)}"/> <anti-action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> </condition> + </extension> + + <extension name="defaults" continue="true">  - <condition field="${numbering_plan}" expression="^"> + <condition field="${numbering_plan}" expression="false"> <action application="set_user" data="default@${domain}"/> </condition> + </extension> + + <extension name="info" continue="true"> <condition> <action application="info"/> <action application="db" data="insert/spymap/${caller_id_number}/${uuid}"/> @@ -133,8 +139,7 @@ </extension>  <extension name="conferences"> <condition field="destination_number" expression="^(3\d{3})$">

1 0

[commit] r6929 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: brian Date: Thu Dec 20 23:44:32 2007 New Revision: 6929 Modified: freeswitch/trunk/conf/dialplan/US.conf.xml freeswitch/trunk/conf/dialplan/default.xml Log: more dialplan fixes Modified: freeswitch/trunk/conf/dialplan/US.conf.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/US.conf.xml (original) +++ freeswitch/trunk/conf/dialplan/US.conf.xml Thu Dec 20 23:44:32 2007 @@ -33,7 +33,7 @@ --> <extension name="US_Local"> <condition field="${default_area_code}" expression="\d{3}" continue="on-true"> - <anti-action application="say" data="you must dial the area code to call this destination"/> + <anti-action application="speak" data="you must dial the area code to call this destination"/> </condition> <condition field="destination_number" expression="^([2-9]\d{6})$"> <action application="set" data="continue_on_fail=true"/> Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Dec 20 23:44:32 2007 @@ -24,14 +24,14 @@ </extension> <extension name="global" continue="true"> - <condition field="${network_addr}" expression="^$"> + <condition field="${network_addr}" expression="^"> <action application="set" data="use_profile=${cond(${is_lan_addr($${local_ip_v4})} == yes ? nat : default)}"/> <anti-action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> </condition>  - <condition field="${numbering_plan}" expression="^$"> + <condition field="${numbering_plan}" expression="^"> <action application="set_user" data="default@${domain}"/> </condition> <condition>

1 0

[commit] r6928 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: mikej Date: Thu Dec 20 23:29:41 2007 New Revision: 6928 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: a little error handling cleanup 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 Dec 20 23:29:41 2007 @@ -1493,7 +1493,7 @@ switch_memory_pool_t **pool, switch_originate_flag_t flags) { switch_call_cause_t cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; - switch_core_session_t *nsession; + switch_core_session_t *nsession = NULL; char *data, *profile_name, *dest; sofia_profile_t *profile = NULL; switch_caller_profile_t *caller_profile = NULL; @@ -1505,14 +1505,12 @@ if (!(nsession = switch_core_session_request(sofia_endpoint_interface, pool))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error Creating Session\n"); - goto done; + goto error; } if (!(tech_pvt = (struct private_object *) switch_core_session_alloc(nsession, sizeof(*tech_pvt)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error Creating Session\n"); - switch_core_session_destroy(&nsession); - *pool = NULL; - goto done; + goto error; } switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(nsession)); @@ -1527,30 +1525,24 @@ if (!(gw = strchr(profile_name, '/'))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid URL\n"); - switch_core_session_destroy(&nsession); cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT; - *pool = NULL; - goto done; + goto error; } *gw++ = '\0'; if (!(dest = strchr(gw, '/'))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid URL\n"); - switch_core_session_destroy(&nsession); cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT; - *pool = NULL; - goto done; + goto error; } *dest++ = '\0'; if (!(gateway_ptr = sofia_reg_find_gateway(gw))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Gateway\n"); - switch_core_session_destroy(&nsession); cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT; - *pool = NULL; - goto done; + goto error; } profile = gateway_ptr->profile; @@ -1569,19 +1561,15 @@ } else { if (!(dest = strchr(profile_name, '/'))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid URL\n"); - switch_core_session_destroy(&nsession); cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT; - *pool = NULL; - goto done; + goto error; } *dest++ = '\0'; if (!(profile = sofia_glue_find_profile(profile_name))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Profile\n"); - switch_core_session_destroy(&nsession); cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; - *pool = NULL; - goto done; + goto error; } if ((dest_to = strchr(dest, '^'))) { @@ -1601,9 +1589,7 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, host); cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; - switch_core_session_destroy(&nsession); - *pool = NULL; - goto done; + goto error; } } else if (!strchr(dest, '@')) { char buf[128]; @@ -1614,9 +1600,7 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, profile_name); cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; - switch_core_session_destroy(&nsession); - *pool = NULL; - goto done; + goto error; } } else { tech_pvt->dest = switch_core_session_alloc(nsession, strlen(dest) + 5); @@ -1629,7 +1613,6 @@ } sofia_glue_attach_private(nsession, profile, tech_pvt, dest); - if (tech_pvt->local_url) { switch_channel_set_variable(nchannel, "sip_local_url", tech_pvt->local_url); @@ -1664,6 +1647,14 @@ } } + goto done; + + error: + if (nsession) { + switch_core_session_destroy(&nsession); + } + *pool = NULL; + done: if (profile) { sofia_glue_release_profile(profile);

1 0

[commit] r6927 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: brian Date: Thu Dec 20 22:40:42 2007 New Revision: 6927 Modified: freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/conf/sip_profiles/nat.xml freeswitch/trunk/conf/sip_profiles/outbound.xml Log: broken phones.. you know who you are... Please fix it... Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Thu Dec 20 22:40:42 2007 @@ -73,10 +73,11 @@   +  + <param name="NDLB-broken-auth-hash" value="true"/> <param name="auth-calls" value="true"/>  -  - + <param name="auth-all-packets" value="true"/>    Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Thu Dec 20 22:40:42 2007 @@ -20,6 +20,7 @@ <param name="inbound-codec-negotiation" value="generous"/> <param name="nonce-ttl" value="60"/> <param name="auth-calls" value="true"/> + <param name="NDLB-broken-auth-hash" value="true"/> <param name="rtp-timeout-sec" value="1800"/> <param name="rtp-ip" value="$${local_ip_v4}"/> <param name="sip-ip" value="$${local_ip_v4}"/> Modified: freeswitch/trunk/conf/sip_profiles/outbound.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/outbound.xml (original) +++ freeswitch/trunk/conf/sip_profiles/outbound.xml Thu Dec 20 22:40:42 2007 @@ -25,6 +25,7 @@ <param name="inbound-codec-negotiation" value="generous"/> <param name="nonce-ttl" value="60"/> <param name="auth-calls" value="false"/> + <param name="NDLB-broken-auth-hash" value="true"/> <param name="rtp-timeout-sec" value="1800"/> <param name="rtp-ip" value="$${local_ip_v4}"/> <param name="sip-ip" value="$${local_ip_v4}"/>

1 0

[commit] r6926 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: mikej Date: Thu Dec 20 22:07:52 2007 New Revision: 6926 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: typos Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Dec 20 22:07:52 2007 @@ -31,7 +31,7 @@  - <condition field="${numbering_plan}" condition="^$"> + <condition field="${numbering_plan}" expression="^$"> <action application="set_user" data="default@${domain}"/> </condition> <condition>

1 0

[commit] r6925 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: brian Date: Thu Dec 20 22:06:20 2007 New Revision: 6925 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: woops thanks trixter for pointing that out... Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Dec 20 22:06:20 2007 @@ -24,7 +24,7 @@ </extension> <extension name="global" continue="true"> - <condition field="${network_addr}" condition="^$"> + <condition field="${network_addr}" expression="^$"> <action application="set" data="use_profile=${cond(${is_lan_addr($${local_ip_v4})} == yes ? nat : default)}"/> <anti-action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> </condition>

1 0

[commit] r6924 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 21 Dec '07

21 Dec '07

Author: brian Date: Thu Dec 20 21:50:59 2007 New Revision: 6924 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: example of continue_on_fail with cause codes thanks frank.. Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Dec 20 21:50:59 2007 @@ -115,7 +115,7 @@ <anti-action application="set" data="call_timeout=30"/> <anti-action application="set" data="hangup_after_bridge=true"/> <anti-action application="set" data="left_hanging_extension=5900"/> - <anti-action application="set" data="continue_on_fail=true"/> + <anti-action application="set" data="continue_on_fail=NORMAL_TEMPORARY_FAILURE,BUSY,USER_BUSY,NO_ANSWER,TIMEOUT"/> <anti-action application="db" data="insert/call_return/${dialed_ext}/${caller_id_number}"/> <anti-action application="db" data="insert/last_dial_ext/${dialed_ext}/${uuid}"/> <anti-action application="bridge" data="user/${dialed_ext}@$${domain}"/>

1 0