- gerrit-log - lists.osmocom.org

[S] Change in osmo-hnbgw[master]: peek_l3_ul_nas: Improve RAU req parsing checks
by lynxis lazus 06 Feb '25

06 Feb '25

Attention is currently required from: pespin. lynxis lazus has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39480?usp=email ) Change subject: peek_l3_ul_nas: Improve RAU req parsing checks ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Same code as I did in sgsn. In theory we could move the code into a osmocore lib? Not sure if necessary. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39480?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1a6c642e7017e159a2035869c75475d0de7fbb75 Gerrit-Change-Number: 39480 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 06 Feb 2025 16:41:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in osmo-hnbgw[master]: peek_l3_ul_nas: Improve RAU req parsing checks
by lynxis lazus 06 Feb '25

06 Feb '25

Attention is currently required from: pespin. lynxis lazus has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39480?usp=email ) Change subject: peek_l3_ul_nas: Improve RAU req parsing checks ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39480?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1a6c642e7017e159a2035869c75475d0de7fbb75 Gerrit-Change-Number: 39480 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 06 Feb 2025 16:41:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-hnbgw[master]: peek_l3_ul_nas: Split parsing logic based on PS/CS ctx
by lynxis lazus 06 Feb '25

06 Feb '25

Attention is currently required from: fixeria, laforge, neels, pespin. lynxis lazus has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39479?usp=email ) Change subject: peek_l3_ul_nas: Split parsing logic based on PS/CS ctx ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I would move the code further apart into own functions based on map->is_ps -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I198f2fd14952362c4d189663d067c7f9dae2ed05 Gerrit-Change-Number: 39479 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 06 Feb 2025 16:40:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in osmo-hnbgw[master]: peek_l3_ul_nas: Split parsing logic based on PS/CS ctx
by lynxis lazus 06 Feb '25

06 Feb '25

Attention is currently required from: fixeria, laforge, neels, pespin. lynxis lazus has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39479?usp=email ) Change subject: peek_l3_ul_nas: Split parsing logic based on PS/CS ctx ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I198f2fd14952362c4d189663d067c7f9dae2ed05 Gerrit-Change-Number: 39479 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 06 Feb 2025 16:39:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Use Misc_Helpers.f_shutdown upon rx of unexpected msg
by pespin 06 Feb '25

06 Feb '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39483?usp=email ) Change subject: hnbgw: Use Misc_Helpers.f_shutdown upon rx of unexpected msg ...................................................................... hnbgw: Use Misc_Helpers.f_shutdown upon rx of unexpected msg Otherwise the test continues for a while and ends up with a DTE which makes it harder to figure out the original test failure. Change-Id: I7f07cff2ce93e8b11338ba4e39e1d49662323f58 --- M hnbgw/ConnHdlr.ttcn 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/39483/1 diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn index dec5463..47c25a7 100644 --- a/hnbgw/ConnHdlr.ttcn +++ b/hnbgw/ConnHdlr.ttcn @@ -335,13 +335,13 @@ [] BSSAP.receive(exp_rx) -> value rx { setverdict(pass); } - [] BSSAP.receive(RANAP_PDU:?) { - setverdict(fail, "Got an unexpected RANAP message on BSSAP port, was waiting for ", exp_rx); - mtc.stop; + [] BSSAP.receive(RANAP_PDU:?) -> value rx { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Got an unexpected RANAP message on BSSAP port: ", rx, " vs exp ", exp_rx)); } [] T.timeout { - setverdict(fail, "Timeout waiting for RANAP on BSSAP port: ", exp_rx); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for RANAP on BSSAP port: ", exp_rx)); } } T.stop; @@ -385,13 +385,13 @@ [] RUA.receive(exp_rx) -> value rx { setverdict(pass); } - [] RUA.receive(RANAP_PDU:?) { - setverdict(fail, "Got an unexpected RUA message, was waiting for ", exp_rx); - mtc.stop; + [] RUA.receive(RANAP_PDU:?) -> value rx { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Got an unexpected RUA message: ", rx, " vs exp ", exp_rx)); } [] T.timeout { - setverdict(fail, "Timeout waiting for Iuh ", exp_rx); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for Iuh ", exp_rx)); } } T.stop; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39483?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7f07cff2ce93e8b11338ba4e39e1d49662323f58 Gerrit-Change-Number: 39483 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-hnbgw[master]: peek_l3_ul_nas: Improve RAU req parsing checks
by pespin 06 Feb '25

