<!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>

Ian Bruene pushed to branch packet-raw-mod

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/a737b1f19c200ea64f9d3f3c568fac3f925deee9">a737b1f1</a></strong>

<div>

<span>by Matt Selsky</span>

<i>at 2017-04-10T23:53:45-04:00</i>

</div>

<pre class="commit-message" style="margin: 0; white-space: pre-wrap">Bool-ify mac_authdecrypt

And removed unneeded casts

</pre>

</li>

<li>

<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/0d193918f6bd03546c021f7a453c0a465b4befdd">0d193918</a></strong>

<div>

<span>by Ian Bruene</span>

<i>at 2017-04-11T04:04:59+00:00</i>

</div>

<pre class="commit-message" style="margin: 0; white-space: pre-wrap">Added raw return mode to mode 6 parser

</pre>

</li>

</ul>

<h4>3 changed files:</h4>

<ul>

<li class="file-stats">

<a href="#21bd38237fd26619d99acf750326a2caf1419bdb">

include/ntp_stdlib.h

</a>

</li>

<li class="file-stats">

<a href="#7872cf7240275a21578046e42fd44c27a795edba">

libntp/macencrypt.c

</a>

</li>

<li class="file-stats">

<a href="#e0397ae65951b0adbbedbbb14a096009aaa63642">

pylib/packet.py

</a>

</li>

</ul>

<h4>Changes:</h4>

<li id="21bd38237fd26619d99acf750326a2caf1419bdb">

