<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15353">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce FSM mm_state_gb_fsm<br><br>Implement TS 23.060 6.1.1 Mobility Management States (A/Gb mode) using<br>osmocom FSM and drop old implementation.<br>Most of the logic on each state is still kept in gprs_gmm.c, will be<br>inserted into the FSM later.<br><br>Change-Id: I04004423e993107374d5a3549b8a93ac169251dd<br>---<br>M include/osmocom/sgsn/Makefile.am<br>M include/osmocom/sgsn/gprs_gmm.h<br>A include/osmocom/sgsn/gprs_mm_state_gb_fsm.h<br>M include/osmocom/sgsn/gprs_sgsn.h<br>M src/gprs/Makefile.am<br>M src/gprs/gprs_gb.c<br>M src/gprs/gprs_gmm.c<br>A src/gprs/gprs_mm_state_gb_fsm.c<br>M src/gprs/gprs_sgsn.c<br>M tests/sgsn/Makefile.am<br>10 files changed, 154 insertions(+), 125 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/53/15353/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am</span><br><span>index b91c9f1..d6ee445 100644</span><br><span>--- a/include/osmocom/sgsn/Makefile.am</span><br><span>+++ b/include/osmocom/sgsn/Makefile.am</span><br><span>@@ -7,6 +7,7 @@</span><br><span> gprs_gb_parse.h \</span><br><span> gprs_gmm.h \</span><br><span> gprs_gmm_attach.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_mm_state_gb_fsm.h \</span><br><span> gprs_llc.h \</span><br><span> gprs_llc_xid.h \</span><br><span> gprs_ranap.h \</span><br><span>diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h</span><br><span>index 6c72cda..2fa12e5 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_gmm.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_gmm.h</span><br><span>@@ -50,8 +50,6 @@</span><br><span> void pdp_ctx_detach_mm_ctx(struct sgsn_pdp_ctx *pdp);</span><br><span> </span><br><span> void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_iu state);</span><br><span style="color: hsl(0, 100%, 40%);">-void mmctx_state_timer_start(struct sgsn_mm_ctx *mm, unsigned int T);</span><br><span style="color: hsl(0, 100%, 40%);">-void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_gb state);</span><br><span> </span><br><span> void msgid2mmctx(struct sgsn_mm_ctx *mm, const struct msgb *msg);</span><br><span> #endif /* _GPRS_GMM_H */</span><br><span>diff --git a/include/osmocom/sgsn/gprs_mm_state_gb_fsm.h b/include/osmocom/sgsn/gprs_mm_state_gb_fsm.h</span><br><span>new file mode 100644</span><br><span>index 0000000..e69e1e1</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/sgsn/gprs_mm_state_gb_fsm.h</span><br><span>@@ -0,0 +1,26 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct sgsn_mm_ctx;</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%);">+/* TS 23.060 6.1.1 Mobility Management States (A/Gb mode) */</span><br><span style="color: hsl(120, 100%, 40%);">+enum mm_state_gb_fsm_states {</span><br><span style="color: hsl(120, 100%, 40%);">+ ST_MM_IDLE,</span><br><span style="color: hsl(120, 100%, 40%);">+ ST_MM_READY,</span><br><span style="color: hsl(120, 100%, 40%);">+ ST_MM_STANDBY</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%);">+enum mm_state_gb_fsm_events {</span><br><span style="color: hsl(120, 100%, 40%);">+ E_MM_GPRS_ATTACH,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* E_GPRS_DETACH, TODO: not used */</span><br><span style="color: hsl(120, 100%, 40%);">+ E_MM_PDU_RECEPTION,</span><br><span style="color: hsl(120, 100%, 40%);">+ E_MM_IMPLICIT_DETACH, /* = E_MM_CANCEL_LOCATION */</span><br><span style="color: hsl(120, 100%, 40%);">+ E_MM_READY_TIMER_EXPIRY,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* E_FORCE_TO_STANDBY, TODO: not used */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* E_ABNSORMAL_RLC_CONDITION, TODO: not used */</span><br><span style="color: hsl(120, 100%, 40%);">+ E_MM_RA_UPDATE,</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%);">+extern struct osmo_fsm mm_state_gb_fsm;</span><br><span>diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>index f64e07b..382019c 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>@@ -32,12 +32,6 @@</span><br><span> GMM_DEREGISTERED_INIT, /* 4.1.3.3.1.4 */</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* TS 23.060 6.1.1 Mobility Management States (A/Gb mode) */</span><br><span style="color: hsl(0, 100%, 40%);">-enum gprs_mm_state_gb {</span><br><span style="color: hsl(0, 100%, 40%);">- MM_IDLE,</span><br><span style="color: hsl(0, 100%, 40%);">- MM_READY,</span><br><span style="color: hsl(0, 100%, 40%);">- MM_STANDBY</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span> /* TS 23.060 6.1.2 Mobility Management States (Iu mode) */</span><br><span> enum gprs_mm_state_iu {</span><br><span> PMM_DETACHED,</span><br><span>@@ -161,10 +155,7 @@</span><br><span> uint32_t tlli_new;</span><br><span> </span><br><span> /* TS 23.060 6.1.1 Mobility Management States (A/Gb mode) */</span><br><span style="color: hsl(0, 100%, 40%);">- enum gprs_mm_state_gb mm_state;</span><br><span style="color: hsl(0, 100%, 40%);">- /* timer for mm state. state=READY: T3314 (aka TS 23.060 "READY timer") */</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_timer_list state_timer;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int state_T; /* Txxxx number but only used for mm_state */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_fsm_inst *mm_state_fsm;</span><br><span> } gb;</span><br><span> struct {</span><br><span> int new_key;</span><br><span>diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am</span><br><span>index 85ba906..94861e2 100644</span><br><span>--- a/src/gprs/Makefile.am</span><br><span>+++ b/src/gprs/Makefile.am</span><br><span>@@ -63,6 +63,7 @@</span><br><span> gprs_gb.c \</span><br><span> gprs_gmm_attach.c \</span><br><span> gprs_gmm.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_mm_state_gb_fsm.c \</span><br><span> gprs_ranap.c \</span><br><span> gprs_sgsn.c \</span><br><span> gprs_sndcp.c \</span><br><span>diff --git a/src/gprs/gprs_gb.c b/src/gprs/gprs_gb.c</span><br><span>index 43af434..65342cf 100644</span><br><span>--- a/src/gprs/gprs_gb.c</span><br><span>+++ b/src/gprs/gprs_gb.c</span><br><span>@@ -28,25 +28,11 @@</span><br><span> </span><br><span> #include "bscconfig.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/sgsn/gprs_mm_state_gb_fsm.h></span><br><span> #include <osmocom/sgsn/gprs_sgsn.h></span><br><span> #include <osmocom/sgsn/gprs_gmm.h></span><br><span> #include <osmocom/sgsn/debug.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Update the MM context state */</span><br><span style="color: hsl(0, 100%, 40%);">-static void gsm0408_gprs_notify_pdu_gb(struct sgsn_mm_ctx *mmctx)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- switch (mmctx->gb.mm_state) {</span><br><span style="color: hsl(0, 100%, 40%);">- case MM_STANDBY:</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_set_mm_state(mmctx, MM_READY);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case MM_READY: /* RE-arm the timer upon receival of Gb PDUs */</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_state_timer_start(mmctx, 3314);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- break;</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> /* 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>@@ -63,13 +49,11 @@</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(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_PDU_RECEPTION, NULL);</span><br><span> }</span><br><span> </span><br><span> /* MMCTX can be NULL */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mmctx)</span><br><span style="color: hsl(0, 100%, 40%);">- gsm0408_gprs_notify_pdu_gb(mmctx);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> switch (pdisc) {</span><br><span> case GSM48_PDISC_MM_GPRS:</span><br><span> rc = gsm0408_rcv_gmm(mmctx, msg, llme, drop_cipherable);</span><br><span>diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c</span><br><span>index 766d0f4..75d99fb 100644</span><br><span>--- a/src/gprs/gprs_gmm.c</span><br><span>+++ b/src/gprs/gprs_gmm.c</span><br><span>@@ -55,6 +55,7 @@</span><br><span> #include <osmocom/sgsn/gprs_subscriber.h></span><br><span> #include <osmocom/sgsn/sgsn.h></span><br><span> #include <osmocom/sgsn/gprs_gmm_attach.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/sgsn/gprs_mm_state_gb_fsm.h></span><br><span> #include <osmocom/sgsn/signal.h></span><br><span> #include <osmocom/sgsn/gprs_sndcp.h></span><br><span> #include <osmocom/sgsn/gprs_ranap.h></span><br><span>@@ -102,13 +103,6 @@</span><br><span> },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct value_string gprs_mm_state_gb_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(MM_IDLE),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(MM_READY),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(MM_STANDBY),</span><br><span style="color: hsl(0, 100%, 40%);">- { 0, NULL }</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static const struct value_string gprs_mm_state_iu_names[] = {</span><br><span> OSMO_VALUE_STRING(PMM_DETACHED),</span><br><span> OSMO_VALUE_STRING(PMM_CONNECTED),</span><br><span>@@ -130,56 +124,6 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mmctx_state_timer_cb(void *_mm)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct sgsn_mm_ctx *mm = _mm;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (mm->gb.state_T) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 3314:</span><br><span style="color: hsl(0, 100%, 40%);">- switch (mm->gb.mm_state) {</span><br><span style="color: hsl(0, 100%, 40%);">- case MM_READY:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_INFO, mm, "T3314 expired\n");</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_set_mm_state(mm, MM_STANDBY);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_ERROR, mm, "T3314 expired in state %s != MM_READY\n",</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(gprs_mm_state_gb_names, mm->gb.mm_state));</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_ERROR, mm, "state timer expired in unknown mode %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mm->gb.state_T);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</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 style="color: hsl(0, 100%, 40%);">-void mmctx_state_timer_start(struct sgsn_mm_ctx *mm, unsigned int T)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned long seconds;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (mm->gb.state_T && mm->gb.state_T != T)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_ERROR, mm, "Attempting to start timer %u but %u is active!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- T, mm->gb.state_T);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- mm->gb.state_T = T;</span><br><span style="color: hsl(0, 100%, 40%);">- mm->gb.state_timer.data = mm;</span><br><span style="color: hsl(0, 100%, 40%);">- mm->gb.state_timer.cb = &mmctx_state_timer_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- seconds = osmo_tdef_get(sgsn->cfg.T_defs, T, OSMO_TDEF_S, -1);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_schedule(&mm->gb.state_timer, seconds, 0);</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%);">-static void mmctx_state_timer_stop(struct sgsn_mm_ctx *mm, unsigned int T)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (mm->gb.state_T == T)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_del(&mm->gb.state_timer);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_ERROR, mm, "Attempting to stop timer %u but %u is active!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- T, mm->gb.state_T);</span><br><span style="color: hsl(0, 100%, 40%);">- mm->gb.state_T = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_iu state)</span><br><span> {</span><br><span> OSMO_ASSERT(ctx->ran_type == MM_CTX_T_UTRAN_Iu);</span><br><span>@@ -205,35 +149,6 @@</span><br><span> ctx->iu.mm_state = state;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_gb state)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ctx->ran_type == MM_CTX_T_GERAN_Gb);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ctx->gb.mm_state == state)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_INFO, ctx, "Changing MM state from %s to %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(gprs_mm_state_gb_names, ctx->gb.mm_state),</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(gprs_mm_state_gb_names, state));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (state) {</span><br><span style="color: hsl(0, 100%, 40%);">- case MM_READY:</span><br><span style="color: hsl(0, 100%, 40%);">- /* on expiration, T3314 moves mm state back to MM_STANDBY */</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_state_timer_start(ctx, 3314);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case MM_IDLE:</span><br><span style="color: hsl(0, 100%, 40%);">- if (ctx->gb.mm_state == MM_READY)</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_state_timer_stop(ctx, 3314);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case MM_STANDBY:</span><br><span style="color: hsl(0, 100%, 40%);">- if (ctx->gb.mm_state == MM_READY)</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_state_timer_stop(ctx, 3314);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</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%);">- ctx->gb.mm_state = state;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Our implementation, should be kept in SGSN */</span><br><span> </span><br><span> static void mmctx_timer_cb(void *_mm);</span><br><span>@@ -342,7 +257,7 @@</span><br><span> mmctx_set_pmm_state(ctx, PMM_DETACHED);</span><br><span> break;</span><br><span> case MM_CTX_T_GERAN_Gb:</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_set_mm_state(ctx, MM_IDLE);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(ctx->gb.mm_state_fsm, E_MM_IMPLICIT_DETACH, NULL);</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span>@@ -2097,7 +2012,7 @@</span><br><span> gprs_llme_copy_key(mmctx, mmctx->gb.llme);</span><br><span> gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED,</span><br><span> mmctx->gb.tlli_new);</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_set_mm_state(mmctx, MM_READY);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_GPRS_ATTACH, NULL);</span><br><span> break;</span><br><span> }</span><br><span> rc = 0;</span><br><span>@@ -2126,7 +2041,7 @@</span><br><span> mmctx->gb.tlli = mmctx->gb.tlli_new;</span><br><span> gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED,</span><br><span> mmctx->gb.tlli_new);</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_set_mm_state(mmctx, MM_READY);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_RA_UPDATE, NULL);</span><br><span> break;</span><br><span> }</span><br><span> rc = 0;</span><br><span>diff --git a/src/gprs/gprs_mm_state_gb_fsm.c b/src/gprs/gprs_mm_state_gb_fsm.c</span><br><span>new file mode 100644</span><br><span>index 0000000..2056540</span><br><span>--- /dev/null</span><br><span>+++ b/src/gprs/gprs_mm_state_gb_fsm.c</span><br><span>@@ -0,0 +1,112 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/tdef.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/sgsn/gprs_mm_state_gb_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/sgsn/debug.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/sgsn/sgsn.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define X(s) (1 << (s))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct osmo_tdef_state_timeout mm_state_gb_fsm_timeouts[32] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [ST_MM_IDLE] = { },</span><br><span style="color: hsl(120, 100%, 40%);">+ [ST_MM_READY] = { .T=3314 },</span><br><span style="color: hsl(120, 100%, 40%);">+ [ST_MM_STANDBY] = { },</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%);">+#define mm_state_gb_fsm_state_chg(fi, NEXT_STATE) \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, mm_state_gb_fsm_timeouts, sgsn->cfg.T_defs, -1)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_mm_idle(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch(event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case E_MM_GPRS_ATTACH:</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_state_gb_fsm_state_chg(fi, ST_MM_READY);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E_MM_PDU_RECEPTION:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_mm_ready(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned long t_secs;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch(event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case E_MM_READY_TIMER_EXPIRY:</span><br><span style="color: hsl(120, 100%, 40%);">+ case E_MM_IMPLICIT_DETACH:</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_state_gb_fsm_state_chg(fi, ST_MM_STANDBY);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E_MM_PDU_RECEPTION:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RE-arm the READY timer upon receival of Gb PDUs */</span><br><span style="color: hsl(120, 100%, 40%);">+ t_secs = osmo_tdef_get(sgsn->cfg.T_defs, 3314, OSMO_TDEF_S, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&fi->timer, t_secs, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E_MM_RA_UPDATE:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_mm_standby(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch(event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case E_MM_PDU_RECEPTION:</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_state_gb_fsm_state_chg(fi, ST_MM_READY);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static struct osmo_fsm_state mm_state_gb_fsm_states[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [ST_MM_IDLE] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = X(E_MM_GPRS_ATTACH) | X(E_MM_PDU_RECEPTION),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask = X(ST_MM_READY),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "Idle",</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_mm_idle,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [ST_MM_READY] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = X(E_MM_READY_TIMER_EXPIRY) | X(E_MM_RA_UPDATE) | X(E_MM_IMPLICIT_DETACH) | X(E_MM_PDU_RECEPTION),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask = X(ST_MM_IDLE) | X(ST_MM_STANDBY),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "Ready",</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_mm_ready,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [ST_MM_STANDBY] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = X(E_MM_PDU_RECEPTION),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask = X(ST_MM_IDLE) | X(ST_MM_READY),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "Standby",</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_mm_standby,</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string mm_state_gb_fsm_event_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(E_MM_GPRS_ATTACH),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(E_MM_PDU_RECEPTION),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(E_MM_IMPLICIT_DETACH),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(E_MM_READY_TIMER_EXPIRY),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(E_MM_RA_UPDATE),</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</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%);">+int mm_state_gb_fsm_timer_cb(struct osmo_fsm_inst *fi)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch(fi->state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case ST_MM_READY:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* timer for mm state. state=READY: T3314 (aka TS 23.060 "READY timer") */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, E_MM_READY_TIMER_EXPIRY, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+ return 0;</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%);">+struct osmo_fsm mm_state_gb_fsm = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "MM_STATE_Gb",</span><br><span style="color: hsl(120, 100%, 40%);">+ .states = mm_state_gb_fsm_states,</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_states = ARRAY_SIZE(mm_state_gb_fsm_states),</span><br><span style="color: hsl(120, 100%, 40%);">+ .event_names = mm_state_gb_fsm_event_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ .log_subsys = DMM,</span><br><span style="color: hsl(120, 100%, 40%);">+ .timer_cb = mm_state_gb_fsm_timer_cb,</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%);">+static __attribute__((constructor)) void mm_state_gb_fsm_init(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_register(&mm_state_gb_fsm);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c</span><br><span>index 6acc66e..82855a6 100644</span><br><span>--- a/src/gprs/gprs_sgsn.c</span><br><span>+++ b/src/gprs/gprs_sgsn.c</span><br><span>@@ -42,6 +42,7 @@</span><br><span> #include <osmocom/sgsn/gprs_utils.h></span><br><span> #include <osmocom/sgsn/signal.h></span><br><span> #include <osmocom/sgsn/gprs_gmm_attach.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/sgsn/gprs_mm_state_gb_fsm.h></span><br><span> #include <osmocom/sgsn/gprs_llc.h></span><br><span> </span><br><span> #include <pdp.h></span><br><span>@@ -243,6 +244,7 @@</span><br><span> const struct gprs_ra_id *raid)</span><br><span> {</span><br><span> struct sgsn_mm_ctx *ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ char buf[32];</span><br><span> </span><br><span> ctx = sgsn_mm_ctx_alloc(tlli);</span><br><span> if (!ctx)</span><br><span>@@ -251,8 +253,9 @@</span><br><span> memcpy(&ctx->ra, raid, sizeof(ctx->ra));</span><br><span> ctx->ran_type = MM_CTX_T_GERAN_Gb;</span><br><span> ctx->gb.tlli = tlli;</span><br><span style="color: hsl(0, 100%, 40%);">- ctx->gb.mm_state = MM_IDLE;</span><br><span> ctx->ciph_algo = sgsn->cfg.cipher;</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(buf, sizeof(buf), "%" PRIu32, tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx->gb.mm_state_fsm = osmo_fsm_inst_alloc(&mm_state_gb_fsm, ctx, ctx, LOGL_DEBUG, buf);</span><br><span> </span><br><span> LOGMMCTXP(LOGL_DEBUG, ctx, "Allocated with %s cipher.\n",</span><br><span> get_value_string(gprs_cipher_names, ctx->ciph_algo));</span><br><span>@@ -334,11 +337,6 @@</span><br><span> osmo_timer_del(&mm->timer);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_timer_pending(&mm->gb.state_timer)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_INFO, mm, "Cancelling MM state timer %u\n", mm->gb.state_T);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_del(&mm->gb.state_timer);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> memset(&sig_data, 0, sizeof(sig_data));</span><br><span> sig_data.mm = mm;</span><br><span> osmo_signal_dispatch(SS_SGSN, S_SGSN_MM_FREE, &sig_data);</span><br><span>@@ -353,6 +351,8 @@</span><br><span> </span><br><span> if (mm->gmm_att_req.fsm)</span><br><span> gmm_att_req_free(mm);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mm->gb.mm_state_fsm)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_free(mm->gb.mm_state_fsm);</span><br><span> </span><br><span> sgsn_mm_ctx_free(mm);</span><br><span> mm = NULL;</span><br><span>diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am</span><br><span>index b035468..8a26d88 100644</span><br><span>--- a/tests/sgsn/Makefile.am</span><br><span>+++ b/tests/sgsn/Makefile.am</span><br><span>@@ -50,6 +50,7 @@</span><br><span> $(top_builddir)/src/gprs/gprs_sndcp.o \</span><br><span> $(top_builddir)/src/gprs/gprs_gmm_attach.o \</span><br><span> $(top_builddir)/src/gprs/gprs_gmm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/gprs/gprs_mm_state_gb_fsm.o \</span><br><span> $(top_builddir)/src/gprs/gprs_sgsn.o \</span><br><span> $(top_builddir)/src/gprs/sgsn_vty.o \</span><br><span> $(top_builddir)/src/gprs/sgsn_libgtp.o \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15353">change 15353</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/+/15353"/><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: I04004423e993107374d5a3549b8a93ac169251dd </div>
<div style="display:none"> Gerrit-Change-Number: 15353 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>