06 Feb '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39480?usp=email ) Change subject: peek_l3_ul_nas: Improve RAU req parsing checks ...................................................................... peek_l3_ul_nas: Improve RAU req parsing checks Used recently updated osmo-sgsn gprs_gmm_parse_ra_upd_req() as a guide. Related: OS#6717 Change-Id: I1a6c642e7017e159a2035869c75475d0de7fbb75 --- M src/osmo-hnbgw/hnbgw_l3.c 1 file changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/80/39480/1 diff --git a/src/osmo-hnbgw/hnbgw_l3.c b/src/osmo-hnbgw/hnbgw_l3.c index 86d39dc..5b3b870 100644 --- a/src/osmo-hnbgw/hnbgw_l3.c +++ b/src/osmo-hnbgw/hnbgw_l3.c @@ -121,6 +121,7 @@ return 0; } +/* Parse 24.008 9.4.14 RAU Request */ static int mobile_identity_decode_from_gmm_rau_req(struct osmo_mobile_identity *mi, struct osmo_routing_area_id *old_ra, int *nri, @@ -132,12 +133,15 @@ uint8_t ms_ra_acc_cap_len; int rc; - /* Update Type 10.5.5.18 */ - cur++; - if (cur >= end) + /* all mandatory fields + variable length MS Radio Cap (min value) would be 15 bytes. + * But even short radio capabilities we should handle with 14 bytes */ + if (l3_len < 14) return -ENOSPC; - /* Old routing area identification 10.5.5.15 */ + /* V: Update Type 10.5.5.18 */ + cur++; + + /* V: Old routing area identification 10.5.5.15 */ rc = osmo_routing_area_id_decode(old_ra, cur, end - cur); if (rc < 0) return rc; @@ -145,13 +149,14 @@ if (cur >= end) return -ENOSPC; - /* MS Radio Access Capability 10.5.5.12a */ + /* LV: MS Radio Access Capability 10.5.5.12a */ ms_ra_acc_cap_len = *cur++; + if (l3_len < (ms_ra_acc_cap_len + (cur - l3_data))) + return -ENOSPC; cur += ms_ra_acc_cap_len; - if (cur > end) - return -ENOSPC; - + if (l3_len == (cur - l3_data)) + return 0; /* No Optional TLV section */ decode_gmm_tlv(mi, old_ra, nri, cur, end - cur, allow_hex); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39480?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1a6c642e7017e159a2035869c75475d0de7fbb75 Gerrit-Change-Number: 39480 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-hnbgw[master]: peek_l3_ul_nas: Split parsing logic based on PS/CS ctx
by pespin 06 Feb '25

