<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12253">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: Set subscr log context during complete_layer3<br><br>Change-Id: I162a474f711248a3f64a0438967fa6f8a9a3e686<br>---<br>M src/osmo-bsc/gsm_08_08.c<br>1 file changed, 16 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c</span><br><span>index a3e8b30..c3c5000 100644</span><br><span>--- a/src/osmo-bsc/gsm_08_08.c</span><br><span>+++ b/src/osmo-bsc/gsm_08_08.c</span><br><span>@@ -433,12 +433,14 @@</span><br><span> enum bsc_con ret;</span><br><span> struct gsm0808_speech_codec_list scl;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Check the filter */</span><br><span> rc = bsc_filter_initial(msc->network->bsc_data, msc, conn, msg,</span><br><span> &imsi, &con_type, &lu_cause);</span><br><span> if (rc < 0) {</span><br><span> bsc_maybe_lu_reject(conn, con_type, lu_cause);</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto early_fail;</span><br><span> }</span><br><span> </span><br><span> /* allocate resource for a new connection */</span><br><span>@@ -450,8 +452,7 @@</span><br><span> bsc_send_ussd_no_srv(conn, msg, msc->ussd_msc_lost_txt);</span><br><span> else if (ret == BSC_CON_REJECT_RF_GRACE)</span><br><span> bsc_send_ussd_no_srv(conn, msg, msc->ussd_grace_txt);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto early_fail;</span><br><span> }</span><br><span> </span><br><span> /* TODO: also extract TMSI. We get an IMSI only when an initial L3 Complete comes in that</span><br><span>@@ -460,15 +461,18 @@</span><br><span> if (imsi) {</span><br><span> conn->filter_state.imsi = talloc_steal(conn, imsi);</span><br><span> if (conn->bsub) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub);</span><br><span> /* Already a subscriber on L3 Complete? Should never happen... */</span><br><span> if (conn->bsub->imsi[0]</span><br><span> && strcmp(conn->bsub->imsi, imsi))</span><br><span> LOGP(DMSC, LOGL_ERROR, "Subscriber's IMSI changes from %s to %s\n",</span><br><span> conn->bsub->imsi, imsi);</span><br><span> bsc_subscr_set_imsi(conn->bsub, imsi);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> conn->bsub = bsc_subscr_find_or_create_by_imsi(msc->network->bsc_subscribers,</span><br><span> imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> gscon_update_id(conn);</span><br><span> }</span><br><span> conn->filter_state.con_type = con_type;</span><br><span>@@ -493,14 +497,16 @@</span><br><span> } else</span><br><span> resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!resp) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (resp)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, resp);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span> LOGP(DMSC, LOGL_DEBUG, "Failed to create layer3 message.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, resp);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_BSC_SUBSCR, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return !!resp;</span><br><span style="color: hsl(120, 100%, 40%);">+early_fail:</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_BSC_SUBSCR, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span> }</span><br><span> </span><br><span> /*</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12253">change 12253</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/12253"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I162a474f711248a3f64a0438967fa6f8a9a3e686 </div>
<div style="display:none"> Gerrit-Change-Number: 12253 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>