Author: brian Date: Mon Feb 16 13:01:50 2009 New Revision: 12064 Log: force domain_name to simplify things Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Feb 16 13:01:50 2009 @@ -20,28 +20,6 @@ <action application="deflect" data="${destination_number}"/> </condition> </extension> - - <!-- - Try to get the domain from the sip_auth_realm otherwise it will - default domain in vars.xml for cases it can't figure it out. - - --> - <extension name="set_domain" continue="true"> - <condition field="${domain_name}" expression="^$"/> - <condition field="source" expression="mod_sofia"/> - <condition field="${sip_auth_realm}" expression="^$"> - <action application="set" data="domain_name=$${domain}"/> - <anti-action application="set" data="domain_name=${sip_auth_realm}"/> - </condition> - </extension> - - <!-- Set the domain --> - <extension name="set_domain_openzap" continue="true"> - <condition field="${domain_name}" expression="^$"/> - <condition field="source" expression="mod_openzap"> - <action application="set" data="domain_name=$${domain}"/> - </condition> - </extension> <!-- Example of doing things based on time of day. --> <extension name="tod_example" continue="true"> Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Mon Feb 16 13:01:50 2009 @@ -36,17 +36,6 @@ </condition> </extension> - <!-- Try to get domain_name from the sip_req_params variable --> - <extension name="set_domain" continue="true"> - <condition field="${domain_name}" expression="^$"/> - <condition field="source" expression="mod_sofia"/> - <condition field="${sip_req_params}" expression="domain_name=([A-Z-a-z0-9.]+)"> - <!-- We need to export this so the B-Leg will have it after transfer too. --> - <action application="export" data="domain_name=$1"/> - <anti-action application="export" data="domain_name=${sip_req_host}"/> - </condition> - </extension> - <extension name="public_extensions"> <condition field="destination_number" expression="^(10[01][0-9])$"> <action application="transfer" data="$1 XML default"/> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Mon Feb 16 13:01:50 2009 @@ -11,6 +11,7 @@ information on this topic. --> <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/> + <X-PRE-PROCESS cmd="set" data="domain_name=$${domain}"/> <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/> <!-- xmpp_client_profile and xmpp_server_profile