06 Feb '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39479?usp=email ) Change subject: peek_l3_ul_nas: Split parsing logic based on PS/CS ctx ...................................................................... peek_l3_ul_nas: Split parsing logic based on PS/CS ctx It makes no sense to receive an MM message over PS context or a GMM message over a CS context, hence better clearly split the parsing code paths to avoid unintended logic execution. Related: OS#6717 Change-Id: I198f2fd14952362c4d189663d067c7f9dae2ed05 --- M src/osmo-hnbgw/hnbgw_l3.c 1 file changed, 47 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/79/39479/1 diff --git a/src/osmo-hnbgw/hnbgw_l3.c b/src/osmo-hnbgw/hnbgw_l3.c index 1fd3398..86d39dc 100644 --- a/src/osmo-hnbgw/hnbgw_l3.c +++ b/src/osmo-hnbgw/hnbgw_l3.c @@ -159,9 +159,7 @@ static int peek_l3_ul_nas(struct hnbgw_context_map *map, const uint8_t *nas_pdu, size_t len, const struct osmo_plmn_id *local_plmn) { - const struct gsm48_hdr *gh; - int8_t pdisc; - uint8_t mtype; + const struct gsm48_hdr *gh = (const struct gsm48_hdr *)nas_pdu; const struct gsm48_loc_upd_req *lu; struct gsm48_service_request *cm; struct osmo_location_area_id old_lai; @@ -170,64 +168,71 @@ map->l3 = (struct hnbgw_l3_peek){ .gmm_nri_container = -1, + .mi = { + .type = GSM_MI_TYPE_NONE, + .tmsi = GSM_RESERVED_TMSI, + }, }; - /* Get the mobile identity from CS MM -- the PS GMM happens further down. - * This will return an error for GMM messages, ignore that. */ - if (!map->is_ps) - osmo_mobile_identity_decode_from_l3_buf(&map->l3.mi, nas_pdu, len, false); - - /* Get is_emerg and from_other_plmn */ if (len < sizeof(*gh)) { LOGP(DCN, LOGL_ERROR, "Layer 3 message too short for header\n"); return -EINVAL; } - gh = (void *)nas_pdu; - pdisc = gsm48_hdr_pdisc(gh); - mtype = gsm48_hdr_msg_type(gh); + map->l3.gsm48_pdisc = gsm48_hdr_pdisc(gh); + map->l3.gsm48_msg_type = gsm48_hdr_msg_type(gh); - map->l3.gsm48_pdisc = pdisc; - map->l3.gsm48_msg_type = mtype; + /* CS MM -- the PS GMM happens further down. + * Determine mobile identity, from_other_plmn, is_emerg. */ + if (!map->is_ps) { + osmo_mobile_identity_decode_from_l3_buf(&map->l3.mi, nas_pdu, len, false); - /* Determine from_other_plmn and is_emerg */ - switch (pdisc) { - case GSM48_PDISC_MM: + switch (map->l3.gsm48_pdisc) { + case GSM48_PDISC_MM: + /* Get is_emerg and from_other_plmn */ + switch (map->l3.gsm48_msg_type) { + case GSM48_MT_MM_LOC_UPD_REQUEST: + if (len < sizeof(*gh) + sizeof(*lu)) { + LOGP(DCN, LOGL_ERROR, "LU Req message too short\n"); + break; + } - switch (mtype) { - case GSM48_MT_MM_LOC_UPD_REQUEST: - if (len < sizeof(*gh) + sizeof(*lu)) { - LOGP(DCN, LOGL_ERROR, "LU Req message too short\n"); + lu = (struct gsm48_loc_upd_req *)gh->data; + gsm48_decode_lai2(&lu->lai, &old_lai); + + map->l3.from_other_plmn = (osmo_plmn_cmp(&old_lai.plmn, local_plmn) != 0); + if (map->l3.from_other_plmn) + LOGP(DRUA, LOGL_INFO, "LU from other PLMN: old LAI=%s my PLMN=%s\n", + osmo_plmn_name_c(OTC_SELECT, &old_lai.plmn), + osmo_plmn_name_c(OTC_SELECT, local_plmn)); + break; + + case GSM48_MT_MM_CM_SERV_REQ: + if (len < sizeof(*gh) + sizeof(*cm)) { + LOGP(DRUA, LOGL_ERROR, "CM Service Req message too short\n"); + break; + } + cm = (struct gsm48_service_request *)&gh->data[0]; + map->l3.is_emerg = (cm->cm_service_type == GSM48_CMSERV_EMERGENCY); + LOGP(DRUA, LOGL_DEBUG, "CM Service is_emerg=%d\n", map->l3.is_emerg); + break; + + default: break; } - - lu = (struct gsm48_loc_upd_req *)gh->data; - gsm48_decode_lai2(&lu->lai, &old_lai); - - map->l3.from_other_plmn = (osmo_plmn_cmp(&old_lai.plmn, local_plmn) != 0); - if (map->l3.from_other_plmn) - LOGP(DRUA, LOGL_INFO, "LU from other PLMN: old LAI=%s my PLMN=%s\n", - osmo_plmn_name_c(OTC_SELECT, &old_lai.plmn), - osmo_plmn_name_c(OTC_SELECT, local_plmn)); - break; - - case GSM48_MT_MM_CM_SERV_REQ: - if (len < sizeof(*gh) + sizeof(*cm)) { - LOGP(DRUA, LOGL_ERROR, "CM Service Req message too short\n"); - break; - } - cm = (struct gsm48_service_request *)&gh->data[0]; - map->l3.is_emerg = (cm->cm_service_type == GSM48_CMSERV_EMERGENCY); - LOGP(DRUA, LOGL_DEBUG, "CM Service is_emerg=%d\n", map->l3.is_emerg); break; default: break; } - break; + return 0; + } + + /* PS GMM: Determine mobile identity, gmm_nri_container, from_other_plmn and is_emerg */ + switch (map->l3.gsm48_pdisc) { case GSM48_PDISC_MM_GPRS: - switch (mtype) { + switch (map->l3.gsm48_msg_type) { case GSM48_MT_GMM_ATTACH_REQ: mobile_identity_decode_from_gmm_att_req(&map->l3.mi, &old_ra, &nri, nas_pdu, len, false); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I198f2fd14952362c4d189663d067c7f9dae2ed05 Gerrit-Change-Number: 39479 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-hnbgw[master]: peek_l3_ul_nas: Improve GMM Attach Req parsing checks
by pespin 06 Feb '25

