more fun stuff

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9750 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/conf/directory/default.xml b/conf/directory/default.xml
index 2f386a2523806bb164f1da3975af281b16aefe63..fc19f4a24268260326dccd66b6d9056928ff22c0 100644 (file)
--- a/conf/directory/default.xml
+++ b/conf/directory/default.xml
@@ -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"/>

diff --git a/conf/directory/default/1000.xml b/conf/directory/default/1000.xml
index bbbb422df6473f4e634cd38e21a03c1000e2e8e2..868be9e51321473ef914be87c903b8f4145e2b0c 100644 (file)
--- a/conf/directory/default/1000.xml
+++ b/conf/directory/default/1000.xml
@@ -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>

diff --git a/conf/directory/default/1001.xml b/conf/directory/default/1001.xml
index cc7762c8ed2b1b1b7b0400a60462460593ff83b1..ff2287a71e049bf253c46b56d0b98887b89a14fe 100644 (file)
--- a/conf/directory/default/1001.xml
+++ b/conf/directory/default/1001.xml
@@ -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>

diff --git a/conf/directory/default/1002.xml b/conf/directory/default/1002.xml
index a6a7c19f25789c309bf89419a0ab4a54ff5e9b23..d6ccc63ec7d4341c680d1bb6b81ad491f37b630d 100644 (file)
--- a/conf/directory/default/1002.xml
+++ b/conf/directory/default/1002.xml
@@ -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>

diff --git a/conf/directory/default/1003.xml b/conf/directory/default/1003.xml
index 501db5e0957959e514c0eb3fa28dbc8d9260c6fa..3ef39c8f5778b696a243161eeb7571b860b5fec5 100644 (file)
--- a/conf/directory/default/1003.xml
+++ b/conf/directory/default/1003.xml
@@ -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>

diff --git a/conf/directory/default/1004.xml b/conf/directory/default/1004.xml
index 5eff8520ce782d9b6c212b0458d75952b588b461..8db784199f7e4c65a40105146d3d27655483881d 100644 (file)
--- a/conf/directory/default/1004.xml
+++ b/conf/directory/default/1004.xml
@@ -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>

diff --git a/conf/directory/default/1005.xml b/conf/directory/default/1005.xml
index 04ed28e06e7cfa46b324ce48fcfa9fd10418bb21..6711745321b09e5713b4667d90516092e8568b4e 100644 (file)
--- a/conf/directory/default/1005.xml
+++ b/conf/directory/default/1005.xml
@@ -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>

diff --git a/conf/directory/default/1006.xml b/conf/directory/default/1006.xml
index 86306dc728f7acbe8d163bc4a4b92a0711c29bcb..2a5f63a506c883b5c15cda2153806252682bc95d 100644 (file)
--- a/conf/directory/default/1006.xml
+++ b/conf/directory/default/1006.xml
@@ -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>

diff --git a/conf/directory/default/1007.xml b/conf/directory/default/1007.xml
index 70d6529b5584064f3a42c8537e8cb9fdbe0f5790..d941c543a3ac88769b338b3b9530fed0919175db 100644 (file)
--- a/conf/directory/default/1007.xml
+++ b/conf/directory/default/1007.xml
@@ -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>

diff --git a/conf/directory/default/1008.xml b/conf/directory/default/1008.xml
index 95f220eb798b44433d97c6635d54e9eecefde81f..86c7b91edc96e3b603df344f7ee5f62fc2781cad 100644 (file)
--- a/conf/directory/default/1008.xml
+++ b/conf/directory/default/1008.xml
@@ -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>

diff --git a/conf/directory/default/1009.xml b/conf/directory/default/1009.xml
index f6c3167a9642c0bb0c9696950f018f50afb3abcd..cbb670e870d003cf97120ed5101d46dbaabfac9a 100644 (file)
--- a/conf/directory/default/1009.xml
+++ b/conf/directory/default/1009.xml
@@ -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>

