<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15552">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_sgsn: always allocate Gb/Iu mm fsm<br><br>When moving between RANs we need them at a later point.<br>Allocate them always to not make the code (more) complex.<br><br>Change-Id: I1724790335b0820f153a0cbdb5cfd1cfea36d1e9<br>---<br>M src/sgsn/gprs_sgsn.c<br>1 file changed, 4 insertions(+), 6 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/52/15552/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sgsn/gprs_sgsn.c b/src/sgsn/gprs_sgsn.c</span><br><span>index 465a5fa..ce06e7a 100644</span><br><span>--- a/src/sgsn/gprs_sgsn.c</span><br><span>+++ b/src/sgsn/gprs_sgsn.c</span><br><span>@@ -245,6 +245,8 @@</span><br><span>     }</span><br><span>    ctx->gmm_fsm = osmo_fsm_inst_alloc(&gmm_fsm, ctx, ctx, LOGL_DEBUG, "gmm_fsm");</span><br><span>      ctx->gmm_att_req.fsm = osmo_fsm_inst_alloc(&gmm_attach_req_fsm, ctx, ctx, LOGL_DEBUG, "gb_gmm_req");</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, NULL);</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, NULL);</span><br><span>     INIT_LLIST_HEAD(&ctx->pdp_list);</span><br><span> </span><br><span>  llist_add(&ctx->list, &sgsn_mm_ctxts);</span><br><span>@@ -256,7 +258,6 @@</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(0, 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>@@ -266,8 +267,7 @@</span><br><span>      ctx->ran_type = MM_CTX_T_GERAN_Gb;</span><br><span>        ctx->gb.tlli = tlli;</span><br><span>      ctx->ciph_algo = sgsn->cfg.cipher;</span><br><span style="color: hsl(0, 100%, 40%);">-        snprintf(buf, sizeof(buf), "%" PRIu32, tlli);</span><br><span style="color: hsl(0, 100%, 40%);">- ctx->gb.mm_state_fsm = osmo_fsm_inst_alloc(&mm_state_gb_fsm, ctx, ctx, LOGL_DEBUG, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_fsm_inst_update_id_f(ctx->gb.mm_state_fsm, "%" PRIu32, tlli);</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>@@ -278,7 +278,6 @@</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(0, 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>@@ -292,8 +291,7 @@</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%);">- snprintf(buf, sizeof(buf), "%" PRIu32, ue_ctx->conn_id);</span><br><span style="color: hsl(0, 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%);">+       osmo_fsm_inst_update_id_f(ctx->iu.mm_state_fsm, "%" PRIu32, ue_ctx->conn_id);</span><br><span> </span><br><span> </span><br><span>        return ctx;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15552">change 15552</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/+/15552"/><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: I1724790335b0820f153a0cbdb5cfd1cfea36d1e9 </div>
<div style="display:none"> Gerrit-Change-Number: 15552 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>