- gerrit-log - lists.osmocom.org

[M] Change in libosmocore[master]: gsm23.003: add RNC Id
by laforge 27 Nov '24

27 Nov '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/38948?usp=email ) Change subject: gsm23.003: add RNC Id ...................................................................... gsm23.003: add RNC Id The RNC is similar to the GUMMEI, but for 3G. Change-Id: I0768c99b4c42b0948e7574d05b70e1b7bdb8a55a --- M include/osmocom/gsm/gsm23003.h M src/gsm/gsm23003.c M src/gsm/libosmogsm.map 3 files changed, 70 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm23003.h b/include/osmocom/gsm/gsm23003.h index 8b9bcfb..00f05eb 100644 --- a/include/osmocom/gsm/gsm23003.h +++ b/include/osmocom/gsm/gsm23003.h @@ -55,6 +55,12 @@ uint16_t ci; }; +/* 12.4 */ +struct osmo_rnc_id { + struct osmo_plmn_id plmn; + uint16_t rnc_id; +}; + /* 12.5 */ struct osmo_service_area_id { struct osmo_location_area_id lai; @@ -137,6 +143,9 @@ const char *osmo_cgi_ps_name2(const struct osmo_cell_global_id_ps *cgi_ps); char *osmo_cgi_ps_name_buf(char *buf, size_t buf_len, const struct osmo_cell_global_id_ps *cgi_ps); char *osmo_cgi_ps_name_c(const void *ctx, const struct osmo_cell_global_id_ps *cgi_ps); +const char *osmo_rnc_id_name(const struct osmo_rnc_id *rnc_id); +char *osmo_rnc_id_name_buf(char *buf, size_t buf_len, const struct osmo_rnc_id *rnc_id); +char *osmo_rnc_id_name_c(const void *ctx, const struct osmo_rnc_id *rnc_id); const char *osmo_sai_name(const struct osmo_service_area_id *sai); const char *osmo_sai_name2(const struct osmo_service_area_id *sai); char *osmo_sai_name_buf(char *buf, size_t buf_len, const struct osmo_service_area_id *sai); @@ -167,6 +176,7 @@ int osmo_rai_cmp(const struct osmo_routing_area_id *a, const struct osmo_routing_area_id *b); int osmo_cgi_cmp(const struct osmo_cell_global_id *a, const struct osmo_cell_global_id *b); int osmo_cgi_ps_cmp(const struct osmo_cell_global_id_ps *a, const struct osmo_cell_global_id_ps *b); +int osmo_rnc_id_cmp(const struct osmo_rnc_id *a, const struct osmo_rnc_id *b); int osmo_mme_id_cmp(const struct osmo_mme_id *a, const struct osmo_mme_id *b); int osmo_gummei_cmp(const struct osmo_gummei *a, const struct osmo_gummei *b); diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c index 0f4c301..b0bac93 100644 --- a/src/gsm/gsm23003.c +++ b/src/gsm/gsm23003.c @@ -357,6 +357,44 @@ return osmo_cgi_ps_name_buf(buf, sizeof(buf), cgi_ps); } +/*! Return string representation of RNC in caller-provided output buffer. + * \param[out] buf pointer to caller-provided output buffer + * \param[in] buf_len size of buf in bytes + * \param[in] rnc RNC to be stringified + * \returns buf + */ +char *osmo_rnc_id_name_buf(char *buf, size_t buf_len, const struct osmo_rnc_id *rnc) +{ + char plmn[16]; + snprintf(buf, buf_len, "%s-%d", osmo_plmn_name_buf(plmn, sizeof(plmn), &rnc->plmn), + rnc->rnc_id); + return buf; +} + +/*! Return string representation of RNC in static output buffer. + * \param[in] rnc RNC to be stringified + * \returns pointer to static output buffer + */ +const char *osmo_rnc_id_name(const struct osmo_rnc_id *rnc) +{ + static __thread char buf[32]; + return osmo_rnc_id_name_buf(buf, sizeof(buf), rnc); +} + +/*! Return string representation of RNC in static output buffer. + * \param[out] buf pointer to caller-provided output buffer + * \param[in] buf_len size of buf in bytes + * \param[in] rnc RNC to be stringified + * \returns pointer to static output buffer + */ +char *osmo_rnc_id_name_c(const void *ctx, const struct osmo_rnc_id *rnc) +{ + char *buf = talloc_size(ctx, 32); + if (!buf) + return NULL; + return osmo_rnc_id_name_buf(buf, 32, rnc); +} + /*! Return MCC-MNC-LAC-RAC-CI as string, in a talloc-allocated output buffer. * \param[in] ctx talloc context from which to allocate output buffer * \param[in] cgi_ps CGI-PS to encode. @@ -656,6 +694,24 @@ return 0; } +/* Compare two RNC Ids + * The order of comparison is PLMN, RNCId. + * \param a[in] "Left" side RNC Id. + * \param b[in] "Right" side RNC Id. + * \returns 0 if the RNC Ids are equal, -1 if a < b, 1 if a > b. */ +int osmo_rnc_id_cmp(const struct osmo_rnc_id *a, const struct osmo_rnc_id *b) +{ + int rc = osmo_plmn_cmp(&a->plmn, &b->plmn); + if (rc) + return rc; + + if (a->rnc_id < b->rnc_id) + return -1; + if (a->rnc_id > b->rnc_id) + return 1; + return 0; +} + /* Compare two MME Ids * The order of comparison is MME GroupId, MME Code. * \param a[in] "Left" side MME Id. diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 7c78347..78e0385 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -500,6 +500,10 @@ osmo_cgi_ps_name_buf; osmo_cgi_ps_name_c; osmo_cgi_ps_name2; +osmo_rnc_id_name; +osmo_rnc_id_name_buf; +osmo_rnc_id_name_c; +osmo_rnc_id_cmp; osmo_gummei_name; osmo_gummei_name_buf; osmo_gummei_name_c; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38948?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0768c99b4c42b0948e7574d05b70e1b7bdb8a55a Gerrit-Change-Number: 38948 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: gsm23.003: make the header self-contained
by laforge 27 Nov '24

