mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Put a kludge for now which Fixes #3280. It should be improved later on to have proper handling and overloading of configuration functions

Browse Source
This commit is contained in:
Ermal 2014-02-17 14:03:42 +00:00
parent bae729da39
commit 6191b3215c
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
etc/inc/interfaces.inc
View File

@ -2982,6 +2982,7 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
unset($interface_ipv6_arr_cache[$realif]);
unset($interface_snv6_arr_cache[$realif]);
$tunnelif = substr($realif, 0, 3);
switch ($wancfg['ipaddr']) {
case 'dhcp':
interface_dhcp_configure($interface);
@ -2993,8 +2994,11 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
interface_ppps_configure($interface);
break;
default:
if (is_ipaddrv4($wancfg['ipaddr']) && $wancfg['subnet'] <> "")
pfSense_interface_setaddress($realif, "{$wancfg['ipaddr']}/{$wancfg['subnet']}");
/* XXX: Kludge for now related to #3280 */
if (!in_array($tunnelif, array("gif", "gre", "ovp"))) {
if (is_ipaddrv4($wancfg['ipaddr']) && $wancfg['subnet'] <> "")
pfSense_interface_setaddress($realif, "{$wancfg['ipaddr']}/{$wancfg['subnet']}");
}
break;
}
@ -3013,10 +3017,13 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
interface_track6_configure($interface, $wancfg);
break;
default:
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 " . escapeshellarg($realif) . " inet6 {$wancfg['ipaddrv6']} prefixlen " . escapeshellarg($wancfg['subnetv6']));
/* XXX: Kludge for now related to #3280 */
if (!in_array($tunnelif, array("gif", "gre", "ovp"))) {
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 " . escapeshellarg($realif) . " inet6 {$wancfg['ipaddrv6']} prefixlen " . escapeshellarg($wancfg['subnetv6']));
}
}
break;
}