Fix next_unused_port already bin detection

[pve-common.git] / data / PVE / Tools.pm

diff --git a/data/PVE/Tools.pm b/data/PVE/Tools.pm
index 7448183455f5a1c2e23bdccfc9fdffa0adaa0872..b666e9b8e915e7e08c4edbdac63593e071ae5a00 100644 (file)
--- a/data/PVE/Tools.pm
+++ b/data/PVE/Tools.pm
@@ -19,6 +19,9 @@ use Text::ParseWords;
 use String::ShellQuote;
 use Time::HiRes qw(usleep gettimeofday tv_interval);
 
+# avoid warning when parsing long hex values with hex()
+no warnings 'portable'; # Support for 64-bit ints required
+
 our @EXPORT_OK = qw(
 $IPV6RE
 $IPV4RE
@@ -142,8 +145,7 @@ sub lock_file_full {
        $err = $@;
     }
 
-    if ($lock_handles->{$$}->{$filename}) {
-        my $fh = $lock_handles->{$$}->{$filename};
+    if (my $fh = $lock_handles->{$$}->{$filename}) {
         $lock_handles->{$$}->{$filename} = undef;
         close ($fh);
     }
@@ -690,7 +692,7 @@ sub next_unused_port {
            next if $ports->{$p}; # reserved
 
            my $sock = IO::Socket::INET->new(Listen => 5,
-                                            LocalAddr => 'localhost',
+                                            LocalAddr => '0.0.0.0',
                                             LocalPort => $p,
                                             ReuseAddr => 1,
                                             Proto     => 0);
@@ -932,7 +934,7 @@ sub split_args {
 }
 
 sub dump_logfile {
-    my ($filename, $start, $limit) = @_;
+    my ($filename, $start, $limit, $filter) = @_;
 
     my $lines = [];
     my $count = 0;
@@ -948,12 +950,25 @@ sub dump_logfile {
     $limit = 50 if !$limit;
 
     my $line;
-    while (defined($line = <$fh>)) {
-       next if $count++ < $start;
-       next if $limit <= 0;
-       chomp $line;
-       push @$lines, { n => $count, t => $line};
-       $limit--;
+
+    if ($filter) {
+       # duplicate code, so that we do not slow down normal path
+       while (defined($line = <$fh>)) {
+           next if $line !~ m/$filter/;
+           next if $count++ < $start;
+           next if $limit <= 0;
+           chomp $line;
+           push @$lines, { n => $count, t => $line};
+           $limit--;
+       }
+    } else {
+       while (defined($line = <$fh>)) {
+           next if $count++ < $start;
+           next if $limit <= 0;
+           chomp $line;
+           push @$lines, { n => $count, t => $line};
+           $limit--;
+       }
     }
 
     close($fh);
@@ -1002,8 +1017,30 @@ sub assert_if_modified {
     my ($digest1, $digest2) = @_;
 
     if ($digest1 && $digest2 && ($digest1 ne $digest2)) {
-       die "detected modified configuration - file change by other user? Try again.\n";
+       die "detected modified configuration - file changed by other user? Try again.\n";
     }
 }
 
+# Digest for short strings
+# like FNV32a, but we only return 31 bits (positive numbers)
+sub fnv31a {
+    my ($string) = @_;
+
+    my $hval = 0x811c9dc5;
+
+    foreach my $c (unpack('C*', $string)) {
+       $hval ^= $c;
+       $hval += (
+           (($hval << 1) ) +
+           (($hval << 4) ) +
+           (($hval << 7) ) +
+           (($hval << 8) ) +
+           (($hval << 24) ) );
+       $hval = $hval & 0xffffffff;
+    }
+    return $hval & 0x7fffffff;
+}
+
+sub fnv31a_hex { return sprintf("%X", fnv31a(@_)); }
+
 1;