summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2013-12-18 22:00:35 +0000
committerErmal <eri@pfsense.org>2013-12-18 22:00:35 +0000
commit27a015571a497dae6729d6ee4560566bc7e8daaa (patch)
tree486b3434d93e63301b53c30a6281f96e4bfbdbc9 /etc
parent6a3b460168a023b3cf1b866e0f57f2e3dbbb7908 (diff)
downloadpfsense-27a015571a497dae6729d6ee4560566bc7e8daaa.zip
pfsense-27a015571a497dae6729d6ee4560566bc7e8daaa.tar.gz
Use proper function to check for ipaddr and also do not call the module ip set function since its only v4 fro now
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/interfaces.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 9f735e1..999b2c0 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -2945,7 +2945,7 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
interface_ppps_configure($interface);
break;
default:
- if (is_ipaddr($wancfg['ipaddr']) && $wancfg['subnet'] <> "") {
+ if (is_ipaddrv4($wancfg['ipaddr']) && $wancfg['subnet'] <> "") {
pfSense_interface_setaddress($realif, "{$wancfg['ipaddr']}/{$wancfg['subnet']}");
} else if (substr($realif, 0, 3) == "gre") {
if (is_array($config['gres']['gre'])) {
@@ -2980,8 +2980,8 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
interface_track6_configure($interface, $wancfg);
break;
default:
- if (is_ipaddr($wancfg['ipaddrv6']) && $wancfg['subnetv6'] <> "") {
- pfSense_interface_setaddress($realif, "{$wancfg['ipaddrv6']}/{$wancfg['subnetv6']}");
+ if (is_ipaddrv6($wancfg['ipaddrv6']) && $wancfg['subnetv6'] <> "") {
+ //pfSense_interface_setaddress($realif, "{$wancfg['ipaddrv6']}/{$wancfg['subnetv6']}");
// FIXME: Add IPv6 Support to the pfSense module
mwexec("/sbin/ifconfig {$realif} inet6 {$wancfg['ipaddrv6']} prefixlen {$wancfg['subnetv6']} ");
}
OpenPOWER on IntegriCloud