From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 13 Jul 2015 04:18:36 +0000 (+0000)
Subject: scripts/lib/NTP/Util.pm: stratum output is version-dependent.  Harlan Stenn.
X-Git-Tag: NTP_4_3_59~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=384968a21e35f8919357cdcc7713be4eab22fb07;p=thirdparty%2Fntp.git

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

bk: 55a33c1csVQBKGlKXcSBfBCEbRjF5Q
---

diff --git a/ChangeLog b/ChangeLog
index a4be86b1c..e29250148 100644
--- 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 f37aeaa65..69d4df1c9 100644
--- 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);