<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/23737">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;">gprs_gmm.c: State proper GMM prefix logging rx/tx of GMM messages<br><br>Change-Id: I58af41acdc4a04870b4cf2ea34a272d46d896254<br>---<br>M src/sgsn/gprs_gmm.c<br>1 file changed, 23 insertions(+), 23 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 545c8e7..f05167f 100644</span><br><span>--- a/src/sgsn/gprs_gmm.c</span><br><span>+++ b/src/sgsn/gprs_gmm.c</span><br><span>@@ -215,7 +215,7 @@</span><br><span> </span><br><span> /* MMCTX might be NULL! */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMM, "<- GPRS MM STATUS (cause: %s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DMM, "<- GMM STATUS (cause: %s)\n",</span><br><span> get_value_string(gsm48_gmm_cause_names, cause));</span><br><span> </span><br><span> gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh) + 1);</span><br><span>@@ -241,7 +241,7 @@</span><br><span> </span><br><span> /* MMCTX might be NULL! */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMM, "<- GPRS MM DETACH REQ (type: %s, cause: %s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DMM, "<- GMM DETACH REQ (type: %s, cause: %s)\n",</span><br><span> get_value_string(gprs_det_t_mt_strs, detach_type),</span><br><span> get_value_string(gsm48_gmm_cause_names, cause));</span><br><span> </span><br><span>@@ -290,7 +290,7 @@</span><br><span> uint8_t *ptsig;</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_INFO, mm, "<- GPRS ATTACH ACCEPT (new P-TMSI=0x%08x)\n", mm->p_tmsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_INFO, mm, "<- GMM ATTACH ACCEPT (new P-TMSI=0x%08x)\n", mm->p_tmsi);</span><br><span> rate_ctr_inc(&sgsn->rate_ctrs->ctr[CTR_GPRS_ATTACH_ACKED]);</span><br><span> </span><br><span> mmctx2msgid(msg, mm);</span><br><span>@@ -354,7 +354,7 @@</span><br><span> {</span><br><span> struct gsm48_hdr *gh;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_NOTICE, mm, "<- GPRS ATTACH REJECT: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_NOTICE, mm, "<- GMM ATTACH REJECT: %s\n",</span><br><span> get_value_string(gsm48_gmm_cause_names, gmm_cause));</span><br><span> rate_ctr_inc(&sgsn->rate_ctrs->ctr[CTR_GPRS_ATTACH_REJECTED]);</span><br><span> </span><br><span>@@ -388,7 +388,7 @@</span><br><span> </span><br><span> /* MMCTX might be NULL! */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMM, "<- GPRS MM DETACH ACC (force-standby: %d)\n", force_stby);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DMM, "<- GMM DETACH ACC (force-standby: %d)\n", force_stby);</span><br><span> rate_ctr_inc(&sgsn->rate_ctrs->ctr[CTR_GPRS_DETACH_ACKED]);</span><br><span> </span><br><span> gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh) + 1);</span><br><span>@@ -421,7 +421,7 @@</span><br><span> struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ID REQ");</span><br><span> struct gsm48_hdr *gh;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_DEBUG, mm, "<- GPRS IDENTITY REQUEST: mi_type=%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_DEBUG, mm, "<- GMM IDENTITY REQUEST: mi_type=%s\n",</span><br><span> gsm48_mi_type_name(id_type));</span><br><span> </span><br><span> mmctx2msgid(msg, mm);</span><br><span>@@ -456,7 +456,7 @@</span><br><span> uint8_t *m_rand, *m_cksn, rbyte;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_INFO, mm, "<- GPRS AUTH AND CIPHERING REQ (rand = %s,"</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_INFO, mm, "<- GMM AUTH AND CIPHERING REQ (rand = %s,"</span><br><span> " mmctx_is_r99=%d, vec->auth_types=0x%x",</span><br><span> osmo_hexdump(vec->rand, sizeof(vec->rand)),</span><br><span> mmctx_is_r99(mm), vec->auth_types);</span><br><span>@@ -519,7 +519,7 @@</span><br><span> struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 AUTH CIPH REJ");</span><br><span> struct gsm48_hdr *gh;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_NOTICE, mm, "<- GPRS AUTH AND CIPH REJECT\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_NOTICE, mm, "<- GMM AUTH AND CIPH REJECT\n");</span><br><span> </span><br><span> mmctx2msgid(msg, mm);</span><br><span> </span><br><span>@@ -599,7 +599,7 @@</span><br><span> uint8_t res_len;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_INFO, ctx, "-> GPRS AUTH AND CIPH RESPONSE\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_INFO, ctx, "-> GMM AUTH AND CIPH RESPONSE\n");</span><br><span> </span><br><span> if (ctx->auth_triplet.key_seq == GSM_KEY_SEQ_INVAL) {</span><br><span> LOGMMCTXP(LOGL_NOTICE, ctx,</span><br><span>@@ -650,7 +650,7 @@</span><br><span> ctx->sec_ctx = check_auth_resp(ctx, false, &at->vec, res, res_len);</span><br><span> if (!sgsn_mm_ctx_is_authenticated(ctx)) {</span><br><span> rc = gsm48_tx_gmm_auth_ciph_rej(ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- mm_ctx_cleanup_free(ctx, "GPRS AUTH AND CIPH REJECT");</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_ctx_cleanup_free(ctx, "GMM AUTH AND CIPH REJECT");</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span>@@ -673,7 +673,7 @@</span><br><span> const uint8_t *auts;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_INFO, ctx, "-> GPRS AUTH AND CIPH FAILURE (cause = %s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_INFO, ctx, "-> GMM AUTH AND CIPH FAILURE (cause = %s)\n",</span><br><span> get_value_string(gsm48_gmm_cause_names, gmm_cause));</span><br><span> </span><br><span> tlv_parse(&tp, &gsm48_gmm_att_tlvdef, gh->data+1, msg->len - 1, 0, 0);</span><br><span>@@ -713,7 +713,7 @@</span><br><span> </span><br><span> LOGMMCTXP(LOGL_NOTICE, ctx, "Authentication failed\n");</span><br><span> rc = gsm48_tx_gmm_auth_ciph_rej(ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- mm_ctx_cleanup_free(ctx, "GPRS AUTH FAILURE");</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_ctx_cleanup_free(ctx, "GMM AUTH FAILURE");</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span>@@ -792,7 +792,7 @@</span><br><span> struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 SERVICE ACK");</span><br><span> struct gsm48_hdr *gh;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_INFO, mm, "<- GPRS SERVICE ACCEPT (P-TMSI=0x%08x)\n", mm->p_tmsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_INFO, mm, "<- GMM SERVICE ACCEPT (P-TMSI=0x%08x)\n", mm->p_tmsi);</span><br><span> </span><br><span> mmctx2msgid(msg, mm);</span><br><span> </span><br><span>@@ -813,7 +813,7 @@</span><br><span> {</span><br><span> struct gsm48_hdr *gh;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_NOTICE, mm, "<- GPRS SERVICE REJECT: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_NOTICE, mm, "<- GMM SERVICE REJECT: %s\n",</span><br><span> get_value_string(gsm48_gmm_cause_names, gmm_cause));</span><br><span> </span><br><span> gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh) + 1);</span><br><span>@@ -1087,7 +1087,7 @@</span><br><span> "p_tmsi_old=0x%08x\n",</span><br><span> ictx->p_tmsi);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mm_ctx_cleanup_free(ictx, "GPRS IMSI re-use");</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_ctx_cleanup_free(ictx, "GMM IMSI re-use");</span><br><span> }</span><br><span> }</span><br><span> OSMO_STRLCPY_ARRAY(ctx->imsi, mi.imsi);</span><br><span>@@ -1330,7 +1330,7 @@</span><br><span> get_value_string(gsm48_gmm_cause_names, reject_cause), reject_cause);</span><br><span> rc = gsm48_tx_gmm_att_rej_oldmsg(msg, reject_cause);</span><br><span> if (ctx)</span><br><span style="color: hsl(0, 100%, 40%);">- mm_ctx_cleanup_free(ctx, "GPRS ATTACH REJ");</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_ctx_cleanup_free(ctx, "GMM ATTACH REJ");</span><br><span> else if (llme)</span><br><span> gprs_llgmm_unassign(llme);</span><br><span> </span><br><span>@@ -1343,7 +1343,7 @@</span><br><span> {</span><br><span> struct sgsn_signal_data sig_data;</span><br><span> /* 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(120, 100%, 40%);">+ LOGMMCTXP(LOGL_INFO, mmctx, "-> GMM ATTACH COMPLETE\n");</span><br><span> </span><br><span> #ifdef BUILD_IU</span><br><span> if (mmctx->iu.ue_ctx) {</span><br><span>@@ -1430,7 +1430,7 @@</span><br><span> memset(&sig_data, 0, sizeof(sig_data));</span><br><span> sig_data.mm = ctx;</span><br><span> osmo_signal_dispatch(SS_SGSN, S_SGSN_DETACH, &sig_data);</span><br><span style="color: hsl(0, 100%, 40%);">- mm_ctx_cleanup_free(ctx, "GPRS DETACH REQUEST");</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_ctx_cleanup_free(ctx, "GMM DETACH REQUEST");</span><br><span> }</span><br><span> </span><br><span> return rc;</span><br><span>@@ -1450,7 +1450,7 @@</span><br><span> #endif</span><br><span> </span><br><span> rate_ctr_inc(&sgsn->rate_ctrs->ctr[CTR_GPRS_ROUTING_AREA_ACKED]);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_INFO, mm, "<- ROUTING AREA UPDATE ACCEPT\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_INFO, mm, "<- GMM ROUTING AREA UPDATE ACCEPT\n");</span><br><span> </span><br><span> mmctx2msgid(msg, mm);</span><br><span> </span><br><span>@@ -1770,7 +1770,7 @@</span><br><span> get_value_string(gsm48_gmm_cause_names, reject_cause), reject_cause);</span><br><span> rc = gsm48_tx_gmm_ra_upd_rej(msg, reject_cause);</span><br><span> if (mmctx)</span><br><span style="color: hsl(0, 100%, 40%);">- mm_ctx_cleanup_free(mmctx, "GPRS RA UPDATE REJ");</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_ctx_cleanup_free(mmctx, "GMM RA UPDATE REJ");</span><br><span> else if (llme)</span><br><span> gprs_llgmm_unassign(llme);</span><br><span> #ifdef BUILD_IU</span><br><span>@@ -1952,7 +1952,7 @@</span><br><span> {</span><br><span> struct gsm48_hdr *gh = msgb_l3(msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_INFO, mmctx, "-> GPRS MM STATUS (cause: %s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_INFO, mmctx, "-> GMM STATUS (cause: %s)\n",</span><br><span> get_value_string(gsm48_gmm_cause_names, gh->data[0]));</span><br><span> </span><br><span> return 0;</span><br><span>@@ -2071,7 +2071,7 @@</span><br><span> if (!mmctx)</span><br><span> goto null_mmctx;</span><br><span> LOGMMCTXP(LOGL_INFO, mmctx, "-> DETACH ACK\n");</span><br><span style="color: hsl(0, 100%, 40%);">- mm_ctx_cleanup_free(mmctx, "GPRS DETACH ACK");</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_ctx_cleanup_free(mmctx, "GMM DETACH ACK");</span><br><span> rc = 0;</span><br><span> break;</span><br><span> case GSM48_MT_GMM_ATTACH_COMPL:</span><br><span>@@ -2180,7 +2180,7 @@</span><br><span> if (mm->num_T_exp >= 5) {</span><br><span> LOGMMCTXP(LOGL_NOTICE, mm, "T3370 expired >= 5 times\n");</span><br><span> gsm48_tx_gmm_att_rej(mm, GMM_CAUSE_MS_ID_NOT_DERIVED);</span><br><span style="color: hsl(0, 100%, 40%);">- mm_ctx_cleanup_free(mm, "GPRS ATTACH REJECT (T3370)");</span><br><span style="color: hsl(120, 100%, 40%);">+ mm_ctx_cleanup_free(mm, "GMM ATTACH REJECT (T3370)");</span><br><span> break;</span><br><span> }</span><br><span> /* re-tranmit IDENTITY REQUEST and re-start timer */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/23737">change 23737</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/+/23737"/><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: I58af41acdc4a04870b4cf2ea34a272d46d896254 </div>
<div style="display:none"> Gerrit-Change-Number: 23737 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>