<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15380">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;">gmm: Move code handling GMM Attach Complete to its own function<br><br>Change-Id: I2d8d947ab1eb4100f404b885461f7a30583c9ac6<br>---<br>M src/sgsn/gprs_gmm.c<br>1 file changed, 40 insertions(+), 33 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c</span><br><span>index edb7eea..b2c70aa 100644</span><br><span>--- a/src/sgsn/gprs_gmm.c</span><br><span>+++ b/src/sgsn/gprs_gmm.c</span><br><span>@@ -1343,6 +1343,45 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* 3GPP TS 24.008 ยง 9.4.3 Attach complete */</span><br><span style="color: hsl(120, 100%, 40%);">+static int gsm48_rx_gmm_att_compl(struct sgsn_mm_ctx *mmctx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_signal_data sig_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* only in case SGSN offered new P-TMSI */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_INFO, mmctx, "-> ATTACH COMPLETE\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ #ifdef BUILD_IU</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mmctx->iu.ue_ctx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ranap_iu_tx_release(mmctx->iu.ue_ctx, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ #endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ mmctx_timer_stop(mmctx, 3350);</span><br><span style="color: hsl(120, 100%, 40%);">+ mmctx->t3350_mode = GMM_T3350_MODE_NONE;</span><br><span style="color: hsl(120, 100%, 40%);">+ mmctx->p_tmsi_old = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ mmctx->pending_req = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ mmctx->gmm_state = GMM_REGISTERED_NORMAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ switch(mmctx->ran_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case MM_CTX_T_UTRAN_Iu:</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 style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case MM_CTX_T_GERAN_Gb:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Unassign the old TLLI */</span><br><span style="color: hsl(120, 100%, 40%);">+ mmctx->gb.tlli = mmctx->gb.tlli_new;</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_llme_copy_key(mmctx, mmctx->gb.llme);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED,</span><br><span style="color: hsl(120, 100%, 40%);">+ mmctx->gb.tlli_new);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_GPRS_ATTACH, NULL);</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%);">+ osmo_fsm_inst_dispatch(mmctx->gmm_att_req.fsm, E_ATTACH_COMPLETE_RECV, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&sig_data, 0, sizeof(sig_data));</span><br><span style="color: hsl(120, 100%, 40%);">+ sig_data.mm = mmctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_signal_dispatch(SS_SGSN, S_SGSN_ATTACH, &sig_data);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> /* Checks if two attach request contain the IEs and IE values</span><br><span> * return 0 if equal</span><br><span>@@ -1953,39 +1992,7 @@</span><br><span> case GSM48_MT_GMM_ATTACH_COMPL:</span><br><span> if (!mmctx)</span><br><span> goto null_mmctx;</span><br><span style="color: hsl(0, 100%, 40%);">- /* only in case SGSN offered new P-TMSI */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_INFO, mmctx, "-> ATTACH COMPLETE\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef BUILD_IU</span><br><span style="color: hsl(0, 100%, 40%);">- if (mmctx->iu.ue_ctx) {</span><br><span style="color: hsl(0, 100%, 40%);">- ranap_iu_tx_release(mmctx->iu.ue_ctx, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx_timer_stop(mmctx, 3350);</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx->t3350_mode = GMM_T3350_MODE_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx->p_tmsi_old = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx->pending_req = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx->gmm_state = GMM_REGISTERED_NORMAL;</span><br><span style="color: hsl(0, 100%, 40%);">- switch(mmctx->ran_type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case MM_CTX_T_UTRAN_Iu:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(mmctx->iu.mm_state_fsm, E_PMM_PS_ATTACH, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case MM_CTX_T_GERAN_Gb:</span><br><span style="color: hsl(0, 100%, 40%);">- /* Unassign the old TLLI */</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx->gb.tlli = mmctx->gb.tlli_new;</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_llme_copy_key(mmctx, mmctx->gb.llme);</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_llgmm_assign(mmctx->gb.llme, TLLI_UNASSIGNED,</span><br><span style="color: hsl(0, 100%, 40%);">- mmctx->gb.tlli_new);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_GPRS_ATTACH, NULL);</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%);">- rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(mmctx->gmm_att_req.fsm, E_ATTACH_COMPLETE_RECV, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&sig_data, 0, sizeof(sig_data));</span><br><span style="color: hsl(0, 100%, 40%);">- sig_data.mm = mmctx;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_signal_dispatch(SS_SGSN, S_SGSN_ATTACH, &sig_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm48_rx_gmm_att_compl(mmctx);</span><br><span> break;</span><br><span> case GSM48_MT_GMM_RA_UPD_COMPL:</span><br><span> if (!mmctx)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15380">change 15380</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/+/15380"/><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: I2d8d947ab1eb4100f404b885461f7a30583c9ac6 </div>
<div style="display:none"> Gerrit-Change-Number: 15380 </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-MessageType: merged </div>