From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 19 Jan 2011 07:01:33 +0000 (-0500)
Subject: ACTS refclock cleanup from Dave Mills
X-Git-Tag: NTP_4_2_7P120~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d55b7cbc524bfb33a7653d40b83e421b6488f7c;p=thirdparty%2Fntp.git

ACTS refclock cleanup from Dave Mills

bk: 4d368c4dOLbhM9Y46lR0DW4YS33Pxg
---

diff --git a/ChangeLog b/ChangeLog
index f9d60de7b..f7dcfceb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* ACTS refclock cleanup from Dave Mills.
 * Documentation updates from Dave Mills.
 (4.2.7p119) 2011/01/18 Released by Harlan Stenn <stenn@ntp.org>
 * added timespecops.{c,h} and tievalops.{c.h} to libntp and include
diff --git a/ntpd/refclock_acts.c b/ntpd/refclock_acts.c
index 3080343ae..43f656240 100644
--- a/ntpd/refclock_acts.c
+++ b/ntpd/refclock_acts.c
@@ -154,8 +154,7 @@ extern int async_write(int, const void *, unsigned int);
  * Service identifiers (message length)
  */
 #define REFACTS		"NIST"	/* NIST reference ID */
-#define LENACTSA	50	/* NIST format A */
-#define LENACTSB	48	/* NIST format B */
+#define LENACTS		50	/* NIST format A */
 #define REFUSNO		"USNO"	/* USNO reference ID */
 #define LENUSNO		20	/* USNO */
 #define REFPTB		"PTB\0"	/* PTB/NPL reference ID */
@@ -770,7 +769,7 @@ acts_timecode(
 	 * ACTS format A: "jjjjj yy-mm-dd hh:mm:ss ds l uuu aaaaa
 	 * UTC(NIST) *".
 	 */
-	case LENACTSA:
+	case LENACTS:
 		if (sscanf(str,
 		    "%5ld %2d-%2d-%2d %2d:%2d:%2d %2d %1d %3lf %5lf %9s %c",
 		    &mjd, &pp->year, &month, &day, &pp->hour,
@@ -793,31 +792,6 @@ acts_timecode(
 			return;
 
 		break;
-	
-	/*
-	 * ACTS format B: "jjjjj yy-mm-dd hh:mm:ss ds l uuu aaaaa
-	 * UTC(NIST)".
-	 */
-	case LENACTSB:
-		if (sscanf(str,
-		    "%5ld %2d-%2d-%2d %2d:%2d:%2d %2d %1d %3lf %5lf %9s",
-		    &mjd, &pp->year, &month, &day, &pp->hour,
-		    &pp->minute, &pp->second, &dst, &leap, &dut1,
-		    &msADV, utc) != 12) {
-			refclock_report(peer, CEVNT_BADREPLY);
-			return;
-		}
-		pp->day = ymd2yd(pp->year, month, day);
-		pp->leap = LEAP_NOWARNING;
-		if (leap == 1)
-			pp->leap = LEAP_ADDSECOND;
-		else if (leap == 2)
-			pp->leap = LEAP_DELSECOND;
-		memcpy(&pp->refid, REFACTS, 4);
-		if (up->msgcnt == 0)
-			record_clock_stats(&peer->srcadr, str);
-		up->msgcnt++;
-		break;
 
 	/*
 	 * USNO format: "jjjjj nnn hhmmss UTC"