changed US.conf to use ${default_gateway} so it can be user specific and the default...

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

diff --git a/conf/dialplan/US.conf.xml b/conf/dialplan/US.conf.xml
index 8cb5a68f8326c366c078199ea704ac6448f752c3..58e922d8d873be82464ffc49a014af62585cdb10 100644 (file)
--- a/conf/dialplan/US.conf.xml
+++ b/conf/dialplan/US.conf.xml
@@ -9,7 +9,7 @@
      <action application="set" data="hangup_after_bridge=true"/>
      <action application="enum" data="1$1"/>
      <action application="bridge" data="${enum_auto_route}"/>
-     <action application="bridge" data="sofia/gateway/$${default_gateway}/011$1"/>
+     <action application="bridge" data="sofia/gateway/${default_gateway}/011$1"/>
    </condition>
  </extension>
 
@@ -22,7 +22,7 @@
      <action application="set" data="hangup_after_bridge=true"/>
      <action application="enum" data="1$1"/>
      <action application="bridge" data="${enum_auto_route}"/>
-     <action application="bridge" data="sofia/gateway/$${default_gateway}/1$1"/>
+     <action application="bridge" data="sofia/gateway/${default_gateway}/1$1"/>
    </condition>
  </extension>
 
@@ -40,7 +40,7 @@
      <action application="set" data="hangup_after_bridge=true"/>
      <action application="enum" data="1$1"/>
      <action application="bridge" data="${enum_auto_route}"/>
-     <action application="bridge" data="sofia/gateway/$${default_gateway}/1${default_area_code}$1"/>
+     <action application="bridge" data="sofia/gateway/${default_gateway}/1${default_area_code}$1"/>
    </condition>
  </extension>
 
@@ -53,7 +53,7 @@
  -->
  <extension name="FCC_Services">
    <condition field="^([4689]11)$">
-     <action application="bridge" data="sofia/gateway/$${default_gateway}/$1"/>
+     <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/>
    </condition>
  </extension>
 </context>

diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index 48f8db40de0458f5d4fa94dbd82ff63a8f15bfcc..481af113f1d4c63f87bd26becb1f4531f67a2441 100644 (file)
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -96,6 +96,7 @@
  
   <extension name="Localized_Dialplan">
     <condition field="${numbering_plan}" expression="^[[:alnum:]]+$"/>
+    <condition field="${default_gateway}" expression="[[:alnum:]]"/>
     <condition field="destination_number" expression="^([[:alnum:]]+)$">
       <action application="transfer" data="$1 XML ${numbering_plan}-Numbering-Plan"/>
     </condition>

diff --git a/conf/directory/default.xml b/conf/directory/default.xml
index e49321584eb2bc1ed06a1bfe0ed00e1f4105cdd4..cc229fe95e73ea2339bec949b8c33f5dc9cc1e11 100644 (file)
--- a/conf/directory/default.xml
+++ b/conf/directory/default.xml
@@ -50,6 +50,18 @@
     <variables>
       <!--all variables here will be set on all inbound calls that originate from this user -->
       <variable name="testing" value="this"/>
+
+      <!-- limit the max number of outgoing calls for this user -->
+      <!--<variable name="max_calls" value="2"/>-->
+
+      <!-- send presence information if FS is configured to do so -->
+      <!--<variable name="presence_id" value="1000@$${domain}"/>-->
+
+      <!-- set these to take advantage of a dialplan localized to this user -->
+      <!--<variable name="numbering_plan" value="US"/>-->
+      <!--<variable name="default_area_code" value="434"/>-->
+      <!--<variable name="default_gateway" value="asterlink.com"/>-->
+
       <!--<variable name="sip-force-contact" value="nat-connectile-dysfunction"/>-->
       <!--<variable name="sip-force-expires" value="10"/>-->
       <!--<variable name="sip-register-gateway" value="cluecon.com"/>-->
@@ -67,12 +79,6 @@
       <!--<param name="vm-mailto" value="me@mydomain.com"/>-->
       <!--<param name="vm-email-all-messages" value="true"/>-->
     </params>
-    <variables>
-      <variable name="numbering_plan" value="US"/>
-      <variable name="default_area_code" value="434"/>
-      <variable name="max_calls" value="2"/>
-      <variable name="presence_id" value="1001@$${domain}"/>
-    </variables>
   </user>
 
   <!-- authless users and mailboxes -->