aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-08-02 17:07:13 +0000
committerErmal <eri@pfsense.org>2011-08-02 17:07:13 +0000
commit1ba313cd2a05b49c76c16d5d3601123910e28fa4 (patch)
treeb59c271fe887a6fdaa180cf167132f5fb94ec367
parent2b2bd92b01bc7e4dd49d7715085d26e8dd786a2d (diff)
downloadpfsense-packages-1ba313cd2a05b49c76c16d5d3601123910e28fa4.tar.gz
pfsense-packages-1ba313cd2a05b49c76c16d5d3601123910e28fa4.tar.bz2
pfsense-packages-1ba313cd2a05b49c76c16d5d3601123910e28fa4.zip
Correct interface ip gathering.
-rw-r--r--config/snort/snort.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index 7408557b..e962eb42 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -121,8 +121,8 @@ function build_base_whitelist($build_netlist, $wanip, $wangw, $wandns, $vips, $v
case "pppoe":
case "pptp":
case "l2tp":
- if (function_exists('get_real_interface'))
- $subnet = find_interface_ip(get_real_interface($int));
+ if (function_exists('get_interface_ip'))
+ $subnet = get_interface_ip($int);
else
$subnet = find_interface_ip("ng0");
@@ -130,7 +130,7 @@ function build_base_whitelist($build_netlist, $wanip, $wangw, $wandns, $vips, $v
$home_net .= "{$subnet} ";
break;
case "dhcp":
- $subnet = find_interface_ip($int);
+ $subnet = find_interface_ip(snort_get_real_interface($int));
if (is_ipaddr($subnet))
$home_net .= "{$subnet} ";
break;
@@ -178,7 +178,7 @@ function build_base_whitelist($build_netlist, $wanip, $wangw, $wandns, $vips, $v
}
/* Add loopback to whitelist (ftphelper) */
- $home_net .= "127.0.0.1";
+ $home_net .= "127.0.0.1 ";
/* grab a list of vpns and whitelist if user desires added by nestorfish 954 */
if ($vpns == 'yes') {