<p>lynxis lazus <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15535">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
osmith: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsn: when receiving data PDU notify the Gb GMM fsm<br><br>When receiving a PDU, the GMM fsm will change to state MM_READY<br>and will re-arm the T3314<br><br>Relates: OS#1941<br>Change-Id: I78f40762fb17bbd4a6f35608a793f8e5271e9b86<br>---<br>M include/osmocom/sgsn/gprs_gb.h<br>M src/sgsn/gprs_gb.c<br>M src/sgsn/gprs_sndcp.c<br>3 files changed, 21 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/gprs_gb.h b/include/osmocom/sgsn/gprs_gb.h</span><br><span>index 3bc3676..47f2a31 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_gb.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_gb.h</span><br><span>@@ -3,7 +3,9 @@</span><br><span> #include <stdbool.h></span><br><span> </span><br><span> #include <osmocom/core/msgb.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/sgsn/gprs_rllc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/sgsn/gprs_llc.h></span><br><span> </span><br><span> int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme,</span><br><span> bool drop_cipherable);</span><br><span style="color: hsl(120, 100%, 40%);">+/* Has to be called whenever any PDU (signaling, data, ...) has been received */</span><br><span style="color: hsl(120, 100%, 40%);">+void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx);</span><br><span>diff --git a/src/sgsn/gprs_gb.c b/src/sgsn/gprs_gb.c</span><br><span>index 2d9c25a..9fa8e00 100644</span><br><span>--- a/src/sgsn/gprs_gb.c</span><br><span>+++ b/src/sgsn/gprs_gb.c</span><br><span>@@ -34,6 +34,12 @@</span><br><span> #include <osmocom/sgsn/gprs_sm.h></span><br><span> #include <osmocom/sgsn/debug.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Has to be called whenever any PDU (signaling, data, ...) has been received */</span><br><span style="color: hsl(120, 100%, 40%);">+void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mmctx->gb.llme)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_PDU_RECEPTION, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Main entry point for incoming 04.08 GPRS messages from Gb */</span><br><span> int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme,</span><br><span> bool drop_cipherable)</span><br><span>@@ -50,7 +56,7 @@</span><br><span> msgid2mmctx(mmctx, msg);</span><br><span> rate_ctr_inc(&mmctx->ctrg->ctr[GMM_CTR_PKTS_SIG_IN]);</span><br><span> mmctx->gb.llme = llme;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_PDU_RECEPTION, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_gb_recv_pdu(mmctx);</span><br><span> }</span><br><span> </span><br><span> /* MMCTX can be NULL */</span><br><span>diff --git a/src/sgsn/gprs_sndcp.c b/src/sgsn/gprs_sndcp.c</span><br><span>index d9aa1e5..01be57e 100644</span><br><span>--- a/src/sgsn/gprs_sndcp.c</span><br><span>+++ b/src/sgsn/gprs_sndcp.c</span><br><span>@@ -31,6 +31,7 @@</span><br><span> #include <osmocom/gprs/gprs_bssgp.h></span><br><span> </span><br><span> #include <osmocom/sgsn/debug.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/sgsn/gprs_gb.h></span><br><span> #include <osmocom/sgsn/gprs_llc.h></span><br><span> #include <osmocom/sgsn/sgsn.h></span><br><span> #include <osmocom/sgsn/gprs_sndcp.h></span><br><span>@@ -745,6 +746,7 @@</span><br><span> struct sndcp_common_hdr *sch = (struct sndcp_common_hdr *)hdr;</span><br><span> struct sndcp_comp_hdr *scomph = NULL;</span><br><span> struct sndcp_udata_hdr *suh;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_mm_ctx *mmctx;</span><br><span> uint8_t *npdu;</span><br><span> uint16_t npdu_num __attribute__((unused));</span><br><span> int npdu_len;</span><br><span>@@ -778,6 +780,15 @@</span><br><span> /* FIXME: move this RA_ID up to the LLME or even higher */</span><br><span> bssgp_parse_cell_id(&sne->ra_id, msgb_bcid(msg));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ mmctx = sgsn_mm_ctx_by_tlli(msgb_tlli(msg), &sne->ra_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!mmctx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSNDCP, LOGL_ERROR, "Message for non-existing MM ctx "</span><br><span style="color: hsl(120, 100%, 40%);">+ "(lle=%p, TLLI=%08x, SAPI=%u, NSAPI=%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ lle, lle->llme->tlli, lle->sapi, sch->nsapi);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_gb_recv_pdu(mmctx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (scomph) {</span><br><span> sne->defrag.pcomp = scomph->pcomp;</span><br><span> sne->defrag.dcomp = scomph->dcomp;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15535">change 15535</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/osmo-sgsn/+/15535"/><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-Change-Id: I78f40762fb17bbd4a6f35608a793f8e5271e9b86 </div>
<div style="display:none"> Gerrit-Change-Number: 15535 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>