<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15487">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP: implement ran change between 2g and 3g<br><br>Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2<br>---<br>M include/osmocom/sgsn/gprs_mm_state_gb_fsm.h<br>M include/osmocom/sgsn/gprs_mm_state_iu_fsm.h<br>M src/sgsn/gprs_gmm.c<br>M src/sgsn/gprs_mm_state_gb_fsm.c<br>M src/sgsn/gprs_mm_state_iu_fsm.c<br>5 files changed, 36 insertions(+), 2 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/87/15487/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><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>index e69e1e1..4da5abe 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_mm_state_gb_fsm.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_mm_state_gb_fsm.h</span><br><span>@@ -21,6 +21,7 @@</span><br><span>        /* E_FORCE_TO_STANDBY, TODO: not used */</span><br><span>     /* E_ABNSORMAL_RLC_CONDITION, TODO: not used */</span><br><span>      E_MM_RA_UPDATE,</span><br><span style="color: hsl(120, 100%, 40%);">+       E_MM_RAN_CHANGE, /* when a MS is moving to other RAN */</span><br><span> };</span><br><span> </span><br><span> extern struct osmo_fsm mm_state_gb_fsm;</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>index 05342f9..92bdd48 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h</span><br><span>@@ -20,6 +20,7 @@</span><br><span>    E_PMM_IMPLICIT_DETACH, /* = E_PS_ATTACH_REJECT, E_RAU_REJECT */</span><br><span>      E_PMM_RA_UPDATE, /* = Serving RNC relocation */</span><br><span>      E_PMM_USER_INACTIVITY, /* when the inactivity timer runs out */</span><br><span style="color: hsl(120, 100%, 40%);">+       E_PMM_RAN_CHANGE, /* when a UE is moving to other RAN */</span><br><span> };</span><br><span> </span><br><span> extern struct osmo_fsm mm_state_iu_fsm;</span><br><span>diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c</span><br><span>index afae369..68af317 100644</span><br><span>--- a/src/sgsn/gprs_gmm.c</span><br><span>+++ b/src/sgsn/gprs_gmm.c</span><br><span>@@ -1099,6 +1099,21 @@</span><br><span>      osmo_fsm_inst_dispatch(ctx->gmm_fsm, E_GMM_COMMON_PROC_INIT_REQ, NULL);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void migrate_ran(struct sgsn_mm_ctx *ctx,</span><br><span style="color: hsl(120, 100%, 40%);">+                enum sgsn_ran_type new_ran)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ctx->ran_type == new_ran)</span><br><span style="color: hsl(120, 100%, 40%);">+              return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     if (ctx->ran_type == MM_CTX_T_GERAN_Gb)</span><br><span style="color: hsl(120, 100%, 40%);">+            osmo_fsm_inst_dispatch(ctx->gb.mm_state_fsm, E_MM_RAN_CHANGE, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     if (ctx->ran_type == MM_CTX_T_UTRAN_Iu)</span><br><span style="color: hsl(120, 100%, 40%);">+            osmo_fsm_inst_dispatch(ctx->iu.mm_state_fsm, E_PMM_RAN_CHANGE, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    ctx->ran_type = new_ran;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* 3GPP TS 24.008 § 9.4.1 Attach request */</span><br><span> static int gsm48_rx_gmm_att_req(struct sgsn_mm_ctx *ctx, struct msgb *msg,</span><br><span>                               struct gprs_llc_llme *llme)</span><br><span>@@ -1228,6 +1243,12 @@</span><br><span>                 ctx->gb.tlli = msgb_tlli(msg);</span><br><span>            ctx->gb.llme = llme;</span><br><span>      }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   if (MSG_IU_UE_CTX(msg))</span><br><span style="color: hsl(120, 100%, 40%);">+               migrate_ran(ctx, MM_CTX_T_UTRAN_Iu);</span><br><span style="color: hsl(120, 100%, 40%);">+  else</span><br><span style="color: hsl(120, 100%, 40%);">+          migrate_ran(ctx, MM_CTX_T_GERAN_Gb);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       msgid2mmctx(ctx, msg);</span><br><span>       /* Update MM Context with currient RA and Cell ID */</span><br><span>         ctx->ra = ra_id;</span><br><span>@@ -1636,6 +1657,11 @@</span><br><span>                 goto rejected;</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (MSG_IU_UE_CTX(msg))</span><br><span style="color: hsl(120, 100%, 40%);">+               migrate_ran(mmctx, MM_CTX_T_UTRAN_Iu);</span><br><span style="color: hsl(120, 100%, 40%);">+        else</span><br><span style="color: hsl(120, 100%, 40%);">+          migrate_ran(mmctx, MM_CTX_T_GERAN_Gb);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     /* Store new BVCI/NSEI in MM context (FIXME: delay until we ack?) */</span><br><span>         msgid2mmctx(mmctx, msg);</span><br><span>     /* Bump the statistics of received signalling msgs for this MM context */</span><br><span>diff --git a/src/sgsn/gprs_mm_state_gb_fsm.c b/src/sgsn/gprs_mm_state_gb_fsm.c</span><br><span>index 02f6747..34ec82d 100644</span><br><span>--- a/src/sgsn/gprs_mm_state_gb_fsm.c</span><br><span>+++ b/src/sgsn/gprs_mm_state_gb_fsm.c</span><br><span>@@ -46,6 +46,9 @@</span><br><span>       unsigned long t_secs;</span><br><span> </span><br><span>    switch(event) {</span><br><span style="color: hsl(120, 100%, 40%);">+       case E_MM_RAN_CHANGE:</span><br><span style="color: hsl(120, 100%, 40%);">+         mm_state_gb_fsm_state_chg(fi, ST_MM_IDLE);</span><br><span style="color: hsl(120, 100%, 40%);">+            break;</span><br><span>       case E_MM_READY_TIMER_EXPIRY:</span><br><span>        case E_MM_IMPLICIT_DETACH:</span><br><span>           mm_state_gb_fsm_state_chg(fi, ST_MM_STANDBY);</span><br><span>@@ -78,7 +81,7 @@</span><br><span>            .action = st_mm_idle,</span><br><span>        },</span><br><span>   [ST_MM_READY] = {</span><br><span style="color: hsl(0, 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%);">+            .in_event_mask = X(E_MM_READY_TIMER_EXPIRY) | X(E_MM_RA_UPDATE) | X(E_MM_IMPLICIT_DETACH) | X(E_MM_PDU_RECEPTION) | X(E_MM_RAN_CHANGE),</span><br><span>              .out_state_mask = X(ST_MM_IDLE) | X(ST_MM_STANDBY),</span><br><span>          .name = "Ready",</span><br><span>           .action = st_mm_ready,</span><br><span>@@ -97,6 +100,7 @@</span><br><span>  OSMO_VALUE_STRING(E_MM_IMPLICIT_DETACH),</span><br><span>     OSMO_VALUE_STRING(E_MM_READY_TIMER_EXPIRY),</span><br><span>  OSMO_VALUE_STRING(E_MM_RA_UPDATE),</span><br><span style="color: hsl(120, 100%, 40%);">+    OSMO_VALUE_STRING(E_MM_RAN_CHANGE),</span><br><span>  { 0, NULL }</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/sgsn/gprs_mm_state_iu_fsm.c b/src/sgsn/gprs_mm_state_iu_fsm.c</span><br><span>index 2996c4e..627a990 100644</span><br><span>--- a/src/sgsn/gprs_mm_state_iu_fsm.c</span><br><span>+++ b/src/sgsn/gprs_mm_state_iu_fsm.c</span><br><span>@@ -53,6 +53,7 @@</span><br><span>   };</span><br><span> </span><br><span>       switch(event) {</span><br><span style="color: hsl(120, 100%, 40%);">+       case E_PMM_RAN_CHANGE:</span><br><span>       case E_PMM_PS_CONN_RELEASE:</span><br><span>          sgsn_ranap_iu_free(ctx);</span><br><span>             mm_state_iu_fsm_state_chg(fi, ST_PMM_IDLE);</span><br><span>@@ -109,7 +110,7 @@</span><br><span>            .action = st_pmm_detached,</span><br><span>   },</span><br><span>   [ST_PMM_CONNECTED] = {</span><br><span style="color: hsl(0, 100%, 40%);">-          .in_event_mask = X(E_PMM_PS_CONN_RELEASE) | X(E_PMM_RA_UPDATE) | X(E_PMM_IMPLICIT_DETACH) | X(E_PMM_USER_INACTIVITY),</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) | X(E_PMM_USER_INACTIVITY) | X(E_PMM_RAN_CHANGE),</span><br><span>          .out_state_mask = X(ST_PMM_DETACHED) | X(ST_PMM_IDLE),</span><br><span>               .name = "Connected",</span><br><span>               .action = st_pmm_connected,</span><br><span>@@ -130,6 +131,7 @@</span><br><span>    OSMO_VALUE_STRING(E_PMM_IMPLICIT_DETACH),</span><br><span>    OSMO_VALUE_STRING(E_PMM_RA_UPDATE),</span><br><span>  OSMO_VALUE_STRING(E_PMM_USER_INACTIVITY),</span><br><span style="color: hsl(120, 100%, 40%);">+     OSMO_VALUE_STRING(E_PMM_RAN_CHANGE),</span><br><span>         { 0, NULL }</span><br><span> };</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15487">change 15487</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/+/15487"/><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: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 </div>
<div style="display:none"> Gerrit-Change-Number: 15487 </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>