<!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> <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/commit/55d498cbe3f6393d04a5c4e607b34b7d49ffba8c">55d498cb</a> <div> by Rich at 2022-03-04T18:17:35+00:00 </div> <pre class="commit-message" style="white-space: pre-wrap; margin: 0;">socket: Handle ECONNABORTED from recv recv can return ECONNABORTED due to a time-out on the socket. The socket is no longer useable once it enters this state.</pre> </li> <li> <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/commit/bf917b89d64f57d9302aba4b2f027ea68fb78c13">bf917b89</a> <div> by Samuel Thibault at 2022-03-04T18:27:14+00:00 </div> <pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Merge branch 'handle-econnaborted' into 'master' Handle ECONNABORTED from recv See merge request slirp/libslirp!116</pre> </li> </ul> <h4>1 changed file:</h4> <ul> <li class="file-stats"> <a href="#223d6b53cf456d41d3995ab46ba86bf9d0872b46"> src/socket.c </a> </li> </ul> <h4>Changes:</h4> <li id="223d6b53cf456d41d3995ab46ba86bf9d0872b46"> <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/compare/804110bc5c5d1b777313057f84a9b68bb5b2f448...bf917b89d64f57d9302aba4b2f027ea68fb78c13#223d6b53cf456d41d3995ab46ba86bf9d0872b46">src/socket.c</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" style="line-height: 1.6;"> <td class="diff-line-num unfold js-unfold old_line" data-linenumber="217" 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="217" 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">@@ -217,8 +217,8 @@ int soread(struct socket *so)</td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="217" 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"> 217 </td> <td class="new_line diff-line-num" data-linenumber="217" 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"> 217 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"><pre style="margin: 0;"> errno, strerror(errno)); </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="218" 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"> 218 </td> <td class="new_line diff-line-num" data-linenumber="218" 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"> 218 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"><pre style="margin: 0;"> sofcantrcvmore(so); </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="219" 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"> 219 </td> <td class="new_line diff-line-num" data-linenumber="219" 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"> 219 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"><pre style="margin: 0;"> </pre></td> </tr> <tr class="line_holder old" style="line-height: 1.6;"> <td class="old_line diff-line-num old" data-linenumber="220" 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"> 220 </td> <td class="new_line diff-line-num old" data-linenumber="220" 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;">- if (err == ECONNRESET || err == ECONNREFUSED || err == ENOTCONN || </pre></td> </tr> <tr class="line_holder old" style="line-height: 1.6;"> <td class="old_line diff-line-num old" data-linenumber="221" 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"> 221 </td> <td class="new_line diff-line-num old" data-linenumber="220" 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;">- err == EPIPE) { </pre></td> </tr> <tr class="line_holder new" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="222" 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="new_line diff-line-num new" data-linenumber="220" 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"> 220 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"><pre style="margin: 0;">+ if (err == ECONNABORTED || err == ECONNRESET || err == ECONNREFUSED || </pre></td> </tr> <tr class="line_holder new" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="222" 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="new_line diff-line-num new" data-linenumber="221" 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"> 221 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"><pre style="margin: 0;">+ err == ENOTCONN || err == EPIPE) { </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="222" 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"> 222 </td> <td class="new_line diff-line-num" data-linenumber="222" 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"> 222 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"><pre style="margin: 0;"> tcp_drop(sototcpcb(so), err); </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="223" 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"> 223 </td> <td class="new_line diff-line-num" data-linenumber="223" 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"> 223 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"><pre style="margin: 0;"> } else { </pre></td> </tr> <tr class="line_holder" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="224" 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"> 224 </td> <td class="new_line diff-line-num" data-linenumber="224" 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"> 224 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"><pre style="margin: 0;"> tcp_sockclosed(sototcpcb(so)); </pre></td> </tr> </table> </li> </div> <div class="footer" style="margin-top: 10px;"> — <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/compare/804110bc5c5d1b777313057f84a9b68bb5b2f448...bf917b89d64f57d9302aba4b2f027ea68fb78c13">View it on GitLab</a>. 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. </div> </body> </html>