remove + from getopt's prefix_pattern

[pve-common.git] / src / PVE / Network.pm

diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm
index e51099e1c99dfca05277ba1ec92e5497d9cf0ec6..60afe5040e9944e2529b54ba36fd984d16e04b64 100644 (file)
--- a/src/PVE/Network.pm
+++ b/src/PVE/Network.pm
@@ -6,6 +6,8 @@ use PVE::Tools qw(run_command);
 use PVE::ProcFSTools;
 use PVE::INotify;
 use File::Basename;
+use IO::Socket::IP;
+use POSIX qw(ECONNREFUSED);
 
 # host network related utility functions
 
@@ -67,21 +69,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 +82,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");
@@ -119,7 +118,7 @@ my $read_bridge_mtu = sub {
     return $mtu;
 };
 
-my $parse_tap_devive_name = sub {
+my $parse_tap_device_name = sub {
     my ($iface, $noerr) = @_;
 
     my ($vmid, $devid);
@@ -127,7 +126,7 @@ my $parse_tap_devive_name = sub {
     if ($iface =~ m/^tap(\d+)i(\d+)$/) {
        $vmid = $1;
        $devid = $2;
-    } elsif ($iface =~ m/^veth(\d+)\.(\d+)$/) {
+    } elsif ($iface =~ m/^veth(\d+)i(\d+)$/) {
        $vmid = $1;
        $devid = $2;
     } else {
@@ -160,10 +159,22 @@ my $cond_create_bridge = sub {
 };
 
 my $bridge_add_interface = sub {
-    my ($bridge, $iface) = @_;
+    my ($bridge, $iface, $tag) = @_;
 
     system("/sbin/brctl addif $bridge $iface") == 0 ||
        die "can't add interface 'iface' to bridge '$bridge'\n";
+
+   my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering");
+
+   if ($vlan_aware) {
+       if ($tag) {
+           system("/sbin/bridge vlan add dev $iface vid $tag pvid untagged") == 0 ||
+           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";
+       } 
+   }
 };
 
 my $ovs_bridge_add_port = sub {
@@ -225,9 +236,9 @@ sub veth_delete {
 }
 
 my $create_firewall_bridge_linux = sub {
-    my ($iface, $bridge) = @_;
+    my ($iface, $bridge, $tag) = @_;
 
-    my ($vmid, $devid) = &$parse_tap_devive_name($iface);
+    my ($vmid, $devid) = &$parse_tap_device_name($iface);
     my ($fwbr, $vethfw, $vethfwpeer) = &$compute_fwbr_names($vmid, $devid);
 
     &$cond_create_bridge($fwbr);
@@ -237,15 +248,15 @@ my $create_firewall_bridge_linux = sub {
     veth_create($vethfw, $vethfwpeer, $bridge);
 
     &$bridge_add_interface($fwbr, $vethfw);
-    &$bridge_add_interface($bridge, $vethfwpeer);
+    &$bridge_add_interface($bridge, $vethfwpeer, $tag);
 
-    return $fwbr;
+    &$bridge_add_interface($fwbr, $iface);
 };
 
 my $create_firewall_bridge_ovs = sub {
     my ($iface, $bridge, $tag) = @_;
 
-    my ($vmid, $devid) = &$parse_tap_devive_name($iface);
+    my ($vmid, $devid) = &$parse_tap_device_name($iface);
     my ($fwbr, undef, undef, $ovsintport) = &$compute_fwbr_names($vmid, $devid);
 
     my $bridgemtu = &$read_bridge_mtu($bridge);
@@ -267,7 +278,7 @@ my $create_firewall_bridge_ovs = sub {
 my $cleanup_firewall_bridge = sub {
     my ($iface) = @_;
 
-    my ($vmid, $devid) = &$parse_tap_devive_name($iface, 1);
+    my ($vmid, $devid) = &$parse_tap_device_name($iface, 1);
     return if !defined($vmid);  
     my ($fwbr, $vethfw, $vethfwpeer, $ovsintport) = &$compute_fwbr_names($vmid, $devid);
 
@@ -295,12 +306,21 @@ sub tap_plug {
     if (-d "/sys/class/net/$bridge/bridge") {
        &$cleanup_firewall_bridge($iface); # remove stale devices
 
-       my $newbridge = activate_bridge_vlan($bridge, $tag);
-       copy_bridge_config($bridge, $newbridge) if $bridge ne $newbridge;
+       my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering");
 
-       $newbridge = &$create_firewall_bridge_linux($iface, $newbridge) if $firewall;
+       if (!$vlan_aware) {
+           my $newbridge = activate_bridge_vlan($bridge, $tag);
+           copy_bridge_config($bridge, $newbridge) if $bridge ne $newbridge;
+           $bridge = $newbridge;
+           $tag = undef;
+       }
+
+       if ($firewall) {
+           &$create_firewall_bridge_linux($iface, $bridge, $tag);
+       } else {
+           &$bridge_add_interface($bridge, $iface, $tag);
+       }
 
-       &$bridge_add_interface($newbridge, $iface);
     } else {
        &$cleanup_firewall_bridge($iface); # remove stale devices
 
@@ -355,7 +375,7 @@ sub activate_bridge_vlan_slave {
        
     # create vlan on $iface is not already exist
     if (! -d "/sys/class/net/$ifacevlan") {
-       system("/sbin/vconfig add $iface $tag") == 0 ||
+       system("/sbin/ip link add link $iface name ${iface}.${tag} type vlan id $tag") == 0 ||
            die "can't add vlan tag $tag to interface $iface\n";
     }
 
@@ -419,4 +439,32 @@ 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;
+}
+
 1;