August 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-sgsn[master]: sgsn_rim: do not check the origin of a RIM message

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/34121 to look at the new patch set (#2). Change subject: sgsn_rim: do not check the origin of a RIM message ...................................................................... sgsn_rim: do not check the origin of a RIM message When we forward RIM messages from GTP to BSSGP, we do not have to check the origin of the message since it does not matter from which origin the message came when we are forwarding it. Related: OS#6095 Change-Id: Iea8176dcfe64c25d207bafc0ef61ca9d9ad415be --- M src/sgsn/sgsn_rim.c 1 file changed, 14 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/21/34121/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/34121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iea8176dcfe64c25d207bafc0ef61ca9d9ad415be Gerrit-Change-Number: 34121 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years

1
0
0 0

[S] Change in osmo-sgsn[master]: sgsn_rim: do not check the origin of a RIM message

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/34121 ) Change subject: sgsn_rim: do not check the origin of a RIM message ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > I think it is still nice to do checks on stuff being received from an MME. […] Is there even a way to distinguish? I see no identifier in the GTP messages. I guess the only way to distinguish would be to track from which socket the message came from. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/34121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iea8176dcfe64c25d207bafc0ef61ca9d9ad415be Gerrit-Change-Number: 34121 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Aug 2023 09:58:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in osmo-sgsn[master]: sgsn_rim: forward message based on RIM ROUTING ADDRESS

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/34122 to look at the new patch set (#2). Change subject: sgsn_rim: forward message based on RIM ROUTING ADDRESS ...................................................................... sgsn_rim: forward message based on RIM ROUTING ADDRESS At the moment we parse the RAN TRANSPARENT CONTAINER to look at the destination RIM ROUTING INFORMATION. This is not corredt. The SGSN should not decode the RAN TRANSPARENT CONTAINER and use the RIM ROUTING ADDRESS / RIM ROUTING ADDRESS DISCRIMINATOR IE to make the routing decision. Related: OS#6095 Depends: libosmocore.git Ibca1f08906c4ffeecdae80d4e91c6c7b05fe4f8a Change-Id: Ifd2b915ed2f05130cff8ee77714b82005c17de3d --- M include/osmocom/sgsn/sgsn_rim.h M src/sgsn/sgsn_libgtp.c M src/sgsn/sgsn_rim.c 3 files changed, 86 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/22/34122/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/34122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifd2b915ed2f05130cff8ee77714b82005c17de3d Gerrit-Change-Number: 34122 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years

1
0
0 0

[M] Change in osmo-sgsn[master]: sgsn_rim: forward message based on RIM ROUTING ADDRESS

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/34122 ) Change subject: sgsn_rim: forward message based on RIM ROUTING ADDRESS ...................................................................... Patch Set 2: (3 comments) File src/sgsn/sgsn_libgtp.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/34122/comment/495fdd7d_9b476d83 PS1, Line 707: if (gtpie_gettlv(ie, GTPIE_RIM_RA_DISCR, 0, &rim_ra_encoded_len, rim_ra_encoded, > can you move thisgtpie_gettlv() call to be "rc = ... […] Done https://gerrit.osmocom.org/c/osmo-sgsn/+/34122/comment/2535c06f_1d1a5ad0 PS1, Line 714: rim_ra_encoded[0] = BSSGP_RIM_ROUTING_INFO_UTRAN; > why are you using an array in here? we have no packed struct explaining what is this buffer? The problem here is that we deal with two different types, RIM ROUTING ADDRESS and RIM ROUTING INFORMATION. RIM ROUTING INFORMATION is basically RIM ROUTING ADDRESS DISCRIMINATOR (1 byte) + RIM ROUTING ADDRESS - but I see, this is probably not very elegant. We should have a decoder that handles this. https://gerrit.osmocom.org/c/osmo-sgsn/+/34122/comment/a7a022c2_fe65f9df PS1, Line 715: } > rim_ra_encoded++; Done -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/34122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifd2b915ed2f05130cff8ee77714b82005c17de3d Gerrit-Change-Number: 34122 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Aug 2023 09:58:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in libosmocore[master]: gprs_bssgp_rim: add decoder for RIM ROUTING ADDRESS

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34128 ) Change subject: gprs_bssgp_rim: add decoder for RIM ROUTING ADDRESS ...................................................................... Patch Set 1: (2 comments) File src/gb/gprs_bssgp_rim.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10457): https://gerrit.osmocom.org/c/libosmocore/+/34128/comment/b7b39830_4f872cba PS1, Line 57: int bssgp_parse_rim_ra(struct bssgp_rim_routing_info *ri, const uint8_t *buf, open brace '{' following function definitions go on the next line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10457): https://gerrit.osmocom.org/c/libosmocore/+/34128/comment/0793642b_87f30fb2 PS1, Line 92: ri->eutran.global_enb_id_len = len - 5; code indent should use tabs where possible -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibca1f08906c4ffeecdae80d4e91c6c7b05fe4f8a Gerrit-Change-Number: 34128 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 10 Aug 2023 09:50:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in libosmocore[master]: gprs_bssgp_rim: add decoder for RIM ROUTING ADDRESS

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34128 ) Change subject: gprs_bssgp_rim: add decoder for RIM ROUTING ADDRESS ...................................................................... gprs_bssgp_rim: add decoder for RIM ROUTING ADDRESS We have a decoder for RIM ROUTING INFORMATION (bssgp_parse_rim_ri), let's also have a decoder for RIM ROUTING ADDRESS (bssgp_parse_rim_ra. Related: OS#6095 Change-Id: Ibca1f08906c4ffeecdae80d4e91c6c7b05fe4f8a --- M include/osmocom/gprs/gprs_bssgp_rim.h M src/gb/gprs_bssgp_rim.c M src/gb/libosmogb.map 3 files changed, 50 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/34128/1 diff --git a/include/osmocom/gprs/gprs_bssgp_rim.h b/include/osmocom/gprs/gprs_bssgp_rim.h index 4c0a57b..10ea58b 100644 --- a/include/osmocom/gprs/gprs_bssgp_rim.h +++ b/include/osmocom/gprs/gprs_bssgp_rim.h @@ -69,6 +69,7 @@ char *bssgp_rim_ri_name_buf(char *buf, size_t buf_len, const struct bssgp_rim_routing_info *ri); const char *bssgp_rim_ri_name(const struct bssgp_rim_routing_info *ri); int bssgp_parse_rim_ri(struct bssgp_rim_routing_info *ri, const uint8_t *buf, unsigned int len); +int bssgp_parse_rim_ra(struct bssgp_rim_routing_info *ri, const uint8_t *buf, unsigned int len, uint8_t discr); int bssgp_create_rim_ri(uint8_t *buf, const struct bssgp_rim_routing_info *ri); /* 3GPP TS 48.018, table 11.3.63.1.1: RAN-INFORMATION-REQUEST Application Container coding for NACC */ diff --git a/src/gb/gprs_bssgp_rim.c b/src/gb/gprs_bssgp_rim.c index d7b19e7..3cf7329 100644 --- a/src/gb/gprs_bssgp_rim.c +++ b/src/gb/gprs_bssgp_rim.c @@ -49,36 +49,36 @@ { 0, NULL } }; -/*! Parse a RIM Routing information IE (3GPP TS 48.018, chapter 11.3.70). +/*! Parse a RIM Routing address IE (3GPP TS 29.060, chapter 7.7.57 and 7.7.77). * \param[out] ri user provided memory to store the parsed results. - * \param[in] buf input buffer of the value part of the IE. + * \param[in] buf input buffer of the value part of the RIM Routing address IE. + * \discr[in] discr value part (one byte) of the RIM Routing Address Discriminator IE. * \returns length of parsed octets, -EINVAL on error. */ -int bssgp_parse_rim_ri(struct bssgp_rim_routing_info *ri, const uint8_t *buf, - unsigned int len) -{ +int bssgp_parse_rim_ra(struct bssgp_rim_routing_info *ri, const uint8_t *buf, + unsigned int len, uint8_t discr) { + struct gprs_ra_id raid_temp; memset(ri, 0, sizeof(*ri)); if (len < 2) return -EINVAL; - ri->discr = buf[0] & 0x0f; - buf++; + ri->discr = discr; switch (ri->discr) { case BSSGP_RIM_ROUTING_INFO_GERAN: - if (len < 9) + if (len < 8) return -EINVAL; ri->geran.cid = bssgp_parse_cell_id(&ri->geran.raid, buf); - return 9; + return 8; case BSSGP_RIM_ROUTING_INFO_UTRAN: - if (len < 9) + if (len < 8) return -EINVAL; gsm48_parse_ra(&ri->utran.raid, buf); ri->utran.rncid = osmo_load16be(buf + 6); - return 9; + return 8; case BSSGP_RIM_ROUTING_INFO_EUTRAN: - if (len < 7 || len > 14) + if (len < 6 || len > 13) return -EINVAL; /* Note: 3GPP TS 24.301 Figure 9.9.3.32.1 and 3GPP TS 24.008 * Figure 10.5.130 specify MCC/MNC encoding in the same way, @@ -88,14 +88,35 @@ ri->eutran.tai.mnc = raid_temp.mnc; ri->eutran.tai.mnc_3_digits = raid_temp.mnc_3_digits; ri->eutran.tai.tac = osmo_load16be(buf + 3); - memcpy(ri->eutran.global_enb_id, buf + 5, len - 6); - ri->eutran.global_enb_id_len = len - 6; + memcpy(ri->eutran.global_enb_id, buf + 5, len - 5); + ri->eutran.global_enb_id_len = len - 5; return len; default: return -EINVAL; } } +/*! Parse a RIM Routing information IE (3GPP TS 48.018, chapter 11.3.70). + * \param[out] ri user provided memory to store the parsed results. + * \param[in] buf input buffer of the value part of the IE. + * \returns length of parsed octets, -EINVAL on error. */ +int bssgp_parse_rim_ri(struct bssgp_rim_routing_info *ri, const uint8_t *buf, + unsigned int len) +{ + uint8_t discr; + int rc; + + if (len < 1) + return -EINVAL; + + discr = buf[0] & 0x0f; + + rc = bssgp_parse_rim_ra(ri, buf + 1, len - 1, discr); + if (rc < 0) + return rc; + return rc + 1; +} + /*! Encode a RIM Routing information IE (3GPP TS 48.018, chapter 11.3.70). * \param[out] buf user provided memory (at least 14 byte) for the generated value part of the IE. * \param[in] ri user provided input data struct. diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map index 7dc427b..e5a5c8f 100644 --- a/src/gb/libosmogb.map +++ b/src/gb/libosmogb.map @@ -34,6 +34,7 @@ bssgp_parse_cell_id; bssgp_parse_rim_pdu; bssgp_parse_rim_ri; +bssgp_parse_rim_ra; bssgp_ran_inf_app_id_strs; bssgp_rim_routing_info_discr_strs; bssgp_rim_ri_name_buf; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibca1f08906c4ffeecdae80d4e91c6c7b05fe4f8a Gerrit-Change-Number: 34128 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-sgsn[master]: sgsn_rim: fix typo

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/34118 ) Change subject: sgsn_rim: fix typo ...................................................................... sgsn_rim: fix typo Related: OS#6095 Change-Id: I86f70ea9a1a3e43523ec327165bfeb1737ad300a --- M src/sgsn/sgsn_rim.c 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sgsn/sgsn_rim.c b/src/sgsn/sgsn_rim.c index 57f6ea7..07eff6b 100644 --- a/src/sgsn/sgsn_rim.c +++ b/src/sgsn/sgsn_rim.c @@ -89,7 +89,7 @@ return -1; } -/* Receive a RIM PDU from GTPvC1 (EUTRAN) */ +/* Receive a RIM PDU from GTPv1C (EUTRAN) */ int sgsn_rim_rx_from_gtp(struct bssgp_ran_information_pdu *pdu, struct sgsn_mme_ctx *mme) { struct sgsn_mme_ctx *mme_tmp; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/34118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I86f70ea9a1a3e43523ec327165bfeb1737ad300a Gerrit-Change-Number: 34118 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[S] Change in libosmocore[master]: gprs_bssgp_rim: also print NSEI when sending RIM messages

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34116 ) Change subject: gprs_bssgp_rim: also print NSEI when sending RIM messages ...................................................................... gprs_bssgp_rim: also print NSEI when sending RIM messages In bssgp_tx_rim we print source and destination address of the RIM message we send, but we do not print the NSEI, even though this is also an important address parameter. Related: OS#6095 Change-Id: I2595abff28fc1d89c1409a2ca0194fedc6f15313 --- M src/gb/gprs_bssgp_rim.c 1 file changed, 16 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_bssgp_rim.c b/src/gb/gprs_bssgp_rim.c index 71f7ea8..55609ed 100644 --- a/src/gb/gprs_bssgp_rim.c +++ b/src/gb/gprs_bssgp_rim.c @@ -1171,8 +1171,8 @@ msgb_bvci(msg) = 0; /* Signalling */ bgph = (struct bssgp_normal_hdr *)msgb_bssgph(msg); - DEBUGP(DLBSSGP, "BSSGP BVCI=0 Tx RIM-PDU:%s, src=%s, dest=%s\n", - bssgp_pdu_str(bgph->pdu_type), + DEBUGP(DLBSSGP, "BSSGP BVCI=0 NSEI=%u Tx RIM-PDU:%s, src=%s, dest=%s\n", + nsei, bssgp_pdu_str(bgph->pdu_type), bssgp_rim_ri_name_buf(ri_src_str, sizeof(ri_src_str), &pdu->routing_info_src), bssgp_rim_ri_name_buf(ri_dest_str, sizeof(ri_dest_str), &pdu->routing_info_dest)); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2595abff28fc1d89c1409a2ca0194fedc6f15313 Gerrit-Change-Number: 34116 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: attempt to fix sporadic test failures

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34127 ) Change subject: hnbgw: attempt to fix sporadic test failures ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: coolest solution would be to emit some event when the RANAP RESET procedure is finished, but not sure of the layering, so just quick-fixing now and not diving into it. (RAN_Emulation.ttcnpp f_ranap_reset() should probably do something like CLIENT.send("RESET done"), and f_init() from HNBGW_Tests.ttcn should wait for it; that will likely have effects on other suites, so this is likely a vortex pulling you in, in order to save a few hundred ms.) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia5144dbbc5168b3707e714e12b805f5d640fa774 Gerrit-Change-Number: 34127 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 10 Aug 2023 01:48:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: attempt to fix sporadic test failures

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34127 ) Change subject: hnbgw: attempt to fix sporadic test failures ...................................................................... hnbgw: attempt to fix sporadic test failures Give some more wait time for RANAP RESET after f_cn_nr_init(). Intended to fix sporadic failures of HNBGW_Tests... - TC_rab_assign_mgcp_to - TC_ranap_cs_mo_disconnect Change-Id: Ia5144dbbc5168b3707e714e12b805f5d640fa774 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/34127/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index df6fc8e..b1f6cae 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -533,6 +533,11 @@ if (start_hnb) { f_start_hnbs(); } + + /* Sometimes, the RUA InitialUE-Message from a test happens too quickly, before the RANAP RESET from + * RAN_Emulation is through, after above f_cn_nr_init(). In the pcap it seems to be a matter of 50 ms. Give some + * grace. */ + f_sleep(1.0); } friend function f_shutdown_helper() runs on test_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia5144dbbc5168b3707e714e12b805f5d640fa774 Gerrit-Change-Number: 34127 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023