diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-08-13 19:09:32 +0200 |
|---|---|---|
| committer | pespin <pespin@sysmocom.de> | 2019-08-20 10:34:29 +0000 |
| commit | 2179dec71d00bb794f6770b1a8925ac13e95e03f (patch) | |
| tree | 8b5824b11dfdca48dbda907e2970602ed9311368 /src | |
| parent | 2844b5ea0012d4168c80ae7144f5c8e61f500591 (diff) | |
gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type
For new readers it's very confusing why PMM states and MM states are in
the same enum, but handled with different functions, and sometimes
called one right after the other with different enums. Calling them when
on a different ran_type makes the function early return, so let's better
conditionally call the function to make it clear in the flow when the
function is expected to do something.
Change-Id: I65ad9e180177bc9fc7c4a037cd85cfe33b161f73
Diffstat (limited to 'src')
| -rw-r--r-- | src/gprs/gprs_gmm.c | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 95a184234..6c8703215 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -138,8 +138,7 @@ static void mmctx_change_gtpu_endpoints_to_sgsn(struct sgsn_mm_ctx *mm_ctx) static void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) { - if (ctx->ran_type != MM_CTX_T_UTRAN_Iu) - return; + OSMO_ASSERT(ctx->ran_type == MM_CTX_T_UTRAN_Iu); if (ctx->pmm_state == state) return; @@ -164,8 +163,7 @@ static void mmctx_set_pmm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state sta static void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) { - if (ctx->ran_type != MM_CTX_T_GERAN_Gb) - return; + OSMO_ASSERT(ctx->ran_type == MM_CTX_T_GERAN_Gb); if (ctx->pmm_state == state) return; @@ -326,8 +324,15 @@ static void mm_ctx_cleanup_free(struct sgsn_mm_ctx *ctx, const char *log_text) /* Mark MM state as deregistered */ ctx->gmm_state = GMM_DEREGISTERED; - mmctx_set_pmm_state(ctx, PMM_DETACHED); - mmctx_set_mm_state(ctx, MM_IDLE); + + switch(ctx->ran_type) { + case MM_CTX_T_UTRAN_Iu: + mmctx_set_pmm_state(ctx, PMM_DETACHED); + break; + case MM_CTX_T_GERAN_Gb: + mmctx_set_mm_state(ctx, MM_IDLE); + break; + } sgsn_mm_ctx_cleanup_free(ctx); } @@ -2078,16 +2083,20 @@ static int gsm0408_rcv_gmm(struct sgsn_mm_ctx *mmctx, struct msgb *msg, mmctx->t3350_mode = GMM_T3350_MODE_NONE; mmctx->p_tmsi_old = 0; mmctx->pending_req = 0; - if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) { + mmctx->gmm_state = GMM_REGISTERED_NORMAL; + switch(mmctx->ran_type) { + case MM_CTX_T_UTRAN_Iu: + mmctx_set_pmm_state(mmctx, PMM_CONNECTED); + break; + case MM_CTX_T_GERAN_Gb: /* Unassign the old TLLI */ mmctx->gb.tlli = mmctx->gb.tlli_new; gprs_llme_copy_key(mmctx, mmctx->gb.llme); gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, mmctx->gb.tlli_new); + mmctx_set_mm_state(mmctx, MM_READY); + break; } - mmctx->gmm_state = GMM_REGISTERED_NORMAL; - mmctx_set_pmm_state(mmctx, PMM_CONNECTED); - mmctx_set_mm_state(mmctx, MM_READY); rc = 0; osmo_fsm_inst_dispatch(mmctx->gmm_att_req.fsm, E_ATTACH_COMPLETE_RECV, 0); @@ -2104,15 +2113,19 @@ static int gsm0408_rcv_gmm(struct sgsn_mm_ctx *mmctx, struct msgb *msg, mmctx->t3350_mode = GMM_T3350_MODE_NONE; mmctx->p_tmsi_old = 0; mmctx->pending_req = 0; - if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) { + mmctx->gmm_state = GMM_REGISTERED_NORMAL; + switch(mmctx->ran_type) { + case MM_CTX_T_UTRAN_Iu: + mmctx_set_pmm_state(mmctx, PMM_CONNECTED); + break; + case MM_CTX_T_GERAN_Gb: /* Unassign the old TLLI */ mmctx->gb.tlli = mmctx->gb.tlli_new; gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED, mmctx->gb.tlli_new); + mmctx_set_mm_state(mmctx, MM_READY); + break; } - mmctx->gmm_state = GMM_REGISTERED_NORMAL; - mmctx_set_pmm_state(mmctx, PMM_CONNECTED); - mmctx_set_mm_state(mmctx, MM_READY); rc = 0; memset(&sig_data, 0, sizeof(sig_data)); |