<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15354">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce FSM mm_state_iu_fsm<br><br>Implement TS 23.060 6.1.2 Mobility Management States (Iu 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: I4c9cf8c27194817c56e8949af0205e1cc14af317<br>---<br>M include/osmocom/sgsn/Makefile.am<br>M include/osmocom/sgsn/gprs_gmm.h<br>A include/osmocom/sgsn/gprs_mm_state_iu_fsm.h<br>M include/osmocom/sgsn/gprs_sgsn.h<br>M src/gprs/Makefile.am<br>M src/gprs/gprs_gmm.c<br>A src/gprs/gprs_mm_state_iu_fsm.c<br>M src/gprs/gprs_ranap.c<br>M src/gprs/gprs_sgsn.c<br>M tests/sgsn/Makefile.am<br>10 files changed, 165 insertions(+), 65 deletions(-)<br><br></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 d6ee445..0ab00fe 100644</span><br><span>--- a/include/osmocom/sgsn/Makefile.am</span><br><span>+++ b/include/osmocom/sgsn/Makefile.am</span><br><span>@@ -8,6 +8,7 @@</span><br><span> gprs_gmm.h \</span><br><span> gprs_gmm_attach.h \</span><br><span> gprs_mm_state_gb_fsm.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_mm_state_iu_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 2fa12e5..982cd93 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_gmm.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_gmm.h</span><br><span>@@ -49,7 +49,5 @@</span><br><span> </span><br><span> void pdp_ctx_detach_mm_ctx(struct sgsn_pdp_ctx *pdp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-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%);">-</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_iu_fsm.h b/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h</span><br><span>new file mode 100644</span><br><span>index 0000000..7f02bcc</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h</span><br><span>@@ -0,0 +1,24 @@</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_iu_fsm_states {</span><br><span style="color: hsl(120, 100%, 40%);">+ ST_PMM_DETACHED,</span><br><span style="color: hsl(120, 100%, 40%);">+ ST_PMM_CONNECTED,</span><br><span style="color: hsl(120, 100%, 40%);">+ ST_PMM_IDLE</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_iu_fsm_events {</span><br><span style="color: hsl(120, 100%, 40%);">+ E_PMM_PS_ATTACH,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* E_PS_DETACH, TODO: not used */</span><br><span style="color: hsl(120, 100%, 40%);">+ E_PMM_PS_CONN_RELEASE,</span><br><span style="color: hsl(120, 100%, 40%);">+ E_PMM_PS_CONN_ESTABLISH,</span><br><span style="color: hsl(120, 100%, 40%);">+ E_PMM_IMPLICIT_DETACH, /* = E_PS_ATTACH_REJECT, E_RAU_REJECT */</span><br><span style="color: hsl(120, 100%, 40%);">+ E_PMM_RA_UPDATE, /* = Serving RNC relocation */</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_iu_fsm;</span><br><span>diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>index 382019c..8f16c5b 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,13 +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.2 Mobility Management States (Iu mode) */</span><br><span style="color: hsl(0, 100%, 40%);">-enum gprs_mm_state_iu {</span><br><span style="color: hsl(0, 100%, 40%);">- PMM_DETACHED,</span><br><span style="color: hsl(0, 100%, 40%);">- PMM_CONNECTED,</span><br><span style="color: hsl(0, 100%, 40%);">- PMM_IDLE</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> enum gprs_mm_ctr {</span><br><span> GMM_CTR_PKTS_SIG_IN,</span><br><span> GMM_CTR_PKTS_SIG_OUT,</span><br><span>@@ -171,7 +164,7 @@</span><br><span> struct ranap_ue_conn_ctx *ue_ctx;</span><br><span> struct service_info service;</span><br><span> /* TS 23.060 6.1.2 Mobility Management States (Iu mode) */</span><br><span style="color: hsl(0, 100%, 40%);">- enum gprs_mm_state_iu mm_state;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_fsm_inst *mm_state_fsm;</span><br><span> } iu;</span><br><span> struct {</span><br><span> struct osmo_fsm_inst *fsm;</span><br><span>diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am</span><br><span>index 94861e2..05d5b4c 100644</span><br><span>--- a/src/gprs/Makefile.am</span><br><span>+++ b/src/gprs/Makefile.am</span><br><span>@@ -64,6 +64,7 @@</span><br><span> gprs_gmm_attach.c \</span><br><span> gprs_gmm.c \</span><br><span> gprs_mm_state_gb_fsm.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_mm_state_iu_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_gmm.c b/src/gprs/gprs_gmm.c</span><br><span>index 81f4273..edb7eea 100644</span><br><span>--- a/src/gprs/gprs_gmm.c</span><br><span>+++ b/src/gprs/gprs_gmm.c</span><br><span>@@ -56,6 +56,7 @@</span><br><span> #include <osmocom/sgsn/sgsn.h></span><br><span> #include <osmocom/sgsn/gprs_gmm_attach.h></span><br><span> #include <osmocom/sgsn/gprs_mm_state_gb_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/sgsn/gprs_mm_state_iu_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>@@ -103,52 +104,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_iu_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(PMM_DETACHED),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(PMM_CONNECTED),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(PMM_IDLE),</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 style="color: hsl(0, 100%, 40%);">-static void mmctx_change_gtpu_endpoints_to_sgsn(struct sgsn_mm_ctx *mm_ctx)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- char buf[INET_ADDRSTRLEN];</span><br><span style="color: hsl(0, 100%, 40%);">- struct sgsn_pdp_ctx *pdp;</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(pdp, &mm_ctx->pdp_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_INFO, mm_ctx, "Changing GTP-U endpoints %s -> %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_gtp_ntoa(&pdp->lib->gsnlu),</span><br><span style="color: hsl(0, 100%, 40%);">- inet_ntop(AF_INET, &sgsn->cfg.gtp_listenaddr.sin_addr, buf, sizeof(buf)));</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_pdp_upd_gtp_u(pdp,</span><br><span style="color: hsl(0, 100%, 40%);">- &sgsn->cfg.gtp_listenaddr.sin_addr,</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(sgsn->cfg.gtp_listenaddr.sin_addr));</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_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_iu 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_UTRAN_Iu);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ctx->iu.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 PMM state from %s to %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(gprs_mm_state_iu_names, ctx->iu.mm_state),</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(gprs_mm_state_iu_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 PMM_IDLE:</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: start RA Upd timer */</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_change_gtpu_endpoints_to_sgsn(ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case PMM_CONNECTED:</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case PMM_DETACHED:</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->iu.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>@@ -260,7 +215,7 @@</span><br><span> </span><br><span> switch(ctx->ran_type) {</span><br><span> case MM_CTX_T_UTRAN_Iu:</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_set_pmm_state(ctx, PMM_DETACHED);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(ctx->iu.mm_state_fsm, E_PMM_IMPLICIT_DETACH, NULL);</span><br><span> break;</span><br><span> case MM_CTX_T_GERAN_Gb:</span><br><span> osmo_fsm_inst_dispatch(ctx->gb.mm_state_fsm, E_MM_IMPLICIT_DETACH, NULL);</span><br><span>@@ -1019,7 +974,7 @@</span><br><span> #ifdef BUILD_IU</span><br><span> case GSM48_MT_GMM_SERVICE_REQ:</span><br><span> ctx->pending_req = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_set_pmm_state(ctx, PMM_CONNECTED);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(ctx->iu.mm_state_fsm, E_PMM_PS_ATTACH, NULL);</span><br><span> rc = gsm48_tx_gmm_service_ack(ctx);</span><br><span> </span><br><span> if (ctx->iu.service.type != GPRS_SERVICE_T_SIGNALLING)</span><br><span>@@ -2014,7 +1969,7 @@</span><br><span> mmctx->gmm_state = GMM_REGISTERED_NORMAL;</span><br><span> switch(mmctx->ran_type) {</span><br><span> case MM_CTX_T_UTRAN_Iu:</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_set_pmm_state(mmctx, PMM_CONNECTED);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mmctx->iu.mm_state_fsm, E_PMM_PS_ATTACH, NULL);</span><br><span> break;</span><br><span> case MM_CTX_T_GERAN_Gb:</span><br><span> /* Unassign the old TLLI */</span><br><span>@@ -2044,7 +1999,7 @@</span><br><span> mmctx->gmm_state = GMM_REGISTERED_NORMAL;</span><br><span> switch(mmctx->ran_type) {</span><br><span> case MM_CTX_T_UTRAN_Iu:</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_set_pmm_state(mmctx, PMM_CONNECTED);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mmctx->iu.mm_state_fsm, E_PMM_RA_UPDATE, NULL);</span><br><span> break;</span><br><span> case MM_CTX_T_GERAN_Gb:</span><br><span> /* Unassign the old TLLI */</span><br><span>diff --git a/src/gprs/gprs_mm_state_iu_fsm.c b/src/gprs/gprs_mm_state_iu_fsm.c</span><br><span>new file mode 100644</span><br><span>index 0000000..1ed5f56</span><br><span>--- /dev/null</span><br><span>+++ b/src/gprs/gprs_mm_state_iu_fsm.c</span><br><span>@@ -0,0 +1,121 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include <arpa/inet.h></span><br><span style="color: hsl(120, 100%, 40%);">+</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_iu_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_iu_fsm_timeouts[32] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [ST_PMM_DETACHED] = { },</span><br><span style="color: hsl(120, 100%, 40%);">+ [ST_PMM_CONNECTED] = { },</span><br><span style="color: hsl(120, 100%, 40%);">+ [ST_PMM_IDLE] = { },</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_iu_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_iu_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 mmctx_change_gtpu_endpoints_to_sgsn(struct sgsn_mm_ctx *mm_ctx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ char buf[INET_ADDRSTRLEN];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_pdp_ctx *pdp;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(pdp, &mm_ctx->pdp_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_INFO, mm_ctx, "Changing GTP-U endpoints %s -> %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_gtp_ntoa(&pdp->lib->gsnlu),</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET, &sgsn->cfg.gtp_listenaddr.sin_addr, buf, sizeof(buf)));</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_pdp_upd_gtp_u(pdp,</span><br><span style="color: hsl(120, 100%, 40%);">+ &sgsn->cfg.gtp_listenaddr.sin_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(sgsn->cfg.gtp_listenaddr.sin_addr));</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_pmm_detached(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_PMM_PS_ATTACH:</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_state_iu_fsm_state_chg(fi, ST_PMM_CONNECTED);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E_PMM_IMPLICIT_DETACH:</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_pmm_connected(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_PMM_PS_CONN_RELEASE:</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_state_iu_fsm_state_chg(fi, ST_PMM_IDLE);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E_PMM_IMPLICIT_DETACH:</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_state_iu_fsm_state_chg(fi, ST_PMM_DETACHED);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E_PMM_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_pmm_idle_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_mm_ctx *ctx = fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ mmctx_change_gtpu_endpoints_to_sgsn(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%);">+static void st_pmm_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_PMM_PS_CONN_ESTABLISH:</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_state_iu_fsm_state_chg(fi, ST_PMM_CONNECTED);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E_PMM_IMPLICIT_DETACH:</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_state_iu_fsm_state_chg(fi, ST_PMM_DETACHED);</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_iu_fsm_states[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [ST_PMM_DETACHED] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = X(E_PMM_PS_ATTACH) | X(E_PMM_IMPLICIT_DETACH),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask = X(ST_PMM_CONNECTED),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "Detached",</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_pmm_detached,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [ST_PMM_CONNECTED] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = X(E_PMM_PS_CONN_RELEASE) | X(E_PMM_RA_UPDATE) | X(E_PMM_IMPLICIT_DETACH),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask = X(ST_PMM_DETACHED) | X(ST_PMM_IDLE),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "Connected",</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_pmm_connected,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [ST_PMM_IDLE] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = X(E_PMM_IMPLICIT_DETACH) | X(E_PMM_PS_CONN_ESTABLISH),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask = X(ST_PMM_DETACHED) | X(ST_PMM_CONNECTED),</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "Idle",</span><br><span style="color: hsl(120, 100%, 40%);">+ .onenter = st_pmm_idle_on_enter,</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_pmm_idle,</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_iu_fsm_event_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(E_PMM_PS_ATTACH),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(E_PMM_PS_CONN_RELEASE),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(E_PMM_PS_CONN_ESTABLISH),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(E_PMM_IMPLICIT_DETACH),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(E_PMM_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%);">+struct osmo_fsm mm_state_iu_fsm = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "MM_STATE_Iu",</span><br><span style="color: hsl(120, 100%, 40%);">+ .states = mm_state_iu_fsm_states,</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_states = ARRAY_SIZE(mm_state_iu_fsm_states),</span><br><span style="color: hsl(120, 100%, 40%);">+ .event_names = mm_state_iu_fsm_event_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ .log_subsys = DMM,</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_iu_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_iu_fsm);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/gprs/gprs_ranap.c b/src/gprs/gprs_ranap.c</span><br><span>index 836937b..027b666 100644</span><br><span>--- a/src/gprs/gprs_ranap.c</span><br><span>+++ b/src/gprs/gprs_ranap.c</span><br><span>@@ -36,6 +36,7 @@</span><br><span> #include <osmocom/sgsn/sgsn.h></span><br><span> #include <osmocom/sgsn/gprs_ranap.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_iu_fsm.h></span><br><span> </span><br><span> /* Send RAB activation requests for all PDP contexts */</span><br><span> void activate_pdp_rabs(struct sgsn_mm_ctx *ctx)</span><br><span>@@ -134,12 +135,11 @@</span><br><span> /* fall thru */</span><br><span> case RANAP_IU_EVENT_LINK_INVALIDATED:</span><br><span> /* Clean up ranap_ue_conn_ctx here */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mm)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mm) {</span><br><span> LOGMMCTXP(LOGL_INFO, mm, "IU release for imsi %s\n", mm->imsi);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mm->iu.mm_state_fsm, E_PMM_PS_CONN_RELEASE, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span> LOGIUP(ctx, LOGL_INFO, "IU release\n");</span><br><span style="color: hsl(0, 100%, 40%);">- if (mm && mm->iu.mm_state == PMM_CONNECTED)</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_set_pmm_state(mm, PMM_IDLE);</span><br><span> rc = 0;</span><br><span> break;</span><br><span> case RANAP_IU_EVENT_SECURITY_MODE_COMPLETE:</span><br><span>diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c</span><br><span>index 82855a6..2334707 100644</span><br><span>--- a/src/gprs/gprs_sgsn.c</span><br><span>+++ b/src/gprs/gprs_sgsn.c</span><br><span>@@ -43,6 +43,7 @@</span><br><span> #include <osmocom/sgsn/signal.h></span><br><span> #include <osmocom/sgsn/gprs_gmm_attach.h></span><br><span> #include <osmocom/sgsn/gprs_mm_state_gb_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/sgsn/gprs_mm_state_iu_fsm.h></span><br><span> #include <osmocom/sgsn/gprs_llc.h></span><br><span> </span><br><span> #include <pdp.h></span><br><span>@@ -266,6 +267,7 @@</span><br><span> struct sgsn_mm_ctx *sgsn_mm_ctx_alloc_iu(void *uectx)</span><br><span> {</span><br><span> #if BUILD_IU</span><br><span style="color: hsl(120, 100%, 40%);">+ char buf[32];</span><br><span> struct sgsn_mm_ctx *ctx;</span><br><span> struct ranap_ue_conn_ctx *ue_ctx = uectx;</span><br><span> </span><br><span>@@ -279,7 +281,9 @@</span><br><span> ctx->iu.ue_ctx = ue_ctx;</span><br><span> ctx->iu.ue_ctx->rab_assign_addr_enc = sgsn->cfg.iu.rab_assign_addr_enc;</span><br><span> ctx->iu.new_key = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- ctx->iu.mm_state = PMM_DETACHED;</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(buf, sizeof(buf), "%" PRIu32, ue_ctx->conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx->iu.mm_state_fsm = osmo_fsm_inst_alloc(&mm_state_iu_fsm, ctx, ctx, LOGL_DEBUG, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> return ctx;</span><br><span> #else</span><br><span>@@ -353,6 +357,8 @@</span><br><span> gmm_att_req_free(mm);</span><br><span> if (mm->gb.mm_state_fsm)</span><br><span> osmo_fsm_inst_free(mm->gb.mm_state_fsm);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mm->iu.mm_state_fsm)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_free(mm->iu.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 8a26d88..47189e5 100644</span><br><span>--- a/tests/sgsn/Makefile.am</span><br><span>+++ b/tests/sgsn/Makefile.am</span><br><span>@@ -51,6 +51,7 @@</span><br><span> $(top_builddir)/src/gprs/gprs_gmm_attach.o \</span><br><span> $(top_builddir)/src/gprs/gprs_gmm.o \</span><br><span> $(top_builddir)/src/gprs/gprs_mm_state_gb_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/gprs/gprs_mm_state_iu_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/+/15354">change 15354</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/+/15354"/><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: I4c9cf8c27194817c56e8949af0205e1cc14af317 </div>
<div style="display:none"> Gerrit-Change-Number: 15354 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>