<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10656">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ipa: Simplify code in ipa_client_read<br><br>By doing this change we remove a duplicated error code path and thus<br>avoid having to maintain an extra code path with function pointers.<br><br>Change-Id: Ic044894980ae2b882d99eb30d9df50066671d8f3<br>---<br>M src/input/ipa.c<br>1 file changed, 4 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/input/ipa.c b/src/input/ipa.c</span><br><span>index 995d2c3..26bf170 100644</span><br><span>--- a/src/input/ipa.c</span><br><span>+++ b/src/input/ipa.c</span><br><span>@@ -56,17 +56,13 @@</span><br><span>  LOGIPA(link, LOGL_DEBUG, "message received\n");</span><br><span> </span><br><span>        ret = ipa_msg_recv_buffered(ofd->fd, &msg, &link->pending_msg);</span><br><span style="color: hsl(0, 100%, 40%);">-   if (ret < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+     if (ret <= 0) {</span><br><span>           if (ret == -EAGAIN)</span><br><span>                  return;</span><br><span style="color: hsl(0, 100%, 40%);">-         if (ret == -EPIPE || ret == -ECONNRESET)</span><br><span style="color: hsl(120, 100%, 40%);">+              else if (ret == -EPIPE || ret == -ECONNRESET)</span><br><span>                        LOGIPA(link, LOGL_ERROR, "lost connection with server\n");</span><br><span style="color: hsl(0, 100%, 40%);">-            ipa_client_conn_close(link);</span><br><span style="color: hsl(0, 100%, 40%);">-            if (link->updown_cb)</span><br><span style="color: hsl(0, 100%, 40%);">-                 link->updown_cb(link, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-            return;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (ret == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-          LOGIPA(link, LOGL_ERROR, "connection closed with server\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                else if (ret == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                    LOGIPA(link, LOGL_ERROR, "connection closed with server\n");</span><br><span>               ipa_client_conn_close(link);</span><br><span>                 if (link->updown_cb)</span><br><span>                      link->updown_cb(link, 0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10656">change 10656</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10656"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-abis </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ic044894980ae2b882d99eb30d9df50066671d8f3 </div>
<div style="display:none"> Gerrit-Change-Number: 10656 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>