net: remove flowid in traffic limit commands

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

diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm
index c8bd8abeec1bb4c3c34a2b5496b38b617e8a37bf..de8b2897d6c340d4f33c6d46c008667282da956d 100644 (file)
--- a/src/PVE/Network.pm
+++ b/src/PVE/Network.pm
@@ -7,12 +7,15 @@ use PVE::ProcFSTools;
 use PVE::INotify;
 use File::Basename;
 use IO::Socket::IP;
+use Socket qw(NI_NUMERICHOST NI_NUMERICSERV);
 use POSIX qw(ECONNREFUSED);
 
 use Net::IP;
 
 # 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',
@@ -99,7 +102,7 @@ sub setup_tc_rate_limit {
     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";
@@ -575,6 +578,37 @@ sub get_local_ip_from_cidr {
     return $IPs;
 }
 
+sub addr_to_ip {
+    my ($addr) = @_;
+    my ($err, $host, $port) = Socket::getnameinfo($addr, NI_NUMERICHOST | NI_NUMERICSERV);
+    die "failed to get numerical host address: $err\n" if $err;
+    return ($host, $port) if wantarray;
+    return $host;
+}
+
+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})
+    };
+    if ($@) {
+       die "hostname lookup '$hostname' failed - $@" if !$noerr;
+       return undef;
+    }
+
+    if ($ip =~ m/^127\.|^::1$/) {
+       die "hostname lookup '$hostname' failed - got local IP address '$ip'\n" if !$noerr;
+       return undef;
+    }
+
+    return wantarray ? ($ip, $family) : $ip;
+}
+
 sub lock_network {
     my ($code, @param) = @_;
     my $res = lock_file('/var/lock/pve-network.lck', 10, $code, @param);