[ntp:bk-ntp-dev-send] BitKeeper patch
stenn at whimsy.udel.edu
stenn at whimsy.udel.edu
Mon Jun 23 01:09:42 PDT 2003
This BitKeeper patch contains the following changesets:
stenn at whimsy.udel.edu|ChangeSet|20030623080837|41290
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# ID: stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
# User: stenn
# Host: whimsy.udel.edu
# Root: /backroom/ntp-dev
#
#--- 1.154/ntpd/ntp_proto.c Sat Apr 19 09:09:51 2003
#+++ 1.155/ntpd/ntp_proto.c Mon Jun 23 04:08:23 2003
#@@ -34,7 +34,7 @@
# u_int32 sys_peer_refid; /* hashed refid of our current peer */
# static double sys_offset; /* current local clock offset */
# l_fp sys_reftime; /* time we were last updated */
#-struct peer *sys_peer; /* our current peer */
#+struct peer *sys_peer; /* our current peer */
# struct peer *sys_prefer; /* our cherished peer */
# int sys_kod; /* kod credit */
# int sys_kod_rate = 2; /* max kod packets per second */
#@@ -46,13 +46,13 @@
# * Nonspecified system state variables.
# */
# int sys_bclient; /* broadcast client enable */
#-double sys_bdelay; /* broadcast client default delay */
#+double sys_bdelay; /* broadcast client default delay */
# int sys_calldelay; /* modem callup delay (s) */
# int sys_authenticate; /* requre authentication for config */
# l_fp sys_authdelay; /* authentication delay */
#-static u_long sys_authdly[2]; /* authentication delay shift reg */
#+static u_long sys_authdly[2]; /* authentication delay shift reg */
# static u_char leap_consensus; /* consensus of survivor leap bits */
#-static double sys_selerr; /* select error (squares) */
#+static double sys_selerr; /* select error (squares) */
# static double sys_syserr; /* system error (squares) */
# keyid_t sys_private; /* private value for session seed */
# int sys_manycastserver; /* respond to manycast client pkts */
#@@ -82,7 +82,7 @@
# u_long sys_newversionpkt; /* current version */
# u_long sys_oldversionpkt; /* recent version */
# u_long sys_unknownversion; /* invalid version */
#-u_long sys_restricted; /* access denied */
#+u_long sys_restricted; /* access denied */
# u_long sys_badlength; /* bad length or format */
# u_long sys_badauth; /* bad authentication */
# u_long sys_limitrejected; /* rate exceeded */
#@@ -264,7 +264,7 @@
# return;
# }
# msyslog(LOG_NOTICE,
#- "no reply; clock not set");
#+ "no reply; clock not set");
# exit (0);
# }
# poll_update(peer, hpoll);
#@@ -746,7 +746,7 @@
# if (sys_authenticate && !is_authentic)
# return; /* bad auth */
#
#- if (!sys_bclient)
#+ if (!sys_bclient)
# return; /* not a client */
#
# if ((peer = newpeer(&rbufp->recv_srcadr, rbufp->dstadr,
#@@ -925,7 +925,7 @@
# /* fall through */
#
# /*
#- * The packet originate timestamp is zero, meaning the other guy
#+ * The packet originate timestamp is zero, meaning the other guy
# * either didn't receive the first packet or died and restarted.
# * If the association originate timestamp is zero, this is the
# * first packet received, so we pass it on.
#@@ -1615,7 +1615,7 @@
# allan_xpt)
# dst[i] = MAXDISTANCE + peer->filter_disp[j];
# else
#- dst[i] = peer->filter_delay[j];
#+ dst[i] = peer->filter_delay[j];
# ord[i] = j;
# j++; j %= NTP_SHIFT;
# }
#@@ -1924,7 +1924,7 @@
# *
# * Here, nlist is the number of candidates and allow is the
# * number of falsetickers.
#- */
#+ */
# low = 1e9;
# high = -1e9;
# for (allow = 0; 2 * allow < nlist; allow++) {
#@@ -2245,11 +2245,23 @@
# }
# #endif /* LOCKCLOCK */
# if (osys_peer != sys_peer) {
#+ char *src;
#+
# if (sys_peer == NULL)
# sys_peer_refid = 0;
# else
# sys_peer_refid = addr2refid(&sys_peer->srcadr);
# report_event(EVNT_PEERSTCHG, NULL);
#+
#+#ifdef REFCLOCK
#+ if (ISREFCLOCKADR(&sys_peer->srcadr))
#+ src = refnumtoa(&sys_peer->srcadr);
#+ else
#+#endif
#+ src = ntoa(&sys_peer->srcadr);
#+ NLOG(NLOG_SYNCSTATUS)
#+ msyslog(LOG_INFO, "synchronized to %s, stratum=%d", src,
#+ sys_peer->stratum);
# }
# clock_update();
# }
#@@ -2459,7 +2471,7 @@
# sys_hostname);
# else if (!(peer->crypto & CRYPTO_FLAG_VALID))
# exten = crypto_args(peer, CRYPTO_CERT,
#- peer->issuer);
#+ peer->issuer);
#
# /*
# * Identity. Note we have to sign the
#@@ -2530,7 +2542,7 @@
# * requests them and the protocol blinds it using the
# * agreed key. It is a protocol error if the client has
# * the parameters but the server does not.
#- */
#+ */
# case MODE_CLIENT:
# if (peer->cmmd != NULL) {
# peer->cmmd->associd =
#@@ -2589,7 +2601,7 @@
#
# /*
# * If extension fields are present, we must use a
#- * private value of zero and force min poll interval.
#+ * private value of zero and force min poll interval.
# * Most intricate.
# */
# if (sendlen > LEN_PKT_NOMAC)
#@@ -2843,7 +2855,7 @@
# {
# int i;
#
#- if (peer->keylist != NULL) {
#+ if (peer->keylist != NULL) {
# for (i = 0; i <= peer->keynumber; i++)
# authtrust(peer->keylist[i], 0);
# free(peer->keylist);
#@@ -3163,7 +3175,7 @@
# * Log this error.
# */
# msyslog(LOG_INFO,
#- "proto_config: illegal item %d, value %ld",
#+ "proto_config: illegal item %d, value %ld",
# item, value);
# }
# }
#
# Diff checksum=97f1bbe2
# Patch vers: 1.3
# Patch type: REGULAR
== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20030622095257|41494
D 1.1082 03/06/23 04:08:37-04:00 stenn at whimsy.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 134] Log when we sync to a new source.
K 41290
P ChangeSet
------------------------------------------------
0a0
> stenn at whimsy.udel.edu|ntpd/ntp_proto.c|19990526004817|01635|3aed0663 stenn at whimsy.udel.edu|ntpd/ntp_proto.c|20030623080823|12313
== ntpd/ntp_proto.c ==
stenn at whimsy.udel.edu|ntpd/ntp_proto.c|19990526004817|01635|3aed0663
mayer at tecotoo.myibg.com|ntpd/ntp_proto.c|20030419130951|55172
D 1.155 03/06/23 04:08:23-04:00 stenn at whimsy.udel.edu +27 -15
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 134] Log when we sync to a new source.
K 12313
O -rw-rw-r--
P ntpd/ntp_proto.c
------------------------------------------------
D37 1
I37 1
struct peer *sys_peer; /* our current peer */
D49 1
I49 1
double sys_bdelay; /* broadcast client default delay */
D53 1
I53 1
static u_long sys_authdly[2]; /* authentication delay shift reg */
D55 1
I55 1
static double sys_selerr; /* select error (squares) */
D85 1
I85 1
u_long sys_restricted; /* access denied */
D267 1
I267 1
"no reply; clock not set");
D749 1
I749 1
if (!sys_bclient)
D928 1
I928 1
* The packet originate timestamp is zero, meaning the other guy
D1618 1
I1618 1
dst[i] = peer->filter_delay[j];
D1927 1
I1927 1
*/
I2247 2
char *src;
\
I2252 10
\
#ifdef REFCLOCK
if (ISREFCLOCKADR(&sys_peer->srcadr))
src = refnumtoa(&sys_peer->srcadr);
else
#endif
src = ntoa(&sys_peer->srcadr);
NLOG(NLOG_SYNCSTATUS)
msyslog(LOG_INFO, "synchronized to %s, stratum=%d", src,
sys_peer->stratum);
D2462 1
I2462 1
peer->issuer);
D2533 1
I2533 1
*/
D2592 1
I2592 1
* private value of zero and force min poll interval.
D2846 1
I2846 1
if (peer->keylist != NULL) {
D3166 1
I3166 1
"proto_config: illegal item %d, value %ld",
# Patch checksum=90b467a0
More information about the bk-ntp-dev-send
mailing list