06 Feb '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39481?usp=email ) Change subject: peek_l3_ul_nas: Improve GMM Attach Req parsing checks ...................................................................... peek_l3_ul_nas: Improve GMM Attach Req parsing checks Related: OS#6717 Change-Id: Ic9815215d40d7bb59709dcbffa0a4673f1e0e710 --- M src/osmo-hnbgw/hnbgw_l3.c 1 file changed, 13 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/81/39481/1 diff --git a/src/osmo-hnbgw/hnbgw_l3.c b/src/osmo-hnbgw/hnbgw_l3.c index 5b3b870..591f3a5 100644 --- a/src/osmo-hnbgw/hnbgw_l3.c +++ b/src/osmo-hnbgw/hnbgw_l3.c @@ -68,6 +68,7 @@ } } +/* Parse 3GPP TS 24.008 § 9.4.1 Attach request */ static int mobile_identity_decode_from_gmm_att_req(struct osmo_mobile_identity *mi, struct osmo_routing_area_id *old_ra, int *nri, @@ -82,11 +83,16 @@ uint8_t ms_ra_acc_cap_len; int rc; + if (l3_len < 26) + return -ENOSPC; + /* MS network capability 10.5.5.12 */ msnc_len = *cur++; + if (l3_len < (msnc_len + (cur - l3_data))) + return -ENOSPC; cur += msnc_len; - /* aTTACH Type 10.5.5.2 */ + /* aTTACH Type 10.5.5.2 + Ciphering key sequence number 10.5.1.2 */ cur++; /* DRX parameter 10.5.5.6 */ @@ -95,10 +101,9 @@ /* Mobile Identity (P-TMSI or IMSI) 10.5.1.4 */ mi_len = *cur++; mi_data = cur; - cur += mi_len; - - if (cur >= end) + if (l3_len < (mi_len + (cur - l3_data))) return -ENOSPC; + cur += mi_len; rc = osmo_mobile_identity_decode(mi, mi_data, mi_len, allow_hex); if (rc) @@ -112,11 +117,12 @@ /* MS Radio Access Capability 10.5.5.12a */ ms_ra_acc_cap_len = *cur++; + if (l3_len < (ms_ra_acc_cap_len + (cur - l3_data))) + return -ENOSPC; cur += ms_ra_acc_cap_len; - if (cur > end) - return -ENOSPC; - + if (l3_len == (cur - l3_data)) + return 0; /* No Optional TLV section */ decode_gmm_tlv(mi, old_ra, nri, cur, end - cur, allow_hex); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic9815215d40d7bb59709dcbffa0a4673f1e0e710 Gerrit-Change-Number: 39481 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-hnbgw[master]: peek_l3_ul_nas: Parse PTMSI MI from GMM RAU req
by pespin 06 Feb '25

