<!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>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Ian Bruene pushed to branch master
at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/398a8ada84ec67587d6c603a4f889fc71cc72a14">398a8ada</a></strong>
<div>
<span>by Ian Bruene</span>
<i>at 2018-03-13T21:24:00Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Config parser can handle IP addresses.
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#eddefab35f1463f8d82fc0a5f07b315635f3a4c0">
ntpclients/ntpsnmpd.py
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="eddefab35f1463f8d82fc0a5f07b315635f3a4c0">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/398a8ada84ec67587d6c603a4f889fc71cc72a14#eddefab35f1463f8d82fc0a5f07b315635f3a4c0"><strong>ntpclients/ntpsnmpd.py</strong></a>
<hr>
<table class="code white" style="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="1133" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="1133" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -1133,7 +1133,7 @@ def connect(address):</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1133" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1133
</td>
<td class="diff-line-num new_line" data-linenumber="1133" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1133
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1133" class="line" lang="python"> <span class="n" style="color: #333;">sock</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">socket</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">socket</span><span class="p">(</span><span class="n" style="color: #333;">af</span><span class="p">,</span> <span class="n" style="color: #333;">socket</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">SOCK_STREAM</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="1134" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1134
</td>
<td class="diff-line-num new_line" data-linenumber="1134" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1134
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1134" class="line" lang="python"> <span class="n" style="color: #333;">sock</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">connect</span><span class="p">((</span><span class="n" style="color: #333;">host</span><span class="p">,</span> <span class="n" style="color: #333;">port</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="1135" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1135
</td>
<td class="diff-line-num new_line" data-linenumber="1135" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1135
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1135" class="line" lang="python"> <span class="k" style="font-weight: 600;">except</span> <span class="n" style="color: #333;">socket</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">error</span> <span class="k" style="font-weight: 600;">as</span> <span class="n" style="color: #333;">msg</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="1136" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
1136
</td>
<td class="diff-line-num new_line old" data-linenumber="1136" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC1136" class="line" lang="python"> <span class="n" style="color: #333;">log</span><span class="p">(</span><span class="nb" style="color: #0086b3;"><span class="idiff left">repr</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff right">msg</span></span><span class="p">),</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="1137" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1136" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
1136
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1136" class="line" lang="python"> <span class="n" style="color: #333;">log</span><span class="p">(</span><span class="s" style="color: #d14;"><span class="idiff left">"Connection to </span></span><span class="si" style="color: #d14;"><span class="idiff">%</span></span><span class="s" style="color: #d14;"><span class="idiff">s failure: </span></span><span class="si" style="color: #d14;"><span class="idiff">%</span></span><span class="s" style="color: #d14;"><span class="idiff">s"</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">%</span></span><span class="idiff"> </span><span class="p"><span class="idiff">(</span></span><span class="nb" style="color: #0086b3;"><span class="idiff">repr</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff">address</span></span><span class="p"><span class="idiff">),</span></span><span class="idiff"> </span><span class="nb" style="color: #0086b3;"><span class="idiff">repr</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff">msg</span></span><span class="p"><span class="idiff right">)</span>),</span> <span class="mi" style="color: #099;">1</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="1137" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1137
</td>
<td class="diff-line-num new_line" data-linenumber="1137" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1137
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1137" class="line" lang="python"> <span class="n" style="color: #333;">sys</span><span class="o" style="font-weight: 600;">.</span><span class="nb" style="color: #0086b3;">exit</span><span class="p">(</span><span class="mi" style="color: #099;">1</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="1138" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1138
</td>
<td class="diff-line-num new_line" data-linenumber="1138" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1138
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1138" class="line" lang="python"> <span class="n" style="color: #333;">log</span><span class="p">(</span><span class="s" style="color: #d14;">"connected to master agent at "</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">address</span><span class="p">,</span> <span class="mi" style="color: #099;">3</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="1139" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1139
</td>
<td class="diff-line-num new_line" data-linenumber="1139" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1139
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1139" class="line" lang="python"> <span class="k" style="font-weight: 600;">return</span> <span class="n" style="color: #333;">sock</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="1193" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="1193" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -1193,7 +1193,7 @@ def loadSettings(filename, optionList):</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1193" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1193
</td>
<td class="diff-line-num new_line" data-linenumber="1193" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1193
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1193" class="line" lang="python"> <span class="k" style="font-weight: 600;">with</span> <span class="nb" style="color: #0086b3;">open</span><span class="p">(</span><span class="n" style="color: #333;">filename</span><span class="p">)</span> <span class="k" style="font-weight: 600;">as</span> <span class="n" style="color: #333;">f</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="1194" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1194
</td>
<td class="diff-line-num new_line" data-linenumber="1194" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1194
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1194" class="line" lang="python"> <span class="n" style="color: #333;">data</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">f</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">read</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="1195" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1195
</td>
<td class="diff-line-num new_line" data-linenumber="1195" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1195
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1195" class="line" lang="python"> <span class="n" style="color: #333;">parser</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">shlex</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">shlex</span><span class="p">(</span><span class="n" style="color: #333;">data</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="1196" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
1196
</td>
<td class="diff-line-num new_line old" data-linenumber="1196" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC1196" class="line" lang="python"> <span class="n" style="color: #333;">parser</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">wordchars</span> <span class="o" style="font-weight: 600;">+=</span> <span class="s" style="color: #d14;">"-"</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="1197" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1196" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
1196
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1196" class="line" lang="python"> <span class="n" style="color: #333;">parser</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">wordchars</span> <span class="o" style="font-weight: 600;">+=</span> <span class="s" style="color: #d14;">"-<span class="idiff left right">.</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="1197" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1197
</td>
<td class="diff-line-num new_line" data-linenumber="1197" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1197
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1197" class="line" lang="python"> <span class="n" style="color: #333;">data</span> <span class="o" style="font-weight: 600;">=</span> <span class="p">[</span><span class="n" style="color: #333;">x</span> <span class="k" style="font-weight: 600;">for</span> <span class="n" style="color: #333;">x</span> <span class="ow" style="font-weight: 600;">in</span> <span class="n" style="color: #333;">parser</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="1198" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1198
</td>
<td class="diff-line-num new_line" data-linenumber="1198" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1198
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1198" class="line" lang="python"> <span class="n" style="color: #333;">i</span> <span class="o" style="font-weight: 600;">=</span> <span class="mi" style="color: #099;">0</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1199" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1199
</td>
<td class="diff-line-num new_line" data-linenumber="1199" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1199
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1199" class="line" lang="python"> <span class="n" style="color: #333;">dataLen</span> <span class="o" style="font-weight: 600;">=</span> <span class="nb" style="color: #0086b3;">len</span><span class="p">(</span><span class="n" style="color: #333;">data</span><span class="p">)</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777;">
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/398a8ada84ec67587d6c603a4f889fc71cc72a14">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.com/NTPsec/ntpsec/commit/398a8ada84ec67587d6c603a4f889fc71cc72a14"}}</script>
</p>
</div>
</body>
</html>