X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FLib.pm;h=1e430cae0451d9bee8867f1e39987ed66669543e;hp=0b032822fca76bd550dce839c7822e0ffff3329c;hb=17dcbbebb871212f90b81bb97f8d1feb528bdc43;hpb=2a48c566d7648f26c5a81f24de23be5e0edb05b2 diff --git a/lib/BackupPC/Lib.pm b/lib/BackupPC/Lib.pm index 0b03282..1e430ca 100644 --- a/lib/BackupPC/Lib.pm +++ b/lib/BackupPC/Lib.pm @@ -711,10 +711,12 @@ sub CheckHostAlive if ( $bpc->{verbose} ); return -1; } - if ( $s =~ /time=([\d\.]+)\s*ms/i ) { + if ( $s =~ /rtt\s*min\/avg\/max\/mdev\s*=\s*[\d.]+\/([\d.]+)\/[\d.]+\/[\d.]+\s*(ms|usec)/i ) { + $ret = $1; + $ret /= 1000 if ( lc($2) eq "usec" ); + } elsif ( $s =~ /time=([\d.]+)\s*(ms|usec)/i ) { $ret = $1; - } elsif ( $s =~ /time=([\d\.]+)\s*usec/i ) { - $ret = $1/1000; + $ret /= 1000 if ( lc($2) eq "usec" ); } else { print(STDERR "CheckHostAlive: can't extract round-trip time" . " (not fatal)\n") if ( $bpc->{verbose} );