Author: brian Date: Mon Sep 29 17:30:11 2008 New Revision: 9750 Added: freeswitch/trunk/conf/directory/default/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/vars.xml Log: more fun stuff Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Mon Sep 29 17:30:11 2008 @@ -26,8 +26,8 @@ <variables> <variable name="record_stereo" value="true"/> - <variable name="default_gateway" value="asterlink.com"/> - <variable name="default_areacode" value="918"/> + <variable name="default_gateway" value="$${default_provider}"/> + <variable name="default_areacode" value="$${default_areacode}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </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 17:30:11 2008 @@ -10,8 +10,8 @@ <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="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Added: freeswitch/trunk/conf/directory/default/provider.com.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/provider.com.xml Mon Sep 29 17:30:11 2008 @@ -0,0 +1,26 @@ +<!-- + Shell provider account should work with most providers. + +--> +<include> + <user id="$${default_provider}"> + <gateways> + <gateway name="$${default_provider}"> + <param name="username" value="$${default_provider_username}"/> + <param name="password" value="$${default_provider_password}"/> + <param name="from-user" value="$${default_provider_username}"/> + <param name="from-domain" value="$${default_provider_from_domain}"/> + <param name="expire-seconds" value="600"/> + <param name="register" value="$${default_provider_register}"/> + <param name="retry-seconds" value="30"/> + <param name="extension" value="$${default_provider_contact}"/> + <param name="contact-params" value="domain_name=$${domain}"/> + <param name="context" value="public"/> + </gateway> + </gateways> + <params> + <param name="password" value="$${default_provider_password}"/> + </params> + </user> +</include> + Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Mon Sep 29 17:30:11 2008 @@ -95,14 +95,35 @@ <X-PRE-PROCESS cmd="set" data="unroll_loops=true"/> <!-- outbound_caller_id and outbound_caller_name The caller ID telephone number we should use when calling out. - Used by: conference.conf.xml + Used by: conference.conf.xml and user directory for default + outbound callerid name and number. --> <X-PRE-PROCESS cmd="set" data="outbound_caller_name=FreeSWITCH"/> <X-PRE-PROCESS cmd="set" data="outbound_caller_id=0000000000"/> + + <!-- various debug and defaults --> <X-PRE-PROCESS cmd="set" data="call_debug=false"/> <X-PRE-PROCESS cmd="set" data="console_loglevel=info"/> + <X-PRE-PROCESS cmd="set" data="default_areacode=918"/> <X-PRE-PROCESS cmd="set" data="uk-ring=%(400,200,400,450);%(400,2200,400,450)"/> <X-PRE-PROCESS cmd="set" data="us-ring=%(2000, 4000, 440.0, 480.0)"/> <X-PRE-PROCESS cmd="set" data="fr-ring=%(1500, 3500, 440.0, 0.0)"/> <X-PRE-PROCESS cmd="set" data="bong-ring=v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/> + <!-- + Setting up your default sip provider is easy. + Below are some values that should work in most cases. + + These are for conf/directory/default/provider.com.xml + + --> + <X-PRE-PROCESS cmd="set" data="default_provider=provider.com"/> + <X-PRE-PROCESS cmd="set" data="default_provider_username=joeuser"/> + <X-PRE-PROCESS cmd="set" data="default_provider_password=password"/> + <X-PRE-PROCESS cmd="set" data="default_provider_from_domain=provider.com"/> + <!-- true or false --> + <X-PRE-PROCESS cmd="set" data="default_provider_register=false"/> + <X-PRE-PROCESS cmd="set" data="default_provider_contact=5000"/> + + <X-PRE-PROCESS cmd="include" data="../local_vars.xml"/> +