Commit 812fa8fc authored by Franco Fichtner's avatar Franco Fichtner

interfaces: old switcheroo for eventual php module removal

Only one function left.  :)

(cherry picked from commit 4e8debf8)
parent b7877986
...@@ -2904,8 +2904,7 @@ function interface_configure($interface = 'wan', $reloadall = false, $linkupeven ...@@ -2904,8 +2904,7 @@ function interface_configure($interface = 'wan', $reloadall = false, $linkupeven
if (!file_exists("/var/run/booting") && !(substr($realif, 0, 4) == "ovpn")) { if (!file_exists("/var/run/booting") && !(substr($realif, 0, 4) == "ovpn")) {
/* remove all IPv4 and IPv6 addresses */ /* remove all IPv4 and IPv6 addresses */
$tmpifaces = pfSense_getall_interface_addresses($realif); $tmpifaces = legacy_getall_interface_addresses($realif);
if (is_array($tmpifaces)) {
foreach ($tmpifaces as $tmpiface) { foreach ($tmpifaces as $tmpiface) {
if (is_ipaddrv6($tmpiface) || is_subnetv6($tmpiface)) { if (is_ipaddrv6($tmpiface) || is_subnetv6($tmpiface)) {
if (!is_linklocal($tmpiface)) { if (!is_linklocal($tmpiface)) {
...@@ -2921,7 +2920,6 @@ function interface_configure($interface = 'wan', $reloadall = false, $linkupeven ...@@ -2921,7 +2920,6 @@ function interface_configure($interface = 'wan', $reloadall = false, $linkupeven
legacy_interface_deladdress($realif, $tmpip); legacy_interface_deladdress($realif, $tmpip);
} }
} }
}
/* only bring down the interface when both v4 and v6 are set to NONE */ /* only bring down the interface when both v4 and v6 are set to NONE */
if (empty($wancfg['ipaddr']) && empty($wancfg['ipaddrv6'])) { if (empty($wancfg['ipaddr']) && empty($wancfg['ipaddrv6'])) {
...@@ -4664,7 +4662,7 @@ function find_interface_ipv6_ll($interface) ...@@ -4664,7 +4662,7 @@ function find_interface_ipv6_ll($interface)
{ {
$interface = trim($interface); $interface = trim($interface);
if (does_interface_exist($interface)) { if (does_interface_exist($interface)) {
$ifinfo = pfSense_getall_interface_addresses($interface); $ifinfo = legacy_getall_interface_addresses($interface);
foreach ($ifinfo as $line) { foreach ($ifinfo as $line) {
if (strstr($line, ":")) { if (strstr($line, ":")) {
$parts = explode("/", $line); $parts = explode("/", $line);
......
...@@ -64,7 +64,7 @@ function does_vip_exist($vip) { ...@@ -64,7 +64,7 @@ function does_vip_exist($vip) {
return false; return false;
} }
$ifacedata = pfSense_getall_interface_addresses($realif); $ifacedata = legacy_getall_interface_addresses($realif);
foreach ($ifacedata as $vipips) { foreach ($ifacedata as $vipips) {
if ($vipips == "{$vip['subnet']}/{$vip['subnet_bits']}") { if ($vipips == "{$vip['subnet']}/{$vip['subnet_bits']}") {
return true; return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment