<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20346">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">compl l3: move all message parsing out of bsc_find_msc()<br><br>I lost count of how many times the gsm48_hdr got parsed from the msg in the<br>same compl l3 code path. Here is one less.<br><br>Change-Id: I9f15b3e5e7352ef90b4598dadf2ebc0d2665f069<br>---<br>M src/osmo-bsc/gsm_08_08.c<br>1 file changed, 10 insertions(+), 23 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 984e830..9f3812a 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>@@ -184,33 +184,18 @@</span><br><span> * conn.</span><br><span> * c) All other cases distribute the messages across connected MSCs in a round-robin fashion.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct bsc_msc_data *bsc_find_msc(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg, const struct osmo_mobile_identity *mi)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct bsc_msc_data *bsc_find_msc(struct gsm_subscriber_connection *conn, const struct osmo_mobile_identity *mi,</span><br><span style="color: hsl(120, 100%, 40%);">+ bool is_emerg, bool from_other_plmn)</span><br><span> {</span><br><span> struct gsm_network *net = conn->network;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm48_hdr *gh;</span><br><span style="color: hsl(0, 100%, 40%);">- int8_t pdisc;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t mtype;</span><br><span> struct bsc_msc_data *msc;</span><br><span> struct bsc_msc_data *msc_target = NULL;</span><br><span> struct bsc_msc_data *msc_round_robin_next = NULL;</span><br><span> struct bsc_msc_data *msc_round_robin_first = NULL;</span><br><span> uint8_t round_robin_next_nr;</span><br><span style="color: hsl(0, 100%, 40%);">- bool is_emerg = false;</span><br><span> int16_t nri_v = -1;</span><br><span> bool is_null_nri = false;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (msgb_l3len(msg) < sizeof(*gh)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRSL, LOGL_ERROR, "There is no GSM48 header here.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- gh = msgb_l3(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- pdisc = gsm48_hdr_pdisc(gh);</span><br><span style="color: hsl(0, 100%, 40%);">- mtype = gsm48_hdr_msg_type(gh);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- is_emerg = (pdisc == GSM48_PDISC_MM && mtype == GSM48_MT_MM_CM_SERV_REQ) && is_cm_service_for_emerg(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #define LOG_NRI(LOGLEVEL, FORMAT, ARGS...) \</span><br><span> LOGP(DMSC, LOGLEVEL, "%s NRI(%d)=0x%x=%d: " FORMAT, osmo_mobile_identity_to_str_c(OTC_SELECT, mi), \</span><br><span> net->nri_bitlen, nri_v, nri_v, ##ARGS)</span><br><span>@@ -220,7 +205,7 @@</span><br><span> if (osmo_tmsi_nri_v_get(&nri_v, mi->tmsi, net->nri_bitlen)) {</span><br><span> LOGP(DMSC, LOGL_ERROR, "Unable to retrieve NRI from TMSI, nri_bitlen == %u\n", net->nri_bitlen);</span><br><span> nri_v = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (is_lu_from_other_plmn(msg)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (from_other_plmn) {</span><br><span> /* If a subscriber was previously attached to a different PLMN, it might still send the other</span><br><span> * PLMN's TMSI identity in an IMSI Attach. The LU sends a LAI indicating the previous PLMN. If</span><br><span> * it mismatches our PLMN, ignore the NRI. */</span><br><span>@@ -294,8 +279,6 @@</span><br><span> * them are usable -- wrap to the start. */</span><br><span> msc_target = msc_round_robin_next ? : msc_round_robin_first;</span><br><span> if (!msc_target) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_COMPL_L3(pdisc, mtype, LOGL_ERROR, "%s%s: No suitable MSC for this Complete Layer 3 request found\n",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mobile_identity_to_str_c(OTC_SELECT, mi), is_emerg ? " FOR EMERGENCY CALL" : "");</span><br><span> rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_MSCPOOL_SUBSCR_NO_MSC]);</span><br><span> if (is_emerg)</span><br><span> rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_MSCPOOL_EMERG_LOST]);</span><br><span>@@ -393,6 +376,7 @@</span><br><span> struct osmo_mobile_identity mi;</span><br><span> struct gsm48_hdr *gh;</span><br><span> uint8_t pdisc, mtype;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool is_emerg;</span><br><span> bool release_lchan = true;</span><br><span> </span><br><span> if (msgb_l3len(msg) < sizeof(*gh)) {</span><br><span>@@ -435,6 +419,8 @@</span><br><span> </span><br><span> log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ is_emerg = (pdisc == GSM48_PDISC_MM && mtype == GSM48_MT_MM_CM_SERV_REQ) && is_cm_service_for_emerg(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* When receiving a Paging Response, stop Paging for this subscriber on all cells, and figure out which MSC</span><br><span> * sent the Paging Request, if any. */</span><br><span> paged_from_msc = NULL;</span><br><span>@@ -449,7 +435,7 @@</span><br><span> </span><br><span> rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_PAGING_NO_ACTIVE_PAGING]);</span><br><span> rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_PAGING_NO_ACTIVE_PAGING]);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (is_msc_usable(paged_from_msc, false)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (is_msc_usable(paged_from_msc, is_emerg)) {</span><br><span> LOG_COMPL_L3(pdisc, mtype, LOGL_DEBUG, "%s matches earlier Paging from msc %d\n",</span><br><span> osmo_mobile_identity_to_str_c(OTC_SELECT, &mi), paged_from_msc->nr);</span><br><span> rate_ctr_inc(&paged_from_msc->msc_ctrs->ctr[MSC_CTR_MSCPOOL_SUBSCR_PAGED]);</span><br><span>@@ -465,9 +451,10 @@</span><br><span> if (paged_from_msc)</span><br><span> msc = paged_from_msc;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- msc = bsc_find_msc(conn, msg, &mi);</span><br><span style="color: hsl(120, 100%, 40%);">+ msc = bsc_find_msc(conn, &mi, is_emerg, is_lu_from_other_plmn(msg));</span><br><span> if (!msc) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSC, LOGL_ERROR, "Failed to find a MSC for a connection.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_COMPL_L3(pdisc, mtype, LOGL_ERROR, "%s%s: No suitable MSC for this Complete Layer 3 request found\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mobile_identity_to_str_c(OTC_SELECT, &mi), is_emerg ? " FOR EMERGENCY CALL" : "");</span><br><span> rc = -1;</span><br><span> goto early_fail;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20346">change 20346</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-bsc/+/20346"/><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-Change-Id: I9f15b3e5e7352ef90b4598dadf2ebc0d2665f069 </div>
<div style="display:none"> Gerrit-Change-Number: 20346 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@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>