<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
img {
max-width: 100%;
height: auto;
}
p.details {
font-style:italic;
color:#777
}
.footer p {
font-size:small;
color:#777
}
pre.commit-message {
white-space: pre-wrap;
}
.file-stats a {
text-decoration: none;
}
.file-stats .new-file {
color: #090;
}
.file-stats .deleted-file {
color: #B00;
}
</style>
<body>
<div class='content'>
<h3>Eric S. Raymond pushed to branch master at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a></h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/5c9ab6fa484eccf204b0d5b78f391d92a76428b1">5c9ab6fa</a></strong>
<div>
<span>by Eric S. Raymond</span>
<i>at 2015-12-05T09:25:58Z</i>
</div>
<pre class='commit-message'>Exile recv_srcaddr_len out of the paylaod structure.
Also, correct its spelling in the Windows port tree. Should have
happened in "And another persistent spelling error: dstadr ->
dstaddr."</pre>
</li>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/017f280d97cc0f262f8f2054a50bc5eb45cd74ac">017f280d</a></strong>
<div>
<span>by Eric S. Raymond</span>
<i>at 2015-12-05T10:41:35Z</i>
</div>
<pre class='commit-message'>Remove unused msgflags field from payload structure.</pre>
</li>
</ul>
<h4>3 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
include/recvbuff.h
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
ntpd/ntp_io.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
ports/winnt/ntpd/ntp_iocompletionport.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/175b58dc0dd11493de4a337d4ebcf011c16fc59c...017f280d97cc0f262f8f2054a50bc5eb45cd74ac#diff-0'>
<strong>
include/recvbuff.h
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/include/recvbuff.h
</span><span style="color: #000000;background-color: #ddffdd">+++ b/include/recvbuff.h
</span><span style="color: #aaaaaa">@@ -53,12 +53,8 @@ struct payload {
</span> #define recv_srcaddr X_from_where.X_recv_srcaddr
#define recv_srcclock X_from_where.X_recv_srcclock
#define recv_peer X_from_where.X_recv_peer
<span style="color: #000000;background-color: #ffdddd">-#ifdef HAVE_IO_COMPLETION_PORT
- int recv_srcaddr_len;/* filled in on completion */
-#endif
</span> endpt * dstaddr; /* address pkt arrived on */
SOCKET fd; /* fd on which it was received */
<span style="color: #000000;background-color: #ffdddd">- int msg_flags; /* Flags received about the packet */
</span> l_fp recv_time; /* time of arrival */
size_t recv_length; /* number of octets received */
union {
<span style="color: #aaaaaa">@@ -74,6 +70,9 @@ typedef struct recvbuf recvbuf_t;
</span> struct recvbuf {
recvbuf_t * link; /* next in list */
struct payload payload;
<span style="color: #000000;background-color: #ddffdd">+#ifdef HAVE_IO_COMPLETION_PORT
+ int recv_srcaddr_len;/* filled in on completion */
+#endif
</span> void (*receiver)(struct payload *); /* callback */
int used; /* reference count */
};
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/175b58dc0dd11493de4a337d4ebcf011c16fc59c...017f280d97cc0f262f8f2054a50bc5eb45cd74ac#diff-1'>
<strong>
ntpd/ntp_io.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/ntp_io.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/ntp_io.c
</span><span style="color: #aaaaaa">@@ -3486,7 +3486,6 @@ read_network_packet(
</span> msghdr.msg_iovlen = 1;
msghdr.msg_control = (void *)&control;
msghdr.msg_controllen = sizeof(control);
<span style="color: #000000;background-color: #ffdddd">- msghdr.msg_flags = 0;
</span> rb->payload.recv_length = recvmsg(fd, &msghdr, 0);
#endif
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/175b58dc0dd11493de4a337d4ebcf011c16fc59c...017f280d97cc0f262f8f2054a50bc5eb45cd74ac#diff-2'>
<strong>
ports/winnt/ntpd/ntp_iocompletionport.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ports/winnt/ntpd/ntp_iocompletionport.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ports/winnt/ntpd/ntp_iocompletionport.c
</span><span style="color: #aaaaaa">@@ -1370,12 +1370,12 @@ QueueSocketRecv(
</span>
Flags = 0;
buff->fd = s;
<span style="color: #000000;background-color: #ffdddd">- buff->recv_srcadr_len = sizeof(buff->recv_srcadr);
</span><span style="color: #000000;background-color: #ddffdd">+ buff->recv_srcaddr_len = sizeof(buff->recv_srcadr);
</span> wsabuf.buf = (char *)buff->recv_buffer;
wsabuf.len = sizeof(buff->recv_buffer);
rc = WSARecvFrom(buff->fd, &wsabuf, 1, NULL, &Flags,
<span style="color: #000000;background-color: #ffdddd">- &buff->recv_srcadr.sa, &buff->recv_srcadr_len,
</span><span style="color: #000000;background-color: #ddffdd">+ &buff->recv_srcadr.sa, &buff->recv_srcaddr_len,
</span> &lpo->ol, NULL);
if (SOCKET_ERROR == rc)
return IoResultCheck(GetLastError(), lpo,
<span style="color: #aaaaaa">@@ -1431,7 +1431,7 @@ OnSocketRecv(
</span> * If we keep it add some info to the structure
*/
if (buff->recv_length && !inter->ignore_packets) {
<span style="color: #000000;background-color: #ffdddd">- NTP_INSIST(buff->recv_srcadr_len <=
</span><span style="color: #000000;background-color: #ddffdd">+ NTP_INSIST(buff->recv_srcaddr_len <=
</span> sizeof(buff->recv_srcadr));
buff->receiver = &receive;
buff->dstadr = inter;
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/compare/175b58dc0dd11493de4a337d4ebcf011c16fc59c...017f280d97cc0f262f8f2054a50bc5eb45cd74ac">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>