<p>pespin <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15337">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Split enum gprs_pmm_state into Iu and Gb counterparts<br><br>Those two state sets are not part of the same state machine, and are<br>used in different scenarios, so let's split them and handle them in Gb<br>and Iu specific parts of struct sgsn_mm_ctx. This is required in order<br>to improve related code (for instance, use osmocom fsm).<br><br>Change-Id: I6100d607da316da0595886c6968704dd9ccfbde9<br>---<br>M include/osmocom/sgsn/gprs_gmm.h<br>M include/osmocom/sgsn/gprs_sgsn.h<br>M src/gprs/gprs_gb.c<br>M src/gprs/gprs_gmm.c<br>M src/gprs/gprs_ranap.c<br>M src/gprs/gprs_sgsn.c<br>6 files changed, 43 insertions(+), 36 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h</span><br><span>index 9316351..6c72cda 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,9 +49,9 @@</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_pmm_state state);</span><br><span style="color: hsl(120, 100%, 40%);">+void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_iu state);</span><br><span> 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_pmm_state state);</span><br><span style="color: hsl(120, 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_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>index eea9fb0..f64e07b 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,14 +32,17 @@</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 and 6.1.2 Mobility management states A/Gb and Iu mode */</span><br><span style="color: hsl(0, 100%, 40%);">-enum gprs_pmm_state {</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(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 gprs_mm_state_gb {</span><br><span> MM_IDLE,</span><br><span> MM_READY,</span><br><span style="color: hsl(0, 100%, 40%);">- MM_STANDBY,</span><br><span style="color: hsl(120, 100%, 40%);">+ MM_STANDBY</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+/* TS 23.060 6.1.2 Mobility Management States (Iu mode) */</span><br><span style="color: hsl(120, 100%, 40%);">+enum gprs_mm_state_iu {</span><br><span style="color: hsl(120, 100%, 40%);">+ PMM_DETACHED,</span><br><span style="color: hsl(120, 100%, 40%);">+ PMM_CONNECTED,</span><br><span style="color: hsl(120, 100%, 40%);">+ PMM_IDLE</span><br><span> };</span><br><span> </span><br><span> enum gprs_mm_ctr {</span><br><span>@@ -138,7 +141,6 @@</span><br><span> </span><br><span> char imsi[GSM23003_IMSI_MAX_DIGITS+1];</span><br><span> enum gprs_gmm_state gmm_state;</span><br><span style="color: hsl(0, 100%, 40%);">- enum gprs_pmm_state pmm_state; /* Iu: page when in PMM-IDLE mode */</span><br><span> uint32_t p_tmsi;</span><br><span> uint32_t p_tmsi_old; /* old P-TMSI before new is confirmed */</span><br><span> uint32_t p_tmsi_sig;</span><br><span>@@ -158,9 +160,11 @@</span><br><span> uint32_t tlli;</span><br><span> uint32_t tlli_new;</span><br><span> </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 gprs_mm_state_gb mm_state;</span><br><span> /* timer for mm state. state=READY: T3314 (aka TS 23.060 "READY timer") */</span><br><span> 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 pmm_states */</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int state_T; /* Txxxx number but only used for mm_state */</span><br><span> } gb;</span><br><span> struct {</span><br><span> int new_key;</span><br><span>@@ -175,6 +179,8 @@</span><br><span> /* Voice Support Match Indicator */</span><br><span> struct ranap_ue_conn_ctx *ue_ctx;</span><br><span> struct service_info service;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TS 23.060 6.1.2 Mobility Management States (Iu mode) */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gprs_mm_state_iu mm_state;</span><br><span> } iu;</span><br><span> struct {</span><br><span> struct osmo_fsm_inst *fsm;</span><br><span>diff --git a/src/gprs/gprs_gb.c b/src/gprs/gprs_gb.c</span><br><span>index 29bfc53..43af434 100644</span><br><span>--- a/src/gprs/gprs_gb.c</span><br><span>+++ b/src/gprs/gprs_gb.c</span><br><span>@@ -35,7 +35,7 @@</span><br><span> /* Update the MM context state */</span><br><span> static void gsm0408_gprs_notify_pdu_gb(struct sgsn_mm_ctx *mmctx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- switch (mmctx->pmm_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mmctx->gb.mm_state) {</span><br><span> case MM_STANDBY:</span><br><span> mmctx_set_mm_state(mmctx, MM_READY);</span><br><span> break;</span><br><span>diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c</span><br><span>index 33ade4d..badb881 100644</span><br><span>--- a/src/gprs/gprs_gmm.c</span><br><span>+++ b/src/gprs/gprs_gmm.c</span><br><span>@@ -102,16 +102,20 @@</span><br><span> },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct value_string gprs_pmm_state_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(120, 100%, 40%);">+static const struct value_string gprs_mm_state_gb_names[] = {</span><br><span> OSMO_VALUE_STRING(MM_IDLE),</span><br><span> OSMO_VALUE_STRING(MM_READY),</span><br><span> OSMO_VALUE_STRING(MM_STANDBY),</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct value_string gprs_mm_state_iu_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PMM_DETACHED),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PMM_CONNECTED),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PMM_IDLE),</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> static void mmctx_change_gtpu_endpoints_to_sgsn(struct sgsn_mm_ctx *mm_ctx)</span><br><span> {</span><br><span> struct sgsn_pdp_ctx *pdp;</span><br><span>@@ -130,14 +134,14 @@</span><br><span> </span><br><span> switch (mm->gb.state_T) {</span><br><span> case 3314:</span><br><span style="color: hsl(0, 100%, 40%);">- switch (mm->pmm_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mm->gb.mm_state) {</span><br><span> case MM_READY:</span><br><span> LOGMMCTXP(LOGL_INFO, mm, "T3314 expired\n");</span><br><span> mmctx_set_mm_state(mm, MM_STANDBY);</span><br><span> break;</span><br><span> default:</span><br><span> 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_pmm_state_names, mm->pmm_state));</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(gprs_mm_state_gb_names, mm->gb.mm_state));</span><br><span> break;</span><br><span> }</span><br><span> break;</span><br><span>@@ -174,16 +178,16 @@</span><br><span> mm->gb.state_T = 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state)</span><br><span style="color: hsl(120, 100%, 40%);">+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> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ctx->pmm_state == state)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ctx->iu.mm_state == state)</span><br><span> return;</span><br><span> </span><br><span> 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_pmm_state_names, ctx->pmm_state),</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(gprs_pmm_state_names, state));</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(gprs_mm_state_iu_names, ctx->iu.mm_state),</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(gprs_mm_state_iu_names, state));</span><br><span> </span><br><span> switch (state) {</span><br><span> case PMM_IDLE:</span><br><span>@@ -192,23 +196,23 @@</span><br><span> break;</span><br><span> case PMM_CONNECTED:</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(120, 100%, 40%);">+ case PMM_DETACHED:</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ctx->pmm_state = state;</span><br><span style="color: hsl(120, 100%, 40%);">+ 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_pmm_state state)</span><br><span style="color: hsl(120, 100%, 40%);">+void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_mm_state_gb state)</span><br><span> {</span><br><span> OSMO_ASSERT(ctx->ran_type == MM_CTX_T_GERAN_Gb);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ctx->pmm_state == state)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ctx->gb.mm_state == state)</span><br><span> return;</span><br><span> </span><br><span> 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_pmm_state_names, ctx->pmm_state),</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(gprs_pmm_state_names, state));</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(gprs_mm_state_gb_names, ctx->gb.mm_state),</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(gprs_mm_state_gb_names, state));</span><br><span> </span><br><span> switch (state) {</span><br><span> case MM_READY:</span><br><span>@@ -216,19 +220,16 @@</span><br><span> mmctx_state_timer_start(ctx, 3314);</span><br><span> break;</span><br><span> case MM_IDLE:</span><br><span style="color: hsl(0, 100%, 40%);">- if (ctx->pmm_state == MM_READY)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ctx->gb.mm_state == MM_READY)</span><br><span> mmctx_state_timer_stop(ctx, 3314);</span><br><span> break;</span><br><span> case MM_STANDBY:</span><br><span style="color: hsl(0, 100%, 40%);">- if (ctx->pmm_state == MM_READY)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ctx->gb.mm_state == MM_READY)</span><br><span> mmctx_state_timer_stop(ctx, 3314);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- /* when changing to state != MM_READY */</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ctx->pmm_state = state;</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx->gb.mm_state = state;</span><br><span> }</span><br><span> </span><br><span> /* Our implementation, should be kept in SGSN */</span><br><span>diff --git a/src/gprs/gprs_ranap.c b/src/gprs/gprs_ranap.c</span><br><span>index e0470f6..836937b 100644</span><br><span>--- a/src/gprs/gprs_ranap.c</span><br><span>+++ b/src/gprs/gprs_ranap.c</span><br><span>@@ -138,7 +138,7 @@</span><br><span> LOGMMCTXP(LOGL_INFO, mm, "IU release for imsi %s\n", mm->imsi);</span><br><span> else</span><br><span> LOGIUP(ctx, LOGL_INFO, "IU release\n");</span><br><span style="color: hsl(0, 100%, 40%);">- if (mm && mm->pmm_state == PMM_CONNECTED)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mm && mm->iu.mm_state == PMM_CONNECTED)</span><br><span> mmctx_set_pmm_state(mm, PMM_IDLE);</span><br><span> rc = 0;</span><br><span> break;</span><br><span>diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c</span><br><span>index ee1902c..2116590 100644</span><br><span>--- a/src/gprs/gprs_sgsn.c</span><br><span>+++ b/src/gprs/gprs_sgsn.c</span><br><span>@@ -228,7 +228,7 @@</span><br><span> ctx->ran_type = MM_CTX_T_GERAN_Gb;</span><br><span> ctx->gb.tlli = tlli;</span><br><span> ctx->gmm_state = GMM_DEREGISTERED;</span><br><span style="color: hsl(0, 100%, 40%);">- ctx->pmm_state = MM_IDLE;</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx->gb.mm_state = MM_IDLE;</span><br><span> ctx->auth_triplet.key_seq = GSM_KEY_SEQ_INVAL;</span><br><span> ctx->ciph_algo = sgsn->cfg.cipher;</span><br><span> LOGMMCTXP(LOGL_DEBUG, ctx, "Allocated with %s cipher.\n",</span><br><span>@@ -263,7 +263,7 @@</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> ctx->gmm_state = GMM_DEREGISTERED;</span><br><span style="color: hsl(0, 100%, 40%);">- ctx->pmm_state = PMM_DETACHED;</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx->iu.mm_state = PMM_DETACHED;</span><br><span> ctx->auth_triplet.key_seq = GSM_KEY_SEQ_INVAL;</span><br><span> ctx->ctrg = rate_ctr_group_alloc(ctx, &mmctx_ctrg_desc, ue_ctx->conn_id);</span><br><span> if (!ctx->ctrg) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15337">change 15337</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/+/15337"/><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: I6100d607da316da0595886c6968704dd9ccfbde9 </div>
<div style="display:none"> Gerrit-Change-Number: 15337 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: fixeria <axilirator@gmail.com> </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>