<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
img {
max-width: 100%;
height: auto;
}
p.details {
font-style:italic;
color:#777
}
.footer p {
font-size:small;
color:#777
}
pre.commit-message {
white-space: pre-wrap;
}
.file-stats a {
text-decoration: none;
}
.file-stats .new-file {
color: #090;
}
.file-stats .deleted-file {
color: #B00;
}
</style>
<body>
<div class='content'>
<h3>Eric S. Raymond pushed to branch master at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a></h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0">6364b8c8</a></strong>
<div>
<span>by Eric S. Raymond</span>
<i>at 2015-12-05T08:32:43Z</i>
</div>
<pre class='commit-message'>And another persistent spelling error: dstadr -> dstaddr.</pre>
</li>
</ul>
<h4>20 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
devel/ChangeLog
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
devel/CommitLog-4.1.0
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
docs/includes/ntpq-body.txt
</a>
</li>
<li class='file-stats'>
<a href='#diff-3'>
include/ntp.h
</a>
</li>
<li class='file-stats'>
<a href='#diff-4'>
include/ntpd.h
</a>
</li>
<li class='file-stats'>
<a href='#diff-5'>
include/recvbuff.h
</a>
</li>
<li class='file-stats'>
<a href='#diff-6'>
ntpd/ntp_control.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-7'>
ntpd/ntp_crypto.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-8'>
ntpd/ntp_io.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-9'>
ntpd/ntp_monitor.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-10'>
ntpd/ntp_peer.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-11'>
ntpd/ntp_proto.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-12'>
ntpd/ntp_signd.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-13'>
ntpd/ntp_util.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-14'>
ntpd/ntpsim.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-15'>
ntpd/refclock_parse.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-16'>
ntpq/libntpq.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-17'>
ntpq/ntpq-subs.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-18'>
ntpq/ntpq.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-19'>
tests/perl/ntptrace.t
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-0'>
<strong>
devel/ChangeLog
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/devel/ChangeLog
</span><span style="color: #000000;background-color: #ddffdd">+++ b/devel/ChangeLog
</span><span style="color: #aaaaaa">@@ -1209,7 +1209,7 @@ ntp-4.3 begins.
</span> sys_residual.
* [Bug 2087] from 4.2.6p5-RC3: sys_jitter calculation overweights
sys.peer jitter.
<span style="color: #000000;background-color: #ffdddd">-* from 4.2.6p5-RC3: Ensure NULL peer->dstadr is not accessed in orphan
</span><span style="color: #000000;background-color: #ddffdd">+* from 4.2.6p5-RC3: Ensure NULL peer->dstaddr is not accessed in orphan
</span> parent selection.
(4.2.7p237) 2011/12/01 Released by Harlan Stenn <stenn@ntp.org>
* [Bug 2050] from 4.2.6p5-RC2: Orphan mode stratum counting to infinity.
<span style="color: #aaaaaa">@@ -2460,7 +2460,7 @@ No changes from 4.2.6p5-RC3.
</span> * [Bug 2085] clock_update() sys_rootdisp calculation omits root delay.
* [Bug 2086] get_systime() should not offset by sys_residual.
* [Bug 2087] sys_jitter calculation overweights sys.peer jitter.
<span style="color: #000000;background-color: #ffdddd">-* Ensure NULL peer->dstadr is not accessed in orphan parent selection.
</span><span style="color: #000000;background-color: #ddffdd">+* Ensure NULL peer->dstaddr is not accessed in orphan parent selection.
</span>
---
(4.2.6p5-RC2) 2011/11/30 Released by Harlan Stenn <stenn@ntp.org>
<span style="color: #aaaaaa">@@ -3768,7 +3768,7 @@ display both build and runtime OpenSSL versions when they differ.
</span> * [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.
<span style="color: #000000;background-color: #ffdddd">-* ntp_peer.c: Set peer->srcaddr before (not after) calling set_peerdstadr().
</span><span style="color: #000000;background-color: #ddffdd">+* ntp_peer.c: Set peer->srcaddr before (not after) calling set_peerdstaddr().
</span> * Initialize offset in leap_file() - Coverity View 17.
* Use the correct stratum on KISS codes.
* Fuzz bits cleanup.
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-1'>
<strong>
devel/CommitLog-4.1.0
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/devel/CommitLog-4.1.0
</span><span style="color: #000000;background-color: #ddffdd">+++ b/devel/CommitLog-4.1.0
</span><span style="color: #aaaaaa">@@ -1334,7 +1334,7 @@ comments in the version-control system.
</span> 2000-12-03 Harlan Stenn <stenn@whimsy.udel.edu>
* ntpd/ntp_proto.c (receive): That any_interface is now an
<span style="color: #000000;background-color: #ffdddd">- rbufp->dstadr.
</span><span style="color: #000000;background-color: #ddffdd">+ rbufp->dstaddr.
</span> Various other doc and code cleanup.
* ntpd/ntp_peer.c (findmanycastpeer): Fixes
From Dave Mills
<span style="color: #aaaaaa">@@ -1912,7 +1912,7 @@ comments in the version-control system.
</span>
2000-07-24 Harlan Stenn <stenn@whimsy.udel.edu>
<span style="color: #000000;background-color: #ffdddd">- * ntpd/ntp_proto.c (receive): dstadr_sin needs higher visibility
</span><span style="color: #000000;background-color: #ddffdd">+ * ntpd/ntp_proto.c (receive): dstaddr_sin needs higher visibility
</span> From: Dave Mills
* flock-build: Added baldwin
<span style="color: #aaaaaa">@@ -5263,7 +5263,7 @@ Sat Oct 10 20:13:14 1998 Harlan Stenn <stenn@whimsy.udel.edu>
</span>
* ntpd/ntpd.c (ntpdmain): HAVE_SETPGRP_0 typo.
* parseutil/dcfd.c (detach): Ditto.
<span style="color: #000000;background-color: #ffdddd">- * ntpd/ntp_control.c (ctl_putpeer): Sometimes, peer->dstadr is
</span><span style="color: #000000;background-color: #ddffdd">+ * ntpd/ntp_control.c (ctl_putpeer): Sometimes, peer->dstaddr is
</span> NIL.
From: Perry Ross <pross@platinum.com>
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-2'>
<strong>
docs/includes/ntpq-body.txt
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/docs/includes/ntpq-body.txt
</span><span style="color: #000000;background-color: #ddffdd">+++ b/docs/includes/ntpq-body.txt
</span><span style="color: #aaaaaa">@@ -264,7 +264,7 @@ ind assid status conf reach auth condition last_event cnt
</span> mobilized and unmobilized associations.
+lpeers+ [+-4+ | +-6+]::
<span style="color: #000000;background-color: #ffdddd">- Print a peer spreadsheet for the appropriate IP version(s). _dstadr_
</span><span style="color: #000000;background-color: #ddffdd">+ Print a peer spreadsheet for the appropriate IP version(s). _dstaddr_
</span> (associated with any given IP version).
+monstats+::
<span style="color: #aaaaaa">@@ -320,7 +320,7 @@ which could not be verified in parentheses.
</span>
+opeers+ [+-4+ | +-6+]::
Obtain and print the old-style list of all peers and clients showing
<span style="color: #000000;background-color: #ffdddd">- _dstadr_ (associated with any given IP version), rather than the
</span><span style="color: #000000;background-color: #ddffdd">+ _dstaddr_ (associated with any given IP version), rather than the
</span> _refid_.
+passociations+::
<span style="color: #aaaaaa">@@ -497,7 +497,7 @@ association. Not all variables are displayed in some configurations.
</span> |+associd+ |association ID
|+status+ |link:decode.html#peer[peer status word]
|+srcaddr srcport+|source (remote) IP address and port
<span style="color: #000000;background-color: #ffdddd">-|+dstadr dstport+|destination (local) IP address and port
</span><span style="color: #000000;background-color: #ddffdd">+|+dstaddr dstport+|destination (local) IP address and port
</span> |+leap+ |leap indicator (0-3)
|+stratum+ |stratum (0-15)
|+precision+ |precision (log~2~ s)
</code></pre>
<br>
</li>
<li id='diff-3'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-3'>
<strong>
include/ntp.h
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/include/ntp.h
</span><span style="color: #000000;background-color: #ddffdd">+++ b/include/ntp.h
</span><span style="color: #aaaaaa">@@ -245,7 +245,7 @@ struct peer {
</span> char * hostname; /* if non-NULL, remote name */
struct addrinfo *addrs; /* hostname query result */
struct addrinfo *ai; /* position within addrs */
<span style="color: #000000;background-color: #ffdddd">- endpt * dstadr; /* local address */
</span><span style="color: #000000;background-color: #ddffdd">+ endpt * dstaddr; /* local address */
</span> associd_t associd; /* association ID */
uint8_t version; /* version number */
uint8_t hmode; /* local association mode */
</code></pre>
<br>
</li>
<li id='diff-4'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-4'>
<strong>
include/ntpd.h
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/include/ntpd.h
</span><span style="color: #000000;background-color: #ddffdd">+++ b/include/ntpd.h
</span><span style="color: #aaaaaa">@@ -170,7 +170,7 @@ extern struct peer *findexistingpeer(sockaddr_u *, const char *,
</span> struct peer *, int, uint8_t);
extern struct peer *findpeer (struct recvbuf *, int, int *);
extern struct peer *findpeerbyassoc(associd_t);
<span style="color: #000000;background-color: #ffdddd">-extern void set_peerdstadr (struct peer *, endpt *);
</span><span style="color: #000000;background-color: #ddffdd">+extern void set_peerdstaddr (struct peer *, endpt *);
</span> extern struct peer *newpeer (sockaddr_u *, const char *,
endpt *, uint8_t, uint8_t,
uint8_t, uint8_t, u_int, uint8_t, uint32_t,
<span style="color: #aaaaaa">@@ -287,7 +287,7 @@ extern void record_loop_stats (double, double, double, double, int);
</span> extern void record_clock_stats (sockaddr_u *, const char *);
extern int mprintf_clock_stats(sockaddr_u *, const char *, ...)
NTP_PRINTF(2, 3);
<span style="color: #000000;background-color: #ffdddd">-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);
</span><span style="color: #000000;background-color: #ddffdd">+extern void record_raw_stats (sockaddr_u *srcaddr, sockaddr_u *dstaddr, 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);
</span> 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
</code></pre>
<br>
</li>
<li id='diff-5'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-5'>
<strong>
include/recvbuff.h
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/include/recvbuff.h
</span><span style="color: #000000;background-color: #ddffdd">+++ b/include/recvbuff.h
</span><span style="color: #aaaaaa">@@ -59,7 +59,7 @@ struct recvbuf {
</span> #ifdef HAVE_IO_COMPLETION_PORT
int recv_srcaddr_len;/* filled in on completion */
#endif
<span style="color: #000000;background-color: #ffdddd">- endpt * dstadr; /* address pkt arrived on */
</span><span style="color: #000000;background-color: #ddffdd">+ endpt * dstaddr; /* address pkt arrived on */
</span> SOCKET fd; /* fd on which it was received */
int msg_flags; /* Flags received about the packet */
l_fp recv_time; /* time of arrival */
</code></pre>
<br>
</li>
<li id='diff-6'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-6'>
<strong>
ntpd/ntp_control.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/ntp_control.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/ntp_control.c
</span><span style="color: #aaaaaa">@@ -479,7 +479,7 @@ static const struct ctl_var peer_var[] = {
</span> { CP_AUTHENTIC, RO, "authentic" }, /* 3 */
{ CP_SRCADR, RO, "srcaddr" }, /* 4 */
{ CP_SRCPORT, RO, "srcport" }, /* 5 */
<span style="color: #000000;background-color: #ffdddd">- { CP_DSTADR, RO, "dstadr" }, /* 6 */
</span><span style="color: #000000;background-color: #ddffdd">+ { CP_DSTADR, RO, "dstaddr" }, /* 6 */
</span> { CP_DSTPORT, RO, "dstport" }, /* 7 */
{ CP_LEAP, RO, "leap" }, /* 8 */
{ CP_HMODE, RO, "hmode" }, /* 9 */
<span style="color: #aaaaaa">@@ -946,7 +946,7 @@ process_control(
</span> */
numctlreq++;
rmt_addr = &rbufp->recv_srcaddr;
<span style="color: #000000;background-color: #ffdddd">- lcl_inter = rbufp->dstadr;
</span><span style="color: #000000;background-color: #ddffdd">+ lcl_inter = rbufp->dstaddr;
</span> pkt = (struct ntp_control *)&rbufp->recv_pkt;
/*
<span style="color: #aaaaaa">@@ -1752,7 +1752,7 @@ ctl_putsys(
</span> break;
case CS_PEERADR:
<span style="color: #000000;background-color: #ffdddd">- if (sys_peer != NULL && sys_peer->dstadr != NULL)
</span><span style="color: #000000;background-color: #ddffdd">+ if (sys_peer != NULL && sys_peer->dstaddr != NULL)
</span> ss = sptoa(&sys_peer->srcaddr);
else
ss = "0.0.0.0:0";
<span style="color: #aaaaaa">@@ -2371,15 +2371,15 @@ ctl_putpeer(
</span>
case CP_DSTADR:
ctl_putadr(peer_var[id].text, 0,
<span style="color: #000000;background-color: #ffdddd">- (p->dstadr != NULL)
- ? &p->dstadr->sin
</span><span style="color: #000000;background-color: #ddffdd">+ (p->dstaddr != NULL)
+ ? &p->dstaddr->sin
</span> : NULL);
break;
case CP_DSTPORT:
ctl_putuint(peer_var[id].text,
<span style="color: #000000;background-color: #ffdddd">- (p->dstadr != NULL)
- ? SRCPORT(&p->dstadr->sin)
</span><span style="color: #000000;background-color: #ddffdd">+ (p->dstaddr != NULL)
+ ? SRCPORT(&p->dstaddr->sin)
</span> : 0);
break;
<span style="color: #aaaaaa">@@ -4413,7 +4413,7 @@ set_trap(
</span> * Call ctlsettrap() to do the work. Return
* an error if it can't assign the trap.
*/
<span style="color: #000000;background-color: #ffdddd">- if (!ctlsettrap(&rbufp->recv_srcaddr, rbufp->dstadr, traptype,
</span><span style="color: #000000;background-color: #ddffdd">+ if (!ctlsettrap(&rbufp->recv_srcaddr, rbufp->dstaddr, traptype,
</span> (int)res_version))
ctl_error(CERR_NORESOURCE);
ctl_flushpkt(0);
<span style="color: #aaaaaa">@@ -4444,7 +4444,7 @@ unset_trap(
</span> /*
* Call ctlclrtrap() to clear this out.
*/
<span style="color: #000000;background-color: #ffdddd">- if (!ctlclrtrap(&rbufp->recv_srcaddr, rbufp->dstadr, traptype))
</span><span style="color: #000000;background-color: #ddffdd">+ if (!ctlclrtrap(&rbufp->recv_srcaddr, rbufp->dstaddr, traptype))
</span> ctl_error(CERR_BADASSOC);
ctl_flushpkt(0);
}
</code></pre>
<br>
</li>
<li id='diff-7'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-7'>
<strong>
ntpd/ntp_crypto.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/ntp_crypto.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/ntp_crypto.c
</span><span style="color: #aaaaaa">@@ -227,7 +227,7 @@ readlink(char * link, char * file, int len) {
</span> keyid_t
session_key(
sockaddr_u *srcaddr, /* source address */
<span style="color: #000000;background-color: #ffdddd">- sockaddr_u *dstadr, /* destination address */
</span><span style="color: #000000;background-color: #ddffdd">+ sockaddr_u *dstaddr, /* destination address */
</span> keyid_t keyno, /* key ID */
keyid_t private, /* private value */
u_long lifetime /* key lifetime */
<span style="color: #aaaaaa">@@ -239,7 +239,7 @@ session_key(
</span> uint32_t header[10]; /* data in network byte order */
u_int hdlen, len;
<span style="color: #000000;background-color: #ffdddd">- if (!dstadr)
</span><span style="color: #000000;background-color: #ddffdd">+ if (!dstaddr)
</span> return 0;
/*
<span style="color: #aaaaaa">@@ -250,7 +250,7 @@ session_key(
</span> switch(AF(srcaddr)) {
case AF_INET:
header[0] = NSRCADR(srcaddr);
<span style="color: #000000;background-color: #ffdddd">- header[1] = NSRCADR(dstadr);
</span><span style="color: #000000;background-color: #ddffdd">+ header[1] = NSRCADR(dstaddr);
</span> header[2] = htonl(keyno);
header[3] = htonl(private);
hdlen = 4 * sizeof(uint32_t);
<span style="color: #aaaaaa">@@ -259,7 +259,7 @@ session_key(
</span> case AF_INET6:
memcpy(&header[0], PSOCK_ADDR6(srcaddr),
sizeof(struct in6_addr));
<span style="color: #000000;background-color: #ffdddd">- memcpy(&header[4], PSOCK_ADDR6(dstadr),
</span><span style="color: #000000;background-color: #ddffdd">+ memcpy(&header[4], PSOCK_ADDR6(dstaddr),
</span> sizeof(struct in6_addr));
header[8] = htonl(keyno);
header[9] = htonl(private);
<span style="color: #aaaaaa">@@ -276,7 +276,7 @@ session_key(
</span> authtrust(keyno, lifetime);
}
DPRINTF(2, ("session_key: %s > %s %08x %08x hash %08x life %lu\n",
<span style="color: #000000;background-color: #ffdddd">- stoa(srcaddr), stoa(dstadr), keyno,
</span><span style="color: #000000;background-color: #ddffdd">+ stoa(srcaddr), stoa(dstaddr), keyno,
</span> private, keyid, lifetime));
return (keyid);
<span style="color: #aaaaaa">@@ -299,7 +299,7 @@ session_key(
</span> int
make_keylist(
struct peer *peer, /* peer structure pointer */
<span style="color: #000000;background-color: #ffdddd">- struct interface *dstadr /* interface */
</span><span style="color: #000000;background-color: #ddffdd">+ struct interface *dstaddr /* interface */
</span> )
{
EVP_MD_CTX ctx; /* signature context */
<span style="color: #aaaaaa">@@ -312,7 +312,7 @@ make_keylist(
</span> u_int len, mpoll;
int i;
<span style="color: #000000;background-color: #ffdddd">- if (!dstadr)
</span><span style="color: #000000;background-color: #ddffdd">+ if (!dstaddr)
</span> return XEVNT_ERR;
/*
<span style="color: #aaaaaa">@@ -353,7 +353,7 @@ make_keylist(
</span> for (i = 0; i < NTP_MAXSESSION; i++) {
peer->keylist[i] = keyid;
peer->keynumber = i;
<span style="color: #000000;background-color: #ffdddd">- keyid = session_key(&dstadr->sin, &peer->srcaddr, keyid,
</span><span style="color: #000000;background-color: #ddffdd">+ keyid = session_key(&dstaddr->sin, &peer->srcaddr, keyid,
</span> cookie, lifetime + mpoll);
lifetime -= mpoll;
if (auth_havekey(keyid) || keyid <= NTP_MAXKEY ||
</code></pre>
<br>
</li>
<li id='diff-8'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-8'>
<strong>
ntpd/ntp_io.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/ntp_io.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/ntp_io.c
</span><span style="color: #aaaaaa">@@ -388,7 +388,7 @@ collect_timing(struct recvbuf *rb, const char *tag, int count, l_fp *dts)
</span>
snprintf(buf, sizeof(buf), "%s %d %s %s",
(rb != NULL)
<span style="color: #000000;background-color: #ffdddd">- ? ((rb->dstadr != NULL)
</span><span style="color: #000000;background-color: #ddffdd">+ ? ((rb->dstaddr != NULL)
</span> ? stoa(&rb->recv_srcaddr)
: "-REFCLOCK-")
: "-",
<span style="color: #aaaaaa">@@ -1997,7 +1997,7 @@ update_interfaces(
</span>
/* disconnect peers from deleted endpt. */
while (ep->peers != NULL)
<span style="color: #000000;background-color: #ffdddd">- set_peerdstadr(ep->peers, NULL);
</span><span style="color: #000000;background-color: #ddffdd">+ set_peerdstaddr(ep->peers, NULL);
</span>
/*
* update globals in case we lose
<span style="color: #aaaaaa">@@ -3281,7 +3281,7 @@ read_refclock_packet(
</span> */
rb->recv_length = buflen;
rb->recv_peer = rp->srcclock;
<span style="color: #000000;background-color: #ffdddd">- rb->dstadr = 0;
</span><span style="color: #000000;background-color: #ddffdd">+ rb->dstaddr = 0;
</span> rb->fd = fd;
rb->recv_time = ts;
rb->receiver = rp->clock_recv;
<span style="color: #aaaaaa">@@ -3539,7 +3539,7 @@ read_network_packet(
</span> * Got one. Mark how and when it got here,
* put it on the full list and do bookkeeping.
*/
<span style="color: #000000;background-color: #ffdddd">- rb->dstadr = itf;
</span><span style="color: #000000;background-color: #ddffdd">+ rb->dstaddr = itf;
</span> rb->fd = fd;
#ifdef USE_PACKET_TIMESTAMP
/* pick up a network time stamp if possible */
<span style="color: #aaaaaa">@@ -3822,7 +3822,7 @@ endpt *
</span> select_peerinterface(
struct peer * peer,
sockaddr_u * srcaddr,
<span style="color: #000000;background-color: #ffdddd">- endpt * dstadr
</span><span style="color: #000000;background-color: #ddffdd">+ endpt * dstaddr
</span> )
{
endpt *ep;
<span style="color: #aaaaaa">@@ -3851,13 +3851,13 @@ select_peerinterface(
</span> DPRINTF(4, ("No *-cast local address found for address %s\n",
stoa(srcaddr)));
} else {
<span style="color: #000000;background-color: #ffdddd">- ep = dstadr;
</span><span style="color: #000000;background-color: #ddffdd">+ ep = dstaddr;
</span> if (NULL == ep)
ep = wild;
}
/*
* If it is a multicast address, findbcastinter() may not find
<span style="color: #000000;background-color: #ffdddd">- * it. For unicast, we get to find the interface when dstadr is
</span><span style="color: #000000;background-color: #ddffdd">+ * it. For unicast, we get to find the interface when dstaddr is
</span> * given to us as the wildcard (ANY_INTERFACE_CHOOSE). Either
* way, try a little harder.
*/
</code></pre>
<br>
</li>
<li id='diff-9'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-9'>
<strong>
ntpd/ntp_monitor.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/ntp_monitor.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/ntp_monitor.c
</span><span style="color: #aaaaaa">@@ -477,8 +477,8 @@ ntp_monitor(
</span> mon->leak = 0;
memcpy(&mon->rmtadr, &rbufp->recv_srcaddr, sizeof(mon->rmtadr));
mon->vn_mode = VN_MODE(version, mode);
<span style="color: #000000;background-color: #ffdddd">- mon->lcladr = rbufp->dstadr;
- mon->cast_flags = (uint8_t)(((rbufp->dstadr->flags &
</span><span style="color: #000000;background-color: #ddffdd">+ mon->lcladr = rbufp->dstaddr;
+ mon->cast_flags = (uint8_t)(((rbufp->dstaddr->flags &
</span> INT_MCASTOPEN) && rbufp->fd == mon->lcladr->fd) ? MDF_MCAST
: rbufp->fd == mon->lcladr->bfd ? MDF_BCAST : MDF_UCAST);
</code></pre>
<br>
</li>
<li id='diff-10'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-10'>
<strong>
ntpd/ntp_peer.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/ntp_peer.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/ntp_peer.c
</span><span style="color: #aaaaaa">@@ -337,9 +337,9 @@ findpeer(
</span> */
if (NULL == p) {
*action = MATCH_ASSOC(NO_PEER, pkt_mode);
<span style="color: #000000;background-color: #ffdddd">- } else if (p->dstadr != rbufp->dstadr) {
- set_peerdstadr(p, rbufp->dstadr);
- if (p->dstadr == rbufp->dstadr) {
</span><span style="color: #000000;background-color: #ddffdd">+ } else if (p->dstaddr != rbufp->dstaddr) {
+ set_peerdstaddr(p, rbufp->dstaddr);
+ if (p->dstaddr == rbufp->dstaddr) {
</span> DPRINTF(1, ("Changed %s local address to match response\n",
stoa(&p->srcaddr)));
return findpeer(rbufp, pkt_mode, action);
<span style="color: #aaaaaa">@@ -529,7 +529,7 @@ unpeer(
</span> {
mprintf_event(PEVNT_DEMOBIL, peer, "assoc %u", peer->associd);
restrict_source(&peer->srcaddr, 1, 0);
<span style="color: #000000;background-color: #ffdddd">- set_peerdstadr(peer, NULL);
</span><span style="color: #000000;background-color: #ddffdd">+ set_peerdstaddr(peer, NULL);
</span> peer_demobilizations++;
peer_associations--;
if (FLAG_PREEMPT & peer->flags)
<span style="color: #aaaaaa">@@ -553,7 +553,7 @@ struct peer *
</span> peer_config(
sockaddr_u * srcaddr,
const char * hostname,
<span style="color: #000000;background-color: #ffdddd">- endpt * dstadr,
</span><span style="color: #000000;background-color: #ddffdd">+ endpt * dstaddr,
</span> uint8_t hmode,
uint8_t version,
uint8_t minpoll,
<span style="color: #aaaaaa">@@ -604,45 +604,45 @@ peer_config(
</span> flags |= FLAG_IBURST;
if ((MDF_ACAST | MDF_POOL) & cast_flags)
flags &= ~FLAG_PREEMPT;
<span style="color: #000000;background-color: #ffdddd">- return newpeer(srcaddr, hostname, dstadr, hmode, version,
</span><span style="color: #000000;background-color: #ddffdd">+ return newpeer(srcaddr, hostname, dstaddr, hmode, version,
</span> minpoll, maxpoll, flags, cast_flags, ttl, key, ident);
}
/*
<span style="color: #000000;background-color: #ffdddd">- * setup peer dstadr field keeping it in sync with the interface
</span><span style="color: #000000;background-color: #ddffdd">+ * setup peer dstaddr field keeping it in sync with the interface
</span> * structures
*/
void
<span style="color: #000000;background-color: #ffdddd">-set_peerdstadr(
</span><span style="color: #000000;background-color: #ddffdd">+set_peerdstaddr(
</span> struct peer * p,
<span style="color: #000000;background-color: #ffdddd">- endpt * dstadr
</span><span style="color: #000000;background-color: #ddffdd">+ endpt * dstaddr
</span> )
{
struct peer * unlinked;
<span style="color: #000000;background-color: #ffdddd">- if (p->dstadr == dstadr)
</span><span style="color: #000000;background-color: #ddffdd">+ if (p->dstaddr == dstaddr)
</span> return;
/*
* Don't accept updates to a separate multicast receive-only
* endpt while a BCLNT peer is running its unicast protocol.
*/
<span style="color: #000000;background-color: #ffdddd">- if (dstadr != NULL && (FLAG_BC_VOL & p->flags) &&
- (INT_MCASTIF & dstadr->flags) && MODE_CLIENT == p->hmode) {
</span><span style="color: #000000;background-color: #ddffdd">+ if (dstaddr != NULL && (FLAG_BC_VOL & p->flags) &&
+ (INT_MCASTIF & dstaddr->flags) && MODE_CLIENT == p->hmode) {
</span> return;
}
<span style="color: #000000;background-color: #ffdddd">- if (p->dstadr != NULL) {
- p->dstadr->peercnt--;
- UNLINK_SLIST(unlinked, p->dstadr->peers, p, ilink,
</span><span style="color: #000000;background-color: #ddffdd">+ if (p->dstaddr != NULL) {
+ p->dstaddr->peercnt--;
+ UNLINK_SLIST(unlinked, p->dstaddr->peers, p, ilink,
</span> struct peer);
msyslog(LOG_INFO, "%s local addr %s -> %s",
<span style="color: #000000;background-color: #ffdddd">- stoa(&p->srcaddr), latoa(p->dstadr),
- latoa(dstadr));
</span><span style="color: #000000;background-color: #ddffdd">+ stoa(&p->srcaddr), latoa(p->dstaddr),
+ latoa(dstaddr));
</span> }
<span style="color: #000000;background-color: #ffdddd">- p->dstadr = dstadr;
- if (dstadr != NULL) {
- LINK_SLIST(dstadr->peers, p, ilink);
- dstadr->peercnt++;
</span><span style="color: #000000;background-color: #ddffdd">+ p->dstaddr = dstaddr;
+ if (dstaddr != NULL) {
+ LINK_SLIST(dstaddr->peers, p, ilink);
+ dstaddr->peercnt++;
</span> }
}
<span style="color: #aaaaaa">@@ -661,8 +661,8 @@ peer_refresh_interface(
</span>
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: ",
<span style="color: #000000;background-color: #ffdddd">- p->dstadr == NULL ? "<null>" :
- stoa(&p->dstadr->sin), stoa(&p->srcaddr), p->hmode,
</span><span style="color: #000000;background-color: #ddffdd">+ p->dstaddr == NULL ? "<null>" :
+ stoa(&p->dstaddr->sin), stoa(&p->srcaddr), p->hmode,
</span> p->version, p->minpoll, p->maxpoll, p->flags, p->cast_flags,
p->ttl, p->keyid));
if (niface != NULL) {
<span style="color: #aaaaaa">@@ -679,13 +679,13 @@ peer_refresh_interface(
</span> DPRINTF(4, ("<NONE>\n"));
}
<span style="color: #000000;background-color: #ffdddd">- piface = p->dstadr;
- set_peerdstadr(p, niface);
- if (p->dstadr != NULL) {
</span><span style="color: #000000;background-color: #ddffdd">+ piface = p->dstaddr;
+ set_peerdstaddr(p, niface);
+ if (p->dstaddr != NULL) {
</span> /*
* clear crypto if we change the local address
*/
<span style="color: #000000;background-color: #ffdddd">- if (p->dstadr != piface && !(MDF_ACAST & p->cast_flags)
</span><span style="color: #000000;background-color: #ddffdd">+ if (p->dstaddr != piface && !(MDF_ACAST & p->cast_flags)
</span> && MODE_BROADCAST != p->pmode)
peer_clear(p, "XFAC");
<span style="color: #aaaaaa">@@ -693,14 +693,14 @@ peer_refresh_interface(
</span> * Broadcast needs the socket enabled for broadcast
*/
if (MDF_BCAST & p->cast_flags)
<span style="color: #000000;background-color: #ffdddd">- enable_broadcast(p->dstadr, &p->srcaddr);
</span><span style="color: #000000;background-color: #ddffdd">+ enable_broadcast(p->dstaddr, &p->srcaddr);
</span>
/*
* Multicast needs the socket interface enabled for
* multicast
*/
if (MDF_MCAST & p->cast_flags)
<span style="color: #000000;background-color: #ffdddd">- enable_multicast_if(p->dstadr, &p->srcaddr);
</span><span style="color: #000000;background-color: #ddffdd">+ enable_multicast_if(p->dstaddr, &p->srcaddr);
</span> }
}
<span style="color: #aaaaaa">@@ -721,7 +721,7 @@ refresh_all_peerinterfaces(void)
</span> * or if the one they have hasn't worked for a while.
*/
for (p = peer_list; p != NULL; p = p->p_link) {
<span style="color: #000000;background-color: #ffdddd">- if (!(p->dstadr && (p->reach & 0x3))) // Bug 2849 XOR 2043
</span><span style="color: #000000;background-color: #ddffdd">+ if (!(p->dstaddr && (p->reach & 0x3))) // Bug 2849 XOR 2043
</span> peer_refresh_interface(p);
}
}
<span style="color: #aaaaaa">@@ -734,7 +734,7 @@ struct peer *
</span> newpeer(
sockaddr_u * srcaddr,
const char * hostname,
<span style="color: #000000;background-color: #ffdddd">- endpt * dstadr,
</span><span style="color: #000000;background-color: #ddffdd">+ endpt * dstaddr,
</span> uint8_t hmode,
uint8_t version,
uint8_t minpoll,
<span style="color: #aaaaaa">@@ -777,17 +777,17 @@ newpeer(
</span> * actual interface, because that's what gets put into the peer
* structure.
*/
<span style="color: #000000;background-color: #ffdddd">- if (dstadr != NULL) {
</span><span style="color: #000000;background-color: #ddffdd">+ if (dstaddr != NULL) {
</span> peer = findexistingpeer(srcaddr, hostname, NULL, hmode,
cast_flags);
while (peer != NULL) {
<span style="color: #000000;background-color: #ffdddd">- if (peer->dstadr == dstadr ||
</span><span style="color: #000000;background-color: #ddffdd">+ if (peer->dstaddr == dstaddr ||
</span> ((MDF_BCLNT & cast_flags) &&
(MDF_BCLNT & peer->cast_flags)))
break;
<span style="color: #000000;background-color: #ffdddd">- if (dstadr == ANY_INTERFACE_CHOOSE(srcaddr) &&
- peer->dstadr == findinterface(srcaddr))
</span><span style="color: #000000;background-color: #ddffdd">+ if (dstaddr == ANY_INTERFACE_CHOOSE(srcaddr) &&
+ peer->dstaddr == findinterface(srcaddr))
</span> break;
peer = findexistingpeer(srcaddr, hostname, peer,
<span style="color: #aaaaaa">@@ -839,8 +839,8 @@ newpeer(
</span> peer->version = version;
peer->flags = flags;
peer->cast_flags = cast_flags;
<span style="color: #000000;background-color: #ffdddd">- set_peerdstadr(peer,
- select_peerinterface(peer, srcaddr, dstadr));
</span><span style="color: #000000;background-color: #ddffdd">+ set_peerdstaddr(peer,
+ select_peerinterface(peer, srcaddr, dstaddr));
</span>
/*
* It is an error to set minpoll less than NTP_MINPOLL or to
<span style="color: #aaaaaa">@@ -860,10 +860,10 @@ newpeer(
</span> if (peer->minpoll > peer->maxpoll)
peer->minpoll = peer->maxpoll;
<span style="color: #000000;background-color: #ffdddd">- if (peer->dstadr != NULL)
</span><span style="color: #000000;background-color: #ddffdd">+ if (peer->dstaddr != NULL)
</span> DPRINTF(3, ("newpeer(%s): using fd %d and our addr %s\n",
<span style="color: #000000;background-color: #ffdddd">- stoa(srcaddr), peer->dstadr->fd,
- stoa(&peer->dstadr->sin)));
</span><span style="color: #000000;background-color: #ddffdd">+ stoa(srcaddr), peer->dstaddr->fd,
+ stoa(&peer->dstaddr->sin)));
</span> else
DPRINTF(3, ("newpeer(%s): local interface currently not bound\n",
stoa(srcaddr)));
<span style="color: #aaaaaa">@@ -871,14 +871,14 @@ newpeer(
</span> /*
* Broadcast needs the socket enabled for broadcast
*/
<span style="color: #000000;background-color: #ffdddd">- if ((MDF_BCAST & cast_flags) && peer->dstadr != NULL)
- enable_broadcast(peer->dstadr, srcaddr);
</span><span style="color: #000000;background-color: #ddffdd">+ if ((MDF_BCAST & cast_flags) && peer->dstaddr != NULL)
+ enable_broadcast(peer->dstaddr, srcaddr);
</span>
/*
* Multicast needs the socket interface enabled for multicast
*/
<span style="color: #000000;background-color: #ffdddd">- if ((MDF_MCAST & cast_flags) && peer->dstadr != NULL)
- enable_multicast_if(peer->dstadr, srcaddr);
</span><span style="color: #000000;background-color: #ddffdd">+ if ((MDF_MCAST & cast_flags) && peer->dstaddr != NULL)
+ enable_multicast_if(peer->dstaddr, srcaddr);
</span>
#ifdef ENABLE_AUTOKEY
if (key > NTP_MAXKEY)
<span style="color: #aaaaaa">@@ -924,14 +924,14 @@ newpeer(
</span> /*
* Dump it, something screwed up
*/
<span style="color: #000000;background-color: #ffdddd">- set_peerdstadr(peer, NULL);
</span><span style="color: #000000;background-color: #ddffdd">+ set_peerdstaddr(peer, NULL);
</span> free_peer(peer, 0);
return NULL;
}
#else /* REFCLOCK */
msyslog(LOG_ERR, "refclock %s isn't supported. ntpd was compiled without refclock support.",
stoa(&peer->srcaddr));
<span style="color: #000000;background-color: #ffdddd">- set_peerdstadr(peer, NULL);
</span><span style="color: #000000;background-color: #ddffdd">+ set_peerdstaddr(peer, NULL);
</span> free_peer(peer, 0);
return NULL;
#endif /* REFCLOCK */
<span style="color: #aaaaaa">@@ -951,7 +951,7 @@ newpeer(
</span> 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",
<span style="color: #000000;background-color: #ffdddd">- latoa(peer->dstadr), stoa(&peer->srcaddr), peer->hmode,
</span><span style="color: #000000;background-color: #ddffdd">+ latoa(peer->dstaddr), stoa(&peer->srcaddr), peer->hmode,
</span> peer->version, peer->minpoll, peer->maxpoll, peer->flags,
peer->cast_flags, peer->ttl, peer->keyid));
return peer;
</code></pre>
<br>
</li>
<li id='diff-11'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-11'>
<strong>
ntpd/ntp_proto.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/ntp_proto.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/ntp_proto.c
</span><span style="color: #aaaaaa">@@ -397,7 +397,7 @@ receive(
</span> keyid_t skeyid = 0; /* key IDs */
uint32_t opcode = 0; /* extension field opcode */
#if defined(DEBUG) || defined(ENABLE_AUTOKEY)
<span style="color: #000000;background-color: #ffdddd">- sockaddr_u *dstadr_sin; /* active runway */
</span><span style="color: #000000;background-color: #ddffdd">+ sockaddr_u *dstaddr_sin; /* active runway */
</span> #endif
struct peer *peer2; /* aux peer structure pointer */
endpt * match_ep; /* newpeer() local address */
<span style="color: #aaaaaa">@@ -433,9 +433,9 @@ receive(
</span> }
restrict_mask = restrictions(&rbufp->recv_srcaddr);
DPRINTF(2, ("receive: at %ld %s<-%s flags %x restrict %03x\n",
<span style="color: #000000;background-color: #ffdddd">- current_time, stoa(&rbufp->dstadr->sin),
</span><span style="color: #000000;background-color: #ddffdd">+ current_time, stoa(&rbufp->dstaddr->sin),
</span> stoa(&rbufp->recv_srcaddr),
<span style="color: #000000;background-color: #ffdddd">- rbufp->dstadr->flags, restrict_mask));
</span><span style="color: #000000;background-color: #ddffdd">+ rbufp->dstaddr->flags, restrict_mask));
</span> pkt = &rbufp->recv_pkt;
hisversion = PKT_VERSION(pkt->li_vn_mode);
hisleap = PKT_LEAP(pkt->li_vn_mode);
<span style="color: #aaaaaa">@@ -635,7 +635,7 @@ receive(
</span> */
peer = findpeer(rbufp, hismode, &retcode);
#ifdef DEBUG
<span style="color: #000000;background-color: #ffdddd">- dstadr_sin = &rbufp->dstadr->sin;
</span><span style="color: #000000;background-color: #ddffdd">+ dstaddr_sin = &rbufp->dstaddr->sin;
</span> #endif
NTOHL_FP(&pkt->org, &p_org);
NTOHL_FP(&pkt->rec, &p_rec);
<span style="color: #aaaaaa">@@ -672,7 +672,7 @@ receive(
</span> if (debug)
printf(
"receive: at %ld %s<-%s mode %d len %zd\n",
<span style="color: #000000;background-color: #ffdddd">- current_time, stoa(dstadr_sin),
</span><span style="color: #000000;background-color: #ddffdd">+ current_time, stoa(dstaddr_sin),
</span> stoa(&rbufp->recv_srcaddr), hismode,
authlen);
#endif
<span style="color: #aaaaaa">@@ -683,7 +683,7 @@ receive(
</span> if (debug)
printf(
"receive: at %ld %s<-%s mode %d keyid %08x len %zd auth %d\n",
<span style="color: #000000;background-color: #ffdddd">- current_time, stoa(dstadr_sin),
</span><span style="color: #000000;background-color: #ddffdd">+ current_time, stoa(dstaddr_sin),
</span> stoa(&rbufp->recv_srcaddr), hismode, skeyid,
authlen + has_mac, is_authentic);
#endif
<span style="color: #aaaaaa">@@ -754,18 +754,18 @@ receive(
</span> * mobilized. However, if this is from
* the wildcard interface, game over.
*/
<span style="color: #000000;background-color: #ffdddd">- if (crypto_flags && rbufp->dstadr ==
</span><span style="color: #000000;background-color: #ddffdd">+ if (crypto_flags && rbufp->dstaddr ==
</span> ANY_INTERFACE_CHOOSE(&rbufp->recv_srcaddr)) {
sys_restricted++;
return; /* no wildcard */
}
pkeyid = 0;
<span style="color: #000000;background-color: #ffdddd">- if (!SOCK_UNSPEC(&rbufp->dstadr->bcast))
- dstadr_sin =
- &rbufp->dstadr->bcast;
</span><span style="color: #000000;background-color: #ddffdd">+ if (!SOCK_UNSPEC(&rbufp->dstaddr->bcast))
+ dstaddr_sin =
+ &rbufp->dstaddr->bcast;
</span> } else if (peer == NULL) {
pkeyid = session_key(
<span style="color: #000000;background-color: #ffdddd">- &rbufp->recv_srcaddr, dstadr_sin, 0,
</span><span style="color: #000000;background-color: #ddffdd">+ &rbufp->recv_srcaddr, dstaddr_sin, 0,
</span> sys_private, 0);
} else {
pkeyid = peer->pcookie;
<span style="color: #aaaaaa">@@ -780,13 +780,13 @@ receive(
</span> */
if (authlen > LEN_PKT_NOMAC && pkeyid != 0) {
session_key(&rbufp->recv_srcaddr,
<span style="color: #000000;background-color: #ffdddd">- dstadr_sin, skeyid, 0, 2);
</span><span style="color: #000000;background-color: #ddffdd">+ dstaddr_sin, skeyid, 0, 2);
</span> tkeyid = session_key(
<span style="color: #000000;background-color: #ffdddd">- &rbufp->recv_srcaddr, dstadr_sin,
</span><span style="color: #000000;background-color: #ddffdd">+ &rbufp->recv_srcaddr, dstaddr_sin,
</span> skeyid, pkeyid, 0);
} else {
tkeyid = session_key(
<span style="color: #000000;background-color: #ffdddd">- &rbufp->recv_srcaddr, dstadr_sin,
</span><span style="color: #000000;background-color: #ddffdd">+ &rbufp->recv_srcaddr, dstaddr_sin,
</span> skeyid, pkeyid, 2);
}
<span style="color: #aaaaaa">@@ -813,7 +813,7 @@ receive(
</span> if (debug)
printf(
"receive: at %ld %s<-%s mode %d keyid %08x len %zd auth %d\n",
<span style="color: #000000;background-color: #ffdddd">- current_time, stoa(dstadr_sin),
</span><span style="color: #000000;background-color: #ddffdd">+ current_time, stoa(dstaddr_sin),
</span> stoa(&rbufp->recv_srcaddr), hismode, skeyid,
authlen + has_mac, is_authentic);
#endif
<span style="color: #aaaaaa">@@ -843,7 +843,7 @@ receive(
</span> * If authentication OK, send a server reply; otherwise,
* send a crypto-NAK.
*/
<span style="color: #000000;background-color: #ffdddd">- if (!(rbufp->dstadr->flags & INT_MCASTOPEN)) {
</span><span style="color: #000000;background-color: #ddffdd">+ if (!(rbufp->dstaddr->flags & INT_MCASTOPEN)) {
</span> if (AUTH(restrict_mask & RES_DONTTRUST,
is_authentic)) {
fast_xmit(rbufp, MODE_SERVER, skeyid,
<span style="color: #aaaaaa">@@ -884,7 +884,7 @@ receive(
</span> */
if (sys_leap == LEAP_NOTINSYNC || sys_stratum >=
hisstratum || (!sys_cohort && sys_stratum ==
<span style="color: #000000;background-color: #ffdddd">- hisstratum + 1) || rbufp->dstadr->addr_refid ==
</span><span style="color: #000000;background-color: #ddffdd">+ hisstratum + 1) || rbufp->dstaddr->addr_refid ==
</span> pkt->refid) {
sys_declined++;
return; /* no help */
<span style="color: #aaaaaa">@@ -949,7 +949,7 @@ receive(
</span> sys_declined++;
return; /* no help */
}
<span style="color: #000000;background-color: #ffdddd">- peer = newpeer(&rbufp->recv_srcaddr, NULL, rbufp->dstadr,
</span><span style="color: #000000;background-color: #ddffdd">+ peer = newpeer(&rbufp->recv_srcaddr, NULL, rbufp->dstaddr,
</span> MODE_CLIENT, hisversion, peer2->minpoll,
peer2->maxpoll, FLAG_PREEMPT |
(FLAG_IBURST & peer2->flags), MDF_UCAST |
<span style="color: #aaaaaa">@@ -1034,8 +1034,8 @@ receive(
</span> * ephemeral associations are unique across all local
* endpoints.
*/
<span style="color: #000000;background-color: #ffdddd">- if (!(INT_MCASTOPEN & rbufp->dstadr->flags))
- match_ep = rbufp->dstadr;
</span><span style="color: #000000;background-color: #ddffdd">+ if (!(INT_MCASTOPEN & rbufp->dstaddr->flags))
+ match_ep = rbufp->dstaddr;
</span> else
match_ep = NULL;
<span style="color: #aaaaaa">@@ -1177,7 +1177,7 @@ receive(
</span> * Mobilize a symmetric passive association.
*/
if ((peer = newpeer(&rbufp->recv_srcaddr, NULL,
<span style="color: #000000;background-color: #ffdddd">- rbufp->dstadr, MODE_PASSIVE, hisversion, pkt->ppoll,
</span><span style="color: #000000;background-color: #ddffdd">+ rbufp->dstaddr, MODE_PASSIVE, hisversion, pkt->ppoll,
</span> NTP_MAXDPOLL, 0, MDF_UCAST, 0, skeyid,
sys_ident)) == NULL) {
sys_declined++;
<span style="color: #aaaaaa">@@ -1496,7 +1496,7 @@ receive(
</span> break;
}
tkeyid = session_key(
<span style="color: #000000;background-color: #ffdddd">- &rbufp->recv_srcaddr, dstadr_sin,
</span><span style="color: #000000;background-color: #ddffdd">+ &rbufp->recv_srcaddr, dstaddr_sin,
</span> tkeyid, pkeyid, 0);
}
if (peer->flash & BOGON8)
<span style="color: #aaaaaa">@@ -1584,8 +1584,8 @@ process_packet(
</span> /*
* Capture the header values in the client/peer association..
*/
<span style="color: #000000;background-color: #ffdddd">- record_raw_stats(&peer->srcaddr, peer->dstadr ?
- &peer->dstadr->sin : NULL,
</span><span style="color: #000000;background-color: #ddffdd">+ record_raw_stats(&peer->srcaddr, peer->dstaddr ?
+ &peer->dstaddr->sin : NULL,
</span> &p_org, &p_rec, &p_xmt, &peer->dst,
pleap, pversion, pmode, pstratum, pkt->ppoll, pkt->precision,
p_del, p_disp, pkt->refid);
<span style="color: #aaaaaa">@@ -2544,8 +2544,8 @@ clock_select(void)
</span> uint32_t localmet;
uint32_t peermet;
<span style="color: #000000;background-color: #ffdddd">- if (peer->dstadr != NULL)
- localmet = ntohl(peer->dstadr->addr_refid);
</span><span style="color: #000000;background-color: #ddffdd">+ if (peer->dstaddr != NULL)
+ localmet = ntohl(peer->dstaddr->addr_refid);
</span> else
localmet = UINT32_MAX;
peermet = ntohl(addr2refid(&peer->srcaddr));
<span style="color: #aaaaaa">@@ -3056,7 +3056,7 @@ peer_xmit(
</span> keyid_t xkeyid = 0; /* transmit key ID */
l_fp xmt_tx, xmt_ty;
<span style="color: #000000;background-color: #ffdddd">- if (!peer->dstadr) /* drop peers without interface */
</span><span style="color: #000000;background-color: #ddffdd">+ if (!peer->dstaddr) /* drop peers without interface */
</span> return;
xpkt.li_vn_mode = PKT_LI_VN_MODE(sys_leap, peer->version,
<span style="color: #aaaaaa">@@ -3116,7 +3116,7 @@ peer_xmit(
</span> }
}
peer->t21_bytes = sendlen;
<span style="color: #000000;background-color: #ffdddd">- intercept_sendpkt(__func__, &peer->srcaddr, peer->dstadr, sys_ttl[peer->ttl],
</span><span style="color: #000000;background-color: #ddffdd">+ intercept_sendpkt(__func__, &peer->srcaddr, peer->dstaddr, sys_ttl[peer->ttl],
</span> &xpkt, sendlen);
peer->sent++;
peer->throttle += (1 << peer->minpoll) - 2;
<span style="color: #aaaaaa">@@ -3137,8 +3137,8 @@ peer_xmit(
</span> #ifdef DEBUG
if (debug)
printf("transmit: at %ld %s->%s mode %d len %zu\n",
<span style="color: #000000;background-color: #ffdddd">- current_time, peer->dstadr ?
- stoa(&peer->dstadr->sin) : "-",
</span><span style="color: #000000;background-color: #ddffdd">+ current_time, peer->dstaddr ?
+ stoa(&peer->dstaddr->sin) : "-",
</span> stoa(&peer->srcaddr), peer->hmode, sendlen);
#endif
return;
<span style="color: #aaaaaa">@@ -3198,7 +3198,7 @@ peer_xmit(
</span> * regenerate it.
*/
if (peer->keynumber == 0)
<span style="color: #000000;background-color: #ffdddd">- make_keylist(peer, peer->dstadr);
</span><span style="color: #000000;background-color: #ddffdd">+ make_keylist(peer, peer->dstaddr);
</span> else
peer->keynumber--;
xkeyid = peer->keylist[peer->keynumber];
<span style="color: #aaaaaa">@@ -3384,7 +3384,7 @@ peer_xmit(
</span> * fields are present, the cookie value is zero.
*/
if (sendlen > (int)LEN_PKT_NOMAC) {
<span style="color: #000000;background-color: #ffdddd">- session_key(&peer->dstadr->sin, &peer->srcaddr,
</span><span style="color: #000000;background-color: #ddffdd">+ session_key(&peer->dstaddr->sin, &peer->srcaddr,
</span> xkeyid, 0, 2);
}
}
<span style="color: #aaaaaa">@@ -3429,7 +3429,7 @@ peer_xmit(
</span> exit (-1);
}
peer->t21_bytes = sendlen;
<span style="color: #000000;background-color: #ffdddd">- intercept_sendpkt(__func__, &peer->srcaddr, peer->dstadr, sys_ttl[peer->ttl], &xpkt,
</span><span style="color: #000000;background-color: #ddffdd">+ intercept_sendpkt(__func__, &peer->srcaddr, peer->dstaddr, sys_ttl[peer->ttl], &xpkt,
</span> sendlen);
peer->sent++;
peer->throttle += (1 << peer->minpoll) - 2;
<span style="color: #aaaaaa">@@ -3451,7 +3451,7 @@ peer_xmit(
</span> #ifdef DEBUG
if (debug)
printf("transmit: at %ld %s->%s mode %d keyid %08x len %zu index %d\n",
<span style="color: #000000;background-color: #ffdddd">- current_time, latoa(peer->dstadr),
</span><span style="color: #000000;background-color: #ddffdd">+ current_time, latoa(peer->dstaddr),
</span> ntoa(&peer->srcaddr), peer->hmode, xkeyid, sendlen,
peer->keynumber);
#endif
<span style="color: #aaaaaa">@@ -3459,8 +3459,8 @@ peer_xmit(
</span> #ifdef DEBUG
if (debug)
printf("transmit: at %ld %s->%s mode %d keyid %08x len %zd\n",
<span style="color: #000000;background-color: #ffdddd">- current_time, peer->dstadr ?
- ntoa(&peer->dstadr->sin) : "-",
</span><span style="color: #000000;background-color: #ddffdd">+ current_time, peer->dstaddr ?
+ ntoa(&peer->dstaddr->sin) : "-",
</span> ntoa(&peer->srcaddr), peer->hmode, xkeyid, sendlen);
#endif
#endif /* !ENABLE_AUTOKEY */
<span style="color: #aaaaaa">@@ -3509,8 +3509,8 @@ fast_xmit(
</span> * must go out another way.
*/
rpkt = &rbufp->recv_pkt;
<span style="color: #000000;background-color: #ffdddd">- if (rbufp->dstadr->flags & INT_MCASTOPEN)
- rbufp->dstadr = findinterface(&rbufp->recv_srcaddr);
</span><span style="color: #000000;background-color: #ddffdd">+ if (rbufp->dstaddr->flags & INT_MCASTOPEN)
+ rbufp->dstaddr = findinterface(&rbufp->recv_srcaddr);
</span>
/*
* If this is a kiss-o'-death (KoD) packet, show leap
<span style="color: #aaaaaa">@@ -3610,13 +3610,13 @@ fast_xmit(
</span> */
sendlen = LEN_PKT_NOMAC;
if (rbufp->recv_length == sendlen) {
<span style="color: #000000;background-color: #ffdddd">- intercept_sendpkt(__func__, &rbufp->recv_srcaddr, rbufp->dstadr, 0, &xpkt,
</span><span style="color: #000000;background-color: #ddffdd">+ intercept_sendpkt(__func__, &rbufp->recv_srcaddr, rbufp->dstaddr, 0, &xpkt,
</span> sendlen);
#ifdef DEBUG
if (debug)
printf(
"transmit: at %ld %s->%s mode %d len %zd\n",
<span style="color: #000000;background-color: #ffdddd">- current_time, stoa(&rbufp->dstadr->sin),
</span><span style="color: #000000;background-color: #ddffdd">+ current_time, stoa(&rbufp->dstaddr->sin),
</span> stoa(&rbufp->recv_srcaddr), xmode, sendlen);
#endif
return;
<span style="color: #aaaaaa">@@ -3644,9 +3644,9 @@ fast_xmit(
</span> * use the cookie to generate the session key.
*/
cookie = session_key(&rbufp->recv_srcaddr,
<span style="color: #000000;background-color: #ffdddd">- &rbufp->dstadr->sin, 0, sys_private, 0);
</span><span style="color: #000000;background-color: #ddffdd">+ &rbufp->dstaddr->sin, 0, sys_private, 0);
</span> if (rbufp->recv_length > sendlen + (int)MAX_MAC_LEN) {
<span style="color: #000000;background-color: #ffdddd">- session_key(&rbufp->dstadr->sin,
</span><span style="color: #000000;background-color: #ddffdd">+ session_key(&rbufp->dstaddr->sin,
</span> &rbufp->recv_srcaddr, xkeyid, 0, 2);
temp32 = CRYPTO_RESP;
rpkt->exten[0] |= htonl(temp32);
<span style="color: #aaaaaa">@@ -3654,7 +3654,7 @@ fast_xmit(
</span> sendlen, (struct exten *)rpkt->exten,
cookie);
} else {
<span style="color: #000000;background-color: #ffdddd">- session_key(&rbufp->dstadr->sin,
</span><span style="color: #000000;background-color: #ddffdd">+ session_key(&rbufp->dstaddr->sin,
</span> &rbufp->recv_srcaddr, xkeyid, cookie, 2);
}
}
<span style="color: #aaaaaa">@@ -3665,7 +3665,7 @@ fast_xmit(
</span> if (xkeyid > NTP_MAXKEY)
authtrust(xkeyid, 0);
#endif /* ENABLE_AUTOKEY */
<span style="color: #000000;background-color: #ffdddd">- intercept_sendpkt(__func__, &rbufp->recv_srcaddr, rbufp->dstadr, 0, &xpkt, sendlen);
</span><span style="color: #000000;background-color: #ddffdd">+ intercept_sendpkt(__func__, &rbufp->recv_srcaddr, rbufp->dstaddr, 0, &xpkt, sendlen);
</span> intercept_get_systime(__func__, &xmt_ty);
L_SUB(&xmt_ty, &xmt_tx);
sys_authdelay = xmt_ty;
<span style="color: #aaaaaa">@@ -3673,7 +3673,7 @@ fast_xmit(
</span> if (debug)
printf(
"transmit: at %ld %s->%s mode %d keyid %08x len %zd\n",
<span style="color: #000000;background-color: #ffdddd">- current_time, ntoa(&rbufp->dstadr->sin),
</span><span style="color: #000000;background-color: #ddffdd">+ current_time, ntoa(&rbufp->dstaddr->sin),
</span> ntoa(&rbufp->recv_srcaddr), xmode, xkeyid, sendlen);
#endif
}
<span style="color: #aaaaaa">@@ -3882,8 +3882,8 @@ local_refid(
</span> {
endpt * unicast_ep;
<span style="color: #000000;background-color: #ffdddd">- if (p->dstadr != NULL && !(INT_MCASTIF & p->dstadr->flags))
- unicast_ep = p->dstadr;
</span><span style="color: #000000;background-color: #ddffdd">+ if (p->dstaddr != NULL && !(INT_MCASTIF & p->dstaddr->flags))
+ unicast_ep = p->dstaddr;
</span> else
unicast_ep = findinterface(&p->srcaddr);
</code></pre>
<br>
</li>
<li id='diff-12'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-12'>
<strong>
ntpd/ntp_signd.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/ntp_signd.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/ntp_signd.c
</span><span style="color: #aaaaaa">@@ -213,12 +213,12 @@ send_via_ntp_signd(
</span> 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;
<span style="color: #000000;background-color: #ffdddd">- sendpkt(&rbufp->recv_srcaddr, rbufp->dstadr, 0, xpkt, sendlen);
</span><span style="color: #000000;background-color: #ddffdd">+ sendpkt(&rbufp->recv_srcaddr, rbufp->dstaddr, 0, xpkt, sendlen);
</span> #ifdef DEBUG
if (debug)
printf(
"transmit ntp_signd packet: at %ld %s->%s mode %d keyid %08x len %d\n",
<span style="color: #000000;background-color: #ffdddd">- current_time, ntoa(&rbufp->dstadr->sin),
</span><span style="color: #000000;background-color: #ddffdd">+ current_time, ntoa(&rbufp->dstaddr->sin),
</span> ntoa(&rbufp->recv_srcaddr), xmode, xkeyid, sendlen);
#endif
}
</code></pre>
<br>
</li>
<li id='diff-13'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-13'>
<strong>
ntpd/ntp_util.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/ntp_util.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/ntp_util.c
</span><span style="color: #aaaaaa">@@ -535,7 +535,7 @@ mprintf_clock_stats(
</span> void
record_raw_stats(
sockaddr_u *srcaddr,
<span style="color: #000000;background-color: #ffdddd">- sockaddr_u *dstadr,
</span><span style="color: #000000;background-color: #ddffdd">+ sockaddr_u *dstaddr,
</span> l_fp *t1, /* originate timestamp */
l_fp *t2, /* receive timestamp */
l_fp *t3, /* transmit timestamp */
<span style="color: #aaaaaa">@@ -564,7 +564,7 @@ record_raw_stats(
</span> 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),
<span style="color: #000000;background-color: #ffdddd">- stoa(srcaddr), dstadr ? stoa(dstadr) : "-",
</span><span style="color: #000000;background-color: #ddffdd">+ stoa(srcaddr), dstaddr ? stoa(dstaddr) : "-",
</span> ulfptoa(t1, 9), ulfptoa(t2, 9),
ulfptoa(t3, 9), ulfptoa(t4, 9),
leap, version, mode, stratum, ppoll, precision,
</code></pre>
<br>
</li>
<li id='diff-14'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-14'>
<strong>
ntpd/ntpsim.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/ntpsim.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/ntpsim.c
</span><span style="color: #aaaaaa">@@ -347,7 +347,7 @@ int simulate_server(
</span> rbuf.receiver = &receive; /* callback to process the packet */
rbuf.recv_length = LEN_PKT_NOMAC;
rbuf.recv_pkt = xpkt;
<span style="color: #000000;background-color: #ffdddd">- rbuf.dstadr = inter;
</span><span style="color: #000000;background-color: #ddffdd">+ rbuf.dstaddr = inter;
</span> rbuf.fd = inter->fd;
memcpy(&rbuf.srcaddr, serv_addr, sizeof(rbuf.srcaddr));
memcpy(&rbuf.recv_srcaddr, serv_addr, sizeof(rbuf.recv_srcaddr));
</code></pre>
<br>
</li>
<li id='diff-15'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-15'>
<strong>
ntpd/refclock_parse.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/refclock_parse.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/refclock_parse.c
</span><span style="color: #aaaaaa">@@ -1864,7 +1864,7 @@ local_input(
</span> #ifndef HAVE_IO_COMPLETION_PORT
buf->srcaddr = rbufp->srcaddr;
#endif
<span style="color: #000000;background-color: #ffdddd">- buf->dstadr = rbufp->dstadr;
</span><span style="color: #000000;background-color: #ddffdd">+ buf->dstaddr = rbufp->dstaddr;
</span> buf->receiver = rbufp->receiver;
buf->fd = rbufp->fd;
buf->X_from_where = rbufp->X_from_where;
</code></pre>
<br>
</li>
<li id='diff-16'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-16'>
<strong>
ntpq/libntpq.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpq/libntpq.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpq/libntpq.c
</span><span style="color: #aaaaaa">@@ -709,7 +709,7 @@ ntpq_get_assoc_clocktype(
</span> int i;
int rc;
sockaddr_u dum_store;
<span style="color: #000000;background-color: #ffdddd">- char dstadr[NI_MAXHOST];
</span><span style="color: #000000;background-color: #ddffdd">+ char dstaddr[NI_MAXHOST];
</span> char resultbuf[NTPQ_BUFLEN];
if (assoc_index < 0 || assoc_index >= (int)numassoc)
<span style="color: #aaaaaa">@@ -717,17 +717,17 @@ ntpq_get_assoc_clocktype(
</span>
associd = assoc_cache[assoc_index].assid;
if (associd == peervar_assoc) {
<span style="color: #000000;background-color: #ffdddd">- rc = ntpq_get_peervar("dstadr", dstadr, sizeof(dstadr));
</span><span style="color: #000000;background-color: #ddffdd">+ rc = ntpq_get_peervar("dstaddr", dstaddr, sizeof(dstaddr));
</span> } else {
i = ntpq_read_assoc_peervars(associd, resultbuf,
sizeof(resultbuf));
if (i <= 0)
return -1;
<span style="color: #000000;background-color: #ffdddd">- rc = ntpq_getvar(resultbuf, i, "dstadr", dstadr,
- sizeof(dstadr));
</span><span style="color: #000000;background-color: #ddffdd">+ rc = ntpq_getvar(resultbuf, i, "dstaddr", dstaddr,
+ sizeof(dstaddr));
</span> }
<span style="color: #000000;background-color: #ffdddd">- if (0 != rc && decodenetnum(dstadr, &dum_store))
</span><span style="color: #000000;background-color: #ddffdd">+ if (0 != rc && decodenetnum(dstaddr, &dum_store))
</span> return ntpq_decodeaddrtype(&dum_store);
return -1;
</code></pre>
<br>
</li>
<li id='diff-17'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-17'>
<strong>
ntpq/ntpq-subs.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpq/ntpq-subs.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpq/ntpq-subs.c
</span><span style="color: #aaaaaa">@@ -165,10 +165,10 @@ struct xcmd opcmds[] = {
</span> "obtain and print a list of all peers and clients [IP version]" },
{ "opeers", opeers, { OPT|IP_VERSION, NO, NO, NO },
{ "-4|-6", "", "", "" },
<span style="color: #000000;background-color: #ffdddd">- "print peer list the old way, with dstadr shown rather than refid [IP version]" },
</span><span style="color: #000000;background-color: #ddffdd">+ "print peer list the old way, with dstaddr shown rather than refid [IP version]" },
</span> { "lopeers", lopeers, { OPT|IP_VERSION, NO, NO, NO },
{ "-4|-6", "", "", "" },
<span style="color: #000000;background-color: #ffdddd">- "obtain and print a list of all peers and clients showing dstadr [IP version]" },
</span><span style="color: #000000;background-color: #ddffdd">+ "obtain and print a list of all peers and clients showing dstaddr [IP version]" },
</span> { ":config", config, { NTP_STR, NO, NO, NO },
{ "<configuration command line>", "", "", "" },
"send a remote configuration command to ntpd" },
<span style="color: #aaaaaa">@@ -1532,7 +1532,7 @@ decodeaddrtype(
</span> */
struct varlist opeervarlist[] = {
{ "srcaddr", 0 }, /* 0 */
<span style="color: #000000;background-color: #ffdddd">- { "dstadr", 0 }, /* 1 */
</span><span style="color: #000000;background-color: #ddffdd">+ { "dstaddr", 0 }, /* 1 */
</span> { "stratum", 0 }, /* 2 */
{ "hpoll", 0 }, /* 3 */
{ "ppoll", 0 }, /* 4 */
<span style="color: #aaaaaa">@@ -1607,17 +1607,17 @@ doprintpeers(
</span> int c;
int len;
bool have_srchost;
<span style="color: #000000;background-color: #ffdddd">- bool have_dstadr;
</span><span style="color: #000000;background-color: #ddffdd">+ bool have_dstaddr;
</span> bool have_da_rid;
bool have_jitter;
sockaddr_u srcaddr;
<span style="color: #000000;background-color: #ffdddd">- sockaddr_u dstadr;
</span><span style="color: #000000;background-color: #ddffdd">+ sockaddr_u dstaddr;
</span> sockaddr_u dum_store;
sockaddr_u refidadr;
long hmode = 0;
u_long srcport = 0;
uint32_t u32;
<span style="color: #000000;background-color: #ffdddd">- const char *dstadr_refid = "0.0.0.0";
</span><span style="color: #000000;background-color: #ddffdd">+ const char *dstaddr_refid = "0.0.0.0";
</span> const char *serverlocal;
size_t drlen;
u_long stratum = 0;
<span style="color: #aaaaaa">@@ -1639,11 +1639,11 @@ doprintpeers(
</span> get_systime(&ts);
have_srchost = false;
<span style="color: #000000;background-color: #ffdddd">- have_dstadr = false;
</span><span style="color: #000000;background-color: #ddffdd">+ have_dstaddr = false;
</span> have_da_rid = false;
have_jitter = false;
ZERO_SOCK(&srcaddr);
<span style="color: #000000;background-color: #ffdddd">- ZERO_SOCK(&dstadr);
</span><span style="color: #000000;background-color: #ddffdd">+ ZERO_SOCK(&dstaddr);
</span> clock_name[0] = '\0';
ZERO(estoffset);
ZERO(estdelay);
<span style="color: #aaaaaa">@@ -1669,14 +1669,14 @@ doprintpeers(
</span> have_srchost = true;
}
}
<span style="color: #000000;background-color: #ffdddd">- } else if (!strcmp("dstadr", name)) {
</span><span style="color: #000000;background-color: #ddffdd">+ } else if (!strcmp("dstaddr", name)) {
</span> if (decodenetnum(value, &dum_store)) {
type = decodeaddrtype(&dum_store);
<span style="color: #000000;background-color: #ffdddd">- have_dstadr = true;
- dstadr = dum_store;
</span><span style="color: #000000;background-color: #ddffdd">+ have_dstaddr = true;
+ dstaddr = dum_store;
</span> if (pvl == opeervarlist) {
have_da_rid = true;
<span style="color: #000000;background-color: #ffdddd">- dstadr_refid = trunc_left(stoa(&dstadr), 15);
</span><span style="color: #000000;background-color: #ddffdd">+ dstaddr_refid = trunc_left(stoa(&dstaddr), 15);
</span> }
}
} else if (!strcmp("hmode", name)) {
<span style="color: #aaaaaa">@@ -1686,19 +1686,19 @@ doprintpeers(
</span> have_da_rid = true;
drlen = strlen(value);
if (0 == drlen) {
<span style="color: #000000;background-color: #ffdddd">- dstadr_refid = "";
</span><span style="color: #000000;background-color: #ddffdd">+ dstaddr_refid = "";
</span> } else if (drlen <= 4) {
ZERO(u32);
memcpy(&u32, value, drlen);
<span style="color: #000000;background-color: #ffdddd">- dstadr_refid = refid_str(u32, 1);
</span><span style="color: #000000;background-color: #ddffdd">+ dstaddr_refid = refid_str(u32, 1);
</span> } else if (decodenetnum(value, &refidadr)) {
if (SOCK_UNSPEC(&refidadr))
<span style="color: #000000;background-color: #ffdddd">- dstadr_refid = "0.0.0.0";
</span><span style="color: #000000;background-color: #ddffdd">+ dstaddr_refid = "0.0.0.0";
</span> else if (ISREFCLOCKADR(&refidadr))
<span style="color: #000000;background-color: #ffdddd">- dstadr_refid =
</span><span style="color: #000000;background-color: #ddffdd">+ dstaddr_refid =
</span> refnumtoa(&refidadr);
else
<span style="color: #000000;background-color: #ffdddd">- dstadr_refid =
</span><span style="color: #000000;background-color: #ddffdd">+ dstaddr_refid =
</span> stoa(&refidadr);
} else {
have_da_rid = false;
<span style="color: #aaaaaa">@@ -1707,17 +1707,17 @@ doprintpeers(
</span> have_da_rid = true;
drlen = strlen(value);
if (0 == drlen) {
<span style="color: #000000;background-color: #ffdddd">- dstadr_refid = "";
</span><span style="color: #000000;background-color: #ddffdd">+ dstaddr_refid = "";
</span> } else if (drlen <= 4) {
ZERO(u32);
memcpy(&u32, value, drlen);
<span style="color: #000000;background-color: #ffdddd">- dstadr_refid = refid_str(u32, 1);
</span><span style="color: #000000;background-color: #ddffdd">+ dstaddr_refid = refid_str(u32, 1);
</span> //fprintf(stderr, "apeervarlist S1 refid: value=<%s>\n", value);
} else if (decodenetnum(value, &refidadr)) {
if (SOCK_UNSPEC(&refidadr))
<span style="color: #000000;background-color: #ffdddd">- dstadr_refid = "0.0.0.0";
</span><span style="color: #000000;background-color: #ddffdd">+ dstaddr_refid = "0.0.0.0";
</span> else if (ISREFCLOCKADR(&refidadr))
<span style="color: #000000;background-color: #ffdddd">- dstadr_refid =
</span><span style="color: #000000;background-color: #ddffdd">+ dstaddr_refid =
</span> refnumtoa(&refidadr);
else {
char *buf = emalloc(10);
<span style="color: #aaaaaa">@@ -1725,7 +1725,7 @@ doprintpeers(
</span>
snprintf(buf, 10,
"%0x", i);
<span style="color: #000000;background-color: #ffdddd">- dstadr_refid = buf;
</span><span style="color: #000000;background-color: #ddffdd">+ dstaddr_refid = buf;
</span> //fprintf(stderr, "apeervarlist refid: value=<%x>\n", i);
}
//fprintf(stderr, "apeervarlist refid: value=<%s>\n", value);
<span style="color: #aaaaaa">@@ -1816,8 +1816,8 @@ doprintpeers(
</span> c = flash2[CTL_PEER_STATVAL(rstatus) & 0x3];
if (numhosts > 1) {
if ((pvl == peervarlist || pvl == apeervarlist)
<span style="color: #000000;background-color: #ffdddd">- && have_dstadr) {
- serverlocal = nntohost_col(&dstadr,
</span><span style="color: #000000;background-color: #ddffdd">+ && have_dstaddr) {
+ serverlocal = nntohost_col(&dstaddr,
</span> (size_t)min(LIB_BUFLENGTH - 1, maxhostlen),
true);
} else {
<span style="color: #aaaaaa">@@ -1840,8 +1840,8 @@ doprintpeers(
</span> if (!have_da_rid) {
drlen = 0;
} else {
<span style="color: #000000;background-color: #ffdddd">- drlen = strlen(dstadr_refid);
- makeascii(drlen, dstadr_refid, fp);
</span><span style="color: #000000;background-color: #ddffdd">+ drlen = strlen(dstaddr_refid);
+ makeascii(drlen, dstaddr_refid, fp);
</span> }
if (pvl == apeervarlist) {
while (drlen++ < 9)
</code></pre>
<br>
</li>
<li id='diff-18'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-18'>
<strong>
ntpq/ntpq.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpq/ntpq.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpq/ntpq.c
</span><span style="color: #aaaaaa">@@ -115,7 +115,7 @@ const var_format cookedvars[] = {
</span> { "flash", FX },
{ "srcaddr", HA },
{ "peeradr", HA }, /* compat with others */
<span style="color: #000000;background-color: #ffdddd">- { "dstadr", NA },
</span><span style="color: #000000;background-color: #ddffdd">+ { "dstaddr", NA },
</span> { "filtdelay", AR },
{ "filtoffset", AR },
{ "filtdisp", AR },
</code></pre>
<br>
</li>
<li id='diff-19'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0#diff-19'>
<strong>
tests/perl/ntptrace.t
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/tests/perl/ntptrace.t
</span><span style="color: #000000;background-color: #ddffdd">+++ b/tests/perl/ntptrace.t
</span><span style="color: #aaaaaa">@@ -57,7 +57,7 @@ stdout_is(
</span> push @vars, {
srcaddr => '1.2.3.4',
srcport => '123',
<span style="color: #000000;background-color: #ffdddd">- dstadr => '192.168.1.11',
</span><span style="color: #000000;background-color: #ddffdd">+ dstaddr => '192.168.1.11',
</span> dstport => '123',
leap => '00',
stratum => '2',
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.com/NTPsec/ntpsec/commit/6364b8c86bcf820894f6619d35ab4938ae5628f0"}}</script>
</p>
</div>
</body>
</html>