<p>lynxis lazus <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11022">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_llc: remove the FCS from the msgb by trim'ing the msgb<br><br>After checking the FCS, it's no use. The FCS should also not<br>appear on `hexdump(msgb_l3(MSG), msgb_l3len(MSG))`.<br><br>Change-Id: I27e061ead86395a336b67c7aead93d305a0f2ae8<br>---<br>M src/gprs/gprs_llc.c<br>M src/gprs/gprs_sndcp.c<br>2 files changed, 4 insertions(+), 2 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 6c92f83..abbb742 100644</span><br><span>--- a/src/gprs/gprs_llc.c</span><br><span>+++ b/src/gprs/gprs_llc.c</span><br><span>@@ -945,6 +945,9 @@</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(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> </span><br><span>         /* Update LLE's (BVCI, NSEI) tuple */</span><br><span>    lle->llme->bvci = msgb_bvci(msg);</span><br><span>@@ -960,7 +963,6 @@</span><br><span> </span><br><span>    /* llhp.data is only set when we need to send LL_[UNIT]DATA_IND up */</span><br><span>        if (llhp.cmd == GPRS_LLC_UI && llhp.data && llhp.data_len) {</span><br><span style="color: hsl(0, 100%, 40%);">-            msgb_gmmh(msg) = llhp.data;</span><br><span>          switch (llhp.sapi) {</span><br><span>                 case GPRS_SAPI_GMM:</span><br><span>                  /* send LL_UNITDATA_IND to GMM */</span><br><span>diff --git a/src/gprs/gprs_sndcp.c b/src/gprs/gprs_sndcp.c</span><br><span>index 77f8ca6..52eeb75 100644</span><br><span>--- a/src/gprs/gprs_sndcp.c</span><br><span>+++ b/src/gprs/gprs_sndcp.c</span><br><span>@@ -792,7 +792,7 @@</span><br><span> </span><br><span>         npdu_num = (suh->npdu_high << 8) | suh->npdu_low;</span><br><span>        npdu = (uint8_t *)suh + sizeof(*suh);</span><br><span style="color: hsl(0, 100%, 40%);">-   npdu_len = (msg->data + msg->len) - npdu - 3;     /* -3 'removes' the FCS */</span><br><span style="color: hsl(120, 100%, 40%);">+    npdu_len = (msg->data + msg->len) - npdu;</span><br><span> </span><br><span>  if (npdu_len <= 0) {</span><br><span>              LOGP(DSNDCP, LOGL_ERROR, "Short SNDCP N-PDU: %d\n", npdu_len);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11022">change 11022</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/11022"/><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: I27e061ead86395a336b67c7aead93d305a0f2ae8 </div>
<div style="display:none"> Gerrit-Change-Number: 11022 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </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: lynxis lazus <lynxis@fe80.eu> </div>