proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-27 17:16:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add and use physical NIC regexp

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2017-05-22 09:44:17 +02:00 committed by Wolfgang Bumiller
parent 4ed6974a55
commit 3dabe28a23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/PVE/INotify.pm
View File

@ -13,6 +13,7 @@ use File::Basename;
use Fcntl qw(:DEFAULT :flock); use Fcntl qw(:DEFAULT :flock);
use PVE::SafeSyslog; use PVE::SafeSyslog;
use PVE::Exception qw(raise_param_exc); use PVE::Exception qw(raise_param_exc);
use PVE::Network;
use PVE::Tools; use PVE::Tools;
use PVE::ProcFSTools; use PVE::ProcFSTools;
use Clone qw(clone); use Clone qw(clone);
@ -801,7 +802,7 @@ sub __read_etc_network_interfaces {
if ($proc_net_dev) { if ($proc_net_dev) {
while (defined ($line = <$proc_net_dev>)) { while (defined ($line = <$proc_net_dev>)) {
if ($line =~ m/^\s*(eth\d+|en[^:.]+|ib\d+):.*/) { if ($line =~ m/^\s*($PVE::Network::PHYSICAL_NIC_RE):.*/) {
$ifaces->{$1}->{exists} = 1; $ifaces->{$1}->{exists} = 1;
} }
} }
@ -974,7 +975,7 @@ sub __read_etc_network_interfaces {
$ifaces->{$1}->{exists} = 0; $ifaces->{$1}->{exists} = 0;
$d->{exists} = 0; $d->{exists} = 0;
} }
} elsif ($iface =~ m/^(?:eth\d+|en[^:.]+|ib\d+)$/) { } elsif ($iface =~ m/^$PVE::Network::PHYSICAL_NIC_RE$/) {
if (!$d->{ovs_type}) { if (!$d->{ovs_type}) {
$d->{type} = 'eth'; $d->{type} = 'eth';
} elsif ($d->{ovs_type} eq 'OVSPort') { } elsif ($d->{ovs_type} eq 'OVSPort') {
@ -1203,7 +1204,7 @@ sub __write_etc_network_interfaces {
$d->{type} eq 'OVSBond') { $d->{type} eq 'OVSBond') {
my $brname = $used_ports->{$iface}; my $brname = $used_ports->{$iface};
if (!$brname || !$ifaces->{$brname}) { if (!$brname || !$ifaces->{$brname}) {
if ($iface =~ /^(?:eth|en|ib)/) { if ($iface =~ /^$PVE::Network::PHYSICAL_NIC_RE/) {
$ifaces->{$iface} = { type => 'eth', $ifaces->{$iface} = { type => 'eth',
exists => 1, exists => 1,
method => 'manual', method => 'manual',
@ -1292,7 +1293,7 @@ NETWORKDOC
my $pri; my $pri;
if ($iface eq 'lo') { if ($iface eq 'lo') {
$pri = $if_type_hash->{loopback}; $pri = $if_type_hash->{loopback};
} elsif ($iface =~ m/^(?:eth\d+|ib\d+|en[^:.]+)$/) { } elsif ($iface =~ m/^$PVE::Network::PHYSICAL_NIC_RE$/) {
$pri = $if_type_hash->{eth} + $child; $pri = $if_type_hash->{eth} + $child;
} elsif ($iface =~ m/^bond\d+$/) { } elsif ($iface =~ m/^bond\d+$/) {
$pri = $if_type_hash->{bond} + $child; $pri = $if_type_hash->{bond} + $child;

2
src/PVE/Network.pm
View File

@ -14,6 +14,8 @@ use Net::IP;
# host network related utility functions # host network related utility functions
our $PHYSICAL_NIC_RE = qr/(?:eth\d+|en[^:.]+|ib\d+)/;
our $ipv4_reverse_mask = [ our $ipv4_reverse_mask = [
'0.0.0.0', '0.0.0.0',
'128.0.0.0', '128.0.0.0',