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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">LLC: Don't blindly assume all LLC frames have data payload<br><br>In reality, only UI, I, SABM, UA and XID frames carry payload.  All<br>other frames will have llhp.data == NULL.<br><br>Let's therefore not do any msgb adjustments unless we actually know<br>there is a user payload field.<br><br>Change-Id: I51bbd0f2c618d477a037af343ff41de1c8a5a3ae<br>Closes: OS#3952<br>---<br>M src/gprs/gprs_llc.c<br>1 file changed, 8 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs/gprs_llc.c b/src/gprs/gprs_llc.c</span><br><span>index abbb742..c222bc2 100644</span><br><span>--- a/src/gprs/gprs_llc.c</span><br><span>+++ b/src/gprs/gprs_llc.c</span><br><span>@@ -945,9 +945,6 @@</span><br><span>            LOGP(DLLC, LOGL_INFO, "Dropping frame with invalid FCS\n");</span><br><span>                return -EIO;</span><br><span>         }</span><br><span style="color: hsl(0, 100%, 40%);">-       /* set l3 layer & remove the fcs */</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l3h = llhp.data;</span><br><span style="color: hsl(0, 100%, 40%);">-        msgb_l3trim(msg, llhp.data_len);</span><br><span> </span><br><span>         /* Update LLE's (BVCI, NSEI) tuple */</span><br><span>    lle->llme->bvci = msgb_bvci(msg);</span><br><span>@@ -958,6 +955,14 @@</span><br><span>       if (rc < 0)</span><br><span>               return rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        /* there are many frame types that don't carry user information</span><br><span style="color: hsl(120, 100%, 40%);">+    * and which hence have llhp.data = NULL */</span><br><span style="color: hsl(120, 100%, 40%);">+   if (llhp.data)  {</span><br><span style="color: hsl(120, 100%, 40%);">+             /* set l3 layer & remove the fcs */</span><br><span style="color: hsl(120, 100%, 40%);">+               msg->l3h = llhp.data;</span><br><span style="color: hsl(120, 100%, 40%);">+              msgb_l3trim(msg, llhp.data_len);</span><br><span style="color: hsl(120, 100%, 40%);">+      }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  rate_ctr_inc(&sgsn->rate_ctrs->ctr[CTR_LLC_UL_PACKETS]);</span><br><span>   rate_ctr_add(&sgsn->rate_ctrs->ctr[CTR_LLC_UL_BYTES], msg->len);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13764">change 13764</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/13764"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I51bbd0f2c618d477a037af343ff41de1c8a5a3ae </div>
<div style="display:none"> Gerrit-Change-Number: 13764 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </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: Keith Whyte <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>