fix a regex typo in run_command

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

diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
index 827ca58bcfec494e823b6d957599966f6b548ce7..8e18087ab788634307ae24f69b5b836e75b3a2c5 100644 (file)
--- a/src/PVE/Tools.pm
+++ b/src/PVE/Tools.pm
@@ -3,7 +3,8 @@ package PVE::Tools;
 use strict;
 use warnings;
 use POSIX qw(EINTR);
-use IO::Socket::INET;
+use IO::Socket::IP;
+use Socket qw(AF_INET AF_INET6 AI_ALL AI_V4MAPPED);
 use IO::Select;
 use File::Basename;
 use File::Path qw(make_path);
@@ -247,7 +248,7 @@ sub run_command {
 
     if (!ref($cmd)) {
        $cmdstr = $cmd;
-       if ($cmd =~ m/|/) {
+       if ($cmd =~ m/\|/) {
            # see 'man bash' for option pipefail
            $cmd = [ '/bin/bash', '-c', "set -o pipefail && $cmd" ];
        } else {
@@ -659,7 +660,7 @@ sub wait_for_vnc_port {
 }
 
 sub next_unused_port {
-    my ($range_start, $range_end) = @_;
+    my ($range_start, $range_end, $family) = @_;
 
     # We use a file to register allocated ports.
     # Those registrations expires after $expiretime.
@@ -691,11 +692,12 @@ sub next_unused_port {
        for (my $p = $range_start; $p < $range_end; $p++) {
            next if $ports->{$p}; # reserved
 
-           my $sock = IO::Socket::INET->new(Listen => 5,
-                                            LocalAddr => '0.0.0.0',
-                                            LocalPort => $p,
-                                            ReuseAddr => 1,
-                                            Proto     => 0);
+           my $sock = IO::Socket::IP->new(Listen => 5,
+                                          LocalPort => $p,
+                                          ReuseAddr => 1,
+                                          Family    => $family,
+                                          Proto     => 0,
+                                          GetAddrInfoFlags => 0);
 
            if ($sock) {
                close($sock);
@@ -724,15 +726,18 @@ sub next_unused_port {
 }
 
 sub next_migrate_port {
-    return next_unused_port(60000, 60050);
+    my ($family) = @_;
+    return next_unused_port(60000, 60050, $family);
 }
 
 sub next_vnc_port {
-    return next_unused_port(5900, 6000);
+    my ($family) = @_;
+    return next_unused_port(5900, 6000, $family);
 }
 
 sub next_spice_port {
-    return next_unused_port(61000, 61099);
+    my ($family) = @_;
+    return next_unused_port(61000, 61099, $family);
 }
 
 # NOTE: NFS syscall can't be interrupted, so alarm does 
@@ -1043,4 +1048,27 @@ sub fnv31a {
 
 sub fnv31a_hex { return sprintf("%X", fnv31a(@_)); }
 
+sub unpack_sockaddr_in46 {
+    my ($sin) = @_;
+    my $family = Socket::sockaddr_family($sin);
+    my ($port, $host) = ($family == AF_INET6 ? Socket::unpack_sockaddr_in6($sin)
+                                             : Socket::unpack_sockaddr_in($sin));
+    return ($family, $port, $host);
+}
+
+sub getaddrinfo_all {
+    my ($hostname, @opts) = @_;
+    my %hints = ( flags => AI_V4MAPPED | AI_ALL,
+                  @opts );
+    my ($err, @res) = Socket::getaddrinfo($hostname, '0', \%hints);
+    die "failed to get address info for: $hostname: $err\n" if $err;
+    return @res;
+}
+
+sub get_host_address_family {
+    my ($hostname, $socktype) = @_;
+    my @res = getaddrinfo_all($hostname, socktype => $socktype);
+    return $res[0]->{family};
+}
+
 1;