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

[M] Change in osmo-bsc[master]: Fix missing LAC/CI hashtable update upon CTRL SET

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/40917?usp=email ) Change subject: Fix missing LAC/CI hashtable update upon CTRL SET ...................................................................... Fix missing LAC/CI hashtable update upon CTRL SET Add functions to set LAC/CI on a BTS and update hashtables Use these function from both the vty and the control interface. This commit fixes the issue where an update to LAC or CI via the control interface was not resulting in updated hashtables and therefore the BTS was not found during paging. Related: OS#6840 Fixes: 15284337ece94e3ff3ebf9575096290f67d69a88 Change-Id: If9509534bd4a75f8ed8fb3e0a6bec701c7596861 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_ctrl.c M src/osmo-bsc/bts_vty.c 4 files changed, 99 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified keith: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 0264dcf..a10d3c4 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -825,6 +825,9 @@ int gsm_set_bts_model(struct gsm_bts *bts, struct gsm_bts_model *model); int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type); +void gsm_bts_set_lac(struct gsm_bts *bts, uint16_t lac); +void gsm_bts_set_ci(struct gsm_bts *bts, uint16_t ci); + struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index dd60ef8..730cf7a 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -758,6 +758,30 @@ return 0; } +void gsm_bts_set_lac(struct gsm_bts *bts, uint16_t lac) +{ + bts->location_area_code = lac; + + hash_del(&bts->node_by_lac); + hash_del(&bts->node_by_lac_ci); + hash_add(bts->network->bts_by_lac, &bts->node_by_lac, bts->location_area_code); + hash_add(bts->network->bts_by_lac_ci, &bts->node_by_lac_ci, + LAC_CI_HASHTABLE_KEY(bts->location_area_code, bts->cell_identity)); +} + +void gsm_bts_set_ci(struct gsm_bts *bts, uint16_t ci) +{ + bts->cell_identity = ci; + + hash_del(&bts->node_by_ci); + hash_add(bts->network->bts_by_ci, &bts->node_by_ci, bts->cell_identity); + if (bts->location_area_code != GSM_LAC_RESERVED_DETACHED) { + hash_del(&bts->node_by_lac_ci); + hash_add(bts->network->bts_by_lac_ci, &bts->node_by_lac_ci, + LAC_CI_HASHTABLE_KEY(bts->location_area_code, bts->cell_identity)); + } +} + int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode) { if (mode != BTS_GPRS_NONE && diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index 2efa661..d63ad89 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -21,6 +21,7 @@ #include <errno.h> #include <time.h> +#include <inttypes.h> #include <osmocom/ctrl/control_cmd.h> @@ -244,9 +245,76 @@ return 1; } +static int get_bts_lac(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + cmd->reply = talloc_asprintf(cmd, "%" PRIu16, bts->location_area_code); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + return CTRL_CMD_REPLY; +} + +static int set_bts_lac(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + int lac; + + osmo_str_to_int(&lac, cmd->value, 0, 0, 0xffff); + gsm_bts_set_lac(bts, lac); + return get_bts_lac(cmd, data); +} + +static int verify_bts_lac(struct ctrl_cmd *cmd, const char *value, void *data) +{ + int lac; + + if (osmo_str_to_int(&lac, cmd->value, 0, 0, 0xffff) < 0) { + cmd->reply = "Input not within the range"; + return -1; + } + if (lac == GSM_LAC_RESERVED_DETACHED || lac == GSM_LAC_RESERVED_ALL_BTS) { + cmd->reply = talloc_asprintf(cmd, "LAC %d is reserved by GSM 04.08", lac); + return -1; + } + return 0; +} + +static int get_bts_ci(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + cmd->reply = talloc_asprintf(cmd, "%" PRIu16, bts->cell_identity); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + return CTRL_CMD_REPLY; +} + +static int set_bts_ci(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + int ci; + + osmo_str_to_int(&ci, cmd->value, 0, 0, 0xffff); + gsm_bts_set_ci(bts, ci); + return get_bts_ci(cmd, data); +} + +static int verify_bts_ci(struct ctrl_cmd *cmd, const char *value, void *data) +{ + int ci; + + if (osmo_str_to_int(&ci, cmd->value, 0, 0, 0xffff) < 0) { + cmd->reply = "Input not within the range"; + return -1; + } + return 0; +} /* BTS related commands below */ -CTRL_CMD_DEFINE_RANGE(bts_lac, "location-area-code", struct gsm_bts, location_area_code, 0, 65535); -CTRL_CMD_DEFINE_RANGE(bts_ci, "cell-identity", struct gsm_bts, cell_identity, 0, 65535); +CTRL_CMD_DEFINE(bts_lac, "location-area-code"); +CTRL_CMD_DEFINE(bts_ci, "cell-identity"); CTRL_CMD_DEFINE_RANGE(bts_bsic, "bsic", struct gsm_bts, bsic, 0, 63); CTRL_CMD_DEFINE_RANGE(bts_rach_max_delay, "rach-max-delay", struct gsm_bts, rach_max_delay, 1, 127); CTRL_CMD_DEFINE_RANGE(bts_rach_expiry_timeout, "rach-expiry-timeout", struct gsm_bts, rach_expiry_timeout, 4, 64); diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index b2b1247..bbee866 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -274,15 +274,8 @@ ci, VTY_NEWLINE); return CMD_WARNING; } - bts->cell_identity = ci; - hash_del(&bts->node_by_ci); - hash_add(bts->network->bts_by_ci, &bts->node_by_ci, bts->cell_identity); - if (bts->location_area_code != GSM_LAC_RESERVED_DETACHED) { - hash_del(&bts->node_by_lac_ci); - hash_add(bts->network->bts_by_lac_ci, &bts->node_by_lac_ci, - LAC_CI_HASHTABLE_KEY(bts->location_area_code, bts->cell_identity)); - } + gsm_bts_set_ci(bts, ci); return CMD_SUCCESS; } @@ -305,13 +298,7 @@ return CMD_WARNING; } - bts->location_area_code = lac; - hash_del(&bts->node_by_lac); - hash_del(&bts->node_by_lac_ci); - hash_add(bts->network->bts_by_lac, &bts->node_by_lac, bts->location_area_code); - hash_add(bts->network->bts_by_lac_ci, &bts->node_by_lac_ci, - LAC_CI_HASHTABLE_KEY(bts->location_area_code, bts->cell_identity)); - + gsm_bts_set_lac(bts, lac); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/40917?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If9509534bd4a75f8ed8fb3e0a6bec701c7596861 Gerrit-Change-Number: 40917 Gerrit-PatchSet: 8 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org>

