From: Brian West <brian@freeswitch.org>
Date: Thu, 27 Mar 2008 20:34:49 +0000 (+0000)
Subject: tweak configs slightly to use the acl for rfc1918 check
X-Git-Tag: v1.0-rc2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da72bfb9f63c064d52aa21cb75fb4e89b719a4c4;p=thirdparty%2Ffreeswitch.git

tweak configs slightly to use the acl for rfc1918 check

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

diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index 0fd2e71128..69b3238ee8 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -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. 
diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index 872896bc94..297012dd20 100644
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -505,7 +505,7 @@ ok:
 
 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;
 }