06 Feb '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39482?usp=email ) Change subject: peek_l3_ul_nas: Parse PTMSI MI from GMM RAU req ...................................................................... peek_l3_ul_nas: Parse PTMSI MI from GMM RAU req old_ra param in decode_gmm_tlv() is dropped since it was not really used, and all callers already parse old_ra in the manual mandatory parsing step. Related: OS#6717 Change-Id: I570eb31dcee94a3ebef25e15ac7cd7199ec9a79e --- M src/osmo-hnbgw/hnbgw_l3.c 1 file changed, 11 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/82/39482/1 diff --git a/src/osmo-hnbgw/hnbgw_l3.c b/src/osmo-hnbgw/hnbgw_l3.c index 591f3a5..33b8637 100644 --- a/src/osmo-hnbgw/hnbgw_l3.c +++ b/src/osmo-hnbgw/hnbgw_l3.c @@ -50,10 +50,8 @@ }, }; -static void decode_gmm_tlv(struct osmo_mobile_identity *mi, - struct osmo_routing_area_id *old_ra, - int *nri, - const uint8_t *tlv_data, size_t tlv_len, bool allow_hex) +static void decode_gmm_tlv(struct osmo_mobile_identity *mi, int *nri, + const uint8_t *tlv_data, size_t tlv_len, bool allow_hex) { struct tlv_parsed tp; struct tlv_p_entry *e; @@ -66,6 +64,11 @@ *nri <<= 2; *nri |= e->val[1] >> 6; } + + /* RAU Req: 9.4.14.5 P-TMSI (Iu mode only): "This IE shall be included by the MS." */ + e = TLVP_GET(&tp, GSM48_IE_GMM_ALLOC_PTMSI); + if (mi && e) + osmo_mobile_identity_decode(mi, e->val, e->len, allow_hex); } /* Parse 3GPP TS 24.008 § 9.4.1 Attach request */ @@ -123,7 +126,9 @@ if (l3_len == (cur - l3_data)) return 0; /* No Optional TLV section */ - decode_gmm_tlv(mi, old_ra, nri, cur, end - cur, allow_hex); + + /* Mobile identity = NULL: already obtained from Mandatory IE above.*/ + decode_gmm_tlv(NULL, nri, cur, end - cur, allow_hex); return 0; } @@ -163,7 +168,7 @@ if (l3_len == (cur - l3_data)) return 0; /* No Optional TLV section */ - decode_gmm_tlv(mi, old_ra, nri, cur, end - cur, allow_hex); + decode_gmm_tlv(mi, nri, cur, end - cur, allow_hex); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39482?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I570eb31dcee94a3ebef25e15ac7cd7199ec9a79e Gerrit-Change-Number: 39482 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-bsc[master]: nokia_site: Add object_identity, object_state and object_identity_sta...
by pespin 06 Feb '25

06 Feb '25

Attention is currently required from: csaba.sipos, domi, fixeria, laforge. pespin has posted comments on this change by csaba.sipos. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39416?usp=email ) Change subject: nokia_site: Add object_identity, object_state and object_identity_state attributes ...................................................................... Patch Set 14: (1 comment) File src/osmo-bsc/bts_nokia_site.c: https://gerrit.osmocom.org/c/osmo-bsc/+/39416/comment/78c86bd3_185bcfd6?usp… : PS14, Line 1716: #define FIND_ELEM(data, data_len, ei, var) (find_element(data, data_len, ei, var, sizeof(var)) == sizeof(var)) In here you'd be checking for "sizeof(&object_state)", which afaiu is wrong: FIND_ELEM(noh->data, len_data, NOKIA_EI_OBJ_STATE, &object_state) You may need to write it above as "&var, sizeof(var)" but not sure if that's also going to work well for arrays. Otherwise you'll have to add one macro for a var pointer and another one for an array. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39416?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id9f819b0649ba3c247db72d7d738e49c72388dc3 Gerrit-Change-Number: 39416 Gerrit-PatchSet: 14 Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: domi <domi(a)tomcsanyi.net> Gerrit-Attention: csaba.sipos <metro4(a)freemail.hu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: domi <domi(a)tomcsanyi.net> Gerrit-Comment-Date: Thu, 06 Feb 2025 13:09:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

2026

2025

2024

2023

2022

gerrit-log