[Freeswitch-svn] [commit] r7971 - in freeswitch/trunk: conf/dialplan src/mod/applications/mod_commands

[Freeswitch SVN]

Author: brian
Date: Thu Mar 27 16:34:49 2008
New Revision: 7971

Modified:
   freeswitch/trunk/conf/dialplan/default.xml
   freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c

Log:
tweak configs slightly to use the acl for rfc1918 check

Modified: freeswitch/trunk/conf/dialplan/default.xml
==============================================================================
--- freeswitch/trunk/conf/dialplan/default.xml	(original)
+++ freeswitch/trunk/conf/dialplan/default.xml	Thu Mar 27 16:34:49 2008
@@ -40,8 +40,8 @@
 
     <extension name="global" continue="true">
       <condition field="${network_addr}" expression="^$" break="never">
-	<action application="set" data="use_profile=${cond(${is_lan_addr($${local_ip_v4})} == yes ? nat : default)}"/>
-	<anti-action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/>
+	<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>
       <!-- This will setup some variables if the user isn't authenticated.
 	   numbering_plan is required for the demo to function properly. 

Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c	Thu Mar 27 16:34:49 2008
@@ -505,7 +505,7 @@
 
 SWITCH_STANDARD_API(lan_addr_function)
 {
-	stream->write_function(stream, "%s", switch_is_lan_addr(cmd) ? "yes" : "no");
+	stream->write_function(stream, "%s", switch_is_lan_addr(cmd) ? "true" : "false");
 	return SWITCH_STATUS_SUCCESS;
 }