[Bug 2178] refclock_tsyncpci.c reach register fails to shift.

bk: 4fc958183jjPLfts_Z_4pHnHoYttmg

diff --git a/ChangeLog b/ChangeLog
index a12e7f24119bb74c3617cefca26a08854b5a0358..8ea1fe1c3ab792dd5ddb41ae5487934086c499b5 100644 (file)
--- 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 <stenn@ntp.org>
 * [Bug 2193] Building timestruct tests with Clang 3.1 fails.
 (4.2.7p276) 2012/05/15 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 801ce1cc7bfd0e89f0eb15b24e9aa19ab1beae48..a3f8e1cd0358df5ad2dfce0878be83a6a1622229 100644 (file)
--- 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 f13252b44bba91abfa7f8ebd9d2b8e3fa2edd30c..1acf9b208cfa3ba96ef140027767b09daa4b9614 100644 (file)
--- 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 da4a926db5d4e2a72e7afb92b4cfd3fd73f343f4..d5915da3b5e7f8b882cb832c2f2762005b684eb0 100644 (file)
--- 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 797b27c83270d6333c72cfe4ed6ef2180fb0d691..435d8f6c4ffb6055af445f156ed7b8e5130cd4fc 100644 (file)
--- 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 6ae6d3cdbb28b1dda4440bce7cd061cfa3c9b488..dae8b37617797ad6492fcccc23038a399bfc8307 100644 (file)
--- 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 b3e8ddc1be1fc4205d7f90fa0b90c8ab8a00bbcf..d8ec6b7446c1772805c4421fc9ecf92f8ccef809 100644 (file)
--- 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 1af1748066ddba698749daa3a86af679d84b8555..a0067e9c467521fe4f5b09fd6db673fc01ae6d1c 100644 (file)
--- 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 b3ae0618145814c109f0a50fe772d65c931bf36a..39be05138dde693e2c9e66e29995902080bee7c2 100644 (file)
--- 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 dc5f5c004ba2b1a67a38042ccc06967755794569..ac511bb4b392f4b942ce56bf5a64d2b040e845d1 100644 (file)
--- 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 a2370cefe3beaf7777bd3471de1139f33bae7ec2..3b045d0574d676fd8a99f002aebddb4a1b61dfc9 100644 (file)
--- 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 94fdef14f24fe072176461917137612ff3859b59..171ba5c8cc44effe853d74c22f69d23e3659f7a6 100644 (file)
--- 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 5c74bb554c5a72ab14d64c3e63ffd4864ba84c51..cd953cdc0c6158161b20210b71f489d88af96780 100644 (file)
--- 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;
 
 }