Author: brian Date: Mon Sep 29 16:58:13 2008 New Revision: 9748 Added: freeswitch/trunk/conf/dialplan/default/01_provider.com.xml Modified: freeswitch/trunk/conf/directory/default.xml freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml freeswitch/trunk/conf/directory/default/default.xml Log: make it better.. make it faster... figure this out Added: freeswitch/trunk/conf/dialplan/default/01_provider.com.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/dialplan/default/01_provider.com.xml Mon Sep 29 16:58:13 2008 @@ -0,0 +1,30 @@ +<include> + + <extension name="local.provider.com"> + <condition field="${toll_allow}" expression="local"/> + <condition field="destination_number" expression="^(\d{7})$"> + <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/> + <action application="set" data="effective_caller_id_name=${outbound_caller_id_name}"/> + <action application="bridge" data="sofia/gateway/${default_gateway}/1${default_areacode}$1"/> + </condition> + </extension> + + <extension name="domestic.provider.com"> + <condition field="${toll_allow}" expression="domestic"/> + <condition field="destination_number" expression="^(\d{11})$"> + <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/> + <action application="set" data="effective_caller_id_name=${outbound_caller_id_name}"/> + <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/> + </condition> + </extension> + + <extension name="international.provider.com"> + <condition field="${toll_allow}" expression="international"/> + <condition field="destination_number" expression="^(011\d{10+})$"> + <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/> + <action application="set" data="effective_caller_id_name=${outbound_caller_id_name}"/> + <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/> + </condition> + </extension> + +</include> Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Mon Sep 29 16:58:13 2008 @@ -26,6 +26,8 @@ <variables> <variable name="record_stereo" value="true"/> + <variable name="default_gateway" value="asterlink.com"/> + <variable name="default_areacode" value="918"/> </variables> <X-PRE-PROCESS cmd="include" data="default/*.xml"/> Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1000"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1000"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1000"/> <variable name="effective_caller_id_number" value="1000"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1001"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1001"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1001"/> <variable name="effective_caller_id_number" value="1001"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1002"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1002"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1002"/> <variable name="effective_caller_id_number" value="1002"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1003"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1003"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1003"/> <variable name="effective_caller_id_number" value="1003"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1004"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1004"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1004"/> <variable name="effective_caller_id_number" value="1004"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1005"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1005"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1005"/> <variable name="effective_caller_id_number" value="1005"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1006"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1006"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1006"/> <variable name="effective_caller_id_number" value="1006"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1007"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1007"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1007"/> <variable name="effective_caller_id_number" value="1007"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1008"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1008"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1008"/> <variable name="effective_caller_id_number" value="1008"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1009"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1009"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1009"/> <variable name="effective_caller_id_number" value="1009"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1010"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1010"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1010"/> <variable name="effective_caller_id_number" value="1010"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1011"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1011"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1011"/> <variable name="effective_caller_id_number" value="1011"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1012"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1012"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1012"/> <variable name="effective_caller_id_number" value="1012"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1013"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1013"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1013"/> <variable name="effective_caller_id_number" value="1013"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1014"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1014"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1014"/> <variable name="effective_caller_id_number" value="1014"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1015"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1015"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1015"/> <variable name="effective_caller_id_number" value="1015"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1016"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1016"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1016"/> <variable name="effective_caller_id_number" value="1016"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1017"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1017"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1017"/> <variable name="effective_caller_id_number" value="1017"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1018"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1018"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1018"/> <variable name="effective_caller_id_number" value="1018"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1019"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1019"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1019"/> <variable name="effective_caller_id_number" value="1019"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/default.xml (original) +++ freeswitch/trunk/conf/directory/default/default.xml Mon Sep 29 16:58:13 2008 @@ -5,7 +5,7 @@ <!-- set these to take advantage of a dialplan localized to this user --> <variable name="numbering_plan" value="US"/> <variable name="default_gateway" value="asterlink.com"/> - <variable name="default_area_code" value="918"/> + <variable name="default_areacode" value="918"/> </variables> </user> </include>