<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/4a56b232d84e345649643020398806acc87214b6">4a56b232</a></strong>
<div>
<span>by Hal Murray</span>
<i>at 2015-12-01T04:32:42Z</i>
</div>
<pre class='commit-message'>Fix another warning.</pre>
</li>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/31ef9f20bcabb2853382ea13ab873c6e351203d3">31ef9f20</a></strong>
<div>
<span>by Hal Murray</span>
<i>at 2015-12-01T04:53:51Z</i>
</div>
<pre class='commit-message'>Blush. Fix screwup in ntp_proto.c in recent push.</pre>
</li>
</ul>
<h4>3 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
ntpd/ntp_proto.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
ntpd/refclock_palisade.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
ntpd/refclock_palisade.h
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/1658d055daf2d83ed0271ce77c7be9098be1c77e...31ef9f20bcabb2853382ea13ab873c6e351203d3#diff-0'>
<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,7 +1580,6 @@ 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: #ffdddd">- if (peer->outcount) peer->outcount--; /* dup, peer with shorter poll */
</span>
/*
* Capture the header values in the client/peer association..
<span style="color: #aaaaaa">@@ -1589,7 +1588,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, peer->outcount);
</span><span style="color: #000000;background-color: #ddffdd">+ p_del, p_disp, pkt->refid);
</span> peer->leap = pleap;
peer->stratum = min(pstratum, STRATUM_UNSPEC);
peer->pmode = pmode;
<span style="color: #aaaaaa">@@ -1598,7 +1597,6 @@ process_packet(
</span> peer->rootdisp = p_disp;
peer->refid = pkt->refid; /* network byte order */
peer->reftime = p_reftime;
<span style="color: #000000;background-color: #ffdddd">- peer->outcount = 0;
</span>
/*
* First, if either burst mode is armed, enable the burst.
<span style="color: #aaaaaa">@@ -3121,7 +3119,6 @@ peer_xmit(
</span> intercept_sendpkt(__func__, &peer->srcadr, peer->dstadr, sys_ttl[peer->ttl],
&xpkt, sendlen);
peer->sent++;
<span style="color: #000000;background-color: #ffdddd">- peer->outcount++;
</span> peer->throttle += (1 << peer->minpoll) - 2;
/*
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/1658d055daf2d83ed0271ce77c7be9098be1c77e...31ef9f20bcabb2853382ea13ab873c6e351203d3#diff-1'>
<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">@@ -1095,7 +1095,7 @@ palisade_io (
</span> else if (up->rpt_status == TSIP_PARSED_EMPTY)
up->rpt_cnt = 0;
<span style="color: #000000;background-color: #ffdddd">- else if (up->rpt_cnt > BMAX)
</span><span style="color: #000000;background-color: #ddffdd">+ else if (up->rpt_cnt > sizeof(up->rpt_buf))
</span> up->rpt_status =TSIP_PARSED_EMPTY;
if (up->rpt_status == TSIP_PARSED_FULL)
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/1658d055daf2d83ed0271ce77c7be9098be1c77e...31ef9f20bcabb2853382ea13ab873c6e351203d3#diff-2'>
<strong>
ntpd/refclock_palisade.h
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/refclock_palisade.h
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/refclock_palisade.h
</span><span style="color: #aaaaaa">@@ -125,7 +125,7 @@ struct palisade_unit {
</span> int polled; /* flag to detect noreplies */
char leap_status; /* leap second flag */
char rpt_status; /* TSIP Parser State */
<span style="color: #000000;background-color: #ffdddd">- short rpt_cnt; /* TSIP packet length so far */
</span><span style="color: #000000;background-color: #ddffdd">+ size_t rpt_cnt; /* TSIP packet length so far */
</span> char rpt_buf[BMAX]; /* packet assembly buffer */
int type; /* Clock mode type */
int month; /* for LEAP filter */
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/compare/1658d055daf2d83ed0271ce77c7be9098be1c77e...31ef9f20bcabb2853382ea13ab873c6e351203d3">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":["merge_requests","issues","commit"],"url":"https://gitlab.com/NTPsec/ntpsec/compare/1658d055daf2d83ed0271ce77c7be9098be1c77e...31ef9f20bcabb2853382ea13ab873c6e351203d3"}}</script>
</p>
</div>
</body>
</html>