use strict;
use warnings;
-use PVE::Tools qw(run_command lock_file);
-use PVE::ProcFSTools;
+
use PVE::INotify;
+use PVE::ProcFSTools;
+use PVE::Tools qw(run_command lock_file);
+
use File::Basename;
use IO::Socket::IP;
-use Socket qw(NI_NUMERICHOST NI_NUMERICSERV);
-use POSIX qw(ECONNREFUSED);
-
use Net::IP;
+use POSIX qw(ECONNREFUSED);
+use Socket qw(NI_NUMERICHOST NI_NUMERICSERV);
# host network related utility functions
+our $PHYSICAL_NIC_RE = qr/(?:eth\d+|en[^:.]+|ib\d+)/;
+
our $ipv4_reverse_mask = [
'0.0.0.0',
'128.0.0.0',
run_command("/sbin/tc filter add dev $iface parent ffff: " .
"prio 50 basic " .
"police rate ${rate}bps burst ${burst}b mtu 64kb " .
- "drop flowid :1");
+ "drop");
if ($debug) {
print "DEBUG tc settings\n";
return ($fwbr, $vethfw, $vethfwpeer, $ovsintport);
};
+sub iface_delete($) {
+ my ($iface) = @_;
+ run_command(['/sbin/ip', 'link', 'delete', 'dev', $iface], noerr => 1)
+ == 0 or die "failed to delete interface '$iface'\n";
+}
+
+sub iface_create($$@) {
+ my ($iface, $type, @args) = @_;
+ run_command(['/sbin/ip', 'link', 'add', $iface, 'type', $type, @args], noerr => 1)
+ == 0 or die "failed to create interface '$iface'\n";
+}
+
+sub iface_set($@) {
+ my ($iface, @opts) = @_;
+ run_command(['/sbin/ip', 'link', 'set', $iface, @opts], noerr => 1)
+ == 0 or die "failed to set interface options for '$iface' (".join(' ', @opts).")\n";
+}
+
+# helper for nicer error messages:
+sub iface_set_master($$) {
+ my ($iface, $master) = @_;
+ if (defined($master)) {
+ eval { iface_set($iface, 'master', $master) };
+ die "can't enslave '$iface' to '$master'\n" if $@;
+ } else {
+ eval { iface_set($iface, 'nomaster') };
+ die "can't unenslave '$iface'\n" if $@;
+ }
+}
+
my $cond_create_bridge = sub {
my ($bridge) = @_;
if (! -d "/sys/class/net/$bridge") {
- system("/sbin/brctl addbr $bridge") == 0 ||
- die "can't add bridge '$bridge'\n";
+ iface_create($bridge, 'bridge');
disable_ipv6($bridge);
}
};
# drop link local address (it can't be used when on a bridge anyway)
disable_ipv6($iface);
- system("/sbin/brctl addif $bridge $iface") == 0 ||
- die "can't add interface 'iface' to bridge '$bridge'\n";
+ iface_set_master($iface, $bridge);
my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering");
} else {
system("/sbin/bridge vlan add dev $iface vid 2-4094") == 0 ||
die "unable to add default vlan tags to interface $iface\n" if !$trunks;
- }
+ }
if ($trunks) {
my @trunks_array = split /;/, $trunks;
- foreach my $trunk (@trunks_array) {
+ foreach my $trunk (@trunks_array) {
system("/sbin/bridge vlan add dev $iface vid $trunk") == 0 ||
die "unable to add vlan $trunk to interface $iface\n";
}
my $bridgemtu = &$read_bridge_mtu($bridge);
- eval {
+ eval {
disable_ipv6($iface);
PVE::Tools::run_command(['/sbin/ip', 'link', 'set', $iface, 'up', 'promisc', 'on', 'mtu', $bridgemtu]);
};
# create veth pair
if (! -d "/sys/class/net/$veth") {
- my $cmd = "/sbin/ip link add name $veth type veth peer name $vethpeer mtu $bridgemtu";
+ my $cmd = "/sbin/ip link add name $veth mtu $bridgemtu type veth peer name $vethpeer mtu $bridgemtu";
$cmd .= " addr $mac" if $mac;
system($cmd) == 0 || die "can't create interface $veth\n";
}
my ($veth) = @_;
if (-d "/sys/class/net/$veth") {
- run_command("/sbin/ip link delete dev $veth", outfunc => sub {}, errfunc => sub {});
+ iface_delete($veth);
}
eval { tap_unplug($veth) };
}
# set the same mtu for ovs int port
PVE::Tools::run_command(['/sbin/ip', 'link', 'set', $ovsintport, 'mtu', $bridgemtu]);
-
+
&$bridge_add_interface($fwbr, $ovsintport);
};
my ($iface) = @_;
my ($vmid, $devid) = &$parse_tap_device_name($iface, 1);
- return if !defined($vmid);
+ return if !defined($vmid);
my ($fwbr, $vethfw, $vethfwpeer, $ovsintport) = &$compute_fwbr_names($vmid, $devid);
# cleanup old port config from any openvswitch bridge
# cleanup fwbr bridge
if (-d "/sys/class/net/$fwbr") {
- run_command("/sbin/ip link set dev $fwbr down", outfunc => sub {}, errfunc => sub {});
- run_command("/sbin/brctl delbr $fwbr", outfunc => sub {}, errfunc => sub {});
+ iface_delete($fwbr);
}
};
#avoid insecure dependency;
($bridge) = $bridge =~ /(\S+)/;
- system("/sbin/brctl delif $bridge $iface") == 0 ||
- die "can't del interface '$iface' from bridge '$bridge'\n";
-
+ iface_set_master($iface, undef);
}
-
+
&$cleanup_firewall_bridge($iface);
#cleanup old port config from any openvswitch bridge
eval {run_command("/usr/bin/ovs-vsctl del-port $iface", outfunc => sub {}, errfunc => sub {}) };
return if $br0 eq $br1;
- my $br_configs = [ 'ageing_time', 'stp_state', 'priority', 'forward_delay',
+ my $br_configs = [ 'ageing_time', 'stp_state', 'priority', 'forward_delay',
'hello_time', 'max_age', 'multicast_snooping', 'multicast_querier'];
foreach my $sysname (@$br_configs) {
sub activate_bridge_vlan_slave {
my ($bridgevlan, $iface, $tag) = @_;
my $ifacevlan = "${iface}.$tag";
-
+
# create vlan on $iface is not already exist
if (! -d "/sys/class/net/$ifacevlan") {
system("/sbin/ip link add link $iface name $ifacevlan type vlan id $tag") == 0 ||
lock_network(sub {
# add bridgevlan if it doesn't already exist
if (! -d "/sys/class/net/$bridgevlan") {
- system("/sbin/brctl addbr $bridgevlan") == 0 ||
- die "can't add bridge $bridgevlan\n";
+ iface_create($bridgevlan, 'bridge');
}
# for each physical interface (eth or bridge) bind them to bridge vlan
sub get_local_ip_from_cidr {
my ($cidr) = @_;
- my $cmd = ['/sbin/ip', 'address', 'show', 'to', $cidr, 'up'];
-
my $IPs = [];
-
- my $code = sub {
- my $line = shift;
-
- if ($line =~ m!^\s*inet(?:6)?\s+($PVE::Tools::IPRE)/\d+!) {
+ run_command(['/sbin/ip', 'address', 'show', 'to', $cidr, 'up'], outfunc => sub {
+ if ($_[0] =~ m!^\s*inet(?:6)?\s+($PVE::Tools::IPRE)(?:/\d+|\s+peer\s+)!) {
push @$IPs, $1;
}
- };
-
- PVE::Tools::run_command($cmd, outfunc => $code);
+ });
return $IPs;
}
sub get_ip_from_hostname {
my ($hostname, $noerr) = @_;
- my ($family, $ip);
-
- eval {
- my @res = PVE::Tools::getaddrinfo_all($hostname);
- $family = $res[0]->{family};
- $ip = addr_to_ip($res[0]->{addr})
- };
+ my @res = eval { PVE::Tools::getaddrinfo_all($hostname) };
if ($@) {
die "hostname lookup '$hostname' failed - $@" if !$noerr;
return undef;
}
- if ($ip =~ m/^127\.|^::1$/) {
+ my ($ip, $family);
+ for my $ai (@res) {
+ $family = $ai->{family};
+ my $tmpip = addr_to_ip($ai->{addr});
+ if ($tmpip !~ m/^127\.|^::1$/) {
+ $ip = $tmpip;
+ last;
+ }
+ }
+ if (!defined($ip) ) {
die "hostname lookup '$hostname' failed - got local IP address '$ip'\n" if !$noerr;
return undef;
}
projects / pve-common.git / blobdiff