[Git][NTPsec/ntpsec][master] 2 commits: Remove unused member srcaddr in recvbuff structure.
Eric S. Raymond
gitlab at mg.gitlab.com
Sat Dec 5 11:53:26 UTC 2015
Eric S. Raymond pushed to branch master at NTPsec / ntpsec
Commits:
63f217d2 by Eric S. Raymond at 2015-12-05T06:53:01Z
Remove unused member srcaddr in recvbuff structure.
Appears to have been a historical relic, replaced by the sockaddr_u
member of the X_from_where union but never removed.
- - - - -
36a8f4b3 by Eric S. Raymond at 2015-12-05T06:53:01Z
Fix a persistent spelling error: it's srcaddr, not 'srcadr'.
- - - - -
52 changed files:
- devel/ChangeLog
- devel/CommitLog-4.1.0
- docs/includes/ntpq-body.txt
- include/ntp.h
- include/ntp_net.h
- include/ntp_refclock.h
- include/ntpd.h
- include/recvbuff.h
- ntpd/ntp_config.c
- ntpd/ntp_control.c
- ntpd/ntp_crypto.c
- ntpd/ntp_io.c
- ntpd/ntp_monitor.c
- ntpd/ntp_peer.c
- ntpd/ntp_proto.c
- ntpd/ntp_refclock.c
- ntpd/ntp_restrict.c
- ntpd/ntp_signd.c
- ntpd/ntp_util.c
- ntpd/ntpsim.c
- ntpd/refclock_acts.c
- ntpd/refclock_arbiter.c
- ntpd/refclock_arc.c
- ntpd/refclock_as2201.c
- ntpd/refclock_atom.c
- ntpd/refclock_chu.c
- ntpd/refclock_dumbclock.c
- ntpd/refclock_gpsdjson.c
- ntpd/refclock_hopfpci.c
- ntpd/refclock_hopfser.c
- ntpd/refclock_hpgps.c
- ntpd/refclock_irig.c
- ntpd/refclock_jjy.c
- ntpd/refclock_jupiter.c
- ntpd/refclock_mx4200.c
- ntpd/refclock_neoclock4x.c
- ntpd/refclock_nmea.c
- ntpd/refclock_oncore.c
- ntpd/refclock_palisade.c
- ntpd/refclock_parse.c
- ntpd/refclock_pcf.c
- ntpd/refclock_shm.c
- ntpd/refclock_spectracom.c
- ntpd/refclock_true.c
- ntpd/refclock_tsyncpci.c
- ntpd/refclock_zyfer.c
- ntpdig/networking.h
- ntpq/ntpq-subs.c
- ntpq/ntpq.c
- ntptrace/ntptrace
- tests/perl/ntptrace.t
- util/monitoring/ntptrap
Changes:
=====================================
devel/ChangeLog
=====================================
--- a/devel/ChangeLog
+++ b/devel/ChangeLog
@@ -3768,7 +3768,7 @@ display both build and runtime OpenSSL versions when they differ.
* [Bug 850] Fix the wander threshold parameter on the driftfile command.
* ntp_io.c: Dead code cleanup - Coverity View 19.
* Leap file related cleanup from Dave Mills.
-* ntp_peer.c: Set peer->srcadr before (not after) calling set_peerdstadr().
+* ntp_peer.c: Set peer->srcaddr before (not after) calling set_peerdstadr().
* Initialize offset in leap_file() - Coverity View 17.
* Use the correct stratum on KISS codes.
* Fuzz bits cleanup.
=====================================
devel/CommitLog-4.1.0
=====================================
--- a/devel/CommitLog-4.1.0
+++ b/devel/CommitLog-4.1.0
@@ -2721,7 +2721,7 @@ comments in the version-control system.
* configure.in: Get the path to perl
(AC_CONFIG_*): Added scripts/ntp-wait
- * ntptrace/ntptrace.c (DoTrace): If the server's srcadr is 0.0.0.0
+ * ntptrace/ntptrace.c (DoTrace): If the server's srcaddr is 0.0.0.0
then we haven't synced yet. Note and punt.
Reported by: Bdale Garbee <bdale at gag.com>,http://bugs.debian.org/56551
=====================================
docs/includes/ntpq-body.txt
=====================================
--- a/docs/includes/ntpq-body.txt
+++ b/docs/includes/ntpq-body.txt
@@ -496,7 +496,7 @@ association. Not all variables are displayed in some configurations.
|Variable |Description
|+associd+ |association ID
|+status+ |link:decode.html#peer[peer status word]
-|+srcadr srcport+|source (remote) IP address and port
+|+srcaddr srcport+|source (remote) IP address and port
|+dstadr dstport+|destination (local) IP address and port
|+leap+ |leap indicator (0-3)
|+stratum+ |stratum (0-15)
=====================================
include/ntp.h
=====================================
--- a/include/ntp.h
+++ b/include/ntp.h
@@ -241,7 +241,7 @@ struct peer {
struct peer *adr_link; /* link pointer in address hash */
struct peer *aid_link; /* link pointer in associd hash */
struct peer *ilink; /* list of peers for interface */
- sockaddr_u srcadr; /* address of remote host */
+ sockaddr_u srcaddr; /* address of remote host */
char * hostname; /* if non-NULL, remote name */
struct addrinfo *addrs; /* hostname query result */
struct addrinfo *ai; /* position within addrs */
=====================================
include/ntp_net.h
=====================================
--- a/include/ntp_net.h
+++ b/include/ntp_net.h
@@ -204,9 +204,9 @@ typedef union {
#define REFCLOCK_ADDR 0x7f7f0000 /* 127.127.0.0 */
#define REFCLOCK_MASK 0xffff0000 /* 255.255.0.0 */
-#define ISREFCLOCKADR(srcadr) \
- (IS_IPV4(srcadr) && \
- (SRCADR(srcadr) & REFCLOCK_MASK) == REFCLOCK_ADDR)
+#define ISREFCLOCKADR(srcaddr) \
+ (IS_IPV4(srcaddr) && \
+ (SRCADR(srcaddr) & REFCLOCK_MASK) == REFCLOCK_ADDR)
/*
* Macro for checking for invalid addresses. This is really, really
@@ -216,11 +216,11 @@ typedef union {
#define LOOPBACKADR 0x7f000001
#define LOOPNETMASK 0xff000000
-#define ISBADADR(srcadr) \
- (IS_IPV4(srcadr) \
- && ((SRCADR(srcadr) & LOOPNETMASK) \
+#define ISBADADR(srcaddr) \
+ (IS_IPV4(srcaddr) \
+ && ((SRCADR(srcaddr) & LOOPNETMASK) \
== (LOOPBACKADR & LOOPNETMASK)) \
- && SRCADR(srcadr) != LOOPBACKADR)
+ && SRCADR(srcaddr) != LOOPBACKADR)
#endif /* GUARD_NTP_NET_H */
=====================================
include/ntp_refclock.h
=====================================
--- a/include/ntp_refclock.h
+++ b/include/ntp_refclock.h
@@ -23,8 +23,8 @@
* Macros to determine the clock type and unit numbers from a
* 127.127.t.u address
*/
-#define REFCLOCKTYPE(srcadr) ((SRCADR(srcadr) >> 8) & 0xff)
-#define REFCLOCKUNIT(srcadr) (SRCADR(srcadr) & 0xff)
+#define REFCLOCKTYPE(srcaddr) ((SRCADR(srcaddr) >> 8) & 0xff)
+#define REFCLOCKUNIT(srcaddr) (SRCADR(srcaddr) & 0xff)
/*
* List of reference clock names and descriptions. These must agree with
=====================================
include/ntpd.h
=====================================
--- a/include/ntpd.h
+++ b/include/ntpd.h
@@ -287,7 +287,7 @@ extern void record_loop_stats (double, double, double, double, int);
extern void record_clock_stats (sockaddr_u *, const char *);
extern int mprintf_clock_stats(sockaddr_u *, const char *, ...)
NTP_PRINTF(2, 3);
-extern void record_raw_stats (sockaddr_u *srcadr, sockaddr_u *dstadr, l_fp *t1, l_fp *t2, l_fp *t3, l_fp *t4, int leap, int version, int mode, int stratum, int ppoll, int precision, double root_delay, double root_dispersion, uint32_t refid);
+extern void record_raw_stats (sockaddr_u *srcaddr, sockaddr_u *dstadr, l_fp *t1, l_fp *t2, l_fp *t3, l_fp *t4, int leap, int version, int mode, int stratum, int ppoll, int precision, double root_delay, double root_dispersion, uint32_t refid);
extern void check_leap_file (int is_daily_check, uint32_t ntptime, const time_t * systime);
extern void record_crypto_stats (sockaddr_u *, const char *);
#ifdef DEBUG
=====================================
include/recvbuff.h
=====================================
--- a/include/recvbuff.h
+++ b/include/recvbuff.h
@@ -49,17 +49,15 @@ typedef struct recvbuf recvbuf_t;
struct recvbuf {
recvbuf_t * link; /* next in list */
union {
- sockaddr_u X_recv_srcadr;
+ sockaddr_u X_recv_srcaddr; /* where packet came from */
void * X_recv_srcclock;
struct peer * X_recv_peer;
} X_from_where;
-#define recv_srcadr X_from_where.X_recv_srcadr
+#define recv_srcaddr X_from_where.X_recv_srcaddr
#define recv_srcclock X_from_where.X_recv_srcclock
#define recv_peer X_from_where.X_recv_peer
-#ifndef HAVE_IO_COMPLETION_PORT
- sockaddr_u srcadr; /* where packet came from */
-#else
- int recv_srcadr_len;/* filled in on completion */
+#ifdef HAVE_IO_COMPLETION_PORT
+ int recv_srcaddr_len;/* filled in on completion */
#endif
endpt * dstadr; /* address pkt arrived on */
SOCKET fd; /* fd on which it was received */
=====================================
ntpd/ntp_config.c
=====================================
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -3942,7 +3942,7 @@ config_unpeers(
p = findpeerbyassoc(curr_unpeer->assocID);
if (p != NULL) {
msyslog(LOG_NOTICE, "unpeered %s",
- stoa(&p->srcadr));
+ stoa(&p->srcaddr));
peer_clear(p, "GONE");
unpeer(p);
}
=====================================
ntpd/ntp_control.c
=====================================
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -477,7 +477,7 @@ static const struct ctl_var peer_var[] = {
{ CP_CONFIG, RO, "config" }, /* 1 */
{ CP_AUTHENABLE, RO, "authenable" }, /* 2 */
{ CP_AUTHENTIC, RO, "authentic" }, /* 3 */
- { CP_SRCADR, RO, "srcadr" }, /* 4 */
+ { CP_SRCADR, RO, "srcaddr" }, /* 4 */
{ CP_SRCPORT, RO, "srcport" }, /* 5 */
{ CP_DSTADR, RO, "dstadr" }, /* 6 */
{ CP_DSTPORT, RO, "dstport" }, /* 7 */
@@ -821,7 +821,7 @@ save_config(
NLOG(NLOG_SYSINFO)
msyslog(LOG_NOTICE,
"saveconfig from %s rejected due to nomodify restriction",
- stoa(&rbufp->recv_srcadr));
+ stoa(&rbufp->recv_srcaddr));
sys_restricted++;
return;
}
@@ -835,7 +835,7 @@ save_config(
NLOG(NLOG_SYSINFO)
msyslog(LOG_NOTICE,
"saveconfig from %s rejected, no saveconfigdir",
- stoa(&rbufp->recv_srcadr));
+ stoa(&rbufp->recv_srcaddr));
return;
}
@@ -873,7 +873,7 @@ save_config(
ctl_flushpkt(0);
msyslog(LOG_NOTICE,
"saveconfig with path from %s rejected",
- stoa(&rbufp->recv_srcadr));
+ stoa(&rbufp->recv_srcaddr));
return;
}
@@ -893,13 +893,13 @@ save_config(
filename);
msyslog(LOG_ERR,
"saveconfig %s from %s failed", filename,
- stoa(&rbufp->recv_srcadr));
+ stoa(&rbufp->recv_srcaddr));
} else {
snprintf(reply, sizeof(reply),
"Configuration saved to %s", filename);
msyslog(LOG_NOTICE,
"Configuration saved to %s (requested by %s)",
- fullpath, stoa(&rbufp->recv_srcadr));
+ fullpath, stoa(&rbufp->recv_srcaddr));
/*
* save the output filename in system variable
* savedconfig, retrieved with:
@@ -945,7 +945,7 @@ process_control(
* Save the addresses for error responses
*/
numctlreq++;
- rmt_addr = &rbufp->recv_srcadr;
+ rmt_addr = &rbufp->recv_srcaddr;
lcl_inter = rbufp->dstadr;
pkt = (struct ntp_control *)&rbufp->recv_pkt;
@@ -1753,7 +1753,7 @@ ctl_putsys(
case CS_PEERADR:
if (sys_peer != NULL && sys_peer->dstadr != NULL)
- ss = sptoa(&sys_peer->srcadr);
+ ss = sptoa(&sys_peer->srcaddr);
else
ss = "0.0.0.0:0";
ctl_putunqstr(sys_var[CS_PEERADR].text, ss, strlen(ss));
@@ -2356,11 +2356,11 @@ ctl_putpeer(
break;
case CP_SRCADR:
- ctl_putadr(peer_var[id].text, 0, &p->srcadr);
+ ctl_putadr(peer_var[id].text, 0, &p->srcaddr);
break;
case CP_SRCPORT:
- ctl_putuint(peer_var[id].text, SRCPORT(&p->srcadr));
+ ctl_putuint(peer_var[id].text, SRCPORT(&p->srcaddr));
break;
case CP_SRCHOST:
@@ -3258,7 +3258,7 @@ static void configure(
NLOG(NLOG_SYSINFO)
msyslog(LOG_NOTICE,
"runtime config from %s rejected due to nomodify restriction",
- stoa(&rbufp->recv_srcadr));
+ stoa(&rbufp->recv_srcaddr));
sys_restricted++;
return;
}
@@ -3275,7 +3275,7 @@ static void configure(
ctl_flushpkt(0);
msyslog(LOG_NOTICE,
"runtime config from %s rejected: request too long",
- stoa(&rbufp->recv_srcadr));
+ stoa(&rbufp->recv_srcaddr));
return;
}
@@ -3300,13 +3300,13 @@ static void configure(
DPRINTF(1, ("Got Remote Configuration Command: %s\n",
remote_config.buffer));
msyslog(LOG_NOTICE, "%s config: %s",
- stoa(&rbufp->recv_srcadr),
+ stoa(&rbufp->recv_srcaddr),
remote_config.buffer);
if (replace_nl)
remote_config.buffer[data_count - 1] = '\n';
- config_remotely(&rbufp->recv_srcadr);
+ config_remotely(&rbufp->recv_srcaddr);
/*
* Check if errors were reported. If not, output 'Config
@@ -3329,7 +3329,7 @@ static void configure(
if (remote_config.no_errors > 0)
msyslog(LOG_NOTICE, "%d error in %s config",
remote_config.no_errors,
- stoa(&rbufp->recv_srcadr));
+ stoa(&rbufp->recv_srcaddr));
}
@@ -3389,7 +3389,7 @@ static void generate_nonce(
{
uint32_t derived;
- derived = derive_nonce(&rbufp->recv_srcadr,
+ derived = derive_nonce(&rbufp->recv_srcaddr,
rbufp->recv_time.l_ui,
rbufp->recv_time.l_uf);
snprintf(nonce, nonce_octets, "%08x%08x%08x",
@@ -3420,7 +3420,7 @@ static int validate_nonce(
ts.l_ui = (uint32_t)ts_i;
ts.l_uf = (uint32_t)ts_f;
- derived = derive_nonce(&rbufp->recv_srcadr, ts.l_ui, ts.l_uf);
+ derived = derive_nonce(&rbufp->recv_srcaddr, ts.l_ui, ts.l_uf);
intercept_get_systime(__func__, &now_delta);
L_SUB(&now_delta, &ts);
@@ -3690,7 +3690,7 @@ static void read_mru_list(
NLOG(NLOG_SYSINFO)
msyslog(LOG_NOTICE,
"mrulist from %s rejected due to nomrulist restriction",
- stoa(&rbufp->recv_srcadr));
+ stoa(&rbufp->recv_srcaddr));
sys_restricted++;
return;
}
@@ -4308,7 +4308,7 @@ read_clockstatus(
* status.
*/
cs.kv_list = NULL;
- refclock_control(&peer->srcadr, NULL, &cs);
+ refclock_control(&peer->srcaddr, NULL, &cs);
kv = cs.kv_list;
/*
* Look for variables in the packet.
@@ -4413,7 +4413,7 @@ set_trap(
* Call ctlsettrap() to do the work. Return
* an error if it can't assign the trap.
*/
- if (!ctlsettrap(&rbufp->recv_srcadr, rbufp->dstadr, traptype,
+ if (!ctlsettrap(&rbufp->recv_srcaddr, rbufp->dstadr, traptype,
(int)res_version))
ctl_error(CERR_NORESOURCE);
ctl_flushpkt(0);
@@ -4444,7 +4444,7 @@ unset_trap(
/*
* Call ctlclrtrap() to clear this out.
*/
- if (!ctlclrtrap(&rbufp->recv_srcadr, rbufp->dstadr, traptype))
+ if (!ctlclrtrap(&rbufp->recv_srcaddr, rbufp->dstadr, traptype))
ctl_error(CERR_BADASSOC);
ctl_flushpkt(0);
}
@@ -4677,10 +4677,10 @@ report_event(
peer->last_event = errlast;
peer->num_events++;
- if (ISREFCLOCKADR(&peer->srcadr))
- src = refnumtoa(&peer->srcadr);
+ if (ISREFCLOCKADR(&peer->srcaddr))
+ src = refnumtoa(&peer->srcaddr);
else
- src = stoa(&peer->srcadr);
+ src = stoa(&peer->srcaddr);
snprintf(statstr, sizeof(statstr),
"%s %04x %02x %s", src,
@@ -4739,7 +4739,7 @@ report_event(
struct ctl_var *kv;
cs.kv_list = NULL;
- refclock_control(&peer->srcadr, NULL, &cs);
+ refclock_control(&peer->srcaddr, NULL, &cs);
ctl_puthex("refclockstatus",
ctlclkstatus(&cs));
=====================================
ntpd/ntp_crypto.c
=====================================
--- a/ntpd/ntp_crypto.c
+++ b/ntpd/ntp_crypto.c
@@ -226,7 +226,7 @@ readlink(char * link, char * file, int len) {
*/
keyid_t
session_key(
- sockaddr_u *srcadr, /* source address */
+ sockaddr_u *srcaddr, /* source address */
sockaddr_u *dstadr, /* destination address */
keyid_t keyno, /* key ID */
keyid_t private, /* private value */
@@ -247,9 +247,9 @@ session_key(
* greater than zero, install the key and call it trusted.
*/
hdlen = 0;
- switch(AF(srcadr)) {
+ switch(AF(srcaddr)) {
case AF_INET:
- header[0] = NSRCADR(srcadr);
+ header[0] = NSRCADR(srcaddr);
header[1] = NSRCADR(dstadr);
header[2] = htonl(keyno);
header[3] = htonl(private);
@@ -257,7 +257,7 @@ session_key(
break;
case AF_INET6:
- memcpy(&header[0], PSOCK_ADDR6(srcadr),
+ memcpy(&header[0], PSOCK_ADDR6(srcaddr),
sizeof(struct in6_addr));
memcpy(&header[4], PSOCK_ADDR6(dstadr),
sizeof(struct in6_addr));
@@ -276,7 +276,7 @@ session_key(
authtrust(keyno, lifetime);
}
DPRINTF(2, ("session_key: %s > %s %08x %08x hash %08x life %lu\n",
- stoa(srcadr), stoa(dstadr), keyno,
+ stoa(srcaddr), stoa(dstadr), keyno,
private, keyid, lifetime));
return (keyid);
@@ -353,7 +353,7 @@ make_keylist(
for (i = 0; i < NTP_MAXSESSION; i++) {
peer->keylist[i] = keyid;
peer->keynumber = i;
- keyid = session_key(&dstadr->sin, &peer->srcadr, keyid,
+ keyid = session_key(&dstadr->sin, &peer->srcaddr, keyid,
cookie, lifetime + mpoll);
lifetime -= mpoll;
if (auth_havekey(keyid) || keyid <= NTP_MAXKEY ||
@@ -621,7 +621,7 @@ crypto_recv(
"assoc %d %d host %s %s", peer->associd,
peer->assoc, peer->subject,
OBJ_nid2ln(temp32));
- record_crypto_stats(&peer->srcadr, statstr);
+ record_crypto_stats(&peer->srcaddr, statstr);
#ifdef DEBUG
if (debug)
printf("crypto_recv: %s\n", statstr);
@@ -682,7 +682,7 @@ crypto_recv(
xinfo->subject, xinfo->issuer, xinfo->flags,
OBJ_nid2ln(temp32), temp32,
ntohl(ep->fstamp));
- record_crypto_stats(&peer->srcadr, statstr);
+ record_crypto_stats(&peer->srcaddr, statstr);
#ifdef DEBUG
if (debug)
printf("crypto_recv: %s\n", statstr);
@@ -722,7 +722,7 @@ crypto_recv(
peer->flash &= ~BOGON8;
snprintf(statstr, sizeof(statstr), "iff %s fs %u",
peer->issuer, ntohl(ep->fstamp));
- record_crypto_stats(&peer->srcadr, statstr);
+ record_crypto_stats(&peer->srcaddr, statstr);
#ifdef DEBUG
if (debug)
printf("crypto_recv: %s\n", statstr);
@@ -763,7 +763,7 @@ crypto_recv(
peer->flash &= ~BOGON8;
snprintf(statstr, sizeof(statstr), "gq %s fs %u",
peer->issuer, ntohl(ep->fstamp));
- record_crypto_stats(&peer->srcadr, statstr);
+ record_crypto_stats(&peer->srcaddr, statstr);
#ifdef DEBUG
if (debug)
printf("crypto_recv: %s\n", statstr);
@@ -803,7 +803,7 @@ crypto_recv(
peer->flash &= ~BOGON8;
snprintf(statstr, sizeof(statstr), "mv %s fs %u",
peer->issuer, ntohl(ep->fstamp));
- record_crypto_stats(&peer->srcadr, statstr);
+ record_crypto_stats(&peer->srcaddr, statstr);
#ifdef DEBUG
if (debug)
printf("crypto_recv: %s\n", statstr);
@@ -872,7 +872,7 @@ crypto_recv(
snprintf(statstr, sizeof(statstr),
"cook %x ts %u fs %u", peer->pcookie,
ntohl(ep->tstamp), ntohl(ep->fstamp));
- record_crypto_stats(&peer->srcadr, statstr);
+ record_crypto_stats(&peer->srcaddr, statstr);
#ifdef DEBUG
if (debug)
printf("crypto_recv: %s\n", statstr);
@@ -934,7 +934,7 @@ crypto_recv(
"auto seq %d key %x ts %u fs %u", bp->seq,
bp->key, ntohl(ep->tstamp),
ntohl(ep->fstamp));
- record_crypto_stats(&peer->srcadr, statstr);
+ record_crypto_stats(&peer->srcaddr, statstr);
#ifdef DEBUG
if (debug)
printf("crypto_recv: %s\n", statstr);
@@ -974,7 +974,7 @@ crypto_recv(
xinfo->subject, xinfo->issuer, xinfo->flags,
OBJ_nid2ln(temp32), temp32,
ntohl(ep->fstamp));
- record_crypto_stats(&peer->srcadr, statstr);
+ record_crypto_stats(&peer->srcaddr, statstr);
#ifdef DEBUG
if (debug)
printf("crypto_recv: %s\n", statstr);
@@ -1025,7 +1025,7 @@ crypto_recv(
"leap TAI offset %d at %u expire %u fs %u",
ntohl(ep->pkt[0]), ntohl(ep->pkt[1]),
ntohl(ep->pkt[2]), ntohl(ep->fstamp));
- record_crypto_stats(&peer->srcadr, statstr);
+ record_crypto_stats(&peer->srcaddr, statstr);
#ifdef DEBUG
if (debug)
printf("crypto_recv: %s\n", statstr);
@@ -1077,7 +1077,7 @@ crypto_recv(
snprintf(statstr, sizeof(statstr),
"%04x %d %02x %s", htonl(ep->opcode),
associd, rval, eventstr(rval));
- record_crypto_stats(&peer->srcadr, statstr);
+ record_crypto_stats(&peer->srcaddr, statstr);
#ifdef DEBUG
if (debug)
printf("crypto_recv: %s\n", statstr);
@@ -1119,7 +1119,7 @@ crypto_xmit(
{
struct exten *fp; /* extension pointers */
struct cert_info *cp, *xp, *yp; /* cert info/value pointer */
- sockaddr_u *srcadr_sin; /* source address */
+ sockaddr_u *srcaddr_sin; /* source address */
uint32_t *pkt; /* packet pointer */
u_int opcode; /* extension field opcode */
char certname[MAXHOSTNAME + 1]; /* subject name buffer */
@@ -1142,11 +1142,11 @@ crypto_xmit(
fp = (struct exten *)pkt;
opcode = ntohl(ep->opcode);
if (peer != NULL) {
- srcadr_sin = &peer->srcadr;
+ srcaddr_sin = &peer->srcaddr;
if (!(opcode & CRYPTO_RESP))
peer->opcode = ep->opcode;
} else {
- srcadr_sin = &rbufp->recv_srcadr;
+ srcaddr_sin = &rbufp->recv_srcaddr;
}
associd = (associd_t) ntohl(ep->associd);
len = 8;
@@ -1425,7 +1425,7 @@ crypto_xmit(
snprintf(statstr, sizeof(statstr),
"%04x %d %02x %s", opcode, associd, rval,
eventstr(rval));
- record_crypto_stats(srcadr_sin, statstr);
+ record_crypto_stats(srcaddr_sin, statstr);
#ifdef DEBUG
if (debug)
printf("crypto_xmit: %s\n", statstr);
@@ -1699,7 +1699,7 @@ crypto_ident(
snprintf(filename, sizeof(filename), "ntpkey_%spar_%s",
scheme_name, peer->ident);
peer->ident_pkey = crypto_key(filename, NULL,
- &peer->srcadr);
+ &peer->srcaddr);
if (peer->ident_pkey != NULL)
return scheme_id;
}
=====================================
ntpd/ntp_io.c
=====================================
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -389,7 +389,7 @@ collect_timing(struct recvbuf *rb, const char *tag, int count, l_fp *dts)
snprintf(buf, sizeof(buf), "%s %d %s %s",
(rb != NULL)
? ((rb->dstadr != NULL)
- ? stoa(&rb->recv_srcadr)
+ ? stoa(&rb->recv_srcaddr)
: "-REFCLOCK-")
: "-",
count, lfptoa(dts, 9), tag);
@@ -3471,16 +3471,16 @@ read_network_packet(
return (buflen);
}
- fromlen = sizeof(rb->recv_srcadr);
+ fromlen = sizeof(rb->recv_srcaddr);
#ifndef USE_PACKET_TIMESTAMP
rb->recv_length = recvfrom(fd, (char *)&rb->recv_space,
sizeof(rb->recv_space), 0,
- &rb->recv_srcadr.sa, &fromlen);
+ &rb->recv_srcaddr.sa, &fromlen);
#else
iovec.iov_base = &rb->recv_space;
iovec.iov_len = sizeof(rb->recv_space);
- msghdr.msg_name = &rb->recv_srcadr;
+ msghdr.msg_name = &rb->recv_srcaddr;
msghdr.msg_namelen = fromlen;
msghdr.msg_iov = &iovec;
msghdr.msg_iovlen = 1;
@@ -3502,7 +3502,7 @@ read_network_packet(
return (buflen);
} else if (buflen < 0) {
msyslog(LOG_ERR, "recvfrom(%s) fd=%d: %m",
- stoa(&rb->recv_srcadr), fd);
+ stoa(&rb->recv_srcaddr), fd);
DPRINTF(5, ("read_network_packet: fd=%d dropped (bad recvfrom)\n",
fd));
freerecvbuf(rb);
@@ -3510,7 +3510,7 @@ read_network_packet(
}
DPRINTF(3, ("read_network_packet: fd=%d length %d from %s\n",
- fd, buflen, stoa(&rb->recv_srcadr)));
+ fd, buflen, stoa(&rb->recv_srcaddr)));
/*
** Bug 2672: Some OSes (MacOSX and Linux) don't block spoofed ::1
@@ -3518,13 +3518,13 @@ read_network_packet(
if (AF_INET6 == itf->family) {
DPRINTF(2, ("Got an IPv6 packet, from <%s> (%d) to <%s> (%d)\n",
- stoa(&rb->recv_srcadr),
- IN6_IS_ADDR_LOOPBACK(PSOCK_ADDR6(&rb->recv_srcadr)),
+ stoa(&rb->recv_srcaddr),
+ IN6_IS_ADDR_LOOPBACK(PSOCK_ADDR6(&rb->recv_srcaddr)),
stoa(&itf->sin),
!IN6_IS_ADDR_LOOPBACK(PSOCK_ADDR6(&itf->sin))
));
- if ( IN6_IS_ADDR_LOOPBACK(PSOCK_ADDR6(&rb->recv_srcadr))
+ if ( IN6_IS_ADDR_LOOPBACK(PSOCK_ADDR6(&rb->recv_srcaddr))
&& !IN6_IS_ADDR_LOOPBACK(PSOCK_ADDR6(&itf->sin))
) {
packets_dropped++;
@@ -3709,12 +3709,12 @@ input_handler(
*/
if (buflen < 0 && EAGAIN != errno) {
saved_errno = errno;
- clk = refnumtoa(&rp->srcclock->srcadr);
+ clk = refnumtoa(&rp->srcclock->srcaddr);
errno = saved_errno;
msyslog(LOG_ERR, "%s read: %m", clk);
maintain_activefds(fd, true);
} else if (0 == buflen) {
- clk = refnumtoa(&rp->srcclock->srcadr);
+ clk = refnumtoa(&rp->srcclock->srcaddr);
msyslog(LOG_ERR, "%s read EOF", clk);
maintain_activefds(fd, true);
} else {
@@ -3821,7 +3821,7 @@ input_handler(
endpt *
select_peerinterface(
struct peer * peer,
- sockaddr_u * srcadr,
+ sockaddr_u * srcaddr,
endpt * dstadr
)
{
@@ -3829,7 +3829,7 @@ select_peerinterface(
#ifndef SIM
endpt *wild;
- wild = ANY_INTERFACE_CHOOSE(srcadr);
+ wild = ANY_INTERFACE_CHOOSE(srcaddr);
/*
* Initialize the peer structure and dance the interface jig.
@@ -3839,17 +3839,17 @@ select_peerinterface(
* This might happen in some systems and would preclude proper
* operation with public key cryptography.
*/
- if (ISREFCLOCKADR(srcadr)) {
+ if (ISREFCLOCKADR(srcaddr)) {
ep = loopback_interface;
} else if (peer->cast_flags &
(MDF_BCLNT | MDF_ACAST | MDF_MCAST | MDF_BCAST)) {
- ep = findbcastinter(srcadr);
+ ep = findbcastinter(srcaddr);
if (ep != NULL)
DPRINTF(4, ("Found *-cast interface %s for address %s\n",
- stoa(&ep->sin), stoa(srcadr)));
+ stoa(&ep->sin), stoa(srcaddr)));
else
DPRINTF(4, ("No *-cast local address found for address %s\n",
- stoa(srcadr)));
+ stoa(srcaddr)));
} else {
ep = dstadr;
if (NULL == ep)
@@ -3862,7 +3862,7 @@ select_peerinterface(
* way, try a little harder.
*/
if (wild == ep)
- ep = findinterface(srcadr);
+ ep = findinterface(srcaddr);
/*
* we do not bind to the wildcard interfaces for output
* as our (network) source address would be undefined and
=====================================
ntpd/ntp_monitor.c
=====================================
--- a/ntpd/ntp_monitor.c
+++ b/ntpd/ntp_monitor.c
@@ -327,7 +327,7 @@ ntp_monitor(
return ~(RES_LIMITED | RES_KOD) & flags;
pkt = &rbufp->recv_pkt;
- hash = MON_HASH(&rbufp->recv_srcadr);
+ hash = MON_HASH(&rbufp->recv_srcaddr);
mode = PKT_MODE(pkt->li_vn_mode);
version = PKT_VERSION(pkt->li_vn_mode);
mon = mon_hash[hash];
@@ -338,7 +338,7 @@ ntp_monitor(
*/
for (; mon != NULL; mon = mon->hash_next)
- if (SOCK_EQ(&mon->rmtadr, &rbufp->recv_srcadr))
+ if (SOCK_EQ(&mon->rmtadr, &rbufp->recv_srcaddr))
break;
if (mon != NULL) {
@@ -348,7 +348,7 @@ ntp_monitor(
L_ADDUF(&interval_fp, 0x80000000);
interval = interval_fp.l_i;
mon->last = rbufp->recv_time;
- NSRCPORT(&mon->rmtadr) = NSRCPORT(&rbufp->recv_srcadr);
+ NSRCPORT(&mon->rmtadr) = NSRCPORT(&rbufp->recv_srcaddr);
mon->count++;
restrict_mask = flags;
mon->vn_mode = VN_MODE(version, mode);
@@ -475,7 +475,7 @@ ntp_monitor(
mon->count = 1;
mon->flags = ~(RES_LIMITED | RES_KOD) & flags;
mon->leak = 0;
- memcpy(&mon->rmtadr, &rbufp->recv_srcadr, sizeof(mon->rmtadr));
+ memcpy(&mon->rmtadr, &rbufp->recv_srcaddr, sizeof(mon->rmtadr));
mon->vn_mode = VN_MODE(version, mode);
mon->lcladr = rbufp->dstadr;
mon->cast_flags = (uint8_t)(((rbufp->dstadr->flags &
=====================================
ntpd/ntp_peer.c
=====================================
--- a/ntpd/ntp_peer.c
+++ b/ntpd/ntp_peer.c
@@ -188,8 +188,8 @@ findexistingpeer_name(
if (p->hostname != NULL
&& (-1 == mode || p->hmode == mode)
&& (AF_UNSPEC == hname_fam
- || AF_UNSPEC == AF(&p->srcadr)
- || hname_fam == AF(&p->srcadr))
+ || AF_UNSPEC == AF(&p->srcaddr)
+ || hname_fam == AF(&p->srcaddr))
&& !strcasecmp(p->hostname, hostname))
break;
return p;
@@ -210,7 +210,7 @@ findexistingpeer_addr(
DPRINTF(2, ("findexistingpeer_addr(%s, %s, %d, 0x%x)\n",
sptoa(addr),
(start_peer)
- ? sptoa(&start_peer->srcadr)
+ ? sptoa(&start_peer->srcaddr)
: "NULL",
mode, (u_int)cast_flags));
@@ -222,7 +222,7 @@ findexistingpeer_addr(
* if broadcastdelay is not specified, and switch to
* MODE_BCLIENT after estimating the one-way delay. Duplicate
* associations are expanded in definition to match any other
- * MDF_BCLNT with the same srcadr (remote, unicast address).
+ * MDF_BCLNT with the same srcaddr (remote, unicast address).
*/
if (NULL == start_peer)
peer = peer_hash[NTP_HASH_ADDR(addr)];
@@ -231,12 +231,12 @@ findexistingpeer_addr(
while (peer != NULL) {
DPRINTF(3, ("%s %s %d %d 0x%x 0x%x ", sptoa(addr),
- sptoa(&peer->srcadr), mode, peer->hmode,
+ sptoa(&peer->srcaddr), mode, peer->hmode,
(u_int)cast_flags, (u_int)peer->cast_flags));
if ((-1 == mode || peer->hmode == mode ||
((MDF_BCLNT & peer->cast_flags) &&
(MDF_BCLNT & cast_flags))) &&
- ADDR_PORT_EQ(addr, &peer->srcadr)) {
+ ADDR_PORT_EQ(addr, &peer->srcaddr)) {
DPRINTF(3, ("found.\n"));
break;
}
@@ -281,16 +281,16 @@ findpeer(
)
{
struct peer * p;
- sockaddr_u * srcadr;
+ sockaddr_u * srcaddr;
u_int hash;
struct pkt * pkt;
l_fp pkt_org;
findpeer_calls++;
- srcadr = &rbufp->recv_srcadr;
- hash = NTP_HASH_ADDR(srcadr);
+ srcaddr = &rbufp->recv_srcaddr;
+ hash = NTP_HASH_ADDR(srcaddr);
for (p = peer_hash[hash]; p != NULL; p = p->adr_link) {
- if (ADDR_PORT_EQ(srcadr, &p->srcadr)) {
+ if (ADDR_PORT_EQ(srcaddr, &p->srcaddr)) {
/*
* if the association matching rules determine
@@ -341,7 +341,7 @@ findpeer(
set_peerdstadr(p, rbufp->dstadr);
if (p->dstadr == rbufp->dstadr) {
DPRINTF(1, ("Changed %s local address to match response\n",
- stoa(&p->srcadr)));
+ stoa(&p->srcaddr)));
return findpeer(rbufp, pkt_mode, action);
}
}
@@ -469,7 +469,7 @@ free_peer(
int hash;
if (unlink_peer) {
- hash = NTP_HASH_ADDR(&p->srcadr);
+ hash = NTP_HASH_ADDR(&p->srcaddr);
peer_hash_count[hash]--;
UNLINK_SLIST(unlinked, peer_hash[hash], p, adr_link,
@@ -477,7 +477,7 @@ free_peer(
if (NULL == unlinked) {
peer_hash_count[hash]++;
msyslog(LOG_ERR, "peer %s not in address table!",
- stoa(&p->srcadr));
+ stoa(&p->srcaddr));
}
/*
@@ -492,7 +492,7 @@ free_peer(
assoc_hash_count[hash]++;
msyslog(LOG_ERR,
"peer %s not in association ID table!",
- stoa(&p->srcadr));
+ stoa(&p->srcaddr));
}
/* Remove him from the overall list. */
@@ -500,7 +500,7 @@ free_peer(
struct peer);
if (NULL == unlinked)
msyslog(LOG_ERR, "%s not in peer list!",
- stoa(&p->srcadr));
+ stoa(&p->srcaddr));
}
if (p->hostname != NULL)
@@ -528,7 +528,7 @@ unpeer(
)
{
mprintf_event(PEVNT_DEMOBIL, peer, "assoc %u", peer->associd);
- restrict_source(&peer->srcadr, 1, 0);
+ restrict_source(&peer->srcaddr, 1, 0);
set_peerdstadr(peer, NULL);
peer_demobilizations++;
peer_associations--;
@@ -551,7 +551,7 @@ unpeer(
*/
struct peer *
peer_config(
- sockaddr_u * srcadr,
+ sockaddr_u * srcaddr,
const char * hostname,
endpt * dstadr,
uint8_t hmode,
@@ -573,16 +573,16 @@ peer_config(
*/
switch (hmode) {
case MODE_BROADCAST:
- if (IS_MCAST(srcadr))
+ if (IS_MCAST(srcaddr))
cast_flags = MDF_MCAST;
else
cast_flags = MDF_BCAST;
break;
case MODE_CLIENT:
- if (hostname != NULL && SOCK_UNSPEC(srcadr))
+ if (hostname != NULL && SOCK_UNSPEC(srcaddr))
cast_flags = MDF_POOL;
- else if (IS_MCAST(srcadr))
+ else if (IS_MCAST(srcaddr))
cast_flags = MDF_ACAST;
else
cast_flags = MDF_UCAST;
@@ -604,7 +604,7 @@ peer_config(
flags |= FLAG_IBURST;
if ((MDF_ACAST | MDF_POOL) & cast_flags)
flags &= ~FLAG_PREEMPT;
- return newpeer(srcadr, hostname, dstadr, hmode, version,
+ return newpeer(srcaddr, hostname, dstadr, hmode, version,
minpoll, maxpoll, flags, cast_flags, ttl, key, ident);
}
@@ -636,7 +636,7 @@ set_peerdstadr(
UNLINK_SLIST(unlinked, p->dstadr->peers, p, ilink,
struct peer);
msyslog(LOG_INFO, "%s local addr %s -> %s",
- stoa(&p->srcadr), latoa(p->dstadr),
+ stoa(&p->srcaddr), latoa(p->dstadr),
latoa(dstadr));
}
p->dstadr = dstadr;
@@ -657,12 +657,12 @@ peer_refresh_interface(
endpt * niface;
endpt * piface;
- niface = select_peerinterface(p, &p->srcadr, NULL);
+ niface = select_peerinterface(p, &p->srcaddr, NULL);
DPRINTF(4, (
"peer_refresh_interface: %s->%s mode %d vers %d poll %d %d flags 0x%x 0x%x ttl %u key %08x: new interface: ",
p->dstadr == NULL ? "<null>" :
- stoa(&p->dstadr->sin), stoa(&p->srcadr), p->hmode,
+ stoa(&p->dstadr->sin), stoa(&p->srcaddr), p->hmode,
p->version, p->minpoll, p->maxpoll, p->flags, p->cast_flags,
p->ttl, p->keyid));
if (niface != NULL) {
@@ -693,14 +693,14 @@ peer_refresh_interface(
* Broadcast needs the socket enabled for broadcast
*/
if (MDF_BCAST & p->cast_flags)
- enable_broadcast(p->dstadr, &p->srcadr);
+ enable_broadcast(p->dstadr, &p->srcaddr);
/*
* Multicast needs the socket interface enabled for
* multicast
*/
if (MDF_MCAST & p->cast_flags)
- enable_multicast_if(p->dstadr, &p->srcadr);
+ enable_multicast_if(p->dstadr, &p->srcaddr);
}
}
@@ -732,7 +732,7 @@ refresh_all_peerinterfaces(void)
*/
struct peer *
newpeer(
- sockaddr_u * srcadr,
+ sockaddr_u * srcaddr,
const char * hostname,
endpt * dstadr,
uint8_t hmode,
@@ -778,7 +778,7 @@ newpeer(
* structure.
*/
if (dstadr != NULL) {
- peer = findexistingpeer(srcadr, hostname, NULL, hmode,
+ peer = findexistingpeer(srcaddr, hostname, NULL, hmode,
cast_flags);
while (peer != NULL) {
if (peer->dstadr == dstadr ||
@@ -786,16 +786,16 @@ newpeer(
(MDF_BCLNT & peer->cast_flags)))
break;
- if (dstadr == ANY_INTERFACE_CHOOSE(srcadr) &&
- peer->dstadr == findinterface(srcadr))
+ if (dstadr == ANY_INTERFACE_CHOOSE(srcaddr) &&
+ peer->dstadr == findinterface(srcaddr))
break;
- peer = findexistingpeer(srcadr, hostname, peer,
+ peer = findexistingpeer(srcaddr, hostname, peer,
hmode, cast_flags);
}
} else {
/* no endpt address given */
- peer = findexistingpeer(srcadr, hostname, NULL, hmode,
+ peer = findexistingpeer(srcaddr, hostname, NULL, hmode,
cast_flags);
}
@@ -809,7 +809,7 @@ newpeer(
DPRINTF(2, ("newpeer(%s) found existing association\n",
(hostname)
? hostname
- : stoa(srcadr)));
+ : stoa(srcaddr)));
return NULL;
}
@@ -832,7 +832,7 @@ newpeer(
if (++current_association_ID == 0)
++current_association_ID;
- peer->srcadr = *srcadr;
+ peer->srcaddr = *srcaddr;
if (hostname != NULL)
peer->hostname = estrdup(hostname);
peer->hmode = hmode;
@@ -840,7 +840,7 @@ newpeer(
peer->flags = flags;
peer->cast_flags = cast_flags;
set_peerdstadr(peer,
- select_peerinterface(peer, srcadr, dstadr));
+ select_peerinterface(peer, srcaddr, dstadr));
/*
* It is an error to set minpoll less than NTP_MINPOLL or to
@@ -862,23 +862,23 @@ newpeer(
if (peer->dstadr != NULL)
DPRINTF(3, ("newpeer(%s): using fd %d and our addr %s\n",
- stoa(srcadr), peer->dstadr->fd,
+ stoa(srcaddr), peer->dstadr->fd,
stoa(&peer->dstadr->sin)));
else
DPRINTF(3, ("newpeer(%s): local interface currently not bound\n",
- stoa(srcadr)));
+ stoa(srcaddr)));
/*
* Broadcast needs the socket enabled for broadcast
*/
if ((MDF_BCAST & cast_flags) && peer->dstadr != NULL)
- enable_broadcast(peer->dstadr, srcadr);
+ enable_broadcast(peer->dstadr, srcaddr);
/*
* Multicast needs the socket interface enabled for multicast
*/
if ((MDF_MCAST & cast_flags) && peer->dstadr != NULL)
- enable_multicast_if(peer->dstadr, srcadr);
+ enable_multicast_if(peer->dstadr, srcaddr);
#ifdef ENABLE_AUTOKEY
if (key > NTP_MAXKEY)
@@ -910,7 +910,7 @@ newpeer(
peer->timereachable = current_time;
peer->timereceived = current_time;
- if (ISREFCLOCKADR(&peer->srcadr)) {
+ if (ISREFCLOCKADR(&peer->srcaddr)) {
#ifdef REFCLOCK
/*
* We let the reference clock support do clock
@@ -930,7 +930,7 @@ newpeer(
}
#else /* REFCLOCK */
msyslog(LOG_ERR, "refclock %s isn't supported. ntpd was compiled without refclock support.",
- stoa(&peer->srcadr));
+ stoa(&peer->srcaddr));
set_peerdstadr(peer, NULL);
free_peer(peer, 0);
return NULL;
@@ -940,7 +940,7 @@ newpeer(
/*
* Put the new peer in the hash tables.
*/
- hash = NTP_HASH_ADDR(&peer->srcadr);
+ hash = NTP_HASH_ADDR(&peer->srcaddr);
LINK_SLIST(peer_hash[hash], peer, adr_link);
peer_hash_count[hash]++;
hash = peer->associd & NTP_HASH_MASK;
@@ -948,10 +948,10 @@ newpeer(
assoc_hash_count[hash]++;
LINK_SLIST(peer_list, peer, p_link);
- restrict_source(&peer->srcadr, 0, 0);
+ restrict_source(&peer->srcaddr, 0, 0);
mprintf_event(PEVNT_MOBIL, peer, "assoc %d", peer->associd);
DPRINTF(1, ("newpeer: %s->%s mode %u vers %u poll %u %u flags 0x%x 0x%x ttl %u key %08x\n",
- latoa(peer->dstadr), stoa(&peer->srcadr), peer->hmode,
+ latoa(peer->dstadr), stoa(&peer->srcaddr), peer->hmode,
peer->version, peer->minpoll, peer->maxpoll, peer->flags,
peer->cast_flags, peer->ttl, peer->keyid));
return peer;
=====================================
ntpd/ntp_proto.c
=====================================
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -427,14 +427,14 @@ receive(
* reveals a clogging attack.
*/
sys_received++;
- if (0 == SRCPORT(&rbufp->recv_srcadr)) {
+ if (0 == SRCPORT(&rbufp->recv_srcaddr)) {
sys_badlength++;
return; /* bogus port */
}
- restrict_mask = restrictions(&rbufp->recv_srcadr);
+ restrict_mask = restrictions(&rbufp->recv_srcaddr);
DPRINTF(2, ("receive: at %ld %s<-%s flags %x restrict %03x\n",
current_time, stoa(&rbufp->dstadr->sin),
- stoa(&rbufp->recv_srcadr),
+ stoa(&rbufp->recv_srcaddr),
rbufp->dstadr->flags, restrict_mask));
pkt = &rbufp->recv_pkt;
hisversion = PKT_VERSION(pkt->li_vn_mode);
@@ -601,7 +601,7 @@ receive(
hismode || MODE_SERVER == hismode) {
if (MODE_SERVER == hismode)
DPRINTF(1, ("Possibly self-induced rate limiting of MODE_SERVER from %s\n",
- stoa(&rbufp->recv_srcadr)));
+ stoa(&rbufp->recv_srcaddr)));
return; /* rate exceeded */
}
if (hismode == MODE_CLIENT)
@@ -673,7 +673,7 @@ receive(
printf(
"receive: at %ld %s<-%s mode %d len %zd\n",
current_time, stoa(dstadr_sin),
- stoa(&rbufp->recv_srcadr), hismode,
+ stoa(&rbufp->recv_srcaddr), hismode,
authlen);
#endif
} else if (has_mac == 4) {
@@ -684,7 +684,7 @@ receive(
printf(
"receive: at %ld %s<-%s mode %d keyid %08x len %zd auth %d\n",
current_time, stoa(dstadr_sin),
- stoa(&rbufp->recv_srcadr), hismode, skeyid,
+ stoa(&rbufp->recv_srcaddr), hismode, skeyid,
authlen + has_mac, is_authentic);
#endif
@@ -755,7 +755,7 @@ receive(
* the wildcard interface, game over.
*/
if (crypto_flags && rbufp->dstadr ==
- ANY_INTERFACE_CHOOSE(&rbufp->recv_srcadr)) {
+ ANY_INTERFACE_CHOOSE(&rbufp->recv_srcaddr)) {
sys_restricted++;
return; /* no wildcard */
}
@@ -765,7 +765,7 @@ receive(
&rbufp->dstadr->bcast;
} else if (peer == NULL) {
pkeyid = session_key(
- &rbufp->recv_srcadr, dstadr_sin, 0,
+ &rbufp->recv_srcaddr, dstadr_sin, 0,
sys_private, 0);
} else {
pkeyid = peer->pcookie;
@@ -779,14 +779,14 @@ receive(
* use later in the autokey mambo.
*/
if (authlen > LEN_PKT_NOMAC && pkeyid != 0) {
- session_key(&rbufp->recv_srcadr,
+ session_key(&rbufp->recv_srcaddr,
dstadr_sin, skeyid, 0, 2);
tkeyid = session_key(
- &rbufp->recv_srcadr, dstadr_sin,
+ &rbufp->recv_srcaddr, dstadr_sin,
skeyid, pkeyid, 0);
} else {
tkeyid = session_key(
- &rbufp->recv_srcadr, dstadr_sin,
+ &rbufp->recv_srcaddr, dstadr_sin,
skeyid, pkeyid, 2);
}
@@ -814,7 +814,7 @@ receive(
printf(
"receive: at %ld %s<-%s mode %d keyid %08x len %zd auth %d\n",
current_time, stoa(dstadr_sin),
- stoa(&rbufp->recv_srcadr), hismode, skeyid,
+ stoa(&rbufp->recv_srcaddr), hismode, skeyid,
authlen + has_mac, is_authentic);
#endif
}
@@ -949,7 +949,7 @@ receive(
sys_declined++;
return; /* no help */
}
- peer = newpeer(&rbufp->recv_srcadr, NULL, rbufp->dstadr,
+ peer = newpeer(&rbufp->recv_srcaddr, NULL, rbufp->dstadr,
MODE_CLIENT, hisversion, peer2->minpoll,
peer2->maxpoll, FLAG_PREEMPT |
(FLAG_IBURST & peer2->flags), MDF_UCAST |
@@ -1058,7 +1058,7 @@ receive(
* Do not execute the volley. Start out in
* broadcast client mode.
*/
- peer = newpeer(&rbufp->recv_srcadr, NULL,
+ peer = newpeer(&rbufp->recv_srcaddr, NULL,
match_ep, MODE_BCLIENT, hisversion,
pkt->ppoll, pkt->ppoll, FLAG_PREEMPT,
MDF_BCLNT, 0, skeyid, sys_ident);
@@ -1080,7 +1080,7 @@ receive(
* packet, normally 6 (64 s) and that the poll interval
* is fixed at this value.
*/
- peer = newpeer(&rbufp->recv_srcadr, NULL, match_ep,
+ peer = newpeer(&rbufp->recv_srcaddr, NULL, match_ep,
MODE_CLIENT, hisversion, pkt->ppoll, pkt->ppoll,
FLAG_BC_VOL | FLAG_IBURST | FLAG_PREEMPT, MDF_BCLNT,
0, skeyid, sys_ident);
@@ -1148,7 +1148,7 @@ receive(
printf(
"receive: at %ld refusing to mobilize passive association"
" with unknown peer %s mode %d keyid %08x len %zd auth %d\n",
- current_time, stoa(&rbufp->recv_srcadr), hismode, skeyid,
+ current_time, stoa(&rbufp->recv_srcaddr), hismode, skeyid,
authlen + has_mac, is_authentic);
}
#endif
@@ -1176,7 +1176,7 @@ receive(
* The message is correctly authenticated and allowed.
* Mobilize a symmetric passive association.
*/
- if ((peer = newpeer(&rbufp->recv_srcadr, NULL,
+ if ((peer = newpeer(&rbufp->recv_srcaddr, NULL,
rbufp->dstadr, MODE_PASSIVE, hisversion, pkt->ppoll,
NTP_MAXDPOLL, 0, MDF_UCAST, 0, skeyid,
sys_ident)) == NULL) {
@@ -1496,7 +1496,7 @@ receive(
break;
}
tkeyid = session_key(
- &rbufp->recv_srcadr, dstadr_sin,
+ &rbufp->recv_srcaddr, dstadr_sin,
tkeyid, pkeyid, 0);
}
if (peer->flash & BOGON8)
@@ -1584,7 +1584,7 @@ process_packet(
/*
* Capture the header values in the client/peer association..
*/
- record_raw_stats(&peer->srcadr, peer->dstadr ?
+ record_raw_stats(&peer->srcaddr, peer->dstadr ?
&peer->dstadr->sin : NULL,
&p_org, &p_rec, &p_xmt, &peer->dst,
pleap, pversion, pmode, pstratum, pkt->ppoll, pkt->precision,
@@ -1899,7 +1899,7 @@ clock_update(
peer->stratum == STRATUM_UNSPEC)
sys_refid = peer->refid;
else
- sys_refid = addr2refid(&peer->srcadr);
+ sys_refid = addr2refid(&peer->srcaddr);
/*
* Root Dispersion (E) is defined (in RFC 5905) as:
*
@@ -2153,7 +2153,7 @@ poll_update(
peer->nextdate += ntp_minpkt;
}
DPRINTF(2, ("poll_update: at %lu %s poll %d burst %d retry %d head %d early %lu next %lu\n",
- current_time, ntoa(&peer->srcadr), peer->hpoll,
+ current_time, ntoa(&peer->srcaddr), peer->hpoll,
peer->burst, peer->retry, peer->throttle,
utemp - current_time, peer->nextdate -
current_time));
@@ -2428,7 +2428,7 @@ clock_filter(
* processing. If not synchronized or not in a burst, tickle the
* clock select algorithm.
*/
- record_peer_stats(&peer->srcadr, ctlpeerstatus(peer),
+ record_peer_stats(&peer->srcaddr, ctlpeerstatus(peer),
peer->offset, peer->delay, peer->disp, peer->jitter);
#ifdef DEBUG
if (debug)
@@ -2548,7 +2548,7 @@ clock_select(void)
localmet = ntohl(peer->dstadr->addr_refid);
else
localmet = UINT32_MAX;
- peermet = ntohl(addr2refid(&peer->srcadr));
+ peermet = ntohl(addr2refid(&peer->srcaddr));
if (peermet < localmet && peermet < orphmet) {
typeorphan = peer;
orphmet = peermet;
@@ -2764,7 +2764,7 @@ clock_select(void)
for (i = 0; i < nlist; i++) {
peers[i].peer->new_status = CTL_PST_SEL_SELCAND;
DPRINTF(2, ("select: survivor %s %f\n",
- stoa(&peers[i].peer->srcadr), peers[i].synch));
+ stoa(&peers[i].peer->srcaddr), peers[i].synch));
}
/*
@@ -2803,7 +2803,7 @@ clock_select(void)
break;
DPRINTF(3, ("select: drop %s seljit %.6f jit %.6f\n",
- ntoa(&peers[k].peer->srcadr), g, d));
+ ntoa(&peers[k].peer->srcaddr), g, d));
if (nlist > sys_maxclock)
peers[k].peer->new_status = CTL_PST_SEL_EXCESS;
for (j = k + 1; j < nlist; j++)
@@ -3116,7 +3116,7 @@ peer_xmit(
}
}
peer->t21_bytes = sendlen;
- intercept_sendpkt(__func__, &peer->srcadr, peer->dstadr, sys_ttl[peer->ttl],
+ intercept_sendpkt(__func__, &peer->srcaddr, peer->dstadr, sys_ttl[peer->ttl],
&xpkt, sendlen);
peer->sent++;
peer->throttle += (1 << peer->minpoll) - 2;
@@ -3139,7 +3139,7 @@ peer_xmit(
printf("transmit: at %ld %s->%s mode %d len %zu\n",
current_time, peer->dstadr ?
stoa(&peer->dstadr->sin) : "-",
- stoa(&peer->srcadr), peer->hmode, sendlen);
+ stoa(&peer->srcaddr), peer->hmode, sendlen);
#endif
return;
}
@@ -3384,7 +3384,7 @@ peer_xmit(
* fields are present, the cookie value is zero.
*/
if (sendlen > (int)LEN_PKT_NOMAC) {
- session_key(&peer->dstadr->sin, &peer->srcadr,
+ session_key(&peer->dstadr->sin, &peer->srcaddr,
xkeyid, 0, 2);
}
}
@@ -3429,7 +3429,7 @@ peer_xmit(
exit (-1);
}
peer->t21_bytes = sendlen;
- intercept_sendpkt(__func__, &peer->srcadr, peer->dstadr, sys_ttl[peer->ttl], &xpkt,
+ intercept_sendpkt(__func__, &peer->srcaddr, peer->dstadr, sys_ttl[peer->ttl], &xpkt,
sendlen);
peer->sent++;
peer->throttle += (1 << peer->minpoll) - 2;
@@ -3452,7 +3452,7 @@ peer_xmit(
if (debug)
printf("transmit: at %ld %s->%s mode %d keyid %08x len %zu index %d\n",
current_time, latoa(peer->dstadr),
- ntoa(&peer->srcadr), peer->hmode, xkeyid, sendlen,
+ ntoa(&peer->srcaddr), peer->hmode, xkeyid, sendlen,
peer->keynumber);
#endif
#else /* !ENABLE_AUTOKEY follows */
@@ -3461,7 +3461,7 @@ peer_xmit(
printf("transmit: at %ld %s->%s mode %d keyid %08x len %zd\n",
current_time, peer->dstadr ?
ntoa(&peer->dstadr->sin) : "-",
- ntoa(&peer->srcadr), peer->hmode, xkeyid, sendlen);
+ ntoa(&peer->srcaddr), peer->hmode, xkeyid, sendlen);
#endif
#endif /* !ENABLE_AUTOKEY */
}
@@ -3510,7 +3510,7 @@ fast_xmit(
*/
rpkt = &rbufp->recv_pkt;
if (rbufp->dstadr->flags & INT_MCASTOPEN)
- rbufp->dstadr = findinterface(&rbufp->recv_srcadr);
+ rbufp->dstadr = findinterface(&rbufp->recv_srcaddr);
/*
* If this is a kiss-o'-death (KoD) packet, show leap
@@ -3610,14 +3610,14 @@ fast_xmit(
*/
sendlen = LEN_PKT_NOMAC;
if (rbufp->recv_length == sendlen) {
- intercept_sendpkt(__func__, &rbufp->recv_srcadr, rbufp->dstadr, 0, &xpkt,
+ intercept_sendpkt(__func__, &rbufp->recv_srcaddr, rbufp->dstadr, 0, &xpkt,
sendlen);
#ifdef DEBUG
if (debug)
printf(
"transmit: at %ld %s->%s mode %d len %zd\n",
current_time, stoa(&rbufp->dstadr->sin),
- stoa(&rbufp->recv_srcadr), xmode, sendlen);
+ stoa(&rbufp->recv_srcaddr), xmode, sendlen);
#endif
return;
}
@@ -3643,11 +3643,11 @@ fast_xmit(
* jerk can decode it. If no extension field is present,
* use the cookie to generate the session key.
*/
- cookie = session_key(&rbufp->recv_srcadr,
+ cookie = session_key(&rbufp->recv_srcaddr,
&rbufp->dstadr->sin, 0, sys_private, 0);
if (rbufp->recv_length > sendlen + (int)MAX_MAC_LEN) {
session_key(&rbufp->dstadr->sin,
- &rbufp->recv_srcadr, xkeyid, 0, 2);
+ &rbufp->recv_srcaddr, xkeyid, 0, 2);
temp32 = CRYPTO_RESP;
rpkt->exten[0] |= htonl(temp32);
sendlen += crypto_xmit(NULL, &xpkt, rbufp,
@@ -3655,7 +3655,7 @@ fast_xmit(
cookie);
} else {
session_key(&rbufp->dstadr->sin,
- &rbufp->recv_srcadr, xkeyid, cookie, 2);
+ &rbufp->recv_srcaddr, xkeyid, cookie, 2);
}
}
#endif /* ENABLE_AUTOKEY */
@@ -3665,7 +3665,7 @@ fast_xmit(
if (xkeyid > NTP_MAXKEY)
authtrust(xkeyid, 0);
#endif /* ENABLE_AUTOKEY */
- intercept_sendpkt(__func__, &rbufp->recv_srcadr, rbufp->dstadr, 0, &xpkt, sendlen);
+ intercept_sendpkt(__func__, &rbufp->recv_srcaddr, rbufp->dstadr, 0, &xpkt, sendlen);
intercept_get_systime(__func__, &xmt_ty);
L_SUB(&xmt_ty, &xmt_tx);
sys_authdelay = xmt_ty;
@@ -3674,7 +3674,7 @@ fast_xmit(
printf(
"transmit: at %ld %s->%s mode %d keyid %08x len %zd\n",
current_time, ntoa(&rbufp->dstadr->sin),
- ntoa(&rbufp->recv_srcadr), xmode, xkeyid, sendlen);
+ ntoa(&rbufp->recv_srcaddr), xmode, xkeyid, sendlen);
#endif
}
@@ -3704,7 +3704,7 @@ pool_xmit(
pool->addrs = NULL;
}
ZERO(hints);
- hints.ai_family = AF(&pool->srcadr);
+ hints.ai_family = AF(&pool->srcaddr);
hints.ai_socktype = SOCK_DGRAM;
hints.ai_protocol = IPPROTO_UDP;
/* ignore getaddrinfo_sometime() errors, we will retry */
@@ -3885,7 +3885,7 @@ local_refid(
if (p->dstadr != NULL && !(INT_MCASTIF & p->dstadr->flags))
unicast_ep = p->dstadr;
else
- unicast_ep = findinterface(&p->srcadr);
+ unicast_ep = findinterface(&p->srcaddr);
if (unicast_ep != NULL && p->refid == unicast_ep->addr_refid)
return true;
=====================================
ntpd/ntp_refclock.c
=====================================
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -162,14 +162,14 @@ refclock_newpeer(
* Check for valid clock address. If already running, shut it
* down first.
*/
- if (!ISREFCLOCKADR(&peer->srcadr)) {
+ if (!ISREFCLOCKADR(&peer->srcaddr)) {
msyslog(LOG_ERR,
"refclock_newpeer: clock address %s invalid",
- stoa(&peer->srcadr));
+ stoa(&peer->srcaddr));
return false;
}
- clktype = (uint8_t)REFCLOCKTYPE(&peer->srcadr);
- unit = REFCLOCKUNIT(&peer->srcadr);
+ clktype = (uint8_t)REFCLOCKTYPE(&peer->srcaddr);
+ unit = REFCLOCKUNIT(&peer->srcaddr);
if (clktype >= num_refclock_conf ||
refclock_conf[clktype]->clock_start == noentry) {
msyslog(LOG_ERR,
@@ -302,7 +302,7 @@ refclock_transmit(
#ifdef DEBUG
if (debug)
printf("refclock_transmit: at %ld %s\n",
- current_time, stoa(&(peer->srcadr)));
+ current_time, stoa(&(peer->srcaddr)));
#endif
/*
@@ -521,7 +521,7 @@ refclock_receive(
#ifdef DEBUG
if (debug)
printf("refclock_receive: at %lu %s\n",
- current_time, stoa(&peer->srcadr));
+ current_time, stoa(&peer->srcaddr));
#endif
/*
@@ -926,7 +926,7 @@ refclock_ioctl(
*/
void
refclock_control(
- sockaddr_u *srcadr,
+ sockaddr_u *srcaddr,
const struct refclockstat *in,
struct refclockstat *out
)
@@ -939,13 +939,13 @@ refclock_control(
/*
* Check for valid address and running peer
*/
- if (!ISREFCLOCKADR(srcadr))
+ if (!ISREFCLOCKADR(srcaddr))
return;
- clktype = (uint8_t)REFCLOCKTYPE(srcadr);
- unit = REFCLOCKUNIT(srcadr);
+ clktype = (uint8_t)REFCLOCKTYPE(srcaddr);
+ unit = REFCLOCKUNIT(srcaddr);
- peer = findexistingpeer(srcadr, NULL, NULL, -1, 0);
+ peer = findexistingpeer(srcaddr, NULL, NULL, -1, 0);
if (NULL == peer)
return;
@@ -1037,7 +1037,7 @@ refclock_control(
*/
void
refclock_buginfo(
- sockaddr_u *srcadr, /* clock address */
+ sockaddr_u *srcaddr, /* clock address */
struct refclockbug *bug /* output structure */
)
{
@@ -1050,13 +1050,13 @@ refclock_buginfo(
/*
* Check for valid address and peer structure
*/
- if (!ISREFCLOCKADR(srcadr))
+ if (!ISREFCLOCKADR(srcaddr))
return;
- clktype = (uint8_t) REFCLOCKTYPE(srcadr);
- unit = REFCLOCKUNIT(srcadr);
+ clktype = (uint8_t) REFCLOCKTYPE(srcaddr);
+ unit = REFCLOCKUNIT(srcaddr);
- peer = findexistingpeer(srcadr, NULL, NULL, -1, 0);
+ peer = findexistingpeer(srcaddr, NULL, NULL, -1, 0);
if (NULL == peer || NULL == peer->procptr)
return;
=====================================
ntpd/ntp_restrict.c
=====================================
--- a/ntpd/ntp_restrict.c
+++ b/ntpd/ntp_restrict.c
@@ -412,7 +412,7 @@ res_sorts_before6(
*/
u_short
restrictions(
- sockaddr_u *srcadr
+ sockaddr_u *srcaddr
)
{
restrict_u *match;
@@ -422,17 +422,17 @@ restrictions(
res_calls++;
flags = 0;
/* IPv4 source address */
- if (IS_IPV4(srcadr)) {
+ if (IS_IPV4(srcaddr)) {
/*
* Ignore any packets with a multicast source address
* (this should be done early in the receive process,
* not later!)
*/
- if (IN_CLASSD(SRCADR(srcadr)))
+ if (IN_CLASSD(SRCADR(srcaddr)))
return (int)RES_IGNORE;
- match = match_restrict4_addr(SRCADR(srcadr),
- SRCPORT(srcadr));
+ match = match_restrict4_addr(SRCADR(srcaddr),
+ SRCPORT(srcaddr));
match->count++;
/*
* res_not_found counts only use of the final default
@@ -447,8 +447,8 @@ restrictions(
}
/* IPv6 source address */
- if (IS_IPV6(srcadr)) {
- pin6 = PSOCK_ADDR6(srcadr);
+ if (IS_IPV6(srcaddr)) {
+ pin6 = PSOCK_ADDR6(srcaddr);
/*
* Ignore any packets with a multicast source address
@@ -458,7 +458,7 @@ restrictions(
if (IN6_IS_ADDR_MULTICAST(pin6))
return (int)RES_IGNORE;
- match = match_restrict6_addr(pin6, SRCPORT(srcadr));
+ match = match_restrict6_addr(pin6, SRCPORT(srcaddr));
match->count++;
if (&restrict_def6 == match)
res_not_found++;
=====================================
ntpd/ntp_signd.c
=====================================
--- a/ntpd/ntp_signd.c
+++ b/ntpd/ntp_signd.c
@@ -213,13 +213,13 @@ send_via_ntp_signd(
if (ntohl(samba_reply.op) == 3 && reply_len > offsetof(struct samba_key_out, pkt)) {
sendlen = reply_len - offsetof(struct samba_key_out, pkt);
xpkt = &samba_reply.pkt;
- sendpkt(&rbufp->recv_srcadr, rbufp->dstadr, 0, xpkt, sendlen);
+ sendpkt(&rbufp->recv_srcaddr, rbufp->dstadr, 0, xpkt, sendlen);
#ifdef DEBUG
if (debug)
printf(
"transmit ntp_signd packet: at %ld %s->%s mode %d keyid %08x len %d\n",
current_time, ntoa(&rbufp->dstadr->sin),
- ntoa(&rbufp->recv_srcadr), xmode, xkeyid, sendlen);
+ ntoa(&rbufp->recv_srcaddr), xmode, xkeyid, sendlen);
#endif
}
}
=====================================
ntpd/ntp_util.c
=====================================
--- a/ntpd/ntp_util.c
+++ b/ntpd/ntp_util.c
@@ -534,7 +534,7 @@ mprintf_clock_stats(
*/
void
record_raw_stats(
- sockaddr_u *srcadr,
+ sockaddr_u *srcaddr,
sockaddr_u *dstadr,
l_fp *t1, /* originate timestamp */
l_fp *t2, /* receive timestamp */
@@ -564,7 +564,7 @@ record_raw_stats(
if (rawstats.fp != NULL) {
fprintf(rawstats.fp, "%lu %s %s %s %s %s %s %s %d %d %d %d %d %d %.6f %.6f %s\n",
day, ulfptoa(&now, 3),
- stoa(srcadr), dstadr ? stoa(dstadr) : "-",
+ stoa(srcaddr), dstadr ? stoa(dstadr) : "-",
ulfptoa(t1, 9), ulfptoa(t2, 9),
ulfptoa(t3, 9), ulfptoa(t4, 9),
leap, version, mode, stratum, ppoll, precision,
=====================================
ntpd/ntpsim.c
=====================================
--- a/ntpd/ntpsim.c
+++ b/ntpd/ntpsim.c
@@ -349,8 +349,8 @@ int simulate_server(
rbuf.recv_pkt = xpkt;
rbuf.dstadr = inter;
rbuf.fd = inter->fd;
- memcpy(&rbuf.srcadr, serv_addr, sizeof(rbuf.srcadr));
- memcpy(&rbuf.recv_srcadr, serv_addr, sizeof(rbuf.recv_srcadr));
+ memcpy(&rbuf.srcaddr, serv_addr, sizeof(rbuf.srcaddr));
+ memcpy(&rbuf.recv_srcaddr, serv_addr, sizeof(rbuf.recv_srcaddr));
/*
* Create a packet event and insert it onto the event_queue at the
=====================================
ntpd/refclock_acts.c
=====================================
--- a/ntpd/refclock_acts.c
+++ b/ntpd/refclock_acts.c
@@ -580,7 +580,7 @@ acts_timeout(
report_event(PEVNT_CLOCK, peer, "no timecodes");
} else {
pp->lastref = pp->lastrec;
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
refclock_receive(peer);
}
break;
=====================================
ntpd/refclock_arbiter.c
=====================================
--- a/ntpd/refclock_arbiter.c
+++ b/ntpd/refclock_arbiter.c
@@ -311,7 +311,7 @@ arb_receive(
} else if (!strncmp(tbuf, "DB", 2)) {
strlcat(up->latlon, " ", sizeof(up->latlon));
strlcat(up->latlon, tbuf + 2, sizeof(up->latlon));
- record_clock_stats(&peer->srcadr, up->latlon);
+ record_clock_stats(&peer->srcaddr, up->latlon);
#ifdef DEBUG
if (debug)
printf("arbiter: %s\n", up->latlon);
@@ -462,7 +462,7 @@ arb_poll(
return;
}
refclock_receive(peer);
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
#ifdef DEBUG
if (debug)
printf("arbiter: timecode %d %s\n",
=====================================
ntpd/refclock_arc.c
=====================================
--- a/ntpd/refclock_arc.c
+++ b/ntpd/refclock_arc.c
@@ -1409,7 +1409,7 @@ arc_receive(
refclock_report(peer, CEVNT_BADTIME);
return;
}
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
refclock_receive(peer);
}
=====================================
ntpd/refclock_as2201.c
=====================================
--- a/ntpd/refclock_as2201.c
+++ b/ntpd/refclock_as2201.c
@@ -265,7 +265,7 @@ as2201_receive(
up->linect = atoi(pp->a_lastcode);
return;
} else {
- record_clock_stats(&peer->srcadr, up->stats);
+ record_clock_stats(&peer->srcaddr, up->stats);
#ifdef DEBUG
if (debug)
printf("gps: stat %s\n", up->stats);
=====================================
ntpd/refclock_atom.c
=====================================
--- a/ntpd/refclock_atom.c
+++ b/ntpd/refclock_atom.c
@@ -203,7 +203,7 @@ atom_timer(
if (pp->sloppyclockflag & CLK_FLAG4) {
snprintf(tbuf, sizeof(tbuf), "%.9f",
pp->filter[pp->coderecv]);
- record_clock_stats(&peer->srcadr, tbuf);
+ record_clock_stats(&peer->srcaddr, tbuf);
}
}
=====================================
ntpd/refclock_chu.c
=====================================
--- a/ntpd/refclock_chu.c
+++ b/ntpd/refclock_chu.c
@@ -1128,7 +1128,7 @@ chu_b(
snprintf(p, cb, "%02x", up->cbuf[i]);
}
if (pp->sloppyclockflag & CLK_FLAG4)
- record_clock_stats(&peer->srcadr, tbuf);
+ record_clock_stats(&peer->srcaddr, tbuf);
#ifdef DEBUG
if (debug)
printf("%s\n", tbuf);
@@ -1233,7 +1233,7 @@ chu_a(
snprintf(p, cb, "%02x", up->cbuf[i]);
}
if (pp->sloppyclockflag & CLK_FLAG4)
- record_clock_stats(&peer->srcadr, tbuf);
+ record_clock_stats(&peer->srcaddr, tbuf);
#ifdef DEBUG
if (debug)
printf("%s\n", tbuf);
@@ -1407,7 +1407,7 @@ chu_second(
}
}
if (dtemp > 0)
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
#ifdef DEBUG
if (debug)
printf("chu: timecode %d %s\n", pp->lencode,
=====================================
ntpd/refclock_dumbclock.c
=====================================
--- a/ntpd/refclock_dumbclock.c
+++ b/ntpd/refclock_dumbclock.c
@@ -329,7 +329,7 @@ dumbclock_receive(
}
pp->lastref = pp->lastrec;
refclock_receive(peer);
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
up->lasthour = (uint8_t)pp->hour;
}
=====================================
ntpd/refclock_gpsdjson.c
=====================================
--- a/ntpd/refclock_gpsdjson.c
+++ b/ntpd/refclock_gpsdjson.c
@@ -511,7 +511,7 @@ gpsd_start(
++up->refcount;
/* initialize the unit structure */
- up->logname = estrdup(refnumtoa(&peer->srcadr));
+ up->logname = estrdup(refnumtoa(&peer->srcaddr));
up->unit = unit & 0x7F;
up->fdt = -1;
up->addr = s_gpsd_addr;
@@ -566,7 +566,7 @@ gpsd_start(
LOGIF(CLOCKINFO,
(LOG_NOTICE, "%s: startup, device is '%s'",
- refnumtoa(&peer->srcadr), up->device));
+ refnumtoa(&peer->srcaddr), up->device));
up->mode = MODE_OP_MODE(peer->ttl);
if (up->mode > MODE_OP_MAXVAL)
up->mode = 0;
@@ -632,7 +632,7 @@ gpsd_shutdown(
}
pp->unitptr = NULL;
LOGIF(CLOCKINFO,
- (LOG_NOTICE, "%s: shutdown", refnumtoa(&peer->srcadr)));
+ (LOG_NOTICE, "%s: shutdown", refnumtoa(&peer->srcaddr)));
}
/* ------------------------------------------------------------------ */
@@ -718,7 +718,7 @@ poll_primary(
if (pp->sloppyclockflag & CLK_FLAG4)
mprintf_clock_stats(
- &peer->srcadr,"%u %u %u %u %u %u %u",
+ &peer->srcaddr,"%u %u %u %u %u %u %u",
up->tc_recv,
up->tc_breply, up->tc_nosync,
up->tc_sti_recv, up->tc_sti_used,
=====================================
ntpd/refclock_hopfpci.c
=====================================
--- a/ntpd/refclock_hopfpci.c
+++ b/ntpd/refclock_hopfpci.c
@@ -248,7 +248,7 @@ hopfpci_poll(
}
pp->lastref = pp->lastrec;
refclock_receive(peer);
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
return;
}
=====================================
ntpd/refclock_hopfser.c
=====================================
--- a/ntpd/refclock_hopfser.c
+++ b/ntpd/refclock_hopfser.c
@@ -313,7 +313,7 @@ hopfserial_receive (
msyslog(LOG_ERR, " D:%x D:%d D:%d",synch,pp->minute,pp->second);
#endif
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
return;
}
@@ -342,7 +342,7 @@ hopfserial_poll (
up->rpt_next = 1;
#if 0
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
#endif
return;
=====================================
ntpd/refclock_hpgps.c
=====================================
--- a/ntpd/refclock_hpgps.c
+++ b/ntpd/refclock_hpgps.c
@@ -306,12 +306,12 @@ hpgps_receive(
up->lastptr += pp->lencode;
}
if (up->linecnt == 0)
- record_clock_stats(&peer->srcadr, up->statscrn);
+ record_clock_stats(&peer->srcaddr, up->statscrn);
return;
}
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
pp->lastrec = trtmp;
up->lastptr = up->statscrn;
=====================================
ntpd/refclock_irig.c
=====================================
--- a/ntpd/refclock_irig.c
+++ b/ntpd/refclock_irig.c
@@ -954,7 +954,7 @@ irig_decode(
pp->lencode = strlen(pp->a_lastcode);
up->errflg = 0;
if (pp->sloppyclockflag & CLK_FLAG4) {
- record_clock_stats(&peer->srcadr,
+ record_clock_stats(&peer->srcaddr,
pp->a_lastcode);
#ifdef DEBUG
if (debug)
@@ -994,7 +994,7 @@ irig_poll(
}
refclock_receive(peer);
if (!(pp->sloppyclockflag & CLK_FLAG4)) {
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
#ifdef DEBUG
if (debug)
printf("irig %s\n", pp->a_lastcode);
=====================================
ntpd/refclock_jjy.c
=====================================
--- a/ntpd/refclock_jjy.c
+++ b/ntpd/refclock_jjy.c
@@ -396,7 +396,7 @@ jjy_start ( int unit, struct peer *peer )
#ifdef DEBUG
if ( debug ) {
printf( "refclock_jjy.c : jjy_start : %s mode=%d dev=%s unit=%d\n",
- ntoa(&peer->srcadr), peer->ttl, DEVICE, unit ) ;
+ ntoa(&peer->srcaddr), peer->ttl, DEVICE, unit ) ;
}
#endif
@@ -455,7 +455,7 @@ jjy_start ( int unit, struct peer *peer )
rc = jjy_start_telephone ( unit, peer, up ) ;
} else {
msyslog ( LOG_ERR, "JJY receiver [ %s mode %d ] : Unsupported mode",
- ntoa(&peer->srcadr), peer->ttl ) ;
+ ntoa(&peer->srcaddr), peer->ttl ) ;
free ( (void*) up ) ;
return false ;
}
@@ -463,7 +463,7 @@ jjy_start ( int unit, struct peer *peer )
if ( rc != 0 ) {
msyslog ( LOG_ERR, "JJY receiver [ %s mode %d ] : Initialize error",
- ntoa(&peer->srcadr), peer->ttl ) ;
+ ntoa(&peer->srcaddr), peer->ttl ) ;
free ( (void*) up ) ;
return false ;
}
@@ -527,7 +527,7 @@ jjy_shutdown ( int unit, struct peer *peer )
}
snprintf( sLog, sizeof(sLog), "JJY stopped. unit=%d mode=%d", unit, peer->ttl ) ;
- record_clock_stats( &peer->srcadr, sLog ) ;
+ record_clock_stats( &peer->srcaddr, sLog ) ;
}
@@ -4457,7 +4457,7 @@ jjy_write_clockstats ( struct peer *peer, int iMark, const char *pData )
printf( "refclock_jjy.c : clockstats : %s\n", sLog ) ;
}
#endif
- record_clock_stats( &peer->srcadr, sLog ) ;
+ record_clock_stats( &peer->srcaddr, sLog ) ;
}
=====================================
ntpd/refclock_jupiter.c
=====================================
--- a/ntpd/refclock_jupiter.c
+++ b/ntpd/refclock_jupiter.c
@@ -869,7 +869,7 @@ jupiter_debug(
* In the future, we may want to get get more creative...
*/
mvsnprintf(buffer, sizeof(buffer), fmt, ap);
- record_clock_stats(&peer->srcadr, buffer);
+ record_clock_stats(&peer->srcaddr, buffer);
#ifdef DEBUG
if (debug) {
printf("%s: %s\n", function, buffer);
=====================================
ntpd/refclock_mx4200.c
=====================================
--- a/ntpd/refclock_mx4200.c
+++ b/ntpd/refclock_mx4200.c
@@ -636,7 +636,7 @@ mx4200_receive(
up->pollcnt = 2;
pp->a_lastcode[pp->lencode] = '\0';
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
mx4200_debug(peer, "mx4200_receive: %d %s\n",
pp->lencode, pp->a_lastcode);
=====================================
ntpd/refclock_neoclock4x.c
=====================================
--- a/ntpd/refclock_neoclock4x.c
+++ b/ntpd/refclock_neoclock4x.c
@@ -575,7 +575,7 @@ neoclock4x_receive(struct recvbuf *rbufp)
/* report good status */
refclock_report(peer, CEVNT_NOMINAL);
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
}
static void
=====================================
ntpd/refclock_nmea.c
=====================================
--- a/ntpd/refclock_nmea.c
+++ b/ntpd/refclock_nmea.c
@@ -469,7 +469,7 @@ nmea_start(
devlen = snprintf(device, sizeof(device), DEVICE, unit);
if (devlen >= sizeof(device)) {
msyslog(LOG_ERR, "%s clock device name too long",
- refnumtoa(&peer->srcadr));
+ refnumtoa(&peer->srcaddr));
return false; /* buffer overflow */
}
pp->io.fd = refclock_open(device, baudrate, LDISC_CLK);
@@ -479,7 +479,7 @@ nmea_start(
return false;
}
LOGIF(CLOCKINFO, (LOG_NOTICE, "%s serial %s open at %s bps",
- refnumtoa(&peer->srcadr), device, baudtext));
+ refnumtoa(&peer->srcaddr), device, baudtext));
/* succeed if this clock can be added */
return io_addclock(&pp->io) != 0;
@@ -562,7 +562,7 @@ nmea_control(
} else {
up->ppsapi_fd = -1;
msyslog(LOG_ERR, "%s PPS device name too long",
- refnumtoa(&peer->srcadr));
+ refnumtoa(&peer->srcaddr));
}
if (-1 == up->ppsapi_fd)
up->ppsapi_fd = pp->io.fd;
@@ -575,7 +575,7 @@ nmea_control(
time_pps_destroy(up->atom.handle);
msyslog(LOG_WARNING,
"%s set PPSAPI params fails",
- refnumtoa(&peer->srcadr));
+ refnumtoa(&peer->srcaddr));
}
/* note: the PPS I/O handle remains valid until
* flag1 is cleared or the clock is shut down.
@@ -583,7 +583,7 @@ nmea_control(
} else {
msyslog(LOG_WARNING,
"%s flag1 1 but PPSAPI fails",
- refnumtoa(&peer->srcadr));
+ refnumtoa(&peer->srcaddr));
}
}
@@ -822,7 +822,7 @@ nmea_receive(
case CHECK_INVALID:
DPRINTF(1, ("%s invalid data: '%s'\n",
- refnumtoa(&peer->srcadr), rd_lastcode));
+ refnumtoa(&peer->srcaddr), rd_lastcode));
refclock_report(peer, CEVNT_BADREPLY);
return;
@@ -831,7 +831,7 @@ nmea_receive(
default:
DPRINTF(1, ("%s gpsread: %d '%s'\n",
- refnumtoa(&peer->srcadr), rd_lencode,
+ refnumtoa(&peer->srcaddr), rd_lencode,
rd_lastcode));
break;
}
@@ -863,7 +863,7 @@ nmea_receive(
/* Eventually output delay measurement now. */
if (peer->ttl & NMEA_DELAYMEAS_MASK) {
- mprintf_clock_stats(&peer->srcadr, "delay %0.6f %.*s",
+ mprintf_clock_stats(&peer->srcaddr, "delay %0.6f %.*s",
ldexp(rd_timestamp.l_uf, -32),
(int)(strchr(rd_lastcode, ',') - rd_lastcode),
rd_lastcode);
@@ -897,7 +897,7 @@ nmea_receive(
up->cksum_type[sentence] = (uint8_t)checkres;
} else {
DPRINTF(1, ("%s checksum missing: '%s'\n",
- refnumtoa(&peer->srcadr), rd_lastcode));
+ refnumtoa(&peer->srcaddr), rd_lastcode));
refclock_report(peer, CEVNT_BADREPLY);
up->tally.malformed++;
return;
@@ -914,7 +914,7 @@ nmea_receive(
}
DPRINTF(1, ("%s processing %d bytes, timecode '%s'\n",
- refnumtoa(&peer->srcadr), rd_lencode, rd_lastcode));
+ refnumtoa(&peer->srcaddr), rd_lencode, rd_lastcode));
/*
* Grab fields depending on clock string type and possibly wipe
@@ -1010,14 +1010,14 @@ nmea_receive(
}
DPRINTF(1, ("%s effective timecode: %04u-%02u-%02u %02d:%02d:%02d\n",
- refnumtoa(&peer->srcadr),
+ refnumtoa(&peer->srcaddr),
date.year, date.month, date.monthday,
date.hour, date.minute, date.second));
/* Check if we must enter GPS time mode; log so if we do */
if (!up->gps_time && (sentence == NMEA_GPZDG)) {
msyslog(LOG_INFO, "%s using GPS time as if it were UTC",
- refnumtoa(&peer->srcadr));
+ refnumtoa(&peer->srcaddr));
up->gps_time = true;
}
@@ -1037,7 +1037,7 @@ nmea_receive(
rd_fudge = pp->fudgetime2;
DPRINTF(1, ("%s using '%s'\n",
- refnumtoa(&peer->srcadr), rd_lastcode));
+ refnumtoa(&peer->srcaddr), rd_lastcode));
/* Data will be accepted. Update stats & log data. */
up->tally.accepted++;
@@ -1059,7 +1059,7 @@ nmea_receive(
peer->precision = PPS_PRECISION;
peer->flags |= FLAG_PPS;
DPRINTF(2, ("%s PPS_RELATE_PHASE\n",
- refnumtoa(&peer->srcadr)));
+ refnumtoa(&peer->srcaddr)));
up->tally.pps_used++;
break;
@@ -1067,7 +1067,7 @@ nmea_receive(
up->ppsapi_gate = true;
peer->precision = PPS_PRECISION;
DPRINTF(2, ("%s PPS_RELATE_EDGE\n",
- refnumtoa(&peer->srcadr)));
+ refnumtoa(&peer->srcaddr)));
break;
case PPS_RELATE_NONE:
@@ -1078,7 +1078,7 @@ nmea_receive(
* at the end of the poll cycle we know...
*/
DPRINTF(2, ("%s PPS_RELATE_NONE\n",
- refnumtoa(&peer->srcadr)));
+ refnumtoa(&peer->srcaddr)));
break;
}
#endif /* HAVE_PPSAPI */
@@ -1148,13 +1148,13 @@ nmea_poll(
const char *nmea = pp->a_lastcode;
if (*nmea == '\0') nmea = "(none)";
mprintf_clock_stats(
- &peer->srcadr, "%s %u %u %u %u %u %u",
+ &peer->srcaddr, "%s %u %u %u %u %u %u",
nmea,
up->tally.total, up->tally.accepted,
up->tally.rejected, up->tally.malformed,
up->tally.filtered, up->tally.pps_used);
} else {
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
}
ZERO(up->tally);
}
@@ -1222,7 +1222,7 @@ gps_send(
len, beg, dcs);
if ((size_t)len >= sizeof(buf)) {
DPRINTF(1, ("%s gps_send: buffer overflow for command '%s'\n",
- refnumtoa(&peer->srcadr), cmd));
+ refnumtoa(&peer->srcaddr), cmd));
return; /* game over player 1 */
}
cmd = buf;
@@ -1230,7 +1230,7 @@ gps_send(
len = strlen(cmd);
}
- DPRINTF(1, ("%s gps_send: '%.*s'\n", refnumtoa(&peer->srcadr),
+ DPRINTF(1, ("%s gps_send: '%.*s'\n", refnumtoa(&peer->srcaddr),
len - 2, cmd));
/* send out the whole stuff */
@@ -1862,7 +1862,7 @@ eval_gps_time(
up->epoch_warp = weeks;
LOGIF(CLOCKINFO, (LOG_INFO,
"%s Changed GPS epoch warp to %d weeks",
- refnumtoa(&peer->srcadr), weeks));
+ refnumtoa(&peer->srcaddr), weeks));
}
/* - build result and be done */
=====================================
ntpd/refclock_oncore.c
=====================================
--- a/ntpd/refclock_oncore.c
+++ b/ntpd/refclock_oncore.c
@@ -4075,7 +4075,7 @@ oncore_log (
)
{
msyslog(log_level, "ONCORE[%d]: %s", instance->unit, msg);
- mprintf_clock_stats(&instance->peer->srcadr, "ONCORE[%d]: %s",
+ mprintf_clock_stats(&instance->peer->srcaddr, "ONCORE[%d]: %s",
instance->unit, msg);
}
=====================================
ntpd/refclock_palisade.c
=====================================
--- a/ntpd/refclock_palisade.c
+++ b/ntpd/refclock_palisade.c
@@ -917,7 +917,7 @@ palisade_receive (
return;
}
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
#ifdef DEBUG
if (debug)
@@ -991,7 +991,7 @@ praecis_parse (
if(buf[p-2] == '\r' && buf[p-1] == '\n') {
buf[p-2] = '\0';
- record_clock_stats(&peer->srcadr, buf);
+ record_clock_stats(&peer->srcaddr, buf);
p = 0;
praecis_msg = false;
=====================================
ntpd/refclock_parse.c
=====================================
--- a/ntpd/refclock_parse.c
+++ b/ntpd/refclock_parse.c
@@ -1420,7 +1420,7 @@ static int ncltypes = sizeof(parse_clockinfo) / sizeof(struct parse_clockinfo);
#define CLK_REALTYPE(x) ((int)(((x)->ttl) & 0x7F))
#define CLK_TYPE(x) ((CLK_REALTYPE(x) >= ncltypes) ? ~0 : CLK_REALTYPE(x))
-#define CLK_UNIT(x) ((int)REFCLOCKUNIT(&(x)->srcadr))
+#define CLK_UNIT(x) ((int)REFCLOCKUNIT(&(x)->srcaddr))
#define CLK_PPS(x) (((x)->ttl) & 0x80)
/*
@@ -1862,7 +1862,7 @@ local_input(
buf->recv_length = sizeof(parsetime_t);
buf->recv_time = rbufp->recv_time;
#ifndef HAVE_IO_COMPLETION_PORT
- buf->srcadr = rbufp->srcadr;
+ buf->srcaddr = rbufp->srcaddr;
#endif
buf->dstadr = rbufp->dstadr;
buf->receiver = rbufp->receiver;
=====================================
ntpd/refclock_pcf.c
=====================================
--- a/ntpd/refclock_pcf.c
+++ b/ntpd/refclock_pcf.c
@@ -212,7 +212,7 @@ pcf_poll(
refclock_report(peer, CEVNT_BADTIME);
return;
}
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
if ((buf[1] & 1) && !(pp->sloppyclockflag & CLK_FLAG2))
pp->leap = LEAP_NOTINSYNC;
else
=====================================
ntpd/refclock_shm.c
=====================================
--- a/ntpd/refclock_shm.c
+++ b/ntpd/refclock_shm.c
@@ -538,7 +538,7 @@ shm_timer(
shm = up->shm = getShmTime(unit, up->forall);
if (shm == NULL) {
DPRINTF(1, ("%s: no SHM segment\n",
- refnumtoa(&peer->srcadr)));
+ refnumtoa(&peer->srcaddr)));
return;
}
}
@@ -549,31 +549,31 @@ shm_timer(
switch (status) {
case OK:
DPRINTF(2, ("%s: SHM type %d sample\n",
- refnumtoa(&peer->srcadr), shm_stat.mode));
+ refnumtoa(&peer->srcaddr), shm_stat.mode));
break;
case NO_SEGMENT:
/* should never happen, but is harmless */
return;
case NOT_READY:
- DPRINTF(1, ("%s: SHM not ready\n",refnumtoa(&peer->srcadr)));
+ DPRINTF(1, ("%s: SHM not ready\n",refnumtoa(&peer->srcaddr)));
up->notready++;
return;
case BAD_MODE:
DPRINTF(1, ("%s: SHM type blooper, mode=%d\n",
- refnumtoa(&peer->srcadr), shm->mode));
+ refnumtoa(&peer->srcaddr), shm->mode));
up->bad++;
msyslog (LOG_ERR, "SHM: bad mode found in shared memory: %d",
shm->mode);
return;
case CLASH:
DPRINTF(1, ("%s: type 1 access clash\n",
- refnumtoa(&peer->srcadr)));
+ refnumtoa(&peer->srcaddr)));
msyslog (LOG_NOTICE, "SHM: access clash in shared memory");
up->clash++;
return;
default:
DPRINTF(1, ("%s: internal error, unknown SHM fetch status\n",
- refnumtoa(&peer->srcadr)));
+ refnumtoa(&peer->srcaddr)));
msyslog (LOG_NOTICE, "internal error, unknown SHM fetch status");
up->bad++;
return;
@@ -602,7 +602,7 @@ shm_timer(
tt = shm_stat.tvc.tv_sec - shm_stat.tvr.tv_sec;
if (tt < 0 || tt > up->max_delay) {
DPRINTF(1, ("%s:SHM stale/bad receive time, delay=%llds\n",
- refnumtoa(&peer->srcadr), (long long)tt));
+ refnumtoa(&peer->srcaddr), (long long)tt));
up->bad++;
msyslog (LOG_ERR, "SHM: stale/bad receive time, delay=%llds",
(long long)tt);
@@ -615,7 +615,7 @@ shm_timer(
tt = -tt;
if (up->max_delta > 0 && tt > up->max_delta) {
DPRINTF(1, ("%s: SHM diff limit exceeded, delta=%llds\n",
- refnumtoa(&peer->srcadr), (long long)tt));
+ refnumtoa(&peer->srcaddr), (long long)tt));
up->bad++;
msyslog (LOG_ERR, "SHM: difference limit exceeded, delta=%llds\n",
(long long)tt);
@@ -624,7 +624,7 @@ shm_timer(
/* if we really made it to this point... we're winners! */
DPRINTF(2, ("%s: SHM feeding data\n",
- refnumtoa(&peer->srcadr)));
+ refnumtoa(&peer->srcaddr)));
tsrcv = tspec_stamp_to_lfp(shm_stat.tvr);
tsref = tspec_stamp_to_lfp(shm_stat.tvt);
pp->leap = shm_stat.leap;
@@ -647,7 +647,7 @@ static void shm_clockstats(
UNUSED_ARG(unit);
if (pp->sloppyclockflag & CLK_FLAG4) {
mprintf_clock_stats(
- &peer->srcadr, "%3d %3d %3d %3d %3d",
+ &peer->srcaddr, "%3d %3d %3d %3d %3d",
up->ticks, up->good, up->notready,
up->bad, up->clash);
}
=====================================
ntpd/refclock_spectracom.c
=====================================
--- a/ntpd/refclock_spectracom.c
+++ b/ntpd/refclock_spectracom.c
@@ -365,7 +365,7 @@ spectracom_receive(
*/
if (up->linect > 0) {
up->linect--;
- record_clock_stats(&peer->srcadr,
+ record_clock_stats(&peer->srcaddr,
pp->a_lastcode);
} else {
refclock_report(peer, CEVNT_BADREPLY);
@@ -532,7 +532,7 @@ spectracom_poll(
}
#endif /* HAVE_PPSAPI */
refclock_receive(peer);
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
#ifdef DEBUG
if (debug)
printf("wwvb: timecode %d %s\n", pp->lencode,
@@ -589,7 +589,7 @@ spectracom_control(
}
msyslog(LOG_WARNING, "%s flag1 1 but PPSAPI fails",
- refnumtoa(&peer->srcadr));
+ refnumtoa(&peer->srcaddr));
}
#endif /* HAVE_PPSAPI */
=====================================
ntpd/refclock_true.c
=====================================
--- a/ntpd/refclock_true.c
+++ b/ntpd/refclock_true.c
@@ -351,7 +351,7 @@ true_receive(
pp->lencode);
up->pollcnt = 2;
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
/*
* We get down to business, check the timecode format and decode
=====================================
ntpd/refclock_tsyncpci.c
=====================================
--- a/ntpd/refclock_tsyncpci.c
+++ b/ntpd/refclock_tsyncpci.c
@@ -706,7 +706,7 @@ static void tsync_poll(int unit, struct peer *peer)
{
// Store reference peer stratum level and ID
up->refStratum = sys_peer->stratum;
- up->refId = addr2refid(&sys_peer->srcadr);
+ up->refId = addr2refid(&sys_peer->srcaddr);
}
}
else
@@ -759,7 +759,7 @@ static void tsync_poll(int unit, struct peer *peer)
return;
}
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
refclock_receive(peer);
/* Increment the number of times the reference has been polled */
=====================================
ntpd/refclock_zyfer.c
=====================================
--- a/ntpd/refclock_zyfer.c
+++ b/ntpd/refclock_zyfer.c
@@ -242,7 +242,7 @@ zyfer_receive(
if (pp->lencode < LENZYFER)
return;
- record_clock_stats(&peer->srcadr, pp->a_lastcode);
+ record_clock_stats(&peer->srcaddr, pp->a_lastcode);
/*
* We get down to business, check the timecode format and decode
=====================================
ntpdig/networking.h
=====================================
--- a/ntpdig/networking.h
+++ b/ntpdig/networking.h
@@ -44,7 +44,7 @@ int process_pkt(struct pkt *rpkt, sockaddr_u *sas, int pkt_len,
/* Shortened peer structure. Not absolutely necessary yet */
struct speer {
struct speer *next;
- sockaddr_u srcadr;
+ sockaddr_u srcaddr;
uint8_t version;
uint8_t hmode;
uint8_t hpoll;
=====================================
ntpq/ntpq-subs.c
=====================================
--- a/ntpq/ntpq-subs.c
+++ b/ntpq/ntpq-subs.c
@@ -1531,7 +1531,7 @@ decodeaddrtype(
* A list of variables required by the peers command
*/
struct varlist opeervarlist[] = {
- { "srcadr", 0 }, /* 0 */
+ { "srcaddr", 0 }, /* 0 */
{ "dstadr", 0 }, /* 1 */
{ "stratum", 0 }, /* 2 */
{ "hpoll", 0 }, /* 3 */
@@ -1549,7 +1549,7 @@ struct varlist opeervarlist[] = {
};
struct varlist peervarlist[] = {
- { "srcadr", 0 }, /* 0 */
+ { "srcaddr", 0 }, /* 0 */
{ "refid", 0 }, /* 1 */
{ "stratum", 0 }, /* 2 */
{ "hpoll", 0 }, /* 3 */
@@ -1568,7 +1568,7 @@ struct varlist peervarlist[] = {
};
struct varlist apeervarlist[] = {
- { "srcadr", 0 }, /* 0 */
+ { "srcaddr", 0 }, /* 0 */
{ "refid", 0 }, /* 1 */
{ "assid", 0 }, /* 2 */
{ "stratum", 0 }, /* 3 */
@@ -1610,7 +1610,7 @@ doprintpeers(
bool have_dstadr;
bool have_da_rid;
bool have_jitter;
- sockaddr_u srcadr;
+ sockaddr_u srcaddr;
sockaddr_u dstadr;
sockaddr_u dum_store;
sockaddr_u refidadr;
@@ -1642,7 +1642,7 @@ doprintpeers(
have_dstadr = false;
have_da_rid = false;
have_jitter = false;
- ZERO_SOCK(&srcadr);
+ ZERO_SOCK(&srcaddr);
ZERO_SOCK(&dstadr);
clock_name[0] = '\0';
ZERO(estoffset);
@@ -1651,9 +1651,9 @@ doprintpeers(
ZERO(estdisp);
while (nextvar(&datalen, &data, &name, &value)) {
- if (!strcmp("srcadr", name) ||
+ if (!strcmp("srcaddr", name) ||
!strcmp("peeradr", name)) {
- if (!decodenetnum(value, &srcadr))
+ if (!decodenetnum(value, &srcaddr))
fprintf(stderr, "malformed %s=%s\n",
name, value);
} else if (!strcmp("srchost", name)) {
@@ -1780,18 +1780,18 @@ doprintpeers(
case MODE_BROADCAST:
/* broadcast or multicast server */
- if (IS_MCAST(&srcadr))
+ if (IS_MCAST(&srcaddr))
type = 'M';
else
type = 'B';
break;
case MODE_CLIENT:
- if (ISREFCLOCKADR(&srcadr))
+ if (ISREFCLOCKADR(&srcaddr))
type = 'l'; /* local refclock*/
- else if (SOCK_UNSPEC(&srcadr))
+ else if (SOCK_UNSPEC(&srcaddr))
type = 'p'; /* pool */
- else if (IS_MCAST(&srcadr))
+ else if (IS_MCAST(&srcaddr))
type = 'a'; /* manycastclient */
else
type = 'u'; /* unicast */
@@ -1829,9 +1829,9 @@ doprintpeers(
}
fprintf(fp, "%-*s ", (int)maxhostlen, serverlocal);
}
- if (AF_UNSPEC == af || AF(&srcadr) == af) {
+ if (AF_UNSPEC == af || AF(&srcaddr) == af) {
if (!have_srchost)
- strlcpy(clock_name, nntohost(&srcadr),
+ strlcpy(clock_name, nntohost(&srcaddr),
sizeof(clock_name));
if (wideremote && 15 < strlen(clock_name))
fprintf(fp, "%c%s\n ", c, clock_name);
=====================================
ntpq/ntpq.c
=====================================
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -113,7 +113,7 @@ const var_format cookedvars[] = {
{ "rec", TS },
{ "xmt", TS },
{ "flash", FX },
- { "srcadr", HA },
+ { "srcaddr", HA },
{ "peeradr", HA }, /* compat with others */
{ "dstadr", NA },
{ "filtdelay", AR },
=====================================
ntptrace/ntptrace
=====================================
--- a/ntptrace/ntptrace
+++ b/ntptrace/ntptrace
@@ -122,9 +122,9 @@ sub get_info {
sub get_next_host {
my ($peer, $host) = @_;
- my $info = ntp_read_vars($peer, [qw(srcadr)], $host);
+ my $info = ntp_read_vars($peer, [qw(srcaddr)], $host);
return if not defined $info;
- return $info->{srcadr};
+ return $info->{srcaddr};
}
END { close STDOUT };
=====================================
tests/perl/ntptrace.t
=====================================
--- a/tests/perl/ntptrace.t
+++ b/tests/perl/ntptrace.t
@@ -55,7 +55,7 @@ stdout_is(
#Add response to a rv peer
push @vars, {
- srcadr => '1.2.3.4',
+ srcaddr => '1.2.3.4',
srcport => '123',
dstadr => '192.168.1.11',
dstport => '123',
=====================================
util/monitoring/ntptrap
=====================================
--- a/util/monitoring/ntptrap
+++ b/util/monitoring/ntptrap
@@ -395,9 +395,9 @@ sub process_response
else # peer event
{
$msg .= sprintf("peer %5d ",$associd);
- ($srcadr) = ($data =~ /srcadr=\[?([\d\.]+)/);
- $msg .= sprintf("%-18s %40s ", "[$srcadr]",
- &hostname(pack("C4",split(/\./,$srcadr))));
+ ($srcaddr) = ($data =~ /srcaddr=\[?([\d\.]+)/);
+ $msg .= sprintf("%-18s %40s ", "[$srcaddr]",
+ &hostname(pack("C4",split(/\./,$srcaddr))));
$evnt = &ntp'PeerEvent($status); #';
$msg .= "$evnt ";
;# for special cases include additional info
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/b7aacfe1ed8bb14b0bfd2676639a3c8e54bfd622...36a8f4b31b3749232738512bf8a46e659396683f
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20151205/76430e4b/attachment.html>
More information about the vc
mailing list