Author: mcollins Date: Fri Jun 19 15:02:05 2009 New Revision: 13874 Log: config:Remove use_profile from default dialplan, move to vars.xml, default value is 'internal' Modified: freeswitch/trunk/conf/dialplan/default.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 Fri Jun 19 15:02:05 2009 @@ -60,10 +60,6 @@ </extension> <extension name="global" continue="true"> - <condition field="${network_addr}" expression="^$" break="never"> - <action application="set" data="use_profile=${cond(${acl($${local_ip_v4} rfc1918)} == true ? nat : default)}"/> - <anti-action application="set" data="use_profile=${cond(${acl(${network_addr} rfc1918)} == true ? nat : default)}"/> - </condition> <condition field="${call_debug}" expression="^true$" break="never"> <action application="info"/> </condition> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Fri Jun 19 15:02:05 2009 @@ -26,6 +26,7 @@ <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"/> + <X-PRE-PROCESS cmd="set" data="use_profile=internal"/> <!-- Enable ZRTP globally you can override this on a per channel basis