<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21918">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cbsp: Fix osmo_cbsp_recv_buffered() for KEEP-ALIVE-COMPLETE<br><br>We used to suppress/drop any "zero length" messages, but we didn't<br>include the header when computing the length.  However, in CBSP there<br>are messages (at least KEEP-ALIVE-COMPLETE) which only consist of the<br>header without any information elements.  We cannot simply drop such<br>messages.<br><br>This also fixes the return value of osmo_cbsp_recv_buffered() to be<br>the total number of received octets (including the header).<br><br>Change-Id: Ib620128a167cb77f061ee57e8f8ad707b96b1c0d<br>---<br>M src/gsm/cbsp.c<br>1 file changed, 1 insertion(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/18/21918/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm/cbsp.c b/src/gsm/cbsp.c</span><br><span>index 6ddef33..2037f7c 100644</span><br><span>--- a/src/gsm/cbsp.c</span><br><span>+++ b/src/gsm/cbsp.c</span><br><span>@@ -1460,12 +1460,7 @@</span><br><span>             }</span><br><span>    }</span><br><span>    /* else: complete message received */</span><br><span style="color: hsl(0, 100%, 40%);">-   rc = msgb_l2len(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-   if (rc == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-          /* drop empty message */</span><br><span style="color: hsl(0, 100%, 40%);">-                rc = -EAGAIN;</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(120, 100%, 40%);">+     rc = msgb_length(msg);</span><br><span>       if (tmp_msg)</span><br><span>                 *tmp_msg = NULL;</span><br><span>     *rmsg = msg;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21918">change 21918</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/c/libosmocore/+/21918"/><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-Change-Id: Ib620128a167cb77f061ee57e8f8ad707b96b1c0d </div>
<div style="display:none"> Gerrit-Change-Number: 21918 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>