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

Harlan Stenn stenn at deacon.udel.edu
Fri Oct 29 07:43:29 UTC 2010


#### ChangeSet ####
2010-10-29 03:39:15-04:00, stenn at psp-deb1.ntp.org 
  typo

==== ChangeLog ====
2010-10-29 03:39:10-04:00, stenn at psp-deb1.ntp.org +1 -1
  typo

--- 1.665/ChangeLog	2010-10-28 14:07:04 -04:00
+++ 1.666/ChangeLog	2010-10-29 03:39:10 -04:00
@@ -1,6 +1,6 @@
 ---
 
-* [Bug 1685] NMEA driver mode byte confusion
+* [Bug 1685] NMEA driver mode byte confusion.
 
 ---
 (4.2.6p3-RC7) 2010/10/25 Released by Harlan Stenn <stenn at ntp.org>

#### ChangeSet ####
2010-10-28 18:07:23+00:00, hart at psp-os1.ntp.org 
  for perlinger, [Bug 1685]

==== ChangeLog ====
2010-10-28 18:07:04+00:00, hart at psp-os1.ntp.org +4 -0
  for perlinger, [Bug 1685]

--- 1.664/ChangeLog	2010-10-25 03:49:20 -04:00
+++ 1.665/ChangeLog	2010-10-28 14:07:04 -04:00
@@ -1,4 +1,8 @@
 ---
+
+* [Bug 1685] NMEA driver mode byte confusion
+
+---
 (4.2.6p3-RC7) 2010/10/25 Released by Harlan Stenn <stenn at ntp.org>
 
 * [Bug 1676] NMEA: $GPGLL did not work after fix for Bug 1571.

==== ntpd/refclock_nmea.c ====
2010-10-28 18:07:04+00:00, hart at psp-os1.ntp.org +2 -1
  for perlinger, [Bug 1685]

--- 1.54/ntpd/refclock_nmea.c	2010-10-24 06:17:46 -04:00
+++ 1.55/ntpd/refclock_nmea.c	2010-10-28 14:07:04 -04:00
@@ -701,7 +701,8 @@ nmea_receive(
 		return;
 
 	/* See if I want to process this message type */
-	if (peer->ttl && !(peer->ttl & sentence_mode[sentence]))
+	if ((peer->ttl & NMEA_MESSAGE_MASK) &&
+	   !(peer->ttl & sentence_mode[sentence]))
 		return;
 
 	/* 


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