lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-19 02:54:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: old switcheroo for eventual php module removal

Browse Source 
Only one function left.  :)
This commit is contained in:
Franco Fichtner 2016-04-28 12:21:08 +02:00
parent 2533e1103d
commit 4e8debf8f3
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/etc/inc/interfaces.inc
View File

@ -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);

2
src/etc/inc/xmlrpc/legacy.inc
View File

@ -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;