<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23733">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bssap: pass whole tlv_parsed to event GSCON_EV_A_COMMON_ID_IND<br><br>This change will allow handling more IEs in the future, like<br>"Last used E-UTRAN PLMN ID" one.<br><br>Related: SYS#5337<br>Change-Id: I96a0e1a7491fabf7aaad62207886821ad6194927<br>---<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>2 files changed, 11 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/33/23733/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>index 954c6a5..827416b 100644</span><br><span>--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -809,7 +809,8 @@</span><br><span> {</span><br><span> struct gsm_subscriber_connection *conn = fi->priv;</span><br><span> const struct gscon_clear_cmd_data *ccd;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mobile_identity *mi_imsi;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tlv_parsed *tp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mobile_identity mi_imsi;</span><br><span> </span><br><span> /* Regular allstate event processing */</span><br><span> switch (event) {</span><br><span>@@ -868,14 +869,19 @@</span><br><span> break;</span><br><span> case GSCON_EV_A_COMMON_ID_IND:</span><br><span> OSMO_ASSERT(data);</span><br><span style="color: hsl(0, 100%, 40%);">- mi_imsi = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ tp = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_mobile_identity_decode(&mi_imsi, TLVP_VAL(tp, GSM0808_IE_IMSI), TLVP_LEN(tp, GSM0808_IE_IMSI), false)</span><br><span style="color: hsl(120, 100%, 40%);">+ || mi_imsi.type != GSM_MI_TYPE_IMSI) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_ERROR, "CommonID: could not parse IMSI\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> if (!conn->bsub)</span><br><span style="color: hsl(0, 100%, 40%);">- conn->bsub = bsc_subscr_find_or_create_by_imsi(conn->network->bsc_subscribers, mi_imsi->imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->bsub = bsc_subscr_find_or_create_by_imsi(conn->network->bsc_subscribers, mi_imsi.imsi,</span><br><span> BSUB_USE_CONN);</span><br><span> else {</span><br><span> /* we already have a bsc_subscr associated; maybe that subscriber has no IMSI yet? */</span><br><span> if (!conn->bsub->imsi[0])</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_subscr_set_imsi(conn->bsub, mi_imsi->imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_subscr_set_imsi(conn->bsub, mi_imsi.imsi);</span><br><span> }</span><br><span> gscon_update_id(conn);</span><br><span> break;</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index 9d78153..b558fae 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -1072,7 +1072,6 @@</span><br><span> struct msgb *msg, unsigned int length)</span><br><span> {</span><br><span> struct tlv_parsed tp;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_mobile_identity mi_imsi;</span><br><span> </span><br><span> osmo_bssap_tlv_parse(&tp, msg->l4h + 1, length - 1);</span><br><span> </span><br><span>@@ -1084,13 +1083,7 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_mobile_identity_decode(&mi_imsi, TLVP_VAL(&tp, GSM0808_IE_IMSI), TLVP_LEN(&tp, GSM0808_IE_IMSI), false)</span><br><span style="color: hsl(0, 100%, 40%);">- || mi_imsi.type != GSM_MI_TYPE_IMSI) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSML(conn->fi, LOGL_ERROR, "CommonID: could not parse IMSI\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</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%);">- osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_COMMON_ID_IND, &mi_imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_COMMON_ID_IND, &tp);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23733">change 23733</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/+/23733"/><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: I96a0e1a7491fabf7aaad62207886821ad6194927 </div>
<div style="display:none"> Gerrit-Change-Number: 23733 </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-MessageType: newchange </div>