<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
</head>
<body>
<style type="text/css">
img {
max-width: 100%; height: auto;
}
</style>
<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/2cfd3b9c3f176ff38acd4f1c7f47b3d96f1ee6f7">2cfd3b9c</a></strong>
<div>
<span>by Matt Selsky</span>
<i>at 2017-01-29T17:48:19-05:00</i>
</div>
<pre class="commit-message" style="margin: 0; white-space: pre-wrap">Fix build errors when leap smear support is enabled
GitLab issue #235
</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#a9eeb2d7f139fd99254bacd1e507b63de174c843">
ntpd/ntp_proto.c
</a>
</li>
<li class="file-stats">
<a href="#a606834f3bc4135ff5db3cb4a9bed7e7144caf1e">
ntpd/ntp_timer.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="a9eeb2d7f139fd99254bacd1e507b63de174c843">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/2cfd3b9c3f176ff38acd4f1c7f47b3d96f1ee6f7#a9eeb2d7f139fd99254bacd1e507b63de174c843"><strong>ntpd/ntp_proto.c</strong></a>
<hr>
<table class="code white" style="-premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; background: #fff; font-family: monospace; font-size: 12px" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" style="line-height: 1.6">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="2298" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="2298" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -2298,7 +2298,7 @@ fast_xmit(</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="2298" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
2298
</td>
<td class="diff-line-num new_line" data-linenumber="2298" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
2298
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC2298" class="line"> <span class="n" style="color: #333">xpkt</span><span class="p">.</span><span class="n" style="color: #333">refid</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">convertLFPToRefID</span><span class="p">(</span><span class="n" style="color: #333">leap_smear</span><span class="p">.</span><span class="n" style="color: #333">offset</span><span class="p">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="2299" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
2299
</td>
<td class="diff-line-num new_line" data-linenumber="2299" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
2299
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC2299" class="line"> <span class="n" style="color: #333">DPRINTF</span><span class="p">(</span><span class="mi" style="color: #099">2</span><span class="p">,</span> <span class="p">(</span><span class="s" style="color: #d14">"fast_xmit: leap_smear.in_progress: refid %8x, smear %s</span><span class="se" style="color: #d14">\n</span><span class="s" style="color: #d14">"</span><span class="p">,</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="2300" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
2300
</td>
<td class="diff-line-num new_line" data-linenumber="2300" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
2300
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC2300" class="line"> <span class="n" style="color: #333">ntohl</span><span class="p">(</span><span class="n" style="color: #333">xpkt</span><span class="p">.</span><span class="n" style="color: #333">refid</span><span class="p">),</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" style="line-height: 1.6">
<td class="diff-line-num old old_line" data-linenumber="2301" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
2301
</td>
<td class="diff-line-num new_line old" data-linenumber="2301" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">
<pre style="margin: 0">-<span id="LC2301" class="line"> <span class="n" style="color: #333">lfptoa</span><span class="p">(</span><span class="o" style="font-weight: bold"><span class="idiff left right">&</span></span><span class="n" style="color: #333">leap_smear</span><span class="p">.</span><span class="n" style="color: #333">offset</span><span class="p">,</span> <span class="mi" style="color: #099">8</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" style="line-height: 1.6">
<td class="diff-line-num new old_line" data-linenumber="2302" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="2301" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
2301
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0">+<span id="LC2301" class="line"> <span class="n" style="color: #333">lfptoa</span><span class="p">(</span><span class="n" style="color: #333">leap_smear</span><span class="p">.</span><span class="n" style="color: #333">offset</span><span class="p">,</span> <span class="mi" style="color: #099">8</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="2302" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
2302
</td>
<td class="diff-line-num new_line" data-linenumber="2302" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
2302
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC2302" class="line"> <span class="p">));</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="2303" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
2303
</td>
<td class="diff-line-num new_line" data-linenumber="2303" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
2303
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC2303" class="line"> <span class="p">}</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="2304" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
2304
</td>
<td class="diff-line-num new_line" data-linenumber="2304" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
2304
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC2304" class="line"> <span class="n" style="color: #333">xpkt</span><span class="p">.</span><span class="n" style="color: #333">reftime</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">htonl_fp</span><span class="p">(</span><span class="n" style="color: #333">this_ref_time</span><span class="p">);</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
<li id="a606834f3bc4135ff5db3cb4a9bed7e7144caf1e">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/2cfd3b9c3f176ff38acd4f1c7f47b3d96f1ee6f7#a606834f3bc4135ff5db3cb4a9bed7e7144caf1e"><strong>ntpd/ntp_timer.c</strong></a>
<hr>
<table class="code white" style="-premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; background: #fff; font-family: monospace; font-size: 12px" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" style="line-height: 1.6">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="479" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="479" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -479,7 +479,7 @@ check_leapsec(</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="479" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
479
</td>
<td class="diff-line-num new_line" data-linenumber="479" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
479
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC479" class="line"> <span class="cm" style="color: #998; font-style: italic">/*</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="480" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
480
</td>
<td class="diff-line-num new_line" data-linenumber="480" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
480
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC480" class="line"><span class="cm" style="color: #998; font-style: italic"> * Update the current leap smear offset, eventually 0.0 if outside smear interval.</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="481" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
481
</td>
<td class="diff-line-num new_line" data-linenumber="481" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
481
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC481" class="line"><span class="cm" style="color: #998; font-style: italic"> */</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" style="line-height: 1.6">
<td class="diff-line-num old old_line" data-linenumber="482" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
482
</td>
<td class="diff-line-num new_line old" data-linenumber="482" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">
<pre style="margin: 0">-<span id="LC482" class="line"> <span class="n" style="color: #333"><span class="idiff left">DTOLFP</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333"><span class="idiff">leap_smear</span></span><span class="p"><span class="idiff">.</span></span><span class="n" style="color: #333"><span class="idiff">doffset</span></span><span class="p"><span class="idiff">,</span></span><span class="idiff"> </span><span class="o" style="font-weight: bold"><span class="idiff">&</span></span><span class="n" style="color: #333"><span class="idiff">leap_smear</span></span><span class="p"><span class="idiff right">.</span></span><span class="n" style="color: #333">offset</span><span class="p">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" style="line-height: 1.6">
<td class="diff-line-num new old_line" data-linenumber="483" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="482" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
482
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0">+<span id="LC482" class="line"> <span class="n" style="color: #333"><span class="idiff left">leap_smear</span></span><span class="p"><span class="idiff">.</span></span><span class="n" style="color: #333"><span class="idiff">offset</span></span><span class="idiff"> </span><span class="o" style="font-weight: bold"><span class="idiff">=</span></span><span class="idiff"> </span><span class="n" style="color: #333"><span class="idiff">dtolfp</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333"><span class="idiff">leap_smear</span></span><span class="p"><span class="idiff">.</span></span><span class="n" style="color: #333"><span class="idiff right">d</span>offset</span><span class="p">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="483" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
483
</td>
<td class="diff-line-num new_line" data-linenumber="483" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
483
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC483" class="line"><span class="cp" style="color: #999; font-weight: bold">#endif </span><span class="cm" style="color: #998; font-style: italic">/* ENABLE_LEAP_SMEAR */</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="484" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
484
</td>
<td class="diff-line-num new_line" data-linenumber="484" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
484
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC484" class="line"></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="485" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
485
</td>
<td class="diff-line-num new_line" data-linenumber="485" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
485
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC485" class="line"> <span class="cm" style="color: #998; font-style: italic">/* Full hit. Eventually step the clock, but always</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px">
<p style="color: #777; font-size: small">
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/2cfd3b9c3f176ff38acd4f1c7f47b3d96f1ee6f7">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/2cfd3b9c3f176ff38acd4f1c7f47b3d96f1ee6f7"}}</script>
</p>
</div>
</body>
</html>