27 Nov '24

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/libosmocore/+/38949?usp=email ) Change subject: gsm23.003: make the header self-contained ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38949?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5952f5746f7ee9093d9c5c7eaef76952e2c4107b Gerrit-Change-Number: 38949 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 27 Nov 2024 07:26:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmocore[master]: gsm23.003: add RNC Id
by laforge 27 Nov '24

27 Nov '24

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/libosmocore/+/38948?usp=email ) Change subject: gsm23.003: add RNC Id ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38948?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0768c99b4c42b0948e7574d05b70e1b7bdb8a55a Gerrit-Change-Number: 38948 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 27 Nov 2024 07:26:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: bsc: Fix missing teardown in TC_ho_in_fail_msc_clears_after_ho_detect
by laforge 27 Nov '24

27 Nov '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38952?usp=email ) Change subject: bsc: Fix missing teardown in TC_ho_in_fail_msc_clears_after_ho_detect ...................................................................... bsc: Fix missing teardown in TC_ho_in_fail_msc_clears_after_ho_detect Missing handling of teardown messages made the test fail sporadically due to ttcn3 side already closing the SCCP connection when it was still expected to receive messages. Change-Id: I492607aca0e42a823836f4a714ea818c5a897855 --- M bsc/BSC_Tests.ttcn 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 83389a6..1badaa5 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6962,7 +6962,13 @@ BSSAP.send(ts_BSSMAP_ClearCommand(cause)); f_expect_dlcx_conns(); + RSL.receive(tr_RSL_DEACT_SACCH(new_chan_nr)); + RSL.receive(tr_RSL_RF_CHAN_REL(new_chan_nr)); + RSL.send(ts_RSL_RF_CHAN_REL_ACK(new_chan_nr)); + f_rslem_unregister(0, new_chan_nr); + BSSAP.receive(tr_BSSMAP_ClearComplete); + BSSAP.receive(tr_BSSMAP_HandoverFailure); BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); f_sleep(1.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38952?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I492607aca0e42a823836f4a714ea818c5a897855 Gerrit-Change-Number: 38952 Gerrit-PatchSet: 2 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>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: bsc: Fix missing teardown in TC_ho_in_fail_msc_clears_after_ho_detect
by laforge 27 Nov '24

