setup_tc_rate_limit($iface, $rate, $burst);
}
-my $read_bridge_mtu = sub {
+sub read_bridge_mtu {
my ($bridge) = @_;
my $mtu = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/mtu");
my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering");
if ($vlan_aware) {
- if ($tag) {
- system({'/sbin/bridge'} 'bridge', 'vlan', 'del', 'dev', $iface, 'vid', '1-4094') == 0
- or die "failed to remove default vlan tags of $iface\n";
- system({'/sbin/bridge'} 'bridge', 'vlan', 'add', 'dev', $iface, 'vid', $tag, 'pvid', 'untagged') == 0
- or die "unable to add vlan $tag to interface $iface\n";
- warn "Caution: Setting VLAN ID 1 on a VLAN aware bridge may be dangerous\n" if $tag == 1;
- } 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) {
- system("/sbin/bridge vlan add dev $iface vid $trunk") == 0 ||
- die "unable to add vlan $trunk to interface $iface\n";
- }
- }
+ eval { run_command(['/sbin/bridge', 'vlan', 'del', 'dev', $iface, 'vid', '1-4094']) };
+ die "failed to remove default vlan tags of $iface - $@\n" if $@;
+
+ if ($trunks) {
+ my @trunks_array = split /;/, $trunks;
+ foreach my $trunk (@trunks_array) {
+ eval { run_command(['/sbin/bridge', 'vlan', 'add', 'dev', $iface, 'vid', $trunk]) };
+ die "unable to add vlan $trunk to interface $iface - $@\n" if $@;
+ }
+ } elsif (!$tag) {
+ eval { run_command(['/sbin/bridge', 'vlan', 'add', 'dev', $iface, 'vid', '2-4094']) };
+ die "unable to add default vlan tags to interface $iface - $@\n" if $@;
+ }
+
+ $tag = 1 if !$tag;
+ eval { run_command(['/sbin/bridge', 'vlan', 'add', 'dev', $iface, 'vid', $tag, 'pvid', 'untagged']) };
+ die "unable to add vlan $tag to interface $iface - $@\n" if $@;
}
};
$trunks =~ s/;/,/g if $trunks;
- my $cmd = "/usr/bin/ovs-vsctl add-port $bridge $iface";
- $cmd .= " tag=$tag" if $tag;
- $cmd .= " trunks=". join(',', $trunks) if $trunks;
- $cmd .= " vlan_mode=native-untagged" if $tag && $trunks;
+ my $cmd = ['/usr/bin/ovs-vsctl'];
+ # first command
+ push @$cmd, '--', 'add-port', $bridge, $iface;
+ push @$cmd, "tag=$tag" if $tag;
+ push @$cmd, "trunks=". join(',', $trunks) if $trunks;
+ push @$cmd, "vlan_mode=native-untagged" if $tag && $trunks;
+
+ if ($internal) {
+ # second command
+ push @$cmd, '--', 'set', 'Interface', $iface, 'type=internal';
+ }
+
+ eval { run_command($cmd) };
+ die "can't add ovs port '$iface' - $@\n" if $@;
- $cmd .= " -- set Interface $iface type=internal" if $internal;
- system($cmd) == 0 ||
- die "can't add ovs port '$iface'\n";
disable_ipv6($iface);
};
my $activate_interface = sub {
my ($iface) = @_;
- system("/sbin/ip link set $iface up") == 0 ||
- die "can't activate interface '$iface'\n";
+ eval { run_command(['/sbin/ip', 'link', 'set', $iface, 'up']) };
+ die "can't activate interface '$iface' - $@\n" if $@;
};
sub tap_create {
die "unable to get bridge setting\n" if !$bridge;
- my $bridgemtu = &$read_bridge_mtu($bridge);
+ my $bridgemtu = read_bridge_mtu($bridge);
eval {
disable_ipv6($iface);
die "unable to get bridge setting\n" if !$bridge;
- my $bridgemtu = &$read_bridge_mtu($bridge);
+ my $bridgemtu = read_bridge_mtu($bridge);
# create veth pair
if (! -d "/sys/class/net/$veth") {
- 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 $cmd = ['/sbin/ip', 'link', 'add'];
+ # veth device + MTU
+ push @$cmd, 'name', $veth;
+ push @$cmd, 'mtu', $bridgemtu;
+ push @$cmd, 'type', 'veth';
+ # peer device + MTU
+ push @$cmd, 'peer', 'name', $vethpeer, 'mtu', $bridgemtu;
+
+ push @$cmd, 'addr', $mac if $mac;
+
+ eval { run_command($cmd) };
+ die "can't create interface $veth - $@\n" if $@;
}
# up vethpair
my ($vmid, $devid) = &$parse_tap_device_name($iface);
my ($fwbr, undef, undef, $ovsintport) = &$compute_fwbr_names($vmid, $devid);
- my $bridgemtu = &$read_bridge_mtu($bridge);
+ my $bridgemtu = read_bridge_mtu($bridge);
&$cond_create_bridge($fwbr);
&$activate_interface($fwbr);
# 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 ||
- die "can't add vlan tag $tag to interface $iface\n";
+ eval {
+ my $cmd = ['/sbin/ip', 'link', 'add'];
+ push @$cmd, 'link', $iface;
+ push @$cmd, 'name', $ifacevlan;
+ push @$cmd, 'type', 'vlan', 'id', $tag;
+ run_command($cmd);
+ };
+ die "can't add vlan tag $tag to interface $iface - $@\n" if $@;
# remove ipv6 link-local address before activation
disable_ipv6($ifacevlan);
my $ip_obj = Net::IP->new($ip, $version);
return undef if !$ip_obj;
- return $cidr_obj->overlaps($ip_obj) == $Net::IP::IP_B_IN_A_OVERLAP;
+ my $overlap = $cidr_obj->overlaps($ip_obj);
+
+ return $overlap == $Net::IP::IP_B_IN_A_OVERLAP || $overlap == $Net::IP::IP_IDENTICAL;
}
sub get_local_ip_from_cidr {
my ($cidr) = @_;
- my $IPs = [];
+ my $IPs = {};
+ my $i = 1;
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;
+ $IPs->{$1} = $i++ if !exists($IPs->{$1});
}
});
- return $IPs;
+ return [ sort { $IPs->{$a} <=> $IPs->{$b} } keys %{$IPs} ];
}
sub addr_to_ip {