diff --git a/conf/directory/default/1010.xml b/conf/directory/default/1010.xml
index 4be7d5715cf1f2ff4f2501e21e359def0c9cde31..ab0e65c7339a369831a0ba35aec97e75e9d96798 100644 (file)
--- a/conf/directory/default/1010.xml
+++ b/conf/directory/default/1010.xml
@@ -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>

diff --git a/conf/directory/default/1011.xml b/conf/directory/default/1011.xml
index ade1f149a6cb6580df0ee2ca1d4fc57b7237657a..ce9ac52702703d5540141210fc64fcca352350ec 100644 (file)
--- a/conf/directory/default/1011.xml
+++ b/conf/directory/default/1011.xml
@@ -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>

diff --git a/conf/directory/default/1012.xml b/conf/directory/default/1012.xml
index bd883c5538bff164614c79a911b6cad624333114..c080f0b5aea9bf76dfd535604ef6b880a6a823d8 100644 (file)
--- a/conf/directory/default/1012.xml
+++ b/conf/directory/default/1012.xml
@@ -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>

diff --git a/conf/directory/default/1013.xml b/conf/directory/default/1013.xml
index f9ba0c2037c46d4ec97da39684e3894706f0f5c1..51b70283be9a9761de8a289d06a89e3acdc4d097 100644 (file)
--- a/conf/directory/default/1013.xml
+++ b/conf/directory/default/1013.xml
@@ -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>

diff --git a/conf/directory/default/1014.xml b/conf/directory/default/1014.xml
index 5f0306456614c96b100c056780783659344cca2c..7aed857da1a5f37dcde63841aa29bc52e8f33169 100644 (file)
--- a/conf/directory/default/1014.xml
+++ b/conf/directory/default/1014.xml
@@ -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>

diff --git a/conf/directory/default/1015.xml b/conf/directory/default/1015.xml
index 88355e30bb4674f415ad36551879ea85ea617884..e72296fc88fa87efa5373d62cac1cfa2a29bc13c 100644 (file)
--- a/conf/directory/default/1015.xml
+++ b/conf/directory/default/1015.xml
@@ -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>

diff --git a/conf/directory/default/1016.xml b/conf/directory/default/1016.xml
index dddab02e9aa110185354f1d1bc3779da0e9efb3b..5b3d8cb5fc355ed1df14d678a4593614ab3689e0 100644 (file)
--- a/conf/directory/default/1016.xml
+++ b/conf/directory/default/1016.xml
@@ -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>

diff --git a/conf/directory/default/1017.xml b/conf/directory/default/1017.xml
index 9af6792407e9764469b90e0480ec6395da8c2fb3..f3bee1c7bc6bd7ebc4991a50848bfeaa9938c6d5 100644 (file)
--- a/conf/directory/default/1017.xml
+++ b/conf/directory/default/1017.xml
@@ -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>

diff --git a/conf/directory/default/1018.xml b/conf/directory/default/1018.xml
index 25663d43a294696cc50425aa51275496e96dcc45..c57612b1f2bd49de7800e281e0b25a537f1c00e0 100644 (file)
--- a/conf/directory/default/1018.xml
+++ b/conf/directory/default/1018.xml
@@ -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>

diff --git a/conf/directory/default/1019.xml b/conf/directory/default/1019.xml
index 6e58114d676a871ece8d316988957cd8613696f5..5a06e33b2c0dfc7ae56e1340b3e9885affc4fca9 100644 (file)
--- a/conf/directory/default/1019.xml
+++ b/conf/directory/default/1019.xml
@@ -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>

diff --git a/conf/directory/default/provider.com.xml b/conf/directory/default/provider.com.xml
new file mode 100644 (file)
index 0000000..23ffcfa
--- /dev/null
+++ b/conf/directory/default/provider.com.xml
@@ -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>
+

diff --git a/conf/vars.xml b/conf/vars.xml
index 4b3106ae8ef8b8643dd325074589200eb70639d5..d2199857a0e03c791e8f7292d03bc72e9e827485 100644 (file)
--- a/conf/vars.xml
+++ b/conf/vars.xml
@@ -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"/>
+