[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at whimsy.udel.edu
Sun Aug 10 07:13:38 UTC 2008


#### ChangeSet ####
2008-08-10 03:11:51-04:00, stenn at whimsy.udel.edu 
  [Bug 861] leap info was not being transmitted

==== ChangeLog ====
2008-08-10 03:09:08-04:00, stenn at whimsy.udel.edu +1 -0
  [Bug 861] leap info was not being transmitted

--- 1.204/ChangeLog	2008-08-09 20:56:23 -04:00
+++ 1.205/ChangeLog	2008-08-10 03:09:08 -04:00
@@ -1,3 +1,4 @@
+* [Bug 861] leap info was not being transmitted.
 * [Bug 1046] refnumtoa.c is using the wrong header file.
 * [Bug 1047] enable/disable options processing fix.
 * header file cleanup.

==== ntpd/ntp_crypto.c ====
2008-08-10 03:09:17-04:00, stenn at whimsy.udel.edu +2 -2
  [Bug 861] leap info was not being transmitted

--- 1.122/ntpd/ntp_crypto.c	2008-05-13 05:13:27 -04:00
+++ 1.123/ntpd/ntp_crypto.c	2008-08-10 03:09:17 -04:00
@@ -572,7 +572,7 @@ crypto_recv(
 				fstamp |= CRYPTO_FLAG_COOK;
 			else if (hismode == MODE_SERVER)
 				fstamp |= CRYPTO_FLAG_AUTO;
-			if (!(fstamp & CRYPTO_FLAG_LEAP))
+			if (!(fstamp & CRYPTO_FLAG_TAI))
 				fstamp |= CRYPTO_FLAG_LEAP;
 			RAND_bytes((u_char *)&peer->hcookie, 4);
 			peer->crypto = fstamp;
@@ -1844,7 +1844,7 @@ crypto_update(void)
 	if (EVP_SignFinal(&ctx, tai_leap.sig, &len, sign_pkey))
 		tai_leap.siglen = htonl(len);
 	if (leap_sec > 0)
-		crypto_flags |= CRYPTO_FLAG_LEAP;
+		crypto_flags |= CRYPTO_FLAG_TAI;
 	snprintf(statstr, NTP_MAXSTRLEN, "signature update ts %u",
 	    ntohl(hostval.tstamp)); 
 	record_crypto_stats(NULL, statstr);

==== ntpd/ntp_timer.c ====
2008-08-10 03:09:22-04:00, stenn at whimsy.udel.edu +1 -1
  [Bug 861] leap info was not being transmitted

--- 1.47/ntpd/ntp_timer.c	2008-05-13 05:13:44 -04:00
+++ 1.48/ntpd/ntp_timer.c	2008-08-10 03:09:22 -04:00
@@ -349,7 +349,7 @@ timer(void)
 	 */
 	if (leapsec > 0) {
 		leapsec--;
-		if (leap_sec == 0) {
+		if (leapsec == 0) {
 			sys_leap = LEAP_NOWARNING;
 			sys_tai = leap_tai;
 #ifdef KERNEL_PLL

==== ntpd/refclock_local.c ====
2008-08-10 03:09:32-04:00, stenn at whimsy.udel.edu +4 -1
  [Bug 861] leap info was not being transmitted

--- 1.17/ntpd/refclock_local.c	2008-05-13 05:13:54 -04:00
+++ 1.18/ntpd/refclock_local.c	2008-08-10 03:09:32 -04:00
@@ -239,7 +239,10 @@ local_poll(
 	pp->disp = 0;
 	pp->jitter = 0;
 #else /* KERNEL_PLL LOCKCLOCK */
-	pp->leap = LEAP_NOWARNING;
+	if (pp->sloppyclockflag & CLK_FLAG1)
+		pp->leap = LEAP_ADDSECOND;
+	else
+		pp->leap = LEAP_NOWARNING;
 	pp->disp = DISPERSION;
 	pp->jitter = 0;
 #endif /* KERNEL_PLL LOCKCLOCK */


More information about the bk-ntp-dev-send mailing list