From: root <jan.kratochvil@redhat.com>
Date: Tue, 25 Feb 2020 09:32:39 +0000 (+0100)
Subject: bin/checkhello: update
X-Git-Url: http://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=6bc94817fca0043c8b7467ca70bc4e9abdfff6a9

bin/checkhello: update
---

diff --git a/bin/checkhello b/bin/checkhello
index c6eba95..1998e19 100755
--- a/bin/checkhello
+++ b/bin/checkhello
@@ -3,21 +3,25 @@ use strict;
 use warnings;
 use IO::Socket::INET6;
 use Time::HiRes qw(sleep);
+use POSIX;
 @ARGV==5 or die "$0 <hostname> <port> <string> <timeout> <tries>";
 my($hostname,$port,$string,$timeout,$tries)=@ARGV;
-for our $try (1..$tries) {
-  sub ts() {
-    return localtime()." PID=$$ #$try: ";
-  }
+our $try;
+sub ts() {
+  return localtime()." PID=$$ #$try: ";
+}
+for $try (1..$tries) {
   warn ts()."connect($hostname,$port)...\n";
   my $sock=IO::Socket::INET6->new(
       "Proto"   =>"tcp",
       "PeerAddr"=>$hostname,
       "PeerPort"=>$port,
+      "Timeout"=>$timeout,
   );
   if (!$sock) {
-    warn ts()."connect($hostname,$port)=$!";
-    sleep $timeout;
+    my $e=$!+0;
+    warn ts()."connect($hostname,$port)=$e=$!";
+    sleep $timeout if $e!=ETIMEDOUT;
     next;
   }
   warn ts()."connect($hostname,$port): done.\n";
@@ -63,5 +67,6 @@ for our $try (1..$tries) {
   warn ts()."buf=<$buf>, sleep $remains";
   sleep $remains or warn ts()."sleep=$!";
 }
+$try=$tries;
 warn ts()."FAIL\n";
 print "FAIL\n";