<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11911">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">IPA: move duplicated error handling into inline function<br><br>The code is re-ordered to put error handling upfront similar to te way<br>we do it in oter places.<br><br>Change-Id: Ic0147bffaf04b0baf97e5cca22948bd0e116668f<br>---<br>M src/gsm/ipa.c<br>1 file changed, 32 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/11911/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c</span><br><span>index d423c26..6ee003d 100644</span><br><span>--- a/src/gsm/ipa.c</span><br><span>+++ b/src/gsm/ipa.c</span><br><span>@@ -541,6 +541,33 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Attempt to recv() message and analyse return value</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] ret result of recv() will be stored in here.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] fd The fd for the socket to read from.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] msg Message buffer to read into.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] needed Home many bytes we have to read.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns boolean indicating whether message should be discarded.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static inline bool recv_discard_msg(int *ret, int fd, struct msgb *msg, int needed)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ *ret = recv(fd, msg->tail, needed, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (*ret == 0) /* the socket is properly closed or we've requested to receive 0 bytes */</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (*ret > 0) /* some data was obtained */</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (errno == EAGAIN || errno == EINTR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *ret = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* errors indicated by -1 return value, let's save the actual error code */</span><br><span style="color: hsl(120, 100%, 40%);">+ *ret = -errno;</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Read one ipa message from socket fd or store part if still not fully received.</span><br><span> * \param[in] fd The fd for the socket to read from.</span><br><span> * \param[out] rmsg internally allocated msgb containing a fully received ipa message.</span><br><span>@@ -566,6 +593,7 @@</span><br><span> struct ipaccess_head *hh;</span><br><span> int len, ret;</span><br><span> int needed;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool discard;</span><br><span> </span><br><span> if (msg == NULL) {</span><br><span> msg = ipa_msg_alloc(0);</span><br><span>@@ -579,19 +607,10 @@</span><br><span> if (msg->l2h == NULL) {</span><br><span> /* first read our 3-byte header */</span><br><span> needed = sizeof(*hh) - msg->len;</span><br><span style="color: hsl(0, 100%, 40%);">- ret = recv(fd, msg->tail, needed, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (ret == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ discard = recv_discard_msg(&ret, fd, msg, needed);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (discard)</span><br><span> goto discard_msg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ret < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (errno == EAGAIN || errno == EINTR)</span><br><span style="color: hsl(0, 100%, 40%);">- ret = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- else {</span><br><span style="color: hsl(0, 100%, 40%);">- ret = -errno;</span><br><span style="color: hsl(0, 100%, 40%);">- goto discard_msg;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> msgb_put(msg, ret);</span><br><span> </span><br><span> if (ret < needed) {</span><br><span>@@ -629,20 +648,10 @@</span><br><span> needed = len - msgb_l2len(msg);</span><br><span> </span><br><span> if (needed > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- ret = recv(fd, msg->tail, needed, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ret == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ discard = recv_discard_msg(&ret, fd, msg, needed);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (discard)</span><br><span> goto discard_msg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ret < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (errno == EAGAIN || errno == EINTR)</span><br><span style="color: hsl(0, 100%, 40%);">- ret = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- else {</span><br><span style="color: hsl(0, 100%, 40%);">- ret = -errno;</span><br><span style="color: hsl(0, 100%, 40%);">- goto discard_msg;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> msgb_put(msg, ret);</span><br><span> </span><br><span> if (ret < needed) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11911">change 11911</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/11911"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ic0147bffaf04b0baf97e5cca22948bd0e116668f </div>
<div style="display:none"> Gerrit-Change-Number: 11911 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>