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

interfaces: adapt to the new reality of get_real_interface()

Browse Source
This commit is contained in:
Franco Fichtner 2019-04-28 18:32:24 +02:00
parent 79c7c41123
commit 14b9f355f2
4 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -399,11 +399,13 @@ function interface_bridge_configure(&$bridge, $checkmember = 0)
if (empty($checklist[$member])) {
continue;
}
$realif = get_real_interface($member);
if (!$realif) {
if (!does_interface_exist($realif)) {
log_error('realif not defined in interfaces bridge - up');
continue;
}
/* make sure the parent interface is up */
legacy_interface_mtu($realif, $mtu);
configure_interface_hardware($realif);
@ -3456,9 +3458,7 @@ function interface_group_setup(&$groupname)
$members = explode(" ", $groupname['members']);
foreach ($members as $ifs) {
$realif = get_real_interface($ifs);
if ($realif) {
mwexec("/sbin/ifconfig {$realif} group {$groupname['ifname']}");
}
mwexec("/sbin/ifconfig {$realif} group {$groupname['ifname']}");
}
}
@ -3592,9 +3592,9 @@ function get_parent_interface($interface, $avoidrecurse = false)
global $config;
$parents = array();
//Check that we got a valid interface passed
$realif = get_real_interface($interface);
if ($realif == null) {
if (does_interface_exist($realif)) {
return $parents;
}
@ -4016,11 +4016,8 @@ function get_interface_ip($interface = 'wan')
}
$realif = get_real_interface($interface);
if ($realif) {
return find_interface_ip($realif);
}
return null;
return find_interface_ip($realif);
}
function get_interface_ipv6($interface = 'wan')
@ -4033,12 +4030,9 @@ function get_interface_ipv6($interface = 'wan')
}
$realif = get_real_interface($interface, 'inet6');
if ($realif) {
return isset($config['interfaces'][$interface]['dhcp6prefixonly']) ?
find_interface_ipv6_ll($realif) : find_interface_ipv6($realif);
}
return null;
return isset($config['interfaces'][$interface]['dhcp6prefixonly']) ?
find_interface_ipv6_ll($realif) : find_interface_ipv6($realif);
}
/****f* interfaces/is_interface_wireless
@ -4546,10 +4540,7 @@ function interfaces_addresses($interfaces, $as_subnet = false)
foreach ($interfaces as $interface) {
if (isset($config['interfaces'][$interface])) {
foreach (array('all', 'inet6') as $family) {
$realif = get_real_interface($interface, $family);
if (!empty($realif)) {
$realifs[] = $realif;
}
$realifs[] = get_real_interface($interface, $family);
}
} else {
/* take interfaces as is */

2
src/etc/inc/plugins.inc.d/openvpn.inc
View File

@ -708,7 +708,7 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
if (!empty($settings['serverbridge_interface']) &&
strcmp($settings['serverbridge_interface'], "none")) {
$realif = get_real_interface($settings['serverbridge_interface']);
if (!$realif && strstr($settings['serverbridge_interface'], '_vip')) {
if (strstr($settings['serverbridge_interface'], '_vip')) {
list($vipif, $vhid) = explode('_vip', $settings['serverbridge_interface']);
$realif = get_real_interface($vipif);
}

4
src/www/interfaces_groups.php
View File

@ -42,9 +42,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$members = explode(" ", $a_ifgroups[$id]['members']);
foreach ($members as $ifs) {
$realif = get_real_interface($ifs);
if (!empty($realif)) {
mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " -group " . escapeshellarg($a_ifgroups[$id]['ifname']));
}
mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " -group " . escapeshellarg($a_ifgroups[$id]['ifname']));
}
unset($a_ifgroups[$id]);
write_config();

4
src/www/interfaces_groups_edit.php
View File

@ -112,9 +112,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
foreach (explode(" ", $a_ifgroups[$id]['members']) as $old_member) {
if (!in_array($old_member, $pconfig['members']) || $old_ifname != $pconfig['ifname']) {
$realif = get_real_interface($old_member);
if (!empty($realif)) {
mwexec("/sbin/ifconfig {$realif} -group " . escapeshellarg($a_ifgroups[$id]['ifname']));
}
mwexec("/sbin/ifconfig {$realif} -group " . escapeshellarg($a_ifgroups[$id]['ifname']));
}
}
// update item