scripts/lib/NTP/Util.pm: stratum output is version-dependent. Harlan Stenn.

bk: 55a33c1csVQBKGlKXcSBfBCEbRjF5Q

diff --git a/ChangeLog b/ChangeLog
index a4be86b1c319095b51df8446b457d1d68dc7e6dd..e292501485884eb94c4aa6289f7e2b1873c5e6be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@
 * Don't build sntp/libevent/sample/.  Harlan Stenn.
 * tests/libntp/test_caltontp needs -lpthread.  Harlan Stenn.
 * br-flock: --enable-local-libevent.  Harlan Stenn.
+* scripts/lib/NTP/Util.pm: stratum output is version-dependent.  Harlan Stenn.
 ---
 (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/scripts/lib/NTP/Util.pm b/scripts/lib/NTP/Util.pm
index f37aeaa6544605be41b29ccb1a8587857f7e7c7d..69d4df1c93ae1ccf2fb6dda390b156e3efbb9bd2 100644 (file)
--- a/scripts/lib/NTP/Util.pm
+++ b/scripts/lib/NTP/Util.pm
@@ -139,7 +139,14 @@ sub ntp_sntp_line {
         my @output = split / /;
 
         $offset = $output[3];
-        ($stratum = $output[7]) =~ s/s(\d{1,2})/$1/;
+       if (0) {
+       } elsif ($output[7] =~ /s(\d{1,2})/) {
+               $stratum = $1;
+               # warn "Found stratum at #7\n";
+       } elsif ($output[8] =~ /s(\d{1,2})/) {
+               $stratum = $1;
+               # warn "Found stratum at #8\n";
+       }
     }
     close $fh or croak "running sntp failed: $! (exit status $?)";
     return ($offset, $stratum);