<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>Hal Murray 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/1658d055daf2d83ed0271ce77c7be9098be1c77e">1658d055</a></strong>
<div>
<span>by Hal Murray</span>
<i>at 2015-12-01T04:25:34Z</i>
</div>
<pre class='commit-message'>Fix a few more warnings.</pre>
</li>
</ul>
<h4>3 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
ntpd/ntp_io.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
ntpd/ntp_proto.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
ntpd/ntp_signd.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/1658d055daf2d83ed0271ce77c7be9098be1c77e#diff-0'>
<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">@@ -348,7 +348,7 @@ maintain_activefds(
</span> {
int i;
<span style="color: #000000;background-color: #ffdddd">- if (fd < 0 || fd >= FD_SETSIZE) {
</span><span style="color: #000000;background-color: #ddffdd">+ if (fd < 0 || fd >= (int)FD_SETSIZE) {
</span> msyslog(LOG_ERR,
"Too many sockets in use, FD_SETSIZE %d exceeded by fd %d",
FD_SETSIZE, fd);
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/1658d055daf2d83ed0271ce77c7be9098be1c77e#diff-1'>
<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">@@ -1580,6 +1580,7 @@ process_packet(
</span> pleap = PKT_LEAP(pkt->li_vn_mode);
pversion = PKT_VERSION(pkt->li_vn_mode);
pstratum = PKT_TO_STRATUM(pkt->stratum);
<span style="color: #000000;background-color: #ddffdd">+ if (peer->outcount) peer->outcount--; /* dup, peer with shorter poll */
</span>
/*
* Capture the header values in the client/peer association..
<span style="color: #aaaaaa">@@ -1588,7 +1589,7 @@ process_packet(
</span> &peer->dstadr->sin : NULL,
&p_org, &p_rec, &p_xmt, &peer->dst,
pleap, pversion, pmode, pstratum, pkt->ppoll, pkt->precision,
<span style="color: #000000;background-color: #ffdddd">- p_del, p_disp, pkt->refid);
</span><span style="color: #000000;background-color: #ddffdd">+ p_del, p_disp, pkt->refid, peer->outcount);
</span> peer->leap = pleap;
peer->stratum = min(pstratum, STRATUM_UNSPEC);
peer->pmode = pmode;
<span style="color: #aaaaaa">@@ -1597,6 +1598,7 @@ process_packet(
</span> peer->rootdisp = p_disp;
peer->refid = pkt->refid; /* network byte order */
peer->reftime = p_reftime;
<span style="color: #000000;background-color: #ddffdd">+ peer->outcount = 0;
</span>
/*
* First, if either burst mode is armed, enable the burst.
<span style="color: #aaaaaa">@@ -3119,6 +3121,7 @@ peer_xmit(
</span> intercept_sendpkt(__func__, &peer->srcadr, peer->dstadr, sys_ttl[peer->ttl],
&xpkt, sendlen);
peer->sent++;
<span style="color: #000000;background-color: #ddffdd">+ peer->outcount++;
</span> peer->throttle += (1 << peer->minpoll) - 2;
/*
<span style="color: #aaaaaa">@@ -3471,6 +3474,7 @@ peer_xmit(
</span>
static void
leap_smear_add_offs(l_fp *t, l_fp *t_recv) {
<span style="color: #000000;background-color: #ddffdd">+ UNUSED_ARG(t_recv);
</span> L_ADD(t, &leap_smear.offset);
}
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/1658d055daf2d83ed0271ce77c7be9098be1c77e#diff-2'>
<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">@@ -92,7 +92,7 @@ send_packet(int fd, const char *buf, uint32_t len)
</span> {
uint32_t net_len = htonl(len);
if (write_all(fd, &net_len, sizeof(net_len)) != sizeof(net_len)) return -1;
<span style="color: #000000;background-color: #ffdddd">- if (write_all(fd, buf, len) != len) return -1;
</span><span style="color: #000000;background-color: #ddffdd">+ if (write_all(fd, buf, len) != (int)len) return -1;
</span> return 0;
}
<span style="color: #aaaaaa">@@ -105,7 +105,7 @@ recv_packet(int fd, char **buf, uint32_t *len)
</span> if (read_all(fd, len, sizeof(*len)) != sizeof(*len)) return -1;
*len = ntohl(*len);
(*buf) = emalloc(*len);
<span style="color: #000000;background-color: #ffdddd">- if (read_all(fd, *buf, *len) != *len) {
</span><span style="color: #000000;background-color: #ddffdd">+ if (read_all(fd, *buf, *len) != (int)*len) {
</span> free(*buf);
return -1;
}
<span style="color: #aaaaaa">@@ -121,6 +121,7 @@ send_via_ntp_signd(
</span> struct pkt *xpkt
)
{
<span style="color: #000000;background-color: #ddffdd">+ UNUSED_ARG(flags);
</span>
/* We are here because it was detected that the client
* sent an all-zero signature, and we therefore know
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/1658d055daf2d83ed0271ce77c7be9098be1c77e">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.com/NTPsec/ntpsec/commit/1658d055daf2d83ed0271ce77c7be9098be1c77e"}}</script>
</p>
</div>
</body>
</html>