use Fcntl qw(:DEFAULT :flock);
use PVE::SafeSyslog;
use PVE::Exception qw(raise_param_exc);
+use PVE::Network;
use PVE::Tools;
use PVE::ProcFSTools;
-use Storable qw(dclone);
+use Clone qw(clone);
use Linux::Inotify2;
use base 'Exporter';
use JSON;
return read_file ($filename, $full);
}
+sub poll_changes {
+ my ($filename) = @_;
+
+ poll() if $inotify; # read new inotify events
+
+ $versions->{$filename} = 0 if !defined ($versions->{$filename});
+
+ return $versions->{$filename};
+}
+
sub read_file {
my ($fileid, $full) = @_;
my $fd;
my $shadow;
- poll() if $inotify; # read new inotify events
-
- $versions->{$filename} = 0 if !defined ($versions->{$filename});
-
- my $cver = $versions->{$filename};
+ my $cver = poll_changes($filename);
if (my $copy = $shadowfiles->{$filename}) {
if ($fd = IO::File->new ($copy, "r")) {
# file unchanged?
if (!$ccinfo->{nocache} &&
- $inotify && $versions->{$filename} &&
+ $inotify && $cver &&
defined ($ccinfo->{data}) &&
defined ($ccinfo->{version}) &&
($ccinfo->{readonce} ||
- ($ccinfo->{version} == $versions->{$filename}))) {
+ ($ccinfo->{version} == $cver))) {
my $ret;
if (!$noclone && ref ($ccinfo->{data})) {
- $ret->{data} = dclone ($ccinfo->{data});
+ $ret->{data} = clone ($ccinfo->{data});
} else {
$ret->{data} = $ccinfo->{data};
}
}
# we cache data with references, so we always need to
- # dclone this data. Else the original data may get
+ # clone this data. Else the original data may get
# modified.
$ccinfo->{data} = $res;
my $ret;
if (!$noclone && ref ($ccinfo->{data})) {
- $ret->{data} = dclone ($ccinfo->{data});
+ $ret->{data} = clone ($ccinfo->{data});
} else {
$ret->{data} = $ccinfo->{data};
}
if ($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} = 0;
$d->{exists} = 0;
}
- } elsif ($iface =~ m/^(?:eth\d+|en[^:.]+|ib\d+)$/) {
+ } elsif ($iface =~ m/^$PVE::Network::PHYSICAL_NIC_RE$/) {
if (!$d->{ovs_type}) {
$d->{type} = 'eth';
} elsif ($d->{ovs_type} eq 'OVSPort') {
# not printing out options
} elsif ($d->{type} eq 'bridge') {
- $d->{bridge_ports} =~ s/([;,\s])+/ /g;
+ $d->{bridge_ports} =~ s/[;,\s]+/ /g;
my $ports = $d->{bridge_ports} || 'none';
$raw .= "\tbridge_ports $ports\n";
$done->{bridge_ports} = 1;
} elsif ($d->{type} eq 'bond') {
- $d->{slaves} =~ s/([;,\s])+/ /g;
+ $d->{slaves} =~ s/[;,\s]+/ /g;
my $slaves = $d->{slaves} || 'none';
$raw .= "\tslaves $slaves\n";
$done->{slaves} = 1;
$d->{type} eq 'OVSBond') {
my $brname = $used_ports->{$iface};
if (!$brname || !$ifaces->{$brname}) {
- if ($iface =~ /^(?:eth|en|ib)/) {
+ if ($iface =~ /^$PVE::Network::PHYSICAL_NIC_RE/) {
$ifaces->{$iface} = { type => 'eth',
exists => 1,
method => 'manual',
my $pri;
if ($iface eq 'lo') {
$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;
} elsif ($iface =~ m/^bond\d+$/) {
$pri = $if_type_hash->{bond} + $child;