- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9717 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Sun Sep 28 22:04:38 2008 New Revision: 9717 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 Sun Sep 28 22:04:38 2008 @@ -93,7 +93,7 @@  <extension name="external_sip_uri" continue="true"> <condition field="source" expression="mod_sofia"/> - <condition field="${outside_call}"a expression="^$"/> + <condition field="${outside_call}" expression="^$"/> <condition field="${sip_req_host}" expression="${sip_from_host}"> <anti-action application="bridge" data="sofia/${use_profile}/${sip_to_uri}"/> </condition>

1 0

[commit] r9716 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Sun Sep 28 21:48:06 2008 New Revision: 9716 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: update docs Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Sun Sep 28 21:48:06 2008 @@ -146,11 +146,15 @@

1 0

[commit] r9715 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Sun Sep 28 21:27:54 2008 New Revision: 9715 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml Log: more tweaks and docs Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sun Sep 28 21:27:54 2008 @@ -1,3 +1,14 @@ + + <?xml version="1.0" encoding="utf-8"?>  <include> @@ -82,7 +93,7 @@  <extension name="external_sip_uri" continue="true"> <condition field="source" expression="mod_sofia"/> - <condition field="${outside_call}" expression="^$"/> + <condition field="${outside_call}"a expression="^$"/> <condition field="${sip_req_host}" expression="${sip_from_host}"> <anti-action application="bridge" data="sofia/${use_profile}/${sip_to_uri}"/> </condition> @@ -106,9 +117,6 @@ </condition> </extension> - - - <extension name="eavesdrop"> <condition field="destination_number" expression="^88(.*)$|^\*0(.*)$"> <action application="answer"/> @@ -350,14 +358,14 @@ is to use phone's star codes (defaults to *38 and *39). --> <extension name="park"> - <condition field="source" expression="mod_sofia"/> + <condition field="source" expression="mod_sofia"/> <condition field="destination_number" expression="callpark"/> - <condition field="${sip_refer_to}"> - <expression><![CDATA[<sip:callpark@${domain};orbit=(\d+)>]]></expression> - <action application="fifo" data="$1@${domain} in undef $${hold_music}"/> - </condition> + <condition field="${sip_refer_to}"> + <expression><![CDATA[<sip:callpark@${domain};orbit=(\d+)>]]></expression> + <action application="fifo" data="$1@${domain} in undef $${hold_music}"/> + </condition> </extension> - +  <extension name="unpark"> - <condition field="source" expression="mod_sofia"/> + <condition field="source" expression="mod_sofia"/> <condition field="destination_number" expression="pickup"/> - <condition field="${sip_to_params}" expression="orbit\=(\d+)"> - <action application="answer"/> - <action application="fifo" data="$1@${domain} out nowait"/> + <condition field="${sip_to_params}" expression="orbit\=(\d+)"> + <action application="answer"/> + <action application="fifo" data="$1@${domain} out nowait"/> </condition> </extension> @@ -428,6 +436,11 @@ </condition> </extension> +  + <extension name="hold_music"> <condition field="destination_number" expression="^9999$"/> <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$"> @@ -440,7 +453,23 @@ </condition> </extension> +  <X-PRE-PROCESS cmd="include" data="default/*.xml"/> + +  + +   -  -  +  + </context> </include> Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Sun Sep 28 21:27:54 2008 @@ -1,13 +1,18 @@ + +  <include> <context name="public"> - <extension name="outside_call" continue="true"> - <condition break="never"> - <action application="set" data="outside_call=true"/> - </condition> - </extension> - <extension name="unloop"> <condition field="${unroll_loops}" expression="^true$"/> <condition field="${sip_looped_call}" expression="^true$"> @@ -15,6 +20,17 @@ </condition> </extension> +  + <extension name="outside_call" continue="true"> + <condition break="never"> + <action application="set" data="outside_call=true"/> + </condition> + </extension> +  <extension name="set_domain" continue="true"> <condition field="${target_domain}" expression="^$" break="never"/> @@ -37,7 +53,10 @@ <action application="transfer" data="$1 XML default"/> </condition> </extension> - + +  <X-PRE-PROCESS cmd="include" data="public/*.xml"/> </context>

1 0

[commit] r9714 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Sun Sep 28 21:12:58 2008 New Revision: 9714 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: enable auto_from in the default config as a few things depend on this being the challenge realm for URI dialing from phones like snom. Revert to continue the default behavior or set to auto_to which is the default value Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Sun Sep 28 21:12:58 2008 @@ -143,8 +143,18 @@    -  -  +  + <param name="challenge-realm" value="auto_from"/>  </settings> </profile>

