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

console: a small audit and LAGG functionality test

Browse Source 
Seems to work fine, but the new and old code has some oddities like
obsessing over the "up" flag, but we set all interfaces up before
we start the process.  Some style updates and separation of use
while here.

Splitting on /\d/ seems overly toxic when the device is called
e.g. em10_vlan12 so address that in the utility code where it is
carried out.  get_interface_list() is probably a function that
should be removed in the mid-term.
This commit is contained in:
Franco Fichtner 2022-01-19 10:50:01 +01:00
parent c36385ae1c
commit ef1d0a7a01
2 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/etc/inc/console.inc
View File

@ -1,7 +1,7 @@
<?php
/*
* Copyright (C) 2015-2018 Franco Fichtner <franco@opnsense.org>
* Copyright (C) 2015-2022 Franco Fichtner <franco@opnsense.org>
* Copyright (C) 2004-2010 Scott Ullrich <sullrich@gmail.com>
* Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
* All rights reserved.
@ -92,13 +92,10 @@ function set_networking_interfaces_ports($probe = false)
$key = null;
$iflist_all = get_interface_list(false, true);
$iflist = array();
$iflist_lagg = [];
$iflist = [];
foreach ($iflist_all as $iface => $ifa) {
$iftype = preg_split('/\d/', $iface);
if (isset($iftype[1]) && $iftype[1] == '_vlan') {
continue;
}
$iflist[$iface] = $ifa;
interfaces_bring_up($iface);
}
@ -155,9 +152,8 @@ EOD;
"{$lagg['laggif']}",
"member interfaces {$lagg['members']}"
);
$iflist_all[$lagg['laggif']] = array();
// XXX: get_interface_list() doesn't return lagg interfaces.
$iflist[$lagg['laggif']] = ["up" => 1, "mac" => ""];
$iflist_all[$lagg['laggif']] = [];
$iflist_lagg[$lagg['laggif']] = ['mac' => 'XX:XX:XX:XX:XX:XX'];
}
}
@ -173,7 +169,7 @@ EOD;
}
if (in_array($key, array('y', 'Y'))) {
vlan_setup($iflist, $fp);
vlan_setup(array_merge($iflist, $iflist_lagg), $fp);
}
if (isset($config['vlans']['vlan'][0])) {
@ -184,7 +180,7 @@ EOD;
"{$vlan['if']}_vlan{$vlan['tag']}",
"VLAN tag {$vlan['tag']}, parent interface {$vlan['if']}"
);
$iflist_all[$vlan['if'] . '_vlan' . $vlan['tag']] = array();
$iflist_all[$vlan['if'] . '_vlan' . $vlan['tag']] = [];
}
}
@ -266,7 +262,7 @@ EOD;
$done = false;
while (!$done) {
/* optional interfaces */
$optif = array();
$optif = [];
$i = 0;
while (1) {
@ -525,28 +521,23 @@ EOD;
}
}
$laggcfg = array();
$laggcfg = [];
$laggif = 0;
$unused_ifs = array();
$unused_ifs = [];
foreach ($iflist as $iface => $ifa) {
$unused_ifs[$iface] = $ifa;
}
while (1) {
$lagg = array();
$lagg = [];
echo "\nLAGG-capable interfaces:\n\n";
if (!is_array($iflist)) {
echo "No interfaces found!\n";
} else {
foreach ($unused_ifs as $iface => $ifa) {
echo sprintf(
"% -8s%s%s\n",
$iface,
$ifa['mac'],
$ifa['up'] ? " (up)" : ""
);
echo sprintf("% -8s%s\n", $iface, $ifa['mac']);
}
}
@ -559,7 +550,7 @@ EOD;
$members_str = chop(fgets($fp));
if ($members_str) {
$members = explode(",", str_replace(" ", "", $members_str));
$members = preg_split('/[\s\t,;]+/', $members_str);
$unused_ifnames = array_keys($unused_ifs);
$valid_ifs = array_intersect($unused_ifnames, $members);
if (count($members) != count($valid_ifs)) {
@ -567,8 +558,7 @@ EOD;
printf("\nInvalid interfaces: %s\n", implode(", ", $invalid_ifs));
continue;
}
$lagg['members'] = str_replace(" ", "", $members_str);
$lagg['members'] = implode(',', $members);
foreach ($members as $member) {
unset($unused_ifs[$member]);
}
@ -622,11 +612,11 @@ EOD;
}
}
$vlancfg = array();
$vlancfg = [];
$vlanif = 0;
while (1) {
$vlan = array();
$vlan = [];
echo "\nVLAN-capable interfaces:\n\n";
if (!is_array($iflist)) {
@ -634,12 +624,7 @@ EOD;
} else {
$vlan_capable = 0;
foreach ($iflist as $iface => $ifa) {
echo sprintf(
"% -8s%s%s\n",
$iface,
$ifa['mac'],
$ifa['up'] ? " (up)" : ""
);
echo sprintf("% -8s%s\n", $iface, $ifa['mac']);
$vlan_capable++;
}
}

2
src/etc/inc/util.inc
View File

@ -888,7 +888,7 @@ function get_interface_list($only_active = false, $include_dmesg = false)
}
foreach ($ifnames as $ifname) {
$tmp_ifnames = preg_split('/\d/', $ifname);
$tmp_ifnames = preg_split('/\d+/', $ifname);
if (in_array(array_shift($tmp_ifnames), $vfaces)) {
continue;
}