<p>pespin <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15211">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
osmith: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce and use log macros when no mm ctx available<br><br>Change-Id: Iba22060d8646bc8ec6227684ccb91d98cb4c7be2<br>---<br>M include/osmocom/sgsn/gprs_llc.h<br>M include/osmocom/sgsn/gprs_sgsn.h<br>M src/gprs/gprs_gmm.c<br>M src/gprs/gprs_llc.c<br>4 files changed, 46 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/gprs_llc.h b/include/osmocom/sgsn/gprs_llc.h</span><br><span>index 8a0b9ef..ce0e63c 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_llc.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_llc.h</span><br><span>@@ -96,6 +96,7 @@</span><br><span> GPRS_LLMS_UNASSIGNED = 1, /* No TLLI yet */</span><br><span> GPRS_LLMS_ASSIGNED = 2, /* TLLI assigned */</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string gprs_llc_llme_state_names[];</span><br><span> </span><br><span> /* Section 8.9.9 LLC layer parameter default values */</span><br><span> struct gprs_llc_params {</span><br><span>diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>index 10455d6..9753ea2 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>@@ -262,6 +262,28 @@</span><br><span> LOGP(DMM, level, "MM(%s/%08x) " fmt, (mm) ? (mm)->imsi : "---", \</span><br><span> (mm) ? (mm)->p_tmsi : GSM_RESERVED_TMSI, ## args)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef BUILD_IU</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGIUP(ue, level, fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMM, level, "UE(0x%x){%s} " fmt, ue->conn_id, osmo_rai_name(&(ue)->ra_id), ## args)</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGIUP(ue, level, fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMM, level, "UE(%p){NOTSUPPORTED} " fmt, ue, ## args)</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%);">+#define LOGGBP(llme, level, fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMM, level, "LLME(%08x/%08x){%s} " fmt, (llme)->old_tlli, \</span><br><span style="color: hsl(120, 100%, 40%);">+ (llme)->tlli, get_value_string_or_null(gprs_llc_llme_state_names, (llme)->state), ## args);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGGBIUP(llme, msg, level, fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ do { \</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ranap_ue_conn_ctx * _ue; \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llme) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGGBP(llme, level, fmt, ## args); \</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if ((msg) && (_ue = MSG_IU_UE_CTX(msg))) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGIUP(_ue, level, fmt, ## args); \</span><br><span style="color: hsl(120, 100%, 40%);">+ } else { OSMO_ASSERT(0); } \</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* look-up a SGSN MM context based on TLLI + RAI */</span><br><span> struct sgsn_mm_ctx *sgsn_mm_ctx_by_tlli(uint32_t tlli,</span><br><span> const struct gprs_ra_id *raid);</span><br><span>diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c</span><br><span>index 6c87032..2f27182 100644</span><br><span>--- a/src/gprs/gprs_gmm.c</span><br><span>+++ b/src/gprs/gprs_gmm.c</span><br><span>@@ -186,7 +186,7 @@</span><br><span> </span><br><span> #define REQUIRE_MM \</span><br><span> if (!mm) { \</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_NOTICE, "Cannot find mm ctx for IU event %d\n", type); \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGIUP(ctx, LOGL_NOTICE, "Cannot find mm ctx for IU event %d\n", type); \</span><br><span> return rc; \</span><br><span> }</span><br><span> </span><br><span>@@ -202,8 +202,7 @@</span><br><span> if (mm)</span><br><span> LOGMMCTXP(LOGL_INFO, mm, "IU release for imsi %s\n", mm->imsi);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_INFO, mm, "IU release for UE conn 0x%x\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ctx->conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGIUP(ctx, LOGL_INFO, "IU release\n");</span><br><span> if (mm && mm->pmm_state == PMM_CONNECTED)</span><br><span> mmctx_set_pmm_state(mm, PMM_IDLE);</span><br><span> rc = 0;</span><br><span>@@ -220,7 +219,10 @@</span><br><span> osmo_fsm_inst_dispatch(mm->gmm_att_req.fsm, E_IU_SECURITY_CMD_COMPLETE, NULL);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRANAP, LOGL_NOTICE, "Unknown event received: %i\n", type);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mm)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_NOTICE, mm, "Unknown event received: %i\n", type);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGIUP(ctx, LOGL_NOTICE, "Unknown event received: %i\n", type);</span><br><span> rc = -1;</span><br><span> break;</span><br><span> }</span><br><span>@@ -630,7 +632,7 @@</span><br><span> /* 3GPP TS 24.008 ยง 10.5.5.19: */</span><br><span> rc = osmo_get_rand_id(&rbyte, 1);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMM, LOGL_ERROR, "osmo_get_rand_id() failed for A&C ref: %s\n", strerror(-rc));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_ERROR, mm, "osmo_get_rand_id() failed for A&C ref: %s\n", strerror(-rc));</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span>@@ -1659,7 +1661,7 @@</span><br><span> upd_type = *cur++ & 0x07;</span><br><span> </span><br><span> rate_ctr_inc(&sgsn->rate_ctrs->ctr[CTR_GPRS_ROUTING_AREA_REQUEST]);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMM, LOGL_INFO, "-> GMM RA UPDATE REQUEST type=\"%s\"\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_INFO, mmctx, "-> GMM RA UPDATE REQUEST type=\"%s\"\n",</span><br><span> get_value_string(gprs_upd_t_strs, upd_type));</span><br><span> </span><br><span> /* Old routing area identification 10.5.5.15 */</span><br><span>@@ -1669,7 +1671,7 @@</span><br><span> /* MS Radio Access Capability 10.5.5.12a */</span><br><span> ms_ra_acc_cap_len = *cur++;</span><br><span> if (ms_ra_acc_cap_len > 52) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMM, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_ERROR, mmctx,</span><br><span> "Rejecting GMM RA Update Request: MS Radio Access Capability too long"</span><br><span> " (ms_ra_acc_cap_len = %u > 52)\n", ms_ra_acc_cap_len);</span><br><span> reject_cause = GMM_CAUSE_PROTO_ERR_UNSPEC;</span><br><span>@@ -1685,7 +1687,7 @@</span><br><span> switch (upd_type) {</span><br><span> case GPRS_UPD_T_RA_LA:</span><br><span> case GPRS_UPD_T_RA_LA_IMSI_ATT:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMM, LOGL_NOTICE, "Update type %i unsupported in Mode III, is your SI13 corrupt?\n", upd_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_NOTICE, mmctx, "Update type %i unsupported in Mode III, is your SI13 corrupt?\n", upd_type);</span><br><span> reject_cause = GMM_CAUSE_PROTO_ERR_UNSPEC;</span><br><span> goto rejected;</span><br><span> case GPRS_UPD_T_RA:</span><br><span>@@ -1722,7 +1724,8 @@</span><br><span> mmctx = sgsn_mm_ctx_by_ptmsi(tmsi);</span><br><span> }</span><br><span> #else</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMM, LOGL_ERROR, "Rejecting GMM RA Update Request: No Iu support\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGIUP(MSG_IU_UE_CTX(msg), LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Rejecting GMM RA Update Request: No Iu support\n");</span><br><span> goto rejected;</span><br><span> #endif</span><br><span> }</span><br><span>@@ -1758,13 +1761,13 @@</span><br><span> if (llme) {</span><br><span> /* send a XID reset to re-set all LLC sequence numbers</span><br><span> * in the MS */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_NOTICE, mmctx, "LLC XID RESET\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGGBP(llme, LOGL_NOTICE, "LLC XID RESET\n");</span><br><span> gprs_llgmm_reset(llme);</span><br><span> }</span><br><span> /* The MS has to perform GPRS attach */</span><br><span> /* Device is still IMSI attached for CS but initiate GPRS ATTACH,</span><br><span> * see GSM 04.08, 4.7.5.1.4 and G.6 */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_ERROR, mmctx, "Rejecting GMM RA Update Request: MS should GMM Attach first\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGGBIUP(llme, msg, LOGL_ERROR, "Rejecting GMM RA Update Request: MS should GMM Attach first\n");</span><br><span> reject_cause = GMM_CAUSE_IMPL_DETACHED;</span><br><span> goto rejected;</span><br><span> }</span><br><span>@@ -1986,7 +1989,7 @@</span><br><span> if (llme && !mmctx &&</span><br><span> gh->msg_type != GSM48_MT_GMM_ATTACH_REQ &&</span><br><span> gh->msg_type != GSM48_MT_GMM_RA_UPD_REQ) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMM, LOGL_NOTICE, "Cannot handle GMM for unknown MM CTX\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGGBP(llme, LOGL_NOTICE, "Cannot handle GMM for unknown MM CTX\n");</span><br><span> /* 4.7.10 */</span><br><span> if (gh->msg_type == GSM48_MT_GMM_STATUS) {</span><br><span> /* TLLI unassignment */</span><br><span>@@ -2168,7 +2171,7 @@</span><br><span> return rc;</span><br><span> </span><br><span> null_mmctx:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMM, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGGBIUP(llme, msg, LOGL_ERROR,</span><br><span> "Received GSM 04.08 message type 0x%02x,"</span><br><span> " but no MM context available\n",</span><br><span> gh->msg_type);</span><br><span>@@ -2842,7 +2845,7 @@</span><br><span> /* MMCTX can be NULL when called */</span><br><span> </span><br><span> if (!mmctx) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMM, LOGL_NOTICE, "Cannot handle SM for unknown MM CTX\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGGBIUP(llme, msg, LOGL_NOTICE, "Cannot handle SM for unknown MM CTX\n");</span><br><span> /* 6.1.3.6 */</span><br><span> if (gh->msg_type == GSM48_MT_GSM_STATUS)</span><br><span> return 0;</span><br><span>diff --git a/src/gprs/gprs_llc.c b/src/gprs/gprs_llc.c</span><br><span>index a301a63..2a27da8 100644</span><br><span>--- a/src/gprs/gprs_llc.c</span><br><span>+++ b/src/gprs/gprs_llc.c</span><br><span>@@ -41,6 +41,12 @@</span><br><span> #include <osmocom/sgsn/gprs_sndcp_comp.h></span><br><span> #include <osmocom/sgsn/gprs_sndcp.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string gprs_llc_llme_state_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_LLMS_UNASSIGNED, "UNASSIGNED" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_LLMS_ASSIGNED, "ASSIGNED" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct gprs_llc_llme *llme_alloc(uint32_t tlli);</span><br><span> static int gprs_llc_tx_xid(struct gprs_llc_lle *lle, struct msgb *msg,</span><br><span> int command);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15211">change 15211</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/+/15211"/><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: Iba22060d8646bc8ec6227684ccb91d98cb4c7be2 </div>
<div style="display:none"> Gerrit-Change-Number: 15211 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>