X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FTools.pm;h=3080b3ebebc047daec9d3c98fee5503fe197b84c;hp=da7da5d36146a51a5d95276faaa822284ecaf91d;hb=f2c72fc3ba35b0ff951914bef6ca2c54dd7b52de;hpb=a0ecb15991e5faf6aeaa221a7502d60f9eb45d51

diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
index da7da5d..3080b3e 100644
--- a/src/PVE/Tools.pm
+++ b/src/PVE/Tools.pm
@@ -20,6 +20,7 @@ use base 'Exporter';
 use URI::Escape;
 use Encode;
 use Digest::SHA;
+use JSON;
 use Text::ParseWords;
 use String::ShellQuote;
 use Time::HiRes qw(usleep gettimeofday tv_interval alarm);
@@ -580,6 +581,64 @@ sub run_command {
     return $exitcode;
 }
 
+# Run a command with a tcp socket as standard input.
+sub pipe_socket_to_command  {
+    my ($cmd, $ip, $port) = @_;
+
+    my $params = {
+	Listen => 1,
+	ReuseAddr => 1,
+	Proto => &Socket::IPPROTO_TCP,
+	GetAddrInfoFlags => 0,
+	LocalAddr => $ip,
+	LocalPort => $port,
+    };
+    my $socket = IO::Socket::IP->new(%$params) or die "failed to open socket: $!\n";
+
+    print "$ip\n$port\n"; # tell remote where to connect
+    *STDOUT->flush();
+
+    alarm 0;
+    local $SIG{ALRM} = sub { die "timed out waiting for client\n" };
+    alarm 30;
+    my $client = $socket->accept; # Wait for a client
+    alarm 0;
+    close($socket);
+
+    # We want that the command talks over the TCP socket and takes
+    # ownership of it, so that when it closes it the connection is
+    # terminated, so we need to be able to close the socket. So we
+    # can't really use PVE::Tools::run_command().
+    my $pid = fork() // die "fork failed: $!\n";
+    if (!$pid) {
+	POSIX::dup2(fileno($client), 0);
+	POSIX::dup2(fileno($client), 1);
+	close($client);
+	exec {$cmd->[0]} @$cmd or do {
+	    warn "exec failed: $!\n";
+	    POSIX::_exit(1);
+	};
+    }
+
+    close($client);
+    if (waitpid($pid, 0) != $pid) {
+	kill(15 => $pid); # if we got interrupted terminate the child
+	my $count = 0;
+	while (waitpid($pid, POSIX::WNOHANG) != $pid) {
+	    usleep(100000);
+	    $count++;
+	    kill(9 => $pid), last if $count > 300; # 30 second timeout
+	}
+    }
+    if (my $sig = ($? & 127)) {
+	die "got signal $sig\n";
+    } elsif (my $exitcode = ($? >> 8)) {
+	die "exit code $exitcode\n";
+    }
+
+    return undef;
+}
+
 sub split_list {
     my $listtxt = shift || '';
 
@@ -739,18 +798,16 @@ sub wait_for_vnc_port {
     my $starttime = [gettimeofday];
     my $elapsed;
 
+    my $found;
     while (($elapsed = tv_interval($starttime)) < $timeout) {
-	if (my $fh = IO::File->new ("/proc/net/tcp", "r")) {
-	    while (defined (my $line = <$fh>)) {
-		if ($line =~ m/^\s*\d+:\s+([0-9A-Fa-f]{8}):([0-9A-Fa-f]{4})\s/) {
-		    if ($port == hex($2)) {
-			close($fh);
-			return 1;
-		    }
-		}
+	# -Htln = don't print header, tcp, listening sockets only, numeric ports
+	run_command(['/bin/ss', '-Htln', "sport = :$port"], outfunc => sub {
+	    my $line = shift;
+	    if ($line =~ m/^LISTEN\s+\d+\s+\d+\s+\S+:(\d+)\s/) {
+		$found = 1 if ($port == $1);
 	    }
-	    close($fh);
-	}
+	});
+	return 1 if $found;
 	$sleeptime += 100000 if  $sleeptime < 1000000;
 	usleep($sleeptime);
     }
@@ -841,6 +898,67 @@ sub next_spice_port {
     return next_unused_port(61000, 61099, $family, $address);
 }
 
+# sigkill after $timeout  a $sub running in a fork if it can't write a pipe
+# the $sub has to return a single scalar
+sub run_fork_with_timeout {
+    my ($timeout, $sub) = @_;
+
+    my $res;
+    my $error;
+    my $pipe_out = IO::Pipe->new();
+
+    # disable pending alarms, save their remaining time
+    my $prev_alarm = alarm 0;
+
+    # avoid leaving a zombie if the parent gets interrupted
+    my $sig_received;
+    local $SIG{INT} = sub { $sig_received++; };
+
+    my $child = fork();
+    if (!defined($child)) {
+	die "fork failed: $!\n";
+	return $res;
+    }
+
+    if (!$child) {
+	$pipe_out->writer();
+
+	eval {
+	    $res = $sub->();
+	    print {$pipe_out} encode_json({ result => $res });
+	    $pipe_out->flush();
+	};
+	if (my $err = $@) {
+	    print {$pipe_out} encode_json({ error => $err });
+	    $pipe_out->flush();
+	    POSIX::_exit(1);
+	}
+	POSIX::_exit(0);
+    }
+
+    $pipe_out->reader();
+
+    my $readvalues = sub {
+	local $/ = undef;
+	my $child_res = decode_json(scalar<$pipe_out>);
+	$res = $child_res->{result};
+	$error = $child_res->{error};
+    };
+    eval {
+	run_with_timeout($timeout, $readvalues);
+    };
+    warn $@ if $@;
+    $pipe_out->close();
+    kill('KILL', $child);
+    waitpid($child, 0);
+
+    alarm $prev_alarm;
+    die "interrupted by unexpected signal\n" if $sig_received;
+
+    die $error if $error;
+    return $res;
+}
+
 # NOTE: NFS syscall can't be interrupted, so alarm does
 # not work to provide timeouts.
 # from 'man nfs': "Only SIGKILL can interrupt a pending NFS operation"
@@ -1497,4 +1615,37 @@ sub encrypt_pw {
     return crypt(encode("utf8", $pw), "\$5\$$salt\$");
 }
 
+# intended usage: convert_size($val, "kb" => "gb")
+# on reduction (converting to a bigger unit) we round up by default if
+# information got lost. E.g. `convert_size(1023, "b" => "kb")` returns 1
+# use $no_round_up to switch this off, above example would then return 0
+sub convert_size {
+    my ($value, $from, $to, $no_round_up) = @_;
+
+    my $units = {
+	b  => 0,
+	kb => 1,
+	mb => 2,
+	gb => 3,
+	tb => 4,
+	pb => 5,
+    };
+
+    $from = lc($from); $to = lc($to);
+    die "unknown 'from' and/or 'to' units ($from => $to)"
+	if !(defined($units->{$from}) && defined($units->{$to}));
+
+    my $shift_amount = $units->{$from} - $units->{$to};
+
+    if ($shift_amount > 0) {
+	$value <<= ($shift_amount * 10);
+    } elsif ($shift_amount < 0) {
+	my $remainder = ($value & (1 << abs($shift_amount)*10) - 1);
+	$value >>= abs($shift_amount) * 10;
+	$value++ if $remainder && !$no_round_up;
+    }
+
+    return $value;
+}
+
 1;