3 weeks, 5 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: install curl backport only for bookworm

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40939?usp=email ) Change subject: testenv: install curl backport only for bookworm ...................................................................... testenv: install curl backport only for bookworm Change-Id: Ifeeea010fb13bfd65e1d3659a3c43fc4acf07795 --- M _testenv/data/podman/Dockerfile 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index aa99337..961785b 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -99,6 +99,9 @@ # shipped with debian12 is buggy and generates wrong HTTP2 for open5gs. ENV BACKPORTS_SOURCES_LIST="/etc/apt/sources.list.d/debian-backports.sources" RUN set -x && \ + if ! grep -q VERSION_CODENAME=bookworm /etc/os-release; then \ + exit 0; \ + fi && \ echo "Types: deb deb-src" >>"$BACKPORTS_SOURCES_LIST" && \ echo "URIs: http://deb.debian.org/debian" >>"$BACKPORTS_SOURCES_LIST" && \ echo "Suites: bookworm-backports" >>"$BACKPORTS_SOURCES_LIST" && \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40939?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: Ifeeea010fb13bfd65e1d3659a3c43fc4acf07795 Gerrit-Change-Number: 40939 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 weeks, 5 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: Cosmetic: testenv: make builddir_env more readable

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40940?usp=email ) Change subject: Cosmetic: testenv: make builddir_env more readable ...................................................................... Cosmetic: testenv: make builddir_env more readable Change-Id: I7bbd14bd91c97bc37a163018217b104ace0e1a53 --- M _testenv/testenv/testsuite.py 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index 8452a80..8d89ad8 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -43,7 +43,11 @@ cache_dir = "podman" if testenv.args.podman else "host" builddir = os.path.join(testenv.args.cache, cache_dir, f"titan-{titan_version}") path_old = testenv.cmd.generate_env(podman=testenv.args.podman)["PATH"] - builddir_env = {"BUILDDIR": builddir, "TTCN3_DIR": ttcn3_dir, "PATH": f"{ttcn3_dir}/bin:{path_old}"} + builddir_env = { + "BUILDDIR": builddir, + "TTCN3_DIR": ttcn3_dir, + "PATH": f"{ttcn3_dir}/bin:{path_old}", + } prepare_testsuite_dir() -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40940?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: I7bbd14bd91c97bc37a163018217b104ace0e1a53 Gerrit-Change-Number: 40940 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 weeks, 5 days

