From: Dave Hart Date: Sat, 2 Jun 2012 00:02:32 +0000 (+0000) Subject: [Bug 2178] refclock_tsyncpci.c reach register fails to shift. X-Git-Tag: NTP_4_2_7P278~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3743f6929839f0c21f14df14de5a7e970a723adf;p=thirdparty%2Fntp.git [Bug 2178] refclock_tsyncpci.c reach register fails to shift. bk: 4fc958183jjPLfts_Z_4pHnHoYttmg --- diff --git a/ChangeLog b/ChangeLog index a12e7f241..8ea1fe1c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +* [Bug 2178] refclock_tsyncpci.c reach register fails to shift. (4.2.7p277) 2012/05/25 Released by Harlan Stenn * [Bug 2193] Building timestruct tests with Clang 3.1 fails. (4.2.7p276) 2012/05/15 Released by Harlan Stenn diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c index 801ce1cc7..a3f8e1cd0 100644 --- a/ntpd/ntp_io.c +++ b/ntpd/ntp_io.c @@ -1893,7 +1893,7 @@ update_interfaces( "GONE - deleting\n")); remove_interface(ep); refresh_peers = TRUE; - DPRINTF(4, ("refreshing peers due to deleted addr %s", + DPRINTF(4, ("refreshing peers due to deleted addr %s\n", stoa(&ep->sin))); ifi.action = IFS_DELETED; diff --git a/ntpd/refclock_as2201.c b/ntpd/refclock_as2201.c index f13252b44..1acf9b208 100644 --- a/ntpd/refclock_as2201.c +++ b/ntpd/refclock_as2201.c @@ -191,7 +191,6 @@ as2201_start( * Initialize miscellaneous variables */ peer->precision = PRECISION; - peer->burst = NSTAGE; pp->clockdesc = DESCRIPTION; memcpy((char *)&pp->refid, REFID, 4); up->lastptr = up->stats; @@ -377,14 +376,11 @@ as2201_poll( if (!(pp->sloppyclockflag & CLK_FLAG2)) get_systime(&pp->lastrec); } - if (peer->burst > 0) - return; if (pp->coderecv == pp->codeproc) { refclock_report(peer, CEVNT_TIMEOUT); return; } refclock_receive(peer); - peer->burst = NSTAGE; } #else diff --git a/ntpd/refclock_fg.c b/ntpd/refclock_fg.c index da4a926db..d5915da3b 100644 --- a/ntpd/refclock_fg.c +++ b/ntpd/refclock_fg.c @@ -195,15 +195,12 @@ fg_poll( else pp->polls++; - if (peer->burst > 0) - return; /* if (pp->coderecv == pp->codeproc) { refclock_report(peer, CEVNT_TIMEOUT); return; } */ - peer->burst = NSTAGE; record_clock_stats(&peer->srcadr, pp->a_lastcode); diff --git a/ntpd/refclock_heath.c b/ntpd/refclock_heath.c index 797b27c83..435d8f6c4 100644 --- a/ntpd/refclock_heath.c +++ b/ntpd/refclock_heath.c @@ -241,7 +241,6 @@ heath_start( * Initialize miscellaneous variables */ peer->precision = PRECISION; - peer->burst = NSTAGE; pp->clockdesc = DESCRIPTION; memcpy(&pp->refid, REFID, 4); return (1); @@ -431,8 +430,6 @@ heath_poll( if (write(pp->io.fd, "T", 1) != 1) refclock_report(peer, CEVNT_FAULT); ioctl(pp->io.fd, TIOCMBIS, (char *)&bits); - if (peer->burst > 0) - return; if (pp->coderecv == pp->codeproc) { refclock_report(peer, CEVNT_TIMEOUT); return; @@ -445,7 +442,6 @@ heath_poll( printf("heath: timecode %d %s\n", pp->lencode, pp->a_lastcode); #endif - peer->burst = MAXSTAGE; pp->polls++; } diff --git a/ntpd/refclock_hopfser.c b/ntpd/refclock_hopfser.c index 6ae6d3cdb..dae8b3761 100644 --- a/ntpd/refclock_hopfser.c +++ b/ntpd/refclock_hopfser.c @@ -169,7 +169,6 @@ hopfserial_start ( */ pp->clockdesc = DESCRIPTION; peer->precision = PRECISION; - peer->burst = NSTAGE; memcpy((char *)&pp->refid, REFID, 4); up->leap_status = 0; diff --git a/ntpd/refclock_jjy.c b/ntpd/refclock_jjy.c index b3e8ddc1b..d8ec6b744 100644 --- a/ntpd/refclock_jjy.c +++ b/ntpd/refclock_jjy.c @@ -503,7 +503,6 @@ jjy_start ( int unit, struct peer *peer ) * Initialize miscellaneous variables */ peer->precision = PRECISION ; - peer->burst = 1 ; pp->clockdesc = DESCRIPTION ; memcpy ( (char*)&pp->refid, REFID, strlen(REFID) ) ; diff --git a/ntpd/refclock_neoclock4x.c b/ntpd/refclock_neoclock4x.c index 1af174806..a0067e9c4 100644 --- a/ntpd/refclock_neoclock4x.c +++ b/ntpd/refclock_neoclock4x.c @@ -312,7 +312,6 @@ neoclock4x_start(int unit, * Initialize miscellaneous variables */ peer->precision = -10; - peer->burst = NSTAGE; memcpy((char *)&pp->refid, "neol", 4); up->leap_status = 0; diff --git a/ntpd/refclock_pst.c b/ntpd/refclock_pst.c index b3ae06181..39be05138 100644 --- a/ntpd/refclock_pst.c +++ b/ntpd/refclock_pst.c @@ -155,7 +155,6 @@ pst_start( peer->precision = PRECISION; pp->clockdesc = DESCRIPTION; memcpy((char *)&pp->refid, WWVREFID, 4); - peer->burst = MAXSTAGE; return (1); } @@ -300,8 +299,6 @@ pst_poll( up->lastptr = pp->a_lastcode; if (write(pp->io.fd, "QTQDQMT", 6) != 6) refclock_report(peer, CEVNT_FAULT); - if (peer->burst > 0) - return; if (pp->coderecv == pp->codeproc) { refclock_report(peer, CEVNT_TIMEOUT); return; @@ -313,7 +310,6 @@ pst_poll( printf("pst: timecode %d %s\n", pp->lencode, pp->a_lastcode); #endif - peer->burst = MAXSTAGE; pp->polls++; } diff --git a/ntpd/refclock_tpro.c b/ntpd/refclock_tpro.c index dc5f5c004..ac511bb4b 100644 --- a/ntpd/refclock_tpro.c +++ b/ntpd/refclock_tpro.c @@ -99,7 +99,6 @@ tpro_start( * Initialize miscellaneous peer variables */ peer->precision = PRECISION; - peer->burst = NSTAGE; pp->clockdesc = DESCRIPTION; memcpy((char *)&pp->refid, REFID, 4); return (1); @@ -195,8 +194,6 @@ tpro_poll( refclock_report(peer, CEVNT_BADTIME); return; } - if (peer->burst > 0) - return; if (pp->coderecv == pp->codeproc) { refclock_report(peer, CEVNT_TIMEOUT); return; @@ -204,7 +201,6 @@ tpro_poll( pp->lastref = pp->lastrec; record_clock_stats(&peer->srcadr, pp->a_lastcode); refclock_receive(peer); - peer->burst = NSTAGE; } #else diff --git a/ntpd/refclock_tsyncpci.c b/ntpd/refclock_tsyncpci.c index a2370cefe..3b045d057 100644 --- a/ntpd/refclock_tsyncpci.c +++ b/ntpd/refclock_tsyncpci.c @@ -341,7 +341,6 @@ static int tsync_start(int unit, struct peer *peer) pp->io.srcclock = (caddr_t)peer; pp->io.datalen = 0; peer->precision = PRECISION; - peer->burst = NSTAGE; // Allocate and initialize unit structure if (!(up = (TsyncUnit*)emalloc(sizeof(TsyncUnit)))) @@ -767,16 +766,9 @@ static void tsync_poll(int unit, struct peer *peer) return; } - if (peer->burst > 0) { - return; - } - record_clock_stats(&peer->srcadr, pp->a_lastcode); refclock_receive(peer); - /* Reset for the next burst of polls */ - peer->burst = NSTAGE; - /* Increment the number of times the reference has been polled */ pp->polls++; diff --git a/ntpd/refclock_tt560.c b/ntpd/refclock_tt560.c index 94fdef14f..171ba5c8c 100644 --- a/ntpd/refclock_tt560.c +++ b/ntpd/refclock_tt560.c @@ -123,7 +123,6 @@ tt560_start( * Initialize miscellaneous peer variables */ peer->precision = PRECISION; - peer->burst = NSTAGE; pp->clockdesc = DESCRIPTION; memcpy((char *)&pp->refid, REFID, 4); return (1); @@ -227,15 +226,12 @@ tt560_poll( refclock_report(peer, CEVNT_BADTIME); return; } - if (peer->burst > 0) - return; if (pp->coderecv == pp->codeproc) { refclock_report(peer, CEVNT_TIMEOUT); return; } record_clock_stats(&peer->srcadr, pp->a_lastcode); refclock_receive(peer); - peer->burst = NSTAGE; } /****************************************************************** diff --git a/ntpd/refclock_ulink.c b/ntpd/refclock_ulink.c index 5c74bb554..cd953cdc0 100644 --- a/ntpd/refclock_ulink.c +++ b/ntpd/refclock_ulink.c @@ -152,7 +152,6 @@ ulink_start( * Initialize miscellaneous variables */ peer->precision = PRECISION; - peer->burst = NSTAGE; pp->clockdesc = DESCRIPTION; memcpy((char *)&pp->refid, REFID, 4); return (1); @@ -554,8 +553,6 @@ ulink_poll( else pp->polls++; - if (peer->burst > 0) - return; if (pp->coderecv == pp->codeproc) { refclock_report(peer, CEVNT_TIMEOUT); return; @@ -563,7 +560,6 @@ ulink_poll( pp->lastref = pp->lastrec; refclock_receive(peer); record_clock_stats(&peer->srcadr, pp->a_lastcode); - peer->burst = NSTAGE; }