<a href="https://gitlab.com/NTPsec/ntpsec/compare/f211b380eac02ad0b16df07843af9ba0f0ebb9f2...0d193918f6bd03546c021f7a453c0a465b4befdd#21bd38237fd26619d99acf750326a2caf1419bdb"><strong>include/ntp_stdlib.h</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" id="" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="77" 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="77" 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">@@ -77,7 +77,7 @@ int ntp_getopt_long(int argc, char* const argv[], const char *optstring,</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="77" 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">

77

</td>

<td class="diff-line-num new_line" data-linenumber="77" 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">

77

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC77" class="line">             <span class="k" style="font-weight: bold">const</span> <span class="k" style="font-weight: bold">struct</span> <span class="n" style="color: #333">option</span> <span class="o" style="font-weight: bold">*</span><span class="n" style="color: #333">longopts</span><span class="p">,</span> <span class="kt" style="color: #458; font-weight: bold">int</span> <span class="o" style="font-weight: bold">*</span><span class="n" style="color: #333">longindex</span><span class="p">);</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="78" 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">

78

</td>

<td class="diff-line-num new_line" data-linenumber="78" 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">

78

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC78" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="79" 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">

79

</td>

<td class="diff-line-num new_line" data-linenumber="79" 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">

79

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC79" class="line"><span class="cm" style="color: #998; font-style: italic">/* a_md5encrypt.c */</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" id="" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="80" 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">

80

</td>

<td class="diff-line-num new_line old" data-linenumber="80" 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="LC80" class="line"><span class="k" style="font-weight: bold">extern</span>  <span class="kt" style="color: #458; font-weight: bold"><span class="idiff left right">int</span></span>  <span class="n" style="color: #333">mac_authdecrypt</span>      <span class="p">(</span><span class="kt" style="color: #458; font-weight: bold">int</span><span class="p">,</span> <span class="kt" style="color: #458; font-weight: bold">uint8_t</span> <span class="o" style="font-weight: bold">*</span><span class="p">,</span> <span class="kt" style="color: #458; font-weight: bold">uint32_t</span> <span class="o" style="font-weight: bold">*</span><span class="p">,</span> <span class="kt" style="color: #458; font-weight: bold">int</span><span class="p">,</span> <span class="kt" style="color: #458; font-weight: bold">int</span><span class="p">);</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="81" 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="80" 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">

80

</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="LC80" class="line"><span class="k" style="font-weight: bold">extern</span>  <span class="n" style="color: #333"><span class="idiff left right">bool</span></span>     <span class="n" style="color: #333">mac_authdecrypt</span>      <span class="p">(</span><span class="kt" style="color: #458; font-weight: bold">int</span><span class="p">,</span> <span class="kt" style="color: #458; font-weight: bold">uint8_t</span> <span class="o" style="font-weight: bold">*</span><span class="p">,</span> <span class="kt" style="color: #458; font-weight: bold">uint32_t</span> <span class="o" style="font-weight: bold">*</span><span class="p">,</span> <span class="kt" style="color: #458; font-weight: bold">int</span><span class="p">,</span> <span class="kt" style="color: #458; font-weight: bold">int</span><span class="p">);</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="81" 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">

81

</td>

<td class="diff-line-num new_line" data-linenumber="81" 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">

81

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC81" class="line"><span class="k" style="font-weight: bold">extern</span>  <span class="kt" style="color: #458; font-weight: bold">int</span>      <span class="n" style="color: #333">mac_authencrypt</span>      <span class="p">(</span><span class="kt" style="color: #458; font-weight: bold">int</span><span class="p">,</span> <span class="kt" style="color: #458; font-weight: bold">uint8_t</span> <span class="o" style="font-weight: bold">*</span><span class="p">,</span> <span class="kt" style="color: #458; font-weight: bold">uint32_t</span> <span class="o" style="font-weight: bold">*</span><span class="p">,</span> <span class="kt" style="color: #458; font-weight: bold">int</span><span class="p">);</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="82" 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">

82

</td>

<td class="diff-line-num new_line" data-linenumber="82" 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">

82

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC82" class="line"><span class="k" style="font-weight: bold">extern</span>  <span class="kt" style="color: #458; font-weight: bold">void</span>     <span class="n" style="color: #333">mac_setkey</span>   <span class="p">(</span><span class="n" style="color: #333">keyid_t</span><span class="p">,</span> <span class="kt" style="color: #458; font-weight: bold">int</span><span class="p">,</span> <span class="k" style="font-weight: bold">const</span> <span class="kt" style="color: #458; font-weight: bold">uint8_t</span> <span class="o" style="font-weight: bold">*</span><span class="p">,</span> <span class="kt" style="color: #458; font-weight: bold">size_t</span><span class="p">);</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="83" 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">

83

</td>

<td class="diff-line-num new_line" data-linenumber="83" 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">

83

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC83" class="line"><span class="k" style="font-weight: bold">extern</span>  <span class="kt" style="color: #458; font-weight: bold">uint32_t</span> <span class="n" style="color: #333">addr2refid</span>   <span class="p">(</span><span class="n" style="color: #333">sockaddr_u</span> <span class="o" style="font-weight: bold">*</span><span class="p">);</span></span>

</pre>

</td>

</tr>

</table>

<br>

</li>

<li id="7872cf7240275a21578046e42fd44c27a795edba">

<a href="https://gitlab.com/NTPsec/ntpsec/compare/f211b380eac02ad0b16df07843af9ba0f0ebb9f2...0d193918f6bd03546c021f7a453c0a465b4befdd#7872cf7240275a21578046e42fd44c27a795edba"><strong>libntp/macencrypt.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" id="" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="78" 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="78" 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">@@ -78,9 +78,9 @@ mac_authencrypt(</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="78" 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">

78

</td>

<td class="diff-line-num new_line" data-linenumber="78" 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">

78

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC78" class="line"><span class="cm" style="color: #998; font-style: italic">/*</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="79" 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">

79

</td>

<td class="diff-line-num new_line" data-linenumber="79" 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">

79

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC79" class="line"><span class="cm" style="color: #998; font-style: italic"> * mac_authdecrypt - verify MD5 message authenticator</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="80" 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">

80

</td>

<td class="diff-line-num new_line" data-linenumber="80" 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">

80

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC80" class="line"><span class="cm" style="color: #998; font-style: italic"> *</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" id="" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="81" 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">

81

</td>

<td class="diff-line-num new_line old" data-linenumber="81" 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="LC81" class="line"><span class="cm" style="color: #998; font-style: italic"> * Returns <span class="idiff left right">one if digest valid, zero</span> if invalid.</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="82" 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="81" 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">

81

</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="LC81" class="line"><span class="cm" style="color: #998; font-style: italic"> * Returns <span class="idiff left right">true if digest valid, false</span> if invalid.</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="82" 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">

82

</td>

<td class="diff-line-num new_line" data-linenumber="82" 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">

82

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC82" class="line"><span class="cm" style="color: #998; font-style: italic"> */</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" id="" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="83" 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">

83

</td>

<td class="diff-line-num new_line old" data-linenumber="83" 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="LC83" class="line"><span class="kt" style="color: #458; font-weight: bold"><span class="idiff left right">int</span></span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="84" 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="83" 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">

83

</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="LC83" class="line"><span class="n" style="color: #333"><span class="idiff left right">bool</span></span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="84" 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">

84

</td>

<td class="diff-line-num new_line" data-linenumber="84" 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">

84

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC84" class="line"><span class="nf" style="color: #900; font-weight: bold">mac_authdecrypt</span><span class="p">(</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="85" 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">

85

</td>

<td class="diff-line-num new_line" data-linenumber="85" 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">

85

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC85" class="line"> <span class="kt" style="color: #458; font-weight: bold">int</span>      <span class="n" style="color: #333">type</span><span class="p">,</span>           <span class="cm" style="color: #998; font-style: italic">/* hash algorithm */</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="86" 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">

86

</td>

<td class="diff-line-num new_line" data-linenumber="86" 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">

86

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC86" class="line"> <span class="kt" style="color: #458; font-weight: bold">uint8_t</span>  <span class="o" style="font-weight: bold">*</span><span class="n" style="color: #333">key</span><span class="p">,</span>          <span class="cm" style="color: #998; font-style: italic">/* key pointer */</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" id="" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="103" 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="103" 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">@@ -103,7 +103,7 @@ mac_authdecrypt(</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="103" 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">

103

</td>

<td class="diff-line-num new_line" data-linenumber="103" 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">

103

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC103" 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="n" style="color: #333">EVP_DigestInit_ex</span><span class="p">(</span><span class="n" style="color: #333">ctx</span><span class="p">,</span> <span class="n" style="color: #333">EVP_get_digestbynid</span><span class="p">(</span><span class="n" style="color: #333">type</span><span class="p">),</span> <span class="nb" style="color: #0086b3">NULL</span><span class="p">))</span> <span class="p">{</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="104" 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">

104

</td>

<td class="diff-line-num new_line" data-linenumber="104" 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">

104

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC104" class="line">                <span class="n" style="color: #333">msyslog</span><span class="p">(</span><span class="n" style="color: #333">LOG_ERR</span><span class="p">,</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="105" 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">

105

</td>

<td class="diff-line-num new_line" data-linenumber="105" 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">

105

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC105" class="line">                    <span class="s" style="color: #d14">"MAC decrypt: digest init failed"</span><span class="p">);</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" id="" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="106" 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">

106

</td>

<td class="diff-line-num new_line old" data-linenumber="106" 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="LC106" class="line">                <span class="k" style="font-weight: bold">return</span> <span class="p"><span class="idiff left">(</span></span><span class="mi" style="color: #099"><span class="idiff">0</span></span><span class="p"><span class="idiff right">)</span>;</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="107" 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="106" 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">

106

</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="LC106" class="line">                <span class="k" style="font-weight: bold">return</span> <span class="nb" style="color: #0086b3"><span class="idiff left right">false</span></span><span class="p">;</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="107" 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">

107

</td>

<td class="diff-line-num new_line" data-linenumber="107" 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">

107

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC107" class="line">        <span class="p">}</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="108" 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">

108

</td>

<td class="diff-line-num new_line" data-linenumber="108" 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">

108

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC108" class="line">        <span class="n" style="color: #333">EVP_DigestUpdate</span><span class="p">(</span><span class="n" style="color: #333">ctx</span><span class="p">,</span> <span class="n" style="color: #333">key</span><span class="p">,</span> <span class="n" style="color: #333">cache_secretsize</span><span class="p">);</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="109" 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">

109

</td>

<td class="diff-line-num new_line" data-linenumber="109" 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">

109

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC109" class="line">        <span class="n" style="color: #333">EVP_DigestUpdate</span><span class="p">(</span><span class="n" style="color: #333">ctx</span><span class="p">,</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: bold">uint8_t</span> <span class="o" style="font-weight: bold">*</span><span class="p">)</span><span class="n" style="color: #333">pkt</span><span class="p">,</span> <span class="p">(</span><span class="n" style="color: #333">u_int</span><span class="p">)</span><span class="n" style="color: #333">length</span><span class="p">);</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" id="" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="112" 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="112" 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">@@ -112,9 +112,9 @@ mac_authdecrypt(</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="112" 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">

112

</td>

<td class="diff-line-num new_line" data-linenumber="112" 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">

112

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC112" class="line">        <span class="k" style="font-weight: bold">if</span> <span class="p">((</span><span class="n" style="color: #333">u_int</span><span class="p">)</span><span class="n" style="color: #333">size</span> <span class="o" style="font-weight: bold">!=</span> <span class="n" style="color: #333">len</span> <span class="o" style="font-weight: bold">+</span> <span class="mi" style="color: #099">4</span><span class="p">)</span> <span class="p">{</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="113" 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">

113

</td>

<td class="diff-line-num new_line" data-linenumber="113" 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">

113

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC113" class="line">                <span class="n" style="color: #333">msyslog</span><span class="p">(</span><span class="n" style="color: #333">LOG_ERR</span><span class="p">,</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="114" 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">

114

</td>

<td class="diff-line-num new_line" data-linenumber="114" 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">

114

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC114" class="line">                    <span class="s" style="color: #d14">"MAC decrypt: MAC length error"</span><span class="p">);</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" id="" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="115" 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">

115

</td>

<td class="diff-line-num new_line old" data-linenumber="115" 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="LC115" class="line">                <span class="k" style="font-weight: bold">return</span> <span class="p"><span class="idiff left">(</span></span><span class="mi" style="color: #099"><span class="idiff">0</span></span><span class="p"><span class="idiff right">)</span>;</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="116" 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="115" 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">

115

</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="LC115" class="line">                <span class="k" style="font-weight: bold">return</span> <span class="nb" style="color: #0086b3"><span class="idiff left right">false</span></span><span class="p">;</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="116" 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">

116

</td>

<td class="diff-line-num new_line" data-linenumber="116" 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">

116

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC116" class="line">        <span class="p">}</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" id="" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="117" 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">

117

</td>

<td class="diff-line-num new_line old" data-linenumber="117" 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="LC117" class="line">        <span class="k" style="font-weight: bold">return</span> <span class="p"><span class="idiff left">(</span></span><span class="kt" style="color: #458; font-weight: bold"><span class="idiff">int</span></span><span class="p"><span class="idiff right">)</span></span><span class="n" style="color: #333">ctmemeq</span><span class="p">(</span><span class="n" style="color: #333">digest</span><span class="p">,</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: bold">char</span> <span class="o" style="font-weight: bold">*</span><span class="p">)</span><span class="n" style="color: #333">pkt</span> <span class="o" style="font-weight: bold">+</span> <span class="n" style="color: #333">length</span> <span class="o" style="font-weight: bold">+</span> <span class="mi" style="color: #099">4</span><span class="p">,</span> <span class="n" style="color: #333">len</span><span class="p">);</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="118" 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="117" 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">

117

</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="LC117" class="line">        <span class="k" style="font-weight: bold">return</span> <span class="n" style="color: #333">ctmemeq</span><span class="p">(</span><span class="n" style="color: #333">digest</span><span class="p">,</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: bold">char</span> <span class="o" style="font-weight: bold">*</span><span class="p">)</span><span class="n" style="color: #333">pkt</span> <span class="o" style="font-weight: bold">+</span> <span class="n" style="color: #333">length</span> <span class="o" style="font-weight: bold">+</span> <span class="mi" style="color: #099">4</span><span class="p">,</span> <span class="n" style="color: #333">len</span><span class="p">);</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="118" 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">

118

</td>

<td class="diff-line-num new_line" data-linenumber="118" 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">

118

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC118" class="line"><span class="p">}</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="119" 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">

119

</td>

<td class="diff-line-num new_line" data-linenumber="119" 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">

119

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC119" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="120" 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">

120

</td>

<td class="diff-line-num new_line" data-linenumber="120" 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">

120

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC120" class="line"><span class="cm" style="color: #998; font-style: italic">/*</span></span>

</pre>

</td>

</tr>

</table>

<br>

</li>

<li id="e0397ae65951b0adbbedbbb14a096009aaa63642">

<a href="https://gitlab.com/NTPsec/ntpsec/compare/f211b380eac02ad0b16df07843af9ba0f0ebb9f2...0d193918f6bd03546c021f7a453c0a465b4befdd#e0397ae65951b0adbbedbbb14a096009aaa63642"><strong>pylib/packet.py</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" id="" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="1243" 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="1243" 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">@@ -1243,7 +1243,7 @@ class ControlSession:</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1243" 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">

1243

</td>

<td class="diff-line-num new_line" data-linenumber="1243" 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">

1243

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1243" class="line">        <span class="n" style="color: #333">idlist</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">sort</span><span class="p">(</span><span class="n" style="color: #333">key</span><span class="o" style="font-weight: bold">=</span><span class="k" style="font-weight: bold">lambda</span> <span class="n" style="color: #333">a</span><span class="p">:</span> <span class="n" style="color: #333">a</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">associd</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1244" 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">

1244

</td>

<td class="diff-line-num new_line" data-linenumber="1244" 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">

1244

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1244" class="line">        <span class="k" style="font-weight: bold">return</span> <span class="n" style="color: #333">idlist</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1245" 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">

1245

</td>

<td class="diff-line-num new_line" data-linenumber="1245" 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">

1245

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1245" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder old" id="" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="1246" 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">

1246

</td>

<td class="diff-line-num new_line old" data-linenumber="1246" 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="LC1246" class="line">    <span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">__parse_varlist</span><span class="p">(</span><span class="bp" style="color: #999">self</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1247" 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="1246" 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">

1246

</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="LC1246" class="line">    <span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">__parse_varlist</span><span class="p">(</span><span class="bp" style="color: #999">self</span><span class="p"><span class="idiff left">,</span></span><span class="idiff"> </span><span class="n" style="color: #333"><span class="idiff">raw</span></span><span class="o" style="font-weight: bold"><span class="idiff">=</span></span><span class="bp" style="color: #999"><span class="idiff right">False</span></span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1247" 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">

1247

</td>

<td class="diff-line-num new_line" data-linenumber="1247" 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">

1247

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1247" class="line">        <span class="s" style="color: #d14">"Parse a response as a textual varlist."</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1248" 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">

1248

</td>

<td class="diff-line-num new_line" data-linenumber="1248" 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">

1248

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1248" class="line">        <span class="c" style="color: #998; font-style: italic"># Strip out NULs and binary garbage from text;</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1249" 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">

1249

</td>

<td class="diff-line-num new_line" data-linenumber="1249" 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">

1249

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1249" class="line">        <span class="c" style="color: #998; font-style: italic"># ntpd seems prone to generate these, especially</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" id="" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="1268" 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="1268" 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">@@ -1268,11 +1268,18 @@ class ControlSession:</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1268" 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">

1268

</td>

<td class="diff-line-num new_line" data-linenumber="1268" 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">

1268

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1268" class="line">                    <span class="n" style="color: #333">var</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">pair</span><span class="p">[:</span><span class="n" style="color: #333">eq</span><span class="p">]</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">strip</span><span class="p">()</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1269" 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">

1269

</td>

<td class="diff-line-num new_line" data-linenumber="1269" 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">

1269

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1269" class="line">                    <span class="n" style="color: #333">val</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">pair</span><span class="p">[</span><span class="n" style="color: #333">eq</span><span class="o" style="font-weight: bold">+</span><span class="mi" style="color: #099">1</span><span class="p">:]</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">strip</span><span class="p">()</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">replace</span><span class="p">(</span><span class="s" style="color: #d14">"</span><span class="se" style="color: #d14">\xae</span><span class="s" style="color: #d14">"</span><span class="p">,</span> <span class="s" style="color: #d14">","</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1270" 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">

1270

</td>

<td class="diff-line-num new_line" data-linenumber="1270" 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">

1270

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1270" class="line">                    <span class="k" style="font-weight: bold">try</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" id="" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="1271" 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">

1271

</td>

<td class="diff-line-num new_line old" data-linenumber="1271" 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="LC1271" class="line">                        <span class="n" style="color: #333">val</span> <span class="o" style="font-weight: bold">=</span> <span class="nb" style="color: #0086b3">int</span><span class="p">(</span><span class="n" style="color: #333">val</span><span class="p">,</span> <span class="mi" style="color: #099">0</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1272" 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="1271" 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">

1271

</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="LC1271" class="line">                        <span class="k" style="font-weight: bold">if</span> <span class="n" style="color: #333">raw</span> <span class="ow" style="font-weight: bold">is</span> <span class="bp" style="color: #999">True</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1272" 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="1272" 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">

1272

</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="LC1272" class="line">                            <span class="n" style="color: #333">val</span> <span class="o" style="font-weight: bold">=</span> <span class="p">(</span><span class="nb" style="color: #0086b3">int</span><span class="p">(</span><span class="n" style="color: #333">val</span><span class="p">,</span> <span class="mi" style="color: #099">0</span><span class="p">),</span> <span class="n" style="color: #333">val</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1272" 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="1273" 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">

1273

</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="LC1273" class="line">                        <span class="k" style="font-weight: bold">else</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1272" 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="1274" 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">

1274

</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="LC1274" class="line">                            <span class="n" style="color: #333">val</span> <span class="o" style="font-weight: bold">=</span> <span class="nb" style="color: #0086b3">int</span><span class="p">(</span><span class="n" style="color: #333">val</span><span class="p">,</span> <span class="mi" style="color: #099">0</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1272" 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">

1272

</td>

<td class="diff-line-num new_line" data-linenumber="1275" 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">

1275

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1275" class="line">                    <span class="k" style="font-weight: bold">except</span> <span class="nb" style="color: #0086b3">ValueError</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1273" 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">

1273

</td>

<td class="diff-line-num new_line" data-linenumber="1276" 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">

1276

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1276" class="line">                        <span class="k" style="font-weight: bold">try</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" id="" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="1274" 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">

1274

</td>

<td class="diff-line-num new_line old" data-linenumber="1277" 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="LC1274" class="line">                            <span class="n" style="color: #333">valf</span> <span class="o" style="font-weight: bold">=</span> <span class="nb" style="color: #0086b3">float</span><span class="p">(</span><span class="n" style="color: #333">val</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" id="" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="1275" 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">

1275

</td>

<td class="diff-line-num new_line old" data-linenumber="1277" 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="LC1275" class="line">                            <span class="k" style="font-weight: bold">if</span> <span class="n" style="color: #333">var</span> <span class="o" style="font-weight: bold">==</span> <span class="s" style="color: #d14">"delay"</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1276" 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="1277" 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">

1277

</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="LC1277" class="line">                            <span class="k" style="font-weight: bold">if</span> <span class="n" style="color: #333">raw</span> <span class="ow" style="font-weight: bold">is</span> <span class="bp" style="color: #999">True</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1276" 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="1278" 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">

1278

</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="LC1278" class="line">                                <span class="n" style="color: #333">valf</span> <span class="o" style="font-weight: bold">=</span> <span class="p">(</span><span class="nb" style="color: #0086b3">float</span><span class="p">(</span><span class="n" style="color: #333">val</span><span class="p">),</span> <span class="n" style="color: #333">val</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1276" 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="1279" 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">

1279

</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="LC1279" class="line">                            <span class="k" style="font-weight: bold">else</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1276" 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="1280" 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">

1280

</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="LC1280" class="line">                                <span class="n" style="color: #333">valf</span> <span class="o" style="font-weight: bold">=</span> <span class="nb" style="color: #0086b3">float</span><span class="p">(</span><span class="n" style="color: #333">val</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1276" 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="1281" 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">

1281

</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="LC1281" class="line">                            <span class="k" style="font-weight: bold">if</span> <span class="p">(</span><span class="n" style="color: #333">var</span> <span class="o" style="font-weight: bold">==</span> <span class="s" style="color: #d14">"delay"</span><span class="p">)</span> <span class="ow" style="font-weight: bold">and</span> <span class="p">(</span><span class="n" style="color: #333">raw</span> <span class="ow" style="font-weight: bold">is</span> <span class="bp" style="color: #999">False</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1276" 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="1282" 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">

1282

</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="LC1282" class="line">                                <span class="c" style="color: #998; font-style: italic"># raw==false, if true str returned anyway</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1276" 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">

1276

</td>

<td class="diff-line-num new_line" data-linenumber="1283" 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">

1283

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1283" class="line">                                <span class="c" style="color: #998; font-style: italic"># hack to pass string version</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1277" 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">

1277

</td>

<td class="diff-line-num new_line" data-linenumber="1284" 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">

1284

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1284" class="line">                                <span class="c" style="color: #998; font-style: italic"># so printout can handle .3f vs .6f</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1278" 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">

1278

</td>

<td class="diff-line-num new_line" data-linenumber="1285" 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">

1285

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1285" class="line">                                <span class="n" style="color: #333">items</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">append</span><span class="p">((</span><span class="s" style="color: #d14">"delay-s"</span><span class="p">,</span> <span class="n" style="color: #333">val</span><span class="p">))</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" id="" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="1280" 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="1287" 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">@@ -1280,6 +1287,8 @@ class ControlSession:</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1280" 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">

1280

</td>

<td class="diff-line-num new_line" data-linenumber="1287" 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">

1287

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1287" class="line">                        <span class="k" style="font-weight: bold">except</span> <span class="nb" style="color: #0086b3">ValueError</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1281" 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">

1281

</td>

<td class="diff-line-num new_line" data-linenumber="1288" 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">

1288

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1288" class="line">                            <span class="k" style="font-weight: bold">if</span> <span class="n" style="color: #333">val</span><span class="p">[</span><span class="mi" style="color: #099">0</span><span class="p">]</span> <span class="o" style="font-weight: bold">==</span> <span class="s" style="color: #d14">'"'</span> <span class="ow" style="font-weight: bold">and</span> <span class="n" style="color: #333">val</span><span class="p">[</span><span class="o" style="font-weight: bold">-</span><span class="mi" style="color: #099">1</span><span class="p">]</span> <span class="o" style="font-weight: bold">==</span> <span class="s" style="color: #d14">'"'</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1282" 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">

1282

</td>

<td class="diff-line-num new_line" data-linenumber="1289" 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">

1289

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1289" class="line">                                <span class="n" style="color: #333">val</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">val</span><span class="p">[</span><span class="mi" style="color: #099">1</span><span class="p">:</span><span class="o" style="font-weight: bold">-</span><span class="mi" style="color: #099">1</span><span class="p">]</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1283" 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="1290" 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">

1290

</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="LC1290" class="line">                                <span class="k" style="font-weight: bold">if</span> <span class="n" style="color: #333">raw</span> <span class="ow" style="font-weight: bold">is</span> <span class="bp" style="color: #999">True</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1283" 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="1291" 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">

1291

</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="LC1291" class="line">                                    <span class="n" style="color: #333">val</span> <span class="o" style="font-weight: bold">=</span> <span class="p">(</span><span class="n" style="color: #333">val</span><span class="p">,</span> <span class="n" style="color: #333">val</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1283" 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">

1283

</td>

<td class="diff-line-num new_line" data-linenumber="1292" 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">

1292

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1292" class="line">                    <span class="n" style="color: #333">items</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">append</span><span class="p">((</span><span class="n" style="color: #333">var</span><span class="p">,</span> <span class="n" style="color: #333">val</span><span class="p">))</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1284" 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">

1284

</td>

<td class="diff-line-num new_line" data-linenumber="1293" 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">

1293

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1293" class="line">                <span class="k" style="font-weight: bold">except</span> <span class="nb" style="color: #0086b3">ValueError</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1285" 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">

1285

</td>

<td class="diff-line-num new_line" data-linenumber="1294" 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">

1294

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1294" class="line">                    <span class="c" style="color: #998; font-style: italic"># Yes, ntpd really does emit bare tags for empty</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" id="" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="1288" 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="1297" 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">@@ -1288,14 +1297,14 @@ class ControlSession:</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1288" 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">

1288

</td>

<td class="diff-line-num new_line" data-linenumber="1297" 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">

1297

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1297" class="line">        <span class="k" style="font-weight: bold">return</span> <span class="n" style="color: #333">ntp</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">util</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">OrderedDict</span><span class="p">(</span><span class="n" style="color: #333">items</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1289" 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">

1289

</td>

<td class="diff-line-num new_line" data-linenumber="1298" 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">

1298

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1298" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1290" 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">

1290

</td>

<td class="diff-line-num new_line" data-linenumber="1299" 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">

1299

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1299" class="line">    <span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">readvar</span><span class="p">(</span><span class="bp" style="color: #999">self</span><span class="p">,</span> <span class="n" style="color: #333">associd</span><span class="o" style="font-weight: bold">=</span><span class="mi" style="color: #099">0</span><span class="p">,</span> <span class="n" style="color: #333">varlist</span><span class="o" style="font-weight: bold">=</span><span class="bp" style="color: #999">None</span><span class="p">,</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" id="" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="1291" 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">

1291

</td>

<td class="diff-line-num new_line old" data-linenumber="1300" 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="LC1291" class="line">                <span class="n" style="color: #333">opcode</span><span class="o" style="font-weight: bold">=</span><span class="n" style="color: #333">ntp</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">control</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">CTL_OP_READVAR</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1292" 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="1300" 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">

1300

</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="LC1300" class="line">                <span class="n" style="color: #333">opcode</span><span class="o" style="font-weight: bold">=</span><span class="n" style="color: #333">ntp</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">control</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">CTL_OP_READVAR</span><span class="p"><span class="idiff left">,</span></span><span class="idiff"> </span><span class="n" style="color: #333"><span class="idiff">raw</span></span><span class="o" style="font-weight: bold"><span class="idiff">=</span></span><span class="bp" style="color: #999"><span class="idiff right">False</span></span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1292" 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">

1292

</td>

<td class="diff-line-num new_line" data-linenumber="1301" 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">

1301

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1301" class="line">        <span class="s" style="color: #d14">"Read system vars from the host as a dict, or throw an exception."</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1293" 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">

1293

</td>

<td class="diff-line-num new_line" data-linenumber="1302" 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">

1302

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1302" class="line">        <span class="k" style="font-weight: bold">if</span> <span class="n" style="color: #333">varlist</span> <span class="ow" style="font-weight: bold">is</span> <span class="bp" style="color: #999">None</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1294" 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">

1294

</td>

<td class="diff-line-num new_line" data-linenumber="1303" 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">

1303

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1303" class="line">            <span class="n" style="color: #333">qdata</span> <span class="o" style="font-weight: bold">=</span> <span class="s" style="color: #d14">""</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1295" 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">

1295

</td>

<td class="diff-line-num new_line" data-linenumber="1304" 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">

1304

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1304" class="line">        <span class="k" style="font-weight: bold">else</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1296" 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">

1296

</td>

<td class="diff-line-num new_line" data-linenumber="1305" 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">

1305

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1305" class="line">            <span class="n" style="color: #333">qdata</span> <span class="o" style="font-weight: bold">=</span> <span class="s" style="color: #d14">","</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">join</span><span class="p">(</span><span class="n" style="color: #333">varlist</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1297" 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">

1297

</td>

<td class="diff-line-num new_line" data-linenumber="1306" 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">

1306

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1306" class="line">        <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">doquery</span><span class="p">(</span><span class="n" style="color: #333">opcode</span><span class="p">,</span> <span class="n" style="color: #333">associd</span><span class="o" style="font-weight: bold">=</span><span class="n" style="color: #333">associd</span><span class="p">,</span> <span class="n" style="color: #333">qdata</span><span class="o" style="font-weight: bold">=</span><span class="n" style="color: #333">qdata</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" id="" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="1298" 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">

1298

</td>

<td class="diff-line-num new_line old" data-linenumber="1307" 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="LC1298" class="line">        <span class="k" style="font-weight: bold">return</span> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">__parse_varlist</span><span class="p">()</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" id="" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="1299" 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="1307" 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">

1307

</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="LC1307" class="line">        <span class="k" style="font-weight: bold">return</span> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">__parse_varlist</span><span class="p">(</span><span class="n" style="color: #333"><span class="idiff left right">raw</span></span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1299" 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">

1299

</td>

<td class="diff-line-num new_line" data-linenumber="1308" 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">

1308

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1308" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1300" 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">

1300

</td>

<td class="diff-line-num new_line" data-linenumber="1309" 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">

1309

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1309" class="line">    <span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">config</span><span class="p">(</span><span class="bp" style="color: #999">self</span><span class="p">,</span> <span class="n" style="color: #333">configtext</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" id="" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="1301" 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">

1301

</td>

<td class="diff-line-num new_line" data-linenumber="1310" 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">

1310

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC1310" class="line">        <span class="s" style="color: #d14">"Send configuration text to the daemon. Return True if accepted."</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/compare/f211b380eac02ad0b16df07843af9ba0f0ebb9f2...0d193918f6bd03546c021f7a453c0a465b4befdd">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>