1 0

[commit] r9713 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Sun Sep 28 21:09:27 2008 New Revision: 9713 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml Log: more tweaks.. inside vs outside Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sun Sep 28 21:09:27 2008 @@ -80,14 +80,13 @@ </extension>  -   Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Sun Sep 28 21:09:27 2008 @@ -2,6 +2,12 @@ <include> <context name="public"> + <extension name="outside_call" continue="true"> + <condition break="never"> + <action application="set" data="outside_call=true"/> + </condition> + </extension> + <extension name="unloop"> <condition field="${unroll_loops}" expression="^true$"/> <condition field="${sip_looped_call}" expression="^true$">

1 0

[commit] r9712 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Sun Sep 28 20:49:34 2008 New Revision: 9712 Modified: freeswitch/trunk/conf/sip_profiles/external.xml Log: translate the multi domain setup to the external profile to traverse the directory and register all gateways in the directory from ALL domains. Modified: freeswitch/trunk/conf/sip_profiles/external.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external.xml Sun Sep 28 20:49:34 2008 @@ -11,7 +11,7 @@ </aliases> <domains> - <domain name="$${domain}" parse="true"/> + <domain name="all" alias="false" parse="true"/> </domains> <settings>

1 0

[commit] r9711 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Sun Sep 28 20:39:07 2008 New Revision: 9711 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: clarify to match other code 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 Sun Sep 28 20:39:07 2008 @@ -976,7 +976,8 @@ if (sofia_glue_add_profile(switch_core_strdup(profile->pool, dname), profile) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding Alias [%s] for profile [%s]\n", dname, profile->name); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Adding Alias [%s] for profile [%s] (name in use)\n", dname, profile->name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Alias [%s] for profile [%s] (already exists)\n", + dname, profile->name); } }

1 0

[commit] r9710 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Sun Sep 28 20:34:02 2008 New Revision: 9710 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: more tweaks Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Sun Sep 28 20:34:02 2008 @@ -51,7 +51,7 @@ <param name="apply-inbound-acl" value="domains"/>   - <param name="record-template" value="$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> + <param name="record-template" value="$${base_dir}/recordings/${caller_id_number}.${target_domain}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>  <param name="manage-presence" value="true"/>

1 0

[commit] r9709 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Sun Sep 28 20:31:35 2008 New Revision: 9709 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: more goodies Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Sun Sep 28 20:31:35 2008 @@ -2,7 +2,6 @@ <profile name="internal">  <aliases> - <alias name="$${domain}"/> <alias name="default"/> </aliases>  @@ -15,6 +14,7 @@    + <domain name="all" alias="true" parse="false"/> </domains> <settings>

1 0

[commit] r9708 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 28 Sep '08

28 Sep '08

Author: brian Date: Sun Sep 28 19:36:22 2008 New Revision: 9708 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml Log: more tweaks Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sun Sep 28 19:36:22 2008 @@ -17,9 +17,10 @@ --> <extension name="set_domain" continue="true"> <condition field="${target_domain}" expression="^$" break="never"/> - <condition field="source" expression="mod_sofia" break="never"> - <action application="set" data="target_domain=${sip_auth_realm}"/> - <anti-action application="set" data="target_domain=$${domain}"/> + <condition field="source" expression="mod_sofia" break="never"/> + <condition field="${sip_auth_realm}" expression="^$" break="never"> + <action application="set" data="target_domain=$${domain}"/> + <anti-action application="set" data="target_domain=${sip_auth_realm}"/> </condition> </extension> @@ -79,13 +80,14 @@ </extension>  +   Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Sun Sep 28 19:36:22 2008 @@ -14,12 +14,13 @@ <condition field="${target_domain}" expression="^$" break="never"/> <condition field="source" expression="mod_sofia" break="never"/> <condition field="${sip_req_params}" expression="target_domain=([A-Z-a-z0-9.]+)" break="never"> - <action application="set" data="target_domain=$1"/> - <anti-action application="set" data="target_domain=$${domain}"/> +  + <action application="export" data="target_domain=$1"/> + <anti-action application="export" data="target_domain=$${domain}"/> </condition> </extension> - <extension name="call_debug"> + <extension name="call_debug" continue="true"> <condition field="${call_debug}" expression="^true$" break="never"> <action application="info"/> </condition>

1 0