Author: intralanman Date: Fri Nov 9 14:35:05 2007 New Revision: 6207 Modified: freeswitch/trunk/conf/dialplan/US.conf.xml freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/directory/default.xml Log: changed US.conf to use ${default_gateway} so it can be user specific and the default context to not transfer if the numbering plan isn't set. Modified: freeswitch/trunk/conf/dialplan/US.conf.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/US.conf.xml (original) +++ freeswitch/trunk/conf/dialplan/US.conf.xml Fri Nov 9 14:35:05 2007 @@ -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> Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Nov 9 14:35:05 2007 @@ -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> Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Fri Nov 9 14:35:05 2007 @@ -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 -->