X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FTools.pm;h=577a8bc2a70c6e915e6f1c6ba6b74e64cc37d466;hp=0c6e532473d8d7f8939b37d6ae975618de4e32f3;hb=c38cea65b62fef814958346466a3892c0357de73;hpb=467752183d14a62e6412156eff8ec2f3554fb38e

diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
index 0c6e532..577a8bc 100644
--- a/src/PVE/Tools.pm
+++ b/src/PVE/Tools.pm
@@ -18,7 +18,7 @@ use Encode;
 use Digest::SHA;
 use Text::ParseWords;
 use String::ShellQuote;
-use Time::HiRes qw(usleep gettimeofday tv_interval);
+use Time::HiRes qw(usleep gettimeofday tv_interval alarm);
 
 # avoid warning when parsing long hex values with hex()
 no warnings 'portable'; # Support for 64-bit ints required
@@ -68,30 +68,31 @@ sub run_with_timeout {
 
     die "got timeout\n" if $timeout <= 0;
 
-    my $prev_alarm;
+    my $prev_alarm = alarm 0; # suspend outer alarm early
 
     my $sigcount = 0;
 
     my $res;
 
-    local $SIG{ALRM} = sub { $sigcount++; }; # catch alarm outside eval
-
     eval {
 	local $SIG{ALRM} = sub { $sigcount++; die "got timeout\n"; };
 	local $SIG{PIPE} = sub { $sigcount++; die "broken pipe\n" };
 	local $SIG{__DIE__};   # see SA bug 4631
 
-	$prev_alarm = alarm($timeout);
+	alarm($timeout);
 
-	$res = &$code(@param);
+	eval { $res = &$code(@param); };
 
 	alarm(0); # avoid race conditions
+
+	die $@ if $@;
     };
 
     my $err = $@;
 
-    alarm($prev_alarm) if defined($prev_alarm);
+    alarm $prev_alarm;
 
+    # this shouldn't happen anymore?
     die "unknown error" if $sigcount && !$err; # seems to happen sometimes
 
     die $err if $err;
@@ -248,7 +249,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 {
@@ -696,7 +697,8 @@ sub next_unused_port {
 					   LocalPort => $p,
 					   ReuseAddr => 1,
 					   Family    => $family,
-					   Proto     => 0);
+					   Proto     => 0,
+					   GetAddrInfoFlags => 0);
 
 	    if ($sock) {
 		close($sock);
@@ -987,6 +989,37 @@ sub dump_logfile {
     return ($count, $lines);
 }
 
+sub dump_journal {
+    my ($start, $limit, $filter) = @_;
+
+    my $lines = [];
+    my $count = 0;
+    
+    $start = 0 if !$start;
+    $limit = 50 if !$limit;
+
+    my $parser = sub {
+	my $line = shift;
+
+        return if $count++ < $start;
+	return if $limit <= 0;
+	push @$lines, { n => int($count), t => $line};
+	$limit--;
+    };
+
+    my $cmd = ['journalctl', '-o', 'short', '--no-pager'];
+    run_command($cmd, outfunc => $parser);
+
+    # HACK: ExtJS store.guaranteeRange() does not like empty array
+    # so we add a line
+    if (!$count) {
+	$count++;
+	push @$lines, { n => $count, t => "no content"};
+    }
+
+    return ($count, $lines);
+}
+
 sub dir_glob_regex {
     my ($dir, $regex) = @_;
 
@@ -1055,14 +1088,32 @@ sub unpack_sockaddr_in46 {
     return ($family, $port, $host);
 }
 
-sub get_host_address_family {
-    my ($hostname, $socktype) = @_;
+sub getaddrinfo_all {
+    my ($hostname, @opts) = @_;
     my %hints = ( flags => AI_V4MAPPED | AI_ALL,
-		  socktype => $socktype );
+                  @opts );
     my ($err, @res) = Socket::getaddrinfo($hostname, '0', \%hints);
-    die "failed to resolve $hostname: $err\n" if $err;
+    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};
+}
 
-    return ${res[0]}->{family};
+# Parses any sane kind of host, or host+port pair:
+# The port is always optional and thus may be undef.
+sub parse_host_and_port {
+    my ($address) = @_;
+    if ($address =~ /^($IPV4RE|[[:alnum:]\-.]+)(?::(\d+))?$/ ||             # ipv4 or host with optional ':port'
+        $address =~ /^\[($IPV6RE|$IPV4RE|[[:alnum:]\-.]+)\](?::(\d+))?$/ || # anything in brackets with optional ':port'
+        $address =~ /^($IPV6RE)(?:\.(\d+))?$/)                              # ipv6 with optional port separated by dot
+    {
+	return ($1, $2, 1); # end with 1 to support simple if(parse...) tests
+    }
+    return; # nothing
 }
 
 1;