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