From 4e8debf8f315f700a4ae6daba9771272c1c0b8da Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 28 Apr 2016 12:21:08 +0200
Subject: [PATCH] interfaces: old switcheroo for eventual php module removal

Only one function left.  :)
---
 src/etc/inc/interfaces.inc    | 30 ++++++++++++++----------------
 src/etc/inc/xmlrpc/legacy.inc |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index d0ae4e8d0..49ed60621 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -2914,22 +2914,20 @@ function interface_configure($interface = 'wan', $reloadall = false, $linkupeven
 
     if (!file_exists("/var/run/booting") && !(substr($realif, 0, 4) == "ovpn")) {
         /* remove all IPv4 and IPv6 addresses */
-        $tmpifaces = pfSense_getall_interface_addresses($realif);
-        if (is_array($tmpifaces)) {
-            foreach ($tmpifaces as $tmpiface) {
-                if (is_ipaddrv6($tmpiface) || is_subnetv6($tmpiface)) {
-                    if (!is_linklocal($tmpiface)) {
-                        mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " inet6 {$tmpiface} delete");
-                    }
-                } else {
-                    if (is_subnetv4($tmpiface)) {
-                        $tmpip = explode('/', $tmpiface);
-                        $tmpip = $tmpip[0];
-                    } else {
-                        $tmpip = $tmpiface;
-                    }
-                    legacy_interface_deladdress($realif, $tmpip);
+        $tmpifaces = legacy_getall_interface_addresses($realif);
+        foreach ($tmpifaces as $tmpiface) {
+            if (is_ipaddrv6($tmpiface) || is_subnetv6($tmpiface)) {
+                if (!is_linklocal($tmpiface)) {
+                    mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " inet6 {$tmpiface} delete");
                 }
+            } else {
+                if (is_subnetv4($tmpiface)) {
+                    $tmpip = explode('/', $tmpiface);
+                    $tmpip = $tmpip[0];
+                } else {
+                    $tmpip = $tmpiface;
+                }
+                legacy_interface_deladdress($realif, $tmpip);
             }
         }
 
@@ -4674,7 +4672,7 @@ function find_interface_ipv6_ll($interface)
 {
     $interface = trim($interface);
     if (does_interface_exist($interface)) {
-        $ifinfo = pfSense_getall_interface_addresses($interface);
+        $ifinfo = legacy_getall_interface_addresses($interface);
         foreach ($ifinfo as $line) {
             if (strstr($line, ":")) {
                 $parts = explode("/", $line);
diff --git a/src/etc/inc/xmlrpc/legacy.inc b/src/etc/inc/xmlrpc/legacy.inc
index 47f476f22..a9379dc94 100644
--- a/src/etc/inc/xmlrpc/legacy.inc
+++ b/src/etc/inc/xmlrpc/legacy.inc
@@ -64,7 +64,7 @@ function does_vip_exist($vip) {
             return false;
     }
 
-    $ifacedata = pfSense_getall_interface_addresses($realif);
+    $ifacedata = legacy_getall_interface_addresses($realif);
     foreach ($ifacedata as $vipips) {
         if ($vipips == "{$vip['subnet']}/{$vip['subnet_bits']}") {
             return true;