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

interfaces: small follow-up on get_interface_list()

Browse Source
This commit is contained in:
Franco Fichtner 2015-08-09 13:02:06 +02:00
parent 97d35c5622
commit 75c5ddf166
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/config.console.inc
View File

@ -431,7 +431,7 @@ Then press ENTER to continue.
EOD;
fgets($fp);
$iflist = get_interface_list("media");
$iflist = get_interface_list('media');
foreach ($iflist_prev as $ifn => $ifa) {
if (!$ifa['up'] && $iflist[$ifn]['up']) {

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

@ -813,49 +813,52 @@ function get_configured_ipv6_addresses()
/*
* get_interface_list() - Return a list of all physical interfaces
* along with MAC and status.
* along with MAC, IPv4 and status.
*
* $mode = "active" - use ifconfig -lu
* "media" - use ifconfig to check physical connection
* status (much slower)
*/
function get_interface_list($mode = "active", $keyby = "physical", $vfaces = "") {
function get_interface_list($mode = 'active', $keyby = 'physical')
{
global $config;
$upints = array();
/* get a list of virtual interface types */
if(!$vfaces) {
$vfaces = array (
'bridge',
'ppp',
'pppoe',
'pptp',
'l2tp',
'sl',
'gif',
'gre',
'faith',
'lo',
'ng',
'_vlan',
'_wlan',
'pflog',
'plip',
'pfsync',
'enc',
'tun',
'carp',
'lagg',
'vip',
'ipfw'
);
}
/* list of virtual interface types */
$vfaces = array(
'_vlan',
'_wlan',
'bridge',
'carp',
'enc',
'faith',
'gif',
'gre',
'ipfw',
'l2tp',
'lagg',
'lo',
'ng',
'pflog',
'plip',
'ppp',
'pppoe',
'pptp',
'pfsync',
'sl',
'tun',
'vip'
);
$ifnames = legacy_interface_listget();
switch ($mode) {
case 'active':
$upints = legacy_interface_listget('up');
break;
case 'media':
$intlist = legacy_interface_listget();
$intlist = $ifnames;
$ifconfig = "";
exec("/sbin/ifconfig -a", $ifconfig);
$regexp = '/(' . implode('|', $intlist) . '):\s/';
@ -868,15 +871,12 @@ function get_interface_list($mode = "active", $keyby = "physical", $vfaces = "")
}
break;
default:
$upints = legacy_interface_listget();
$upints = $ifnames;
break;
}
$ifnames = legacy_interface_listget();
foreach ($ifnames as $ifname) {
if (in_array(array_shift(preg_split('/\d/', $ifname)), $vfaces) ||
stristr($ifname, '_vlan') || stristr($ifname, '_wlan')) {
if (in_array(array_shift(preg_split('/\d/', $ifname)), $vfaces)) {
continue;
}