From: Dave Hart Date: Sat, 26 Nov 2011 12:11:56 +0000 (+0000) Subject: merge cleanup X-Git-Tag: NTP_4_2_7P237~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62a24967d5659f03b0abcff7a180437d47549df0;p=thirdparty%2Fntp.git merge cleanup bk: 4ed0d78cP7bv09G6QnorArBEyNCcZQ --- diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c index 09cbbe8bb..e5620a989 100644 --- a/ntpd/ntp_control.c +++ b/ntpd/ntp_control.c @@ -2404,16 +2404,16 @@ ctl_putpeer( case CP_REFID: #ifdef REFCLOCK - if (peer->flags & FLAG_REFCLOCK) { - ctl_putrefid(peer_var[varid].text, peer->refid); + if (p->flags & FLAG_REFCLOCK) { + ctl_putrefid(peer_var[id].text, p->refid); break; } #endif - if (peer->stratum > 1 && peer->stratum < STRATUM_UNSPEC) - ctl_putadr(peer_var[varid].text, peer->refid, + if (p->stratum > 1 && p->stratum < STRATUM_UNSPEC) + ctl_putadr(peer_var[id].text, p->refid, NULL); else - ctl_putrefid(peer_var[varid].text, peer->refid); + ctl_putrefid(peer_var[id].text, p->refid); break; case CP_REFTIME: @@ -2691,7 +2691,7 @@ ctl_putclock( pcs->fudgeval2, NULL); else ctl_putrefid(clock_var[id].text, - clock_stat->fudgeval2); + pcs->fudgeval2); } break; diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c index 72d38f338..f5f78b9f0 100644 --- a/ntpd/ntp_io.c +++ b/ntpd/ntp_io.c @@ -4290,17 +4290,6 @@ localaddrtoa( } -const char * -localaddrtoa( - endpt *la - ) -{ - return (NULL == la) - ? "" - : stoa(&la->sin); -} - - #ifdef HAS_ROUTING_SOCKET # ifndef UPDATE_GRACE # define UPDATE_GRACE 2 /* wait UPDATE_GRACE seconds before scanning */ diff --git a/ntpd/ntp_peer.c b/ntpd/ntp_peer.c index 54d97d7e6..b8fb6a1c6 100644 --- a/ntpd/ntp_peer.c +++ b/ntpd/ntp_peer.c @@ -115,7 +115,8 @@ static struct peer init_peer_alloc[INIT_PEER_ALLOC]; /* init alloc */ static struct peer * findexistingpeer_name(const char *, u_short, struct peer *, int); static struct peer * findexistingpeer_addr(sockaddr_u *, - struct peer *, int); + struct peer *, int, + u_char); static void free_peer(struct peer *, int); static void getmorepeermem(void); static int score(struct peer *); @@ -199,7 +200,7 @@ struct peer * findexistingpeer_addr( sockaddr_u * addr, struct peer * start_peer, - int mode + int mode, u_char cast_flags ) { @@ -760,7 +761,7 @@ newpeer( * structure. */ if (dstadr != NULL) { - peer = findexistingpeer(srcadr, hostname, hmode, + peer = findexistingpeer(srcadr, hostname, NULL, hmode, cast_flags); while (peer != NULL) { if (peer->dstadr == dstadr || @@ -777,7 +778,8 @@ newpeer( } } else { /* no endpt address given */ - peer = findexistingpeer(srcadr, hostname, hmode, cast_flags); + peer = findexistingpeer(srcadr, hostname, NULL, hmode, + cast_flags); } /* diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c index 41535bc58..8c77650a6 100644 --- a/ntpd/ntp_proto.c +++ b/ntpd/ntp_proto.c @@ -3582,7 +3582,7 @@ pool_xmit( /* copy_addrinfo_list ai_addr points to a sockaddr_u */ rmtadr = (sockaddr_u *)(void *)pool->ai->ai_addr; pool->ai = pool->ai->ai_next; - p = findexistingpeer(rmtadr, NULL, NULL, MODE_CLIENT); + p = findexistingpeer(rmtadr, NULL, NULL, MODE_CLIENT, 0); } while (p != NULL && pool->ai != NULL); if (p != NULL) return; /* out of addresses, re-query DNS next poll */ diff --git a/ntpq/ntpq-subs.c b/ntpq/ntpq-subs.c index 8294be290..dbaae1586 100644 --- a/ntpq/ntpq-subs.c +++ b/ntpq/ntpq-subs.c @@ -13,7 +13,6 @@ extern char * chosts[]; extern char currenthost[]; extern int currenthostisnum; -extern int numhosts; size_t maxhostlen; /* @@ -1571,6 +1570,8 @@ doprintpeers( int c; int len; int have_srchost; + int have_dstadr; + int have_da_rid; int have_jitter; sockaddr_u srcadr; sockaddr_u dstadr; @@ -1580,7 +1581,7 @@ doprintpeers( u_long srcport = 0; u_int32 u32; const char *dstadr_refid = "0.0.0.0"; - char *serverlocal; + const char *serverlocal; size_t drlen; u_long stratum = 0; long ppoll = 0; @@ -1601,6 +1602,8 @@ doprintpeers( get_systime(&ts); have_srchost = FALSE; + have_dstadr = FALSE; + have_da_rid = FALSE; have_jitter = FALSE; ZERO_SOCK(&srcadr); ZERO_SOCK(&dstadr); @@ -1632,9 +1635,10 @@ doprintpeers( } else if (!strcmp("dstadr", name)) { if (decodenetnum(value, &dum_store)) { type = decodeaddrtype(&dum_store); - havevar[HAVE_DSTADR] = 1; + have_dstadr = TRUE; dstadr = dum_store; if (pvl == opeervarlist) { + have_da_rid = TRUE; dstadr_refid = trunc_left(stoa(&dstadr), 15); } } @@ -1642,6 +1646,7 @@ doprintpeers( decodeint(value, &hmode); } else if (!strcmp("refid", name)) { if (pvl == peervarlist) { + have_da_rid = TRUE; drlen = strlen(value); if (0 == drlen) { dstadr_refid = ""; @@ -1659,7 +1664,7 @@ doprintpeers( dstadr_refid = stoa(&refidadr); } else { - havevar[HAVE_REFID] = 0; + have_da_rid = FALSE; } } } else if (!strcmp("stratum", name)) { @@ -1738,7 +1743,7 @@ doprintpeers( else c = flash2[CTL_PEER_STATVAL(rstatus) & 0x3]; if (numhosts > 1) { - if (peervarlist == pvl && havevar[HAVE_DSTADR]) { + if (peervarlist == pvl && have_dstadr) { serverlocal = nntohost_col(&dstadr, (size_t)min(LIB_BUFLENGTH - 1, maxhostlen), TRUE); @@ -1756,8 +1761,12 @@ doprintpeers( strlcpy(clock_name, nntohost(&srcadr), sizeof(clock_name)); fprintf(fp, "%c%-15.15s ", c, clock_name); - drlen = strlen(dstadr_refid); - makeascii(drlen, dstadr_refid, fp); + if (!have_da_rid) { + drlen = 0; + } else { + drlen = strlen(dstadr_refid); + makeascii(drlen, dstadr_refid, fp); + } while (drlen++ < 15) fputc(' ', fp); fprintf(fp, @@ -1834,20 +1843,20 @@ dopeers( int af ) { - int i; + u_int u; char fullname[LENHOSTNAME]; sockaddr_u netnum; - char * name_or_num; + const char * name_or_num; size_t sl; if (!dogetassoc(fp)) return; - for (i = 0; i < numhosts; ++i) { - if (getnetnum(chosts[i], &netnum, fullname, af)) { + for (u = 0; u < numhosts; u++) { + if (getnetnum(chosts[u], &netnum, fullname, af)) { name_or_num = nntohost(&netnum); sl = strlen(name_or_num); - maxhostlen = max(maxhostlen, (int)sl); + maxhostlen = max(maxhostlen, sl); } } if (numhosts > 1) @@ -1856,22 +1865,23 @@ dopeers( fprintf(fp, " remote refid st t when poll reach delay offset jitter\n"); if (numhosts > 1) - for (i = 0; i <= maxhostlen; ++i) + for (u = 0; u <= maxhostlen; u++) fprintf(fp, "="); fprintf(fp, "==============================================================================\n"); - for (i = 0; i < numassoc; i++) { + for (u = 0; u < numassoc; u++) { if (!showall && - !(CTL_PEER_STATVAL(assoc_cache[i].status) + !(CTL_PEER_STATVAL(assoc_cache[u].status) & (CTL_PST_CONFIG|CTL_PST_REACH))) { if (debug) - fprintf(stderr, "eliding [%d]\n", assoc_cache[i].assid); + fprintf(stderr, "eliding [%d]\n", + (int)assoc_cache[u].assid); continue; } - if (!dogetpeers(peervarlist, (int)assoc_cache[i].assid, fp, af)) { + if (!dogetpeers(peervarlist, (int)assoc_cache[u].assid, + fp, af)) return; - } } return; } diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c index b465f87a1..d2e000441 100644 --- a/ntpq/ntpq.c +++ b/ntpq/ntpq.c @@ -1769,7 +1769,7 @@ nntohost_col( { const char * out; - if (!showhostnames || SOCK_UNSPEC(netnum)) { + if (!showhostnames || SOCK_UNSPEC(addr)) { if (preserve_lowaddrbits) out = trunc_left(stoa(addr), width); else @@ -2730,7 +2730,7 @@ asciize( * "too long" -> "too l" * Used for hostnames. */ -char * +const char * trunc_right( const char * src, size_t width @@ -2758,7 +2758,7 @@ trunc_right( * "too long" -> "_long" * Used for local IPv6 addresses, where low bits differentiate. */ -char * +const char * trunc_left( const char * src, size_t width diff --git a/ntpq/ntpq.h b/ntpq/ntpq.h index eb12be6fc..1672eb01f 100644 --- a/ntpq/ntpq.h +++ b/ntpq/ntpq.h @@ -142,5 +142,5 @@ extern int decodetime (char *, l_fp *); extern void printvars (int, const char *, int, int, int, FILE *); extern int decodeint (char *, long *); extern void makeascii (int, const char *, FILE *); -extern char * trunc_left (const char *, size_t); -extern char * trunc_right (const char *, size_t); +extern const char * trunc_left (const char *, size_t); +extern const char * trunc_right(const char *, size_t);