<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18713">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use osmo_mobile_identity API everywhere<br><br>Depends: Ic3f969e739654c1e8c387aedeeba5cce07fe2307 (libosmocore)<br>Change-Id: I71c3b4c65dbfdfa51409e09d4868aea83225338a<br>---<br>M include/osmocom/bsc/abis_rsl.h<br>M include/osmocom/bsc/gsm_04_08_rr.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/bsc_subscriber.c<br>M src/osmo-bsc/gsm_04_08_rr.c<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>M src/osmo-bsc/paging.c<br>M src/osmo-bsc/pcu_sock.c<br>8 files changed, 73 insertions(+), 59 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/13/18713/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h</span><br><span>index b43e3ae..2611a3d 100644</span><br><span>--- a/include/osmocom/bsc/abis_rsl.h</span><br><span>+++ b/include/osmocom/bsc/abis_rsl.h</span><br><span>@@ -43,8 +43,9 @@</span><br><span> int rsl_tx_chan_activ(struct gsm_lchan *lchan, uint8_t act_type, uint8_t ho_ref);</span><br><span> int rsl_chan_mode_modify_req(struct gsm_lchan *ts);</span><br><span> int rsl_encryption_cmd(struct msgb *msg);</span><br><span style="color: hsl(0, 100%, 40%);">-int rsl_paging_cmd(struct gsm_bts *bts, uint8_t paging_group, uint8_t len,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *ms_ident, uint8_t chan_needed, bool is_gprs);</span><br><span style="color: hsl(120, 100%, 40%);">+int rsl_paging_cmd(struct gsm_bts *bts, uint8_t paging_group,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_mobile_identity *mi,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t chan_needed, bool is_gprs);</span><br><span> int rsl_imm_assign_cmd(struct gsm_bts *bts, uint8_t len, uint8_t *val);</span><br><span> int rsl_tx_imm_assignment(struct gsm_lchan *lchan);</span><br><span> int rsl_tx_imm_ass_rej(struct gsm_bts *bts, struct gsm48_req_ref *rqd_ref);</span><br><span>diff --git a/include/osmocom/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h</span><br><span>index d34e695..8821251 100644</span><br><span>--- a/include/osmocom/bsc/gsm_04_08_rr.h</span><br><span>+++ b/include/osmocom/bsc/gsm_04_08_rr.h</span><br><span>@@ -39,7 +39,6 @@</span><br><span> enum gsm48_reject_value value);</span><br><span> </span><br><span> struct msgb *gsm48_create_mm_serv_rej(enum gsm48_reject_value value);</span><br><span style="color: hsl(0, 100%, 40%);">-int gsm48_extract_mi(uint8_t *classmark2_lv, int length, char *mi_string, uint8_t *mi_type);</span><br><span> struct msgb *gsm48_create_loc_upd_rej(uint8_t cause);</span><br><span> </span><br><span> struct msgb *gsm48_create_rr_status(uint8_t cause);</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 4a1d314..43c52ad 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -664,18 +664,29 @@</span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int rsl_paging_cmd(struct gsm_bts *bts, uint8_t paging_group, uint8_t len,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *ms_ident, uint8_t chan_needed, bool is_gprs)</span><br><span style="color: hsl(120, 100%, 40%);">+int rsl_paging_cmd(struct gsm_bts *bts, uint8_t paging_group,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_mobile_identity *mi,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t chan_needed, bool is_gprs)</span><br><span> {</span><br><span> struct abis_rsl_dchan_hdr *dh;</span><br><span> struct msgb *msg = rsl_msgb_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *l;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span> </span><br><span> dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh));</span><br><span> init_dchan_hdr(dh, RSL_MT_PAGING_CMD);</span><br><span> dh->chan_nr = RSL_CHAN_PCH_AGCH;</span><br><span> </span><br><span> msgb_tv_put(msg, RSL_IE_PAGING_GROUP, paging_group);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tlv_put(msg, RSL_IE_MS_IDENTITY, len-2, ms_ident+2);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ l = msgb_tl_put(msg, RSL_IE_MS_IDENTITY);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_mobile_identity_encode_msgb(msg, mi, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ *l = rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> msgb_tv_put(msg, RSL_IE_CHAN_NEEDED, chan_needed);</span><br><span> </span><br><span> /* Ericsson wants to have this IE in case a paging message</span><br><span>diff --git a/src/osmo-bsc/bsc_subscriber.c b/src/osmo-bsc/bsc_subscriber.c</span><br><span>index ecd6f3d..9ddfcaa 100644</span><br><span>--- a/src/osmo-bsc/bsc_subscriber.c</span><br><span>+++ b/src/osmo-bsc/bsc_subscriber.c</span><br><span>@@ -81,7 +81,7 @@</span><br><span> return NULL;</span><br><span> switch (mi->type) {</span><br><span> case GSM_MI_TYPE_IMSI:</span><br><span style="color: hsl(0, 100%, 40%);">- return bsc_subscr_find_by_imsi(list, mi->string);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bsc_subscr_find_by_imsi(list, mi->imsi);</span><br><span> case GSM_MI_TYPE_TMSI:</span><br><span> return bsc_subscr_find_by_tmsi(list, mi->tmsi);</span><br><span> default:</span><br><span>@@ -130,7 +130,7 @@</span><br><span> return NULL;</span><br><span> switch (mi->type) {</span><br><span> case GSM_MI_TYPE_IMSI:</span><br><span style="color: hsl(0, 100%, 40%);">- return bsc_subscr_find_or_create_by_imsi(list, mi->string);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bsc_subscr_find_or_create_by_imsi(list, mi->imsi);</span><br><span> case GSM_MI_TYPE_TMSI:</span><br><span> return bsc_subscr_find_or_create_by_tmsi(list, mi->tmsi);</span><br><span> default:</span><br><span>diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>index 4630b47..8a74aab 100644</span><br><span>--- a/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>+++ b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>@@ -828,20 +828,6 @@</span><br><span> return msg;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int gsm48_extract_mi(uint8_t *classmark2_lv, int length, char *mi_string, uint8_t *mi_type)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* Check the size for the classmark */</span><br><span style="color: hsl(0, 100%, 40%);">- if (length < 1 + *classmark2_lv)</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *mi_lv = classmark2_lv + *classmark2_lv + 1;</span><br><span style="color: hsl(0, 100%, 40%);">- if (length < 2 + *classmark2_lv + mi_lv[0])</span><br><span style="color: hsl(0, 100%, 40%);">- return -2;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- *mi_type = mi_lv[1] & GSM_MI_TYPE_MASK;</span><br><span style="color: hsl(0, 100%, 40%);">- return gsm48_mi_to_string(mi_string, GSM48_MI_SIZE, mi_lv+1, *mi_lv);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* As per TS 03.03 Section 2.2, the IMSI has 'not more than 15 digits' */</span><br><span> uint64_t str_to_imsi(const char *imsi_str)</span><br><span> {</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 864d96d..49a5765 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>@@ -293,13 +293,13 @@</span><br><span> struct msgb *msg, unsigned int payload_length)</span><br><span> {</span><br><span> struct tlv_parsed tp;</span><br><span style="color: hsl(0, 100%, 40%);">- char mi_string[GSM48_MI_SIZE];</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t tmsi = GSM_RESERVED_TMSI;</span><br><span> uint8_t data_length;</span><br><span> int remain;</span><br><span> const uint8_t *data;</span><br><span> uint8_t chan_needed = RSL_CHANNEED_ANY;</span><br><span> struct gsm0808_cell_id_list2 cil;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mobile_identity mi_imsi;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mobile_identity mi_tmsi = { .tmsi = GSM_RESERVED_TMSI };</span><br><span> </span><br><span> tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l4h + 1, payload_length - 1, 0, 0);</span><br><span> remain = payload_length - 1;</span><br><span>@@ -318,9 +318,12 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_PRESENT(&tp, GSM0808_IE_TMSI) &&</span><br><span style="color: hsl(0, 100%, 40%);">- TLVP_LEN(&tp, GSM0808_IE_TMSI) == 4) {</span><br><span style="color: hsl(0, 100%, 40%);">- tmsi = ntohl(tlvp_val32_unal(&tp, GSM0808_IE_TMSI));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRESENT(&tp, GSM0808_IE_TMSI)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_mobile_identity_decode(&mi_tmsi, TLVP_VAL(&tp, GSM0808_IE_TMSI), TLVP_LEN(&tp, GSM0808_IE_TMSI), false)</span><br><span style="color: hsl(120, 100%, 40%);">+ || mi_tmsi.type != GSM_MI_TYPE_TMSI) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "Paging: could not parse TMSI\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> remain -= TLVP_LEN(&tp, GSM0808_IE_TMSI);</span><br><span> }</span><br><span> </span><br><span>@@ -332,8 +335,11 @@</span><br><span> /*</span><br><span> * parse the IMSI</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_mi_to_string(mi_string, sizeof(mi_string),</span><br><span style="color: hsl(0, 100%, 40%);">- TLVP_VAL(&tp, GSM0808_IE_IMSI), TLVP_LEN(&tp, GSM0808_IE_IMSI));</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%);">+ LOGP(DMSC, LOGL_ERROR, "Paging: could not parse IMSI\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /*</span><br><span> * There are various cell identifier list types defined at 3GPP TS ยง 08.08, we don't support all</span><br><span>@@ -343,8 +349,8 @@</span><br><span> data_length = TLVP_LEN(&tp, GSM0808_IE_CELL_IDENTIFIER_LIST);</span><br><span> data = TLVP_VAL(&tp, GSM0808_IE_CELL_IDENTIFIER_LIST);</span><br><span> if (gsm0808_dec_cell_id_list2(&cil, data, data_length) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSC, LOGL_ERROR, "Paging IMSI %s: Could not parse Cell Identifier List\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mi_string);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "Paging %s: Could not parse Cell Identifier List\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mobile_identity_name_c(OTC_SELECT, &mi_imsi));</span><br><span> return -1;</span><br><span> }</span><br><span> remain = 0;</span><br><span>@@ -360,43 +366,45 @@</span><br><span> </span><br><span> switch (cil.id_discr) {</span><br><span> case CELL_IDENT_NO_CELL:</span><br><span style="color: hsl(0, 100%, 40%);">- page_all_bts(msc, tmsi, mi_string, chan_needed);</span><br><span style="color: hsl(120, 100%, 40%);">+ page_all_bts(msc, mi_tmsi.tmsi, mi_imsi.imsi, chan_needed);</span><br><span> break;</span><br><span> </span><br><span> case CELL_IDENT_WHOLE_GLOBAL:</span><br><span style="color: hsl(0, 100%, 40%);">- page_cgi(msc, &cil, tmsi, mi_string, chan_needed);</span><br><span style="color: hsl(120, 100%, 40%);">+ page_cgi(msc, &cil, mi_tmsi.tmsi, mi_imsi.imsi, chan_needed);</span><br><span> break;</span><br><span> </span><br><span> case CELL_IDENT_LAC_AND_CI:</span><br><span style="color: hsl(0, 100%, 40%);">- page_lac_and_ci(msc, &cil, tmsi, mi_string, chan_needed);</span><br><span style="color: hsl(120, 100%, 40%);">+ page_lac_and_ci(msc, &cil, mi_tmsi.tmsi, mi_imsi.imsi, chan_needed);</span><br><span> break;</span><br><span> </span><br><span> case CELL_IDENT_CI:</span><br><span style="color: hsl(0, 100%, 40%);">- page_ci(msc, &cil, tmsi, mi_string, chan_needed);</span><br><span style="color: hsl(120, 100%, 40%);">+ page_ci(msc, &cil, mi_tmsi.tmsi, mi_imsi.imsi, chan_needed);</span><br><span> break;</span><br><span> </span><br><span> case CELL_IDENT_LAI_AND_LAC:</span><br><span style="color: hsl(0, 100%, 40%);">- page_lai_and_lac(msc, &cil, tmsi, mi_string, chan_needed);</span><br><span style="color: hsl(120, 100%, 40%);">+ page_lai_and_lac(msc, &cil, mi_tmsi.tmsi, mi_imsi.imsi, chan_needed);</span><br><span> break;</span><br><span> </span><br><span> case CELL_IDENT_LAC:</span><br><span style="color: hsl(0, 100%, 40%);">- page_lac(msc, &cil, tmsi, mi_string, chan_needed);</span><br><span style="color: hsl(120, 100%, 40%);">+ page_lac(msc, &cil, mi_tmsi.tmsi, mi_imsi.imsi, chan_needed);</span><br><span> break;</span><br><span> </span><br><span> case CELL_IDENT_BSS:</span><br><span> if (data_length != 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSC, LOGL_ERROR, "Paging IMSI %s: Cell Identifier List for BSS (0x%x)"</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "Paging %s: Cell Identifier List for BSS (0x%x)"</span><br><span> " has invalid length: %u, paging entire BSS anyway (%s)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mi_string, CELL_IDENT_BSS, data_length, osmo_hexdump(data, data_length));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mobile_identity_name_c(OTC_SELECT, &mi_imsi),</span><br><span style="color: hsl(120, 100%, 40%);">+ CELL_IDENT_BSS, data_length, osmo_hexdump(data, data_length));</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- page_all_bts(msc, tmsi, mi_string, chan_needed);</span><br><span style="color: hsl(120, 100%, 40%);">+ page_all_bts(msc, mi_tmsi.tmsi, mi_imsi.imsi, chan_needed);</span><br><span> break;</span><br><span> </span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSC, LOGL_NOTICE, "Paging IMSI %s: unimplemented Cell Identifier List (0x%x),"</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_NOTICE, "Paging %s: unimplemented Cell Identifier List (0x%x),"</span><br><span> " paging entire BSS instead (%s)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mi_string, cil.id_discr, osmo_hexdump(data, data_length));</span><br><span style="color: hsl(0, 100%, 40%);">- page_all_bts(msc, tmsi, mi_string, chan_needed);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mobile_identity_name_c(OTC_SELECT, &mi_imsi),</span><br><span style="color: hsl(120, 100%, 40%);">+ cil.id_discr, osmo_hexdump(data, data_length));</span><br><span style="color: hsl(120, 100%, 40%);">+ page_all_bts(msc, mi_tmsi.tmsi, mi_imsi.imsi, chan_needed);</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c</span><br><span>index 7b89dad..7859c69 100644</span><br><span>--- a/src/osmo-bsc/paging.c</span><br><span>+++ b/src/osmo-bsc/paging.c</span><br><span>@@ -78,10 +78,9 @@</span><br><span> </span><br><span> static void page_ms(struct gsm_paging_request *request)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t mi[128];</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int mi_len;</span><br><span> unsigned int page_group;</span><br><span> struct gsm_bts *bts = request->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mobile_identity mi;</span><br><span> </span><br><span> log_set_context(LOG_CTX_BSC_SUBSCR, request->bsub);</span><br><span> </span><br><span>@@ -89,14 +88,21 @@</span><br><span> "0x%08x for ch. type %d (attempt %d)\n", request->bsub->imsi,</span><br><span> request->bsub->tmsi, request->chan_type, request->attempts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (request->bsub->tmsi == GSM_RESERVED_TMSI)</span><br><span style="color: hsl(0, 100%, 40%);">- mi_len = gsm48_generate_mid_from_imsi(mi, request->bsub->imsi);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- mi_len = gsm48_generate_mid_from_tmsi(mi, request->bsub->tmsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (request->bsub->tmsi == GSM_RESERVED_TMSI) {</span><br><span style="color: hsl(120, 100%, 40%);">+ mi = (struct osmo_mobile_identity){</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = GSM_MI_TYPE_IMSI,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRLCPY_ARRAY(mi.imsi, request->bsub->imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ mi = (struct osmo_mobile_identity){</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = GSM_MI_TYPE_TMSI,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tmsi = request->bsub->tmsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> page_group = gsm0502_calc_paging_group(&bts->si_common.chan_desc,</span><br><span> str_to_imsi(request->bsub->imsi));</span><br><span style="color: hsl(0, 100%, 40%);">- rsl_paging_cmd(bts, page_group, mi_len, mi, request->chan_type, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_paging_cmd(bts, page_group, &mi, request->chan_type, false);</span><br><span> log_set_context(LOG_CTX_BSC_SUBSCR, NULL);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c</span><br><span>index b041402..a2f9f4e 100644</span><br><span>--- a/src/osmo-bsc/pcu_sock.c</span><br><span>+++ b/src/osmo-bsc/pcu_sock.c</span><br><span>@@ -290,27 +290,30 @@</span><br><span> {</span><br><span> struct gsm48_paging1 *p1 = (struct gsm48_paging1 *) raw_rr_msg;</span><br><span> uint8_t chan_needed;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int mi_len;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_mobile_identity mi;</span><br><span> int rc;</span><br><span> </span><br><span> switch (p1->msg_type) {</span><br><span> case GSM48_MT_RR_PAG_REQ_1:</span><br><span> chan_needed = (p1->cneed2 << 2) | p1->cneed1;</span><br><span style="color: hsl(0, 100%, 40%);">- mi_len = p1->data[0];</span><br><span style="color: hsl(0, 100%, 40%);">- mi = p1->data+1;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_mobile_identity_decode(&mi, p1->data+1, p1->data[0], false);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DPCU, LOGL_ERROR, "PCU Sends paging "</span><br><span style="color: hsl(120, 100%, 40%);">+ "request type %02x (chan_needed=%02x): Unable to decode Mobile Identity\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ p1->msg_type, chan_needed);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> LOGP(DPCU, LOGL_ERROR, "PCU Sends paging "</span><br><span style="color: hsl(0, 100%, 40%);">- "request type %02x (chan_needed=%02x, mi_len=%u, mi=%s)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- p1->msg_type, chan_needed, mi_len,</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_hexdump_nospc(mi,mi_len));</span><br><span style="color: hsl(120, 100%, 40%);">+ "request type %02x (chan_needed=%02x, mi=%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ p1->msg_type, chan_needed, osmo_mobile_identity_name_c(OTC_SELECT, &mi));</span><br><span> /* NOTE: We will have to add 2 to mi_len and subtract 2 from</span><br><span> * the mi pointer because rsl_paging_cmd() will perform the</span><br><span> * reverse operations. This is because rsl_paging_cmd() is</span><br><span> * normally expected to chop off the element identifier (0xC0)</span><br><span> * and the length field. In our parameter, we do not have</span><br><span> * those fields included. */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = rsl_paging_cmd(bts, paging_group, mi_len+2, mi-2,</span><br><span style="color: hsl(0, 100%, 40%);">- chan_needed, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = rsl_paging_cmd(bts, paging_group, &mi, chan_needed, true);</span><br><span> break;</span><br><span> case GSM48_MT_RR_PAG_REQ_2:</span><br><span> case GSM48_MT_RR_PAG_REQ_3:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18713">change 18713</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/+/18713"/><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: I71c3b4c65dbfdfa51409e09d4868aea83225338a </div>
<div style="display:none"> Gerrit-Change-Number: 18713 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>