<!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=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>



<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">

<h3>
Samuel Thibault pushed to branch master
at <a href="https://gitlab.freedesktop.org/slirp/libslirp">slirp / libslirp</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.freedesktop.org/slirp/libslirp/-/commit/50a9171f2fb23182c3270faefab74152d49c7e97">50a9171f</a></strong>
<div>
<span>by Samuel Thibault</span>
<i>at 2021-01-29T22:52:35+01:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">tcp_subr: simplify code

This is actually similar to the fix in 9f78e94912f9 ("Fix a typo that
can cause slow socket response on Windows."), except that here there is
no semantic change since s = so->s above.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#848441ab156593220a8526428e9784e3f38417b2">
src/tcp_subr.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="848441ab156593220a8526428e9784e3f38417b2">
<a href="https://gitlab.freedesktop.org/slirp/libslirp/-/commit/50a9171f2fb23182c3270faefab74152d49c7e97#848441ab156593220a8526428e9784e3f38417b2"><strong>src/tcp_subr.c</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" 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="421" 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="421" 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">@@ -421,7 +421,7 @@ int tcp_fconnect(struct socket *so, unsigned short af)</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="421" 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">
421
</td>
<td class="diff-line-num new_line" data-linenumber="421" 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">
421
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC421" class="line" lang="c">        <span class="k" style="font-weight: 600;">struct</span> <span class="n" style="color: #333;">sockaddr_storage</span> <span class="n" style="color: #333;">addr</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="422" 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">
422
</td>
<td class="diff-line-num new_line" data-linenumber="422" 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">
422
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC422" class="line" lang="c"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="423" 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">
423
</td>
<td class="diff-line-num new_line" data-linenumber="423" 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">
423
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC423" class="line" lang="c">        <span class="n" style="color: #333;">slirp_set_nonblock</span><span class="p">(</span><span class="n" style="color: #333;">s</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="424" 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">
424
</td>
<td class="diff-line-num new_line old" data-linenumber="424" 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 old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC424" class="line" lang="c">        <span class="n" style="color: #333;">so</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">slirp</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">cb</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">register_poll_fd</span><span class="p">(</span><span class="n" style="color: #333;">s<span class="idiff left">o</span></span><span class="o" style="font-weight: 600;"><span class="idiff">-></span></span><span class="n" style="color: #333;"><span class="idiff right">s</span></span><span class="p">,</span> <span class="n" style="color: #333;">so</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">slirp</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">opaque</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="425" 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="424" 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">
424
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC424" class="line" lang="c">        <span class="n" style="color: #333;">so</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">slirp</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">cb</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">register_poll_fd</span><span class="p">(</span><span class="n" style="color: #333;">s</span><span class="p">,</span> <span class="n" style="color: #333;">so</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">slirp</span><span class="o" style="font-weight: 600;">-></span><span class="n" style="color: #333;">opaque</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="425" 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">
425
</td>
<td class="diff-line-num new_line" data-linenumber="425" 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">
425
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC425" class="line" lang="c">        <span class="n" style="color: #333;">slirp_socket_set_fast_reuse</span><span class="p">(</span><span class="n" style="color: #333;">s</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="426" 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">
426
</td>
<td class="diff-line-num new_line" data-linenumber="426" 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">
426
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC426" class="line" lang="c">        <span class="n" style="color: #333;">opt</span> <span class="o" style="font-weight: 600;">=</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="427" 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">
427
</td>
<td class="diff-line-num new_line" data-linenumber="427" 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">
427
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC427" class="line" lang="c">        <span class="n" style="color: #333;">setsockopt</span><span class="p">(</span><span class="n" style="color: #333;">s</span><span class="p">,</span> <span class="n" style="color: #333;">SOL_SOCKET</span><span class="p">,</span> <span class="n" style="color: #333;">SO_OOBINLINE</span><span class="p">,</span> <span class="o" style="font-weight: 600;">&</span><span class="n" style="color: #333;">opt</span><span class="p">,</span> <span class="k" style="font-weight: 600;">sizeof</span><span class="p">(</span><span class="n" style="color: #333;">opt</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: #666;">

<br>
<a href="https://gitlab.freedesktop.org/slirp/libslirp/-/commit/50a9171f2fb23182c3270faefab74152d49c7e97">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.freedesktop.org.
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.freedesktop.org/slirp/libslirp/-/commit/50a9171f2fb23182c3270faefab74152d49c7e97"}}</script>


</p>
</div>
</body>
</html>