1
0
0 0

[M] Change in osmo-bsc[master]: Fix missing LAC/CI hashtable update upon CTRL SET

by osmith

Attention is currently required from: fixeria, keith, laforge, pespin. osmith has posted comments on this change by keith. ( https://gerrit.osmocom.org/c/osmo-bsc/+/40917?usp=email ) Change subject: Fix missing LAC/CI hashtable update upon CTRL SET ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/40917?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: If9509534bd4a75f8ed8fb3e0a6bec701c7596861 Gerrit-Change-Number: 40917 Gerrit-PatchSet: 8 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Wed, 27 Aug 2025 11:39:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 5 days

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv: pull trixie image

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40951?usp=email ) Change subject: jobs/ttcn3-testsuites-testenv: pull trixie image ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40951?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id6502c8fdad17feca9e3bc22f8b80d238fad9a8d Gerrit-Change-Number: 40951 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Aug 2025 11:33:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 5 days

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/registry-rebuild-upload-titan: use trixie

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40950?usp=email ) Change subject: jobs/registry-rebuild-upload-titan: use trixie ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40950?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iecca98c88ca81f192b7ffb01314654e1aa5cdb8b Gerrit-Change-Number: 40950 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Aug 2025 11:33:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 5 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: set default distro to debian:trixie

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40949?usp=email ) Change subject: testenv: set default distro to debian:trixie ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40949?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: Ib9c5dafaa7b17e435f61fbedfd92393c0a767f34 Gerrit-Change-Number: 40949 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Aug 2025 11:32:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 5 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: enable_binary_repo: configure apt pin

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40948?usp=email ) Change subject: testenv: enable_binary_repo: configure apt pin ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40948?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: I3a45de277bbd5299c8b840680b56b52a8731caa4 Gerrit-Change-Number: 40948 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Aug 2025 11:32:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 5 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: check value of --distro early

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40946?usp=email ) Change subject: testenv: check value of --distro early ...................................................................... Patch Set 1: (1 comment) File _testenv/testenv/__init__.py: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40946/comment/8b0219c2_744e… : PS1, Line 27: "debian:bookworm": "Debian_12", > we don't support debian 13? Ah, done in next patch ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40946?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: I37493f26d71e70a19f4a19b3bbda972c03c84905 Gerrit-Change-Number: 40946 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Aug 2025 11:31:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

3 weeks, 5 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: add debian:trixie

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40947?usp=email ) Change subject: testenv: add debian:trixie ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40947?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: Ib62851960724c17f9adddf54a2fc39adef911d32 Gerrit-Change-Number: 40947 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Aug 2025 11:31:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 5 days

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2025