X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FNetwork.pm;h=293ebfa0b2666e25166e933c0a95139c088c9586;hp=b9d2d37527736f1e4613071a4d436da05a9c0f75;hb=b0b34ffd4eaf396cb6ca1c394dcb7ba66f81761d;hpb=32cb7d272f3a86f9e33c75f2096f6595505a831d diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm index b9d2d37..293ebfa 100644 --- a/src/PVE/Network.pm +++ b/src/PVE/Network.pm @@ -6,6 +6,10 @@ use PVE::Tools qw(run_command); use PVE::ProcFSTools; use PVE::INotify; use File::Basename; +use IO::Socket::IP; +use POSIX qw(ECONNREFUSED); + +use Net::IP; # host network related utility functions @@ -67,21 +71,12 @@ sub setup_tc_rate_limit { my ($iface, $rate, $burst, $debug) = @_; system("/sbin/tc class del dev $iface parent 1: classid 1:1 >/dev/null 2>&1"); - system("/sbin/tc filter del dev $iface parent ffff: protocol ip prio 50 estimator 1sec 8sec >/dev/null 2>&1"); + system("/sbin/tc filter del dev $iface parent ffff: protocol all pref 50 u32 >/dev/null 2>&1"); system("/sbin/tc qdisc del dev $iface ingress >/dev/null 2>&1"); system("/sbin/tc qdisc del dev $iface root >/dev/null 2>&1"); return if !$rate; - run_command("/sbin/tc qdisc add dev $iface handle ffff: ingress"); - - # this does not work wit virtio - don't know why (setting "mtu 64kb" does not help) - #run_command("/sbin/tc filter add dev $iface parent ffff: protocol ip prio 50 u32 match ip src 0.0.0.0/0 police rate ${rate}bps burst ${burst}b drop flowid :1"); - # so we use avrate instead - run_command("/sbin/tc filter add dev $iface parent ffff: " . - "protocol ip prio 50 estimator 1sec 8sec " . - "u32 match ip src 0.0.0.0/0 police avrate ${rate}bps drop flowid :1"); - # tbf does not work for unknown reason #$TC qdisc add dev $DEV root tbf rate $RATE latency 100ms burst $BURST # so we use htb instead @@ -89,6 +84,12 @@ sub setup_tc_rate_limit { run_command("/sbin/tc class add dev $iface parent 1: classid 1:1 " . "htb rate ${rate}bps burst ${burst}b"); + run_command("/sbin/tc qdisc add dev $iface handle ffff: ingress"); + run_command("/sbin/tc filter add dev $iface parent ffff: " . + "protocol all prio 50 u32 match u32 0 0 " . + "police rate ${rate}bps burst ${burst}b mtu 64kb " . + "drop flowid :1"); + if ($debug) { print "DEBUG tc settings\n"; system("/sbin/tc qdisc ls dev $iface"); @@ -160,7 +161,7 @@ my $cond_create_bridge = sub { }; my $bridge_add_interface = sub { - my ($bridge, $iface, $tag) = @_; + my ($bridge, $iface, $tag, $trunks) = @_; system("/sbin/brctl addif $bridge $iface") == 0 || die "can't add interface 'iface' to bridge '$bridge'\n"; @@ -173,16 +174,27 @@ my $bridge_add_interface = sub { die "unable to add vlan $tag to interface $iface\n"; } else { system("/sbin/bridge vlan add dev $iface vid 2-4094") == 0 || - die "unable to add vlan $tag to interface $iface\n"; + die "unable to add default vlan tags to interface $iface\n" 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"; + } } }; my $ovs_bridge_add_port = sub { - my ($bridge, $iface, $tag, $internal) = @_; + my ($bridge, $iface, $tag, $internal, $trunks) = @_; + + $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; + $cmd .= " -- set Interface $iface type=internal" if $internal; system($cmd) == 0 || die "can't add ovs port '$iface'\n"; @@ -237,7 +249,7 @@ sub veth_delete { } my $create_firewall_bridge_linux = sub { - my ($iface, $bridge, $tag) = @_; + my ($iface, $bridge, $tag, $trunks) = @_; my ($vmid, $devid) = &$parse_tap_device_name($iface); my ($fwbr, $vethfw, $vethfwpeer) = &$compute_fwbr_names($vmid, $devid); @@ -249,13 +261,13 @@ my $create_firewall_bridge_linux = sub { veth_create($vethfw, $vethfwpeer, $bridge); &$bridge_add_interface($fwbr, $vethfw); - &$bridge_add_interface($bridge, $vethfwpeer, $tag); + &$bridge_add_interface($bridge, $vethfwpeer, $tag, $trunks); &$bridge_add_interface($fwbr, $iface); }; my $create_firewall_bridge_ovs = sub { - my ($iface, $bridge, $tag) = @_; + my ($iface, $bridge, $tag, $trunks) = @_; my ($vmid, $devid) = &$parse_tap_device_name($iface); my ($fwbr, undef, undef, $ovsintport) = &$compute_fwbr_names($vmid, $devid); @@ -267,7 +279,7 @@ my $create_firewall_bridge_ovs = sub { &$bridge_add_interface($fwbr, $iface); - &$ovs_bridge_add_port($bridge, $ovsintport, $tag, 1); + &$ovs_bridge_add_port($bridge, $ovsintport, $tag, 1, $trunks); &$activate_interface($ovsintport); # set the same mtu for ovs int port @@ -299,7 +311,7 @@ my $cleanup_firewall_bridge = sub { }; sub tap_plug { - my ($iface, $bridge, $tag, $firewall) = @_; + my ($iface, $bridge, $tag, $firewall, $trunks) = @_; #cleanup old port config from any openvswitch bridge eval {run_command("/usr/bin/ovs-vsctl del-port $iface", outfunc => sub {}, errfunc => sub {}) }; @@ -310,6 +322,7 @@ sub tap_plug { my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering"); if (!$vlan_aware) { + die "vlan aware feature need to be enabled to use trunks" if $trunks; my $newbridge = activate_bridge_vlan($bridge, $tag); copy_bridge_config($bridge, $newbridge) if $bridge ne $newbridge; $bridge = $newbridge; @@ -317,18 +330,18 @@ sub tap_plug { } if ($firewall) { - &$create_firewall_bridge_linux($iface, $bridge, $tag); + &$create_firewall_bridge_linux($iface, $bridge, $tag, $trunks); } else { - &$bridge_add_interface($bridge, $iface, $tag); + &$bridge_add_interface($bridge, $iface, $tag, $trunks); } } else { &$cleanup_firewall_bridge($iface); # remove stale devices if ($firewall) { - &$create_firewall_bridge_ovs($iface, $bridge, $tag); + &$create_firewall_bridge_ovs($iface, $bridge, $tag, $trunks); } else { - &$ovs_bridge_add_port($bridge, $iface, $tag); + &$ovs_bridge_add_port($bridge, $iface, $tag, undef, $trunks); } } } @@ -414,7 +427,7 @@ sub activate_bridge_vlan { my @ifaces = (); my $dir = "/sys/class/net/$bridge/brif"; - PVE::Tools::dir_glob_foreach($dir, '((eth|bond)\d+)', sub { + PVE::Tools::dir_glob_foreach($dir, '((eth|bond)\d+(\.\d+)?)', sub { push @ifaces, $_[0]; }); @@ -440,4 +453,63 @@ sub activate_bridge_vlan { return $bridgevlan; } +sub tcp_ping { + my ($host, $port, $timeout) = @_; + + my $refused = 1; + + $timeout = 3 if !$timeout; # sane default + if (!$port) { + # Net::Ping defaults to the echo port + $port = 7; + } else { + # Net::Ping's port_number() implies service_check(1) + $refused = 0; + } + + my ($sock, $result); + eval { + $result = PVE::Tools::run_with_timeout($timeout, sub { + $sock = IO::Socket::IP->new(PeerHost => $host, PeerPort => $port, Type => SOCK_STREAM); + $result = $refused if $! == ECONNREFUSED; + }); + }; + if ($sock) { + $sock->close(); + $result = 1; + } + return $result; +} + +sub IP_from_cidr { + my ($cidr, $version) = @_; + + return if $cidr !~ m!^(\S+?)/(\S+)$!; + my ($ip, $prefix) = ($1, $2); + + my $ipobj = Net::IP->new($ip, $version); + return if !$ipobj; + + $version = $ipobj->version(); + + my $binmask = Net::IP::ip_get_mask($prefix, $version); + return if !$binmask; + + my $masked_binip = $ipobj->binip() & $binmask; + my $masked_ip = Net::IP::ip_bintoip($masked_binip, $version); + return Net::IP->new("$masked_ip/$prefix"); +} + +sub is_ip_in_cidr { + my ($ip, $cidr, $version) = @_; + + my $cidr_obj = IP_from_cidr($cidr, $version); + return undef if !$cidr_obj; + + 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; +} + 1;