<p>lynxis lazus <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15480">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ranap: refactor REQUIRE_MM define<br><br>All branches need a MM context. Exit early if no MM context<br>present.<br><br>Change-Id: Ifa4c55f1f2c199fa63bd755311026b8586a65f3f<br>---<br>M src/sgsn/gprs_ranap.c<br>1 file changed, 6 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c</span><br><span>index cad8487..b0d0f8d 100644</span><br><span>--- a/src/sgsn/gprs_ranap.c</span><br><span>+++ b/src/sgsn/gprs_ranap.c</span><br><span>@@ -120,31 +120,24 @@</span><br><span> int rc = -1;</span><br><span> </span><br><span> mm = sgsn_mm_ctx_by_ue_ctx(ctx);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define REQUIRE_MM \</span><br><span style="color: hsl(0, 100%, 40%);">- if (!mm) { \</span><br><span style="color: hsl(0, 100%, 40%);">- LOGIUP(ctx, LOGL_NOTICE, "Cannot find mm ctx for IU event %d\n", type); \</span><br><span style="color: hsl(0, 100%, 40%);">- return rc; \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!mm) {</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 style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> }</span><br><span> </span><br><span> switch (type) {</span><br><span> case RANAP_IU_EVENT_RAB_ASSIGN:</span><br><span style="color: hsl(0, 100%, 40%);">- REQUIRE_MM</span><br><span> rc = sgsn_ranap_rab_ass_resp(mm, (RANAP_RAB_SetupOrModifiedItemIEs_t *)data);</span><br><span> break;</span><br><span> case RANAP_IU_EVENT_IU_RELEASE:</span><br><span> /* fall thru */</span><br><span> case RANAP_IU_EVENT_LINK_INVALIDATED:</span><br><span> /* Clean up ranap_ue_conn_ctx here */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mm) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_INFO, mm, "IU release for imsi %s\n", mm->imsi);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(mm->iu.mm_state_fsm, E_PMM_PS_CONN_RELEASE, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(0, 100%, 40%);">- LOGIUP(ctx, LOGL_INFO, "IU release\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_INFO, mm, "IU release for imsi %s\n", mm->imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mm->iu.mm_state_fsm, E_PMM_PS_CONN_RELEASE, NULL);</span><br><span> rc = 0;</span><br><span> break;</span><br><span> case RANAP_IU_EVENT_SECURITY_MODE_COMPLETE:</span><br><span style="color: hsl(0, 100%, 40%);">- REQUIRE_MM</span><br><span> /* Continue authentication here */</span><br><span> mm->iu.ue_ctx->integrity_active = 1;</span><br><span> ranap_iu_tx_common_id(mm->iu.ue_ctx, mm->imsi);</span><br><span>@@ -156,10 +149,7 @@</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%);">- if (mm)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGMMCTXP(LOGL_NOTICE, mm, "Unknown event received: %i\n", type);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- LOGIUP(ctx, LOGL_NOTICE, "Unknown event received: %i\n", type);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_NOTICE, mm, "Unknown event received: %i\n", type);</span><br><span> rc = -1;</span><br><span> break;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15480">change 15480</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/+/15480"/><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: Ifa4c55f1f2c199fa63bd755311026b8586a65f3f </div>
<div style="display:none"> Gerrit-Change-Number: 15480 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </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: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>