<!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>
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/ed16e8a1c1c700dd885b2254178b4dd6ee137d98">ed16e8a1</a></strong>
<div>
<span>by Hal Murray</span>
<i>at 2016-06-19T18:53:36-07:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap">Fix for startup bug: issue 68
I'm not sure this is the correct fix, but it restores
the action broken by ntp-dev-4.2.7p385</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#diff-0" style="text-decoration: none">
ntpd/ntp_proto.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="diff-0">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/ed16e8a1c1c700dd885b2254178b4dd6ee137d98#diff-0"><strong>ntpd/ntp_proto.c</strong></a>
<hr>
<table class="code white" style="-premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; background: #fff; border: none; border-collapse: separate; color: #333; font-family: monospace; margin: 0; padding: 0; width: 100%" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match">
<td class="diff-line-num js-unfold old_line unfold" data-linenumber="3194" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
...
</td>
<td class="diff-line-num js-unfold new_line unfold" data-linenumber="3194" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
...
</td>
<td class="line_content match" style="background: #fafafa; border: none; color: rgba(0,0,0,0.3); display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fafafa">@@ -3194,6 +3194,13 @@ peer_unfit(</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="3194" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3194
</td>
<td class="new_line diff-line-num" data-linenumber="3194" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3194
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span id="LC3194" class="line"> <span class="k" style="font-weight: bold">if</span> <span class="p">(</span><span class="o" style="font-weight: bold">!</span><span class="p">(</span><span class="n" style="color: #333">peer</span><span class="o" style="font-weight: bold">-></span><span class="n" style="color: #333">flags</span> <span class="o" style="font-weight: bold">&</span> <span class="n" style="color: #333">FLAG_REFCLOCK</span><span class="p">)</span> <span class="o" style="font-weight: bold">&&</span> <span class="n" style="color: #333">root_distance</span><span class="p">(</span><span class="n" style="color: #333">peer</span><span class="p">)</span> <span class="o" style="font-weight: bold">>=</span></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="3195" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3195
</td>
<td class="new_line diff-line-num" data-linenumber="3195" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3195
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span id="LC3195" class="line"> <span class="n" style="color: #333">sys_maxdist</span> <span class="o" style="font-weight: bold">+</span> <span class="n" style="color: #333">clock_phi</span> <span class="o" style="font-weight: bold">*</span> <span class="n" style="color: #333">ULOGTOD</span><span class="p">(</span><span class="n" style="color: #333">peer</span><span class="o" style="font-weight: bold">-></span><span class="n" style="color: #333">hpoll</span><span class="p">))</span></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="3196" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3196
</td>
<td class="new_line diff-line-num" data-linenumber="3196" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3196
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span id="LC3196" class="line"> <span class="n" style="color: #333">rval</span> <span class="o" style="font-weight: bold">|=</span> <span class="n" style="color: #333">BOGON11</span><span class="p">;</span> <span class="cm" style="color: #998; font-style: italic">/* distance exceeded */</span></span>
</td>
</tr>
<tr class="line_holder new">
<td class="diff-line-num new old_line" data-linenumber="3197" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="3197" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
3197
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#ecfdf0"> <span id="LC3197" class="line"><span class="cm" style="color: #998; font-style: italic">/* Startup bug, https://gitlab.com/NTPsec/ntpsec/issues/68</span></span>
</td>
</tr>
<tr class="line_holder new">
<td class="diff-line-num new old_line" data-linenumber="3198" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="3198" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
3198
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#ecfdf0"> <span id="LC3198" class="line"><span class="cm" style="color: #998; font-style: italic"> * introduced with ntp-dev-4.2.7p385</span></span>
</td>
</tr>
<tr class="line_holder new">
<td class="diff-line-num new old_line" data-linenumber="3199" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="3199" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
3199
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#ecfdf0"> <span id="LC3199" class="line"><span class="cm" style="color: #998; font-style: italic"> * [2085] Fix root distance and root dispersion calculations.</span></span>
</td>
</tr>
<tr class="line_holder new">
<td class="diff-line-num new old_line" data-linenumber="3200" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="3200" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
3200
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#ecfdf0"> <span id="LC3200" class="line"><span class="cm" style="color: #998; font-style: italic"> */</span></span>
</td>
</tr>
<tr class="line_holder new">
<td class="diff-line-num new old_line" data-linenumber="3201" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="3201" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
3201
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#ecfdf0"> <span id="LC3201" class="line"> <span class="k" style="font-weight: bold">if</span> <span class="p">(</span><span class="o" style="font-weight: bold">!</span><span class="p">(</span><span class="n" style="color: #333">peer</span><span class="o" style="font-weight: bold">-></span><span class="n" style="color: #333">flags</span> <span class="o" style="font-weight: bold">&</span> <span class="n" style="color: #333">FLAG_REFCLOCK</span><span class="p">)</span> <span class="o" style="font-weight: bold">&&</span> <span class="n" style="color: #333">peer</span><span class="o" style="font-weight: bold">-></span><span class="n" style="color: #333">disp</span> <span class="o" style="font-weight: bold">>=</span></span>
</td>
</tr>
<tr class="line_holder new">
<td class="diff-line-num new old_line" data-linenumber="3202" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="3202" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
3202
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#ecfdf0"> <span id="LC3202" class="line"> <span class="n" style="color: #333">sys_maxdist</span> <span class="o" style="font-weight: bold">+</span> <span class="n" style="color: #333">clock_phi</span> <span class="o" style="font-weight: bold">*</span> <span class="n" style="color: #333">ULOGTOD</span><span class="p">(</span><span class="n" style="color: #333">peer</span><span class="o" style="font-weight: bold">-></span><span class="n" style="color: #333">hpoll</span><span class="p">))</span></span>
</td>
</tr>
<tr class="line_holder new">
<td class="diff-line-num new old_line" data-linenumber="3203" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="3203" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
3203
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#ecfdf0"> <span id="LC3203" class="line"> <span class="n" style="color: #333">rval</span> <span class="o" style="font-weight: bold">|=</span> <span class="n" style="color: #333">BOGON11</span><span class="p">;</span> <span class="cm" style="color: #998; font-style: italic">/* Initialization */</span></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="3204" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3197
</td>
<td class="new_line diff-line-num" data-linenumber="3204" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3204
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span id="LC3204" class="line"></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="3205" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3198
</td>
<td class="new_line diff-line-num" data-linenumber="3205" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3205
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span id="LC3205" class="line"> <span class="cm" style="color: #998; font-style: italic">/*</span></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="3206" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3199
</td>
<td class="new_line diff-line-num" data-linenumber="3206" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
3206
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span id="LC3206" class="line"><span class="cm" style="color: #998; font-style: italic"> * A loop error occurs if the remote peer is synchronized to the</span></span>
</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/ed16e8a1c1c700dd885b2254178b4dd6ee137d98">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/ed16e8a1c1c700dd885b2254178b4dd6ee137d98"}}</script>
</p>
</div>
</body>
</html>