27 Nov '24

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38952?usp=email ) Change subject: bsc: Fix missing teardown in TC_ho_in_fail_msc_clears_after_ho_detect ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38952?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I492607aca0e42a823836f4a714ea818c5a897855 Gerrit-Change-Number: 38952 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Nov 2024 07:25:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: TC_rab_release: Fix race condition stats checked too early
by laforge 27 Nov '24

27 Nov '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38953?usp=email ) Change subject: hnbgw: TC_rab_release: Fix race condition stats checked too early ...................................................................... hnbgw: TC_rab_release: Fix race condition stats checked too early It could happen sometimes that the stats report was requested before the hnbgw received the message increasing the counter. Change-Id: Ica53d956ee8aed760854d3148af170144234e6b2 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 3db72bf..ab6a09e 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1226,11 +1226,6 @@ tx := valueof(ts_RANAP_RabAssReq(rab_rl := ts_RAB_RL(t_RAB_id(23), g_pars.rab_rel_cause))); BSSAP.send(tx); - expect := { - {name := hnb0_ctr_prefix & ctr_name, mtype := "c", min := 1, max := 1} - }; - f_statsd_expect(expect); - T.start; alt { @@ -1242,6 +1237,11 @@ T.stop; f_rua_expect(tx); + + expect := { + {name := hnb0_ctr_prefix & ctr_name, mtype := "c", min := 1, max := 1} + }; + f_statsd_expect(expect); } /* RAB release with Cause NAS/Normal (successful/orderly release) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38953?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ica53d956ee8aed760854d3148af170144234e6b2 Gerrit-Change-Number: 38953 Gerrit-PatchSet: 2 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>

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: TC_rab_release: Fix race condition stats checked too early
by laforge 27 Nov '24

27 Nov '24

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38953?usp=email ) Change subject: hnbgw: TC_rab_release: Fix race condition stats checked too early ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38953?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ica53d956ee8aed760854d3148af170144234e6b2 Gerrit-Change-Number: 38953 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Nov 2024 07:25:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in pysim[master]: pySim-shell: change Prompt character to "#" after "verify_adm"
by laforge 27 Nov '24

27 Nov '24

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38884?usp=email ) Change subject: pySim-shell: change Prompt character to "#" after "verify_adm" ...................................................................... Patch Set 1: (1 comment) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/38884/comment/1189a005_d770e466?usp=em… : PS1, Line 301: are we sure all instances of 'reset' or 'detecting a new card' (equip, ...) will always go through this method? I have a gut feeling there are other instances in the code... -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I957b9df7b5069b6fce5bf958c94e8ffda833c77f Gerrit-Change-Number: 38884 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Nov 2024 07:24:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in pysim[master]: Fixing 3-digit MNC PLMN Encoding/Decoding tests expected values for E...
by laforge 27 Nov '24

27 Nov '24

Attention is currently required from: JPM, dexter. laforge has posted comments on this change by JPM. ( https://gerrit.osmocom.org/c/pysim/+/38688?usp=email ) Change subject: Fixing 3-digit MNC PLMN Encoding/Decoding tests expected values for EF_OPL and EF_ePDGSelection. ...................................................................... Patch Set 4: Code-Review+1 (1 comment) Patchset: PS1: > Pending pyosmocom fix 38687: Fixing 3-digit MNC PlmnAdapter encoding and decoding. […] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38688?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib2b586cb570dbe74a617c45c0fca276b08bb075e Gerrit-Change-Number: 38688 Gerrit-PatchSet: 4 Gerrit-Owner: JPM <jean-pierre.marcotte.1(a)ens.etsmtl.ca> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: JPM <jean-pierre.marcotte.1(a)ens.etsmtl.ca> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Nov 2024 07:22:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: JPM <jean-pierre.marcotte.1(a)ens.etsmtl.ca>

1 0

[XS] Change in ...pyosmocom[master]: Bump version to 0.0.7
by laforge 27 Nov '24

27 Nov '24

laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38951?usp=email ) Change subject: Bump version to 0.0.7 ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I've pushed the tag and uploaded it to pypi -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38951?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: Iefe39999e6435a04c12bfbb847873fa605b4ef68 Gerrit-Change-Number: 38951 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Nov 2024 07:21:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

2026

2025

2024

2023

2022

gerrit-log