diff options
| author | Ermal <eri@pfsense.org> | 2014-02-17 14:06:34 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2014-02-17 14:06:58 +0000 |
| commit | fb92e33201d5572530c8cdaa75635b750a13a4db (patch) | |
| tree | 371a5756ca00b9b852c98a69b386832b06c647be | |
| parent | 8f642577048ae81fb97aa9ca1745e4777e5657cf (diff) | |
| download | pfsense-fb92e33201d5572530c8cdaa75635b750a13a4db.zip pfsense-fb92e33201d5572530c8cdaa75635b750a13a4db.tar.gz | |
Put a kludge for now which Fixes #3280. It should be improved later on to have proper handling and overloading of configuration functions
| -rw-r--r-- | etc/inc/interfaces.inc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 124ee2b..a42f7fb 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -2960,6 +2960,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); @@ -2971,15 +2972,13 @@ 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']}"); - } else if (substr($realif, 0, 3) == "gre") { + if ($tunnelif == "gre") { if (is_array($config['gres']['gre'])) { foreach ($config['gres']['gre'] as $gre) if ($gre['greif'] == $realif) interface_gre_configure($gre); } - } else if (substr($realif, 0, 3) == "gif") { + } else if ($tunnelif == "gif") { if (is_array($config['gifs']['gif'])) { foreach ($config['gifs']['gif'] as $gif) if($gif['gifif'] == $realif) @@ -2987,6 +2986,8 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven } } else if (substr($realif, 0, 4) == "ovpn") { /* XXX: Should be done anything?! */ + } else if (is_ipaddrv4($wancfg['ipaddr']) && $wancfg['subnet'] <> "") { + pfSense_interface_setaddress($realif, "{$wancfg['ipaddr']}/{$wancfg['subnet']}"); } break; } @@ -3006,10 +3007,12 @@ 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'])); + 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; } |
