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

interfaces: simplify semantics of link_interface_to_track6()

Browse Source
This commit is contained in:
Franco Fichtner 2018-05-20 12:16:37 +02:00
parent b357788c1a
commit fd94b3affd
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2828,7 +2828,7 @@ function interface_6rd_configure($interface = "wan", $wancfg)
/* configure dependent interfaces */
if (!file_exists("/var/run/booting")) {
link_interface_to_track6($interface, "update");
link_interface_to_track6($interface, true);
}
return 0;
@ -2926,7 +2926,7 @@ function interface_6to4_configure($interface = 'wan', $wancfg)
}
if (!file_exists("/var/run/booting")) {
link_interface_to_track6($interface, "update");
link_interface_to_track6($interface, true);
}
return 0;
@ -3859,30 +3859,29 @@ function guess_interface_from_ip($ipaddress)
return $ret;
}
function link_interface_to_track6($int, $action = '')
function link_interface_to_track6($int, $update = false)
{
global $config;
$list = array();
if (empty($int)) {
return;
}
if (isset($config['interfaces'])) {
$list = array();
foreach (legacy_config_get_interfaces(array("virtual" => false)) as $ifname => $ifcfg) {
if (!isset($ifcfg['enable'])) {
continue;
}
if (!empty($ifcfg['ipaddrv6']) && $ifcfg['track6-interface'] == $int) {
if ($action == "update") {
interface_track6_configure($ifname, $ifcfg);
} elseif ($action == "") {
$list[$ifname] = $ifcfg;
}
}
}
return $list;
}
foreach (legacy_config_get_interfaces(array('virtual' => false)) as $ifname => $ifcfg) {
if (!isset($ifcfg['enable'])) {
continue;
}
if (!empty($ifcfg['ipaddrv6']) && $ifcfg['track6-interface'] == $int) {
if ($update) {
interface_track6_configure($ifname, $ifcfg);
}
$list[$ifname] = $ifcfg;
}
}
return $list;
}
function link_interface_to_vips($int, $action = '')

2
src/etc/rc.newwanipv6
View File

@ -113,7 +113,7 @@ if (!empty($grouptmp)) {
array_walk($grouptmp, 'interface_group_add_member');
}
link_interface_to_track6($interface, "update");
link_interface_to_track6($interface, true);
system_resolvconf_generate();
system_hosts_generate();