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

[S] Change in libosmocore[master]: osmo_io: Clean up code

by pespin

Attention is currently required from: arehbein, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email ) Change subject: osmo_io: Clean up code ...................................................................... Patch Set 1: -Code-Review (1 comment) Patchset: PS1: > osmo_iofd_init() is only called from the main thread, it needs to be public similar to osmo_select_i […] So now the topic is actually: Is this per-thread call requirement documented in the doxygen API of that function? Because it really should ;) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I77f7ae2b211507f420d87c484ec75ee054fceb63 Gerrit-Change-Number: 34524 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Sep 2023 10:44:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pcu: Fail immediately in TC_n3105_max_t3195

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34536?usp=email ) Change subject: pcu: Fail immediately in TC_n3105_max_t3195 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34536?usp=email 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: I55b97037c014478451790e1943c617a634fe2457 Gerrit-Change-Number: 34536 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Sep 2023 10:32:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Init struct msghdr to zero

by daniel

Attention is currently required from: laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34337?usp=email ) Change subject: osmo_io: Init struct msghdr to zero ...................................................................... Patch Set 2: (1 comment) File src/core/osmo_io_poll.c: https://gerrit.osmocom.org/c/libosmocore/+/34337/comment/9b44ef14_c814c573 PS1, Line 58: hdr.msg = msg; > it's a rather trivial change delaying the merge already for a week. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34337?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I21114ad57784126cfdeb4a932ed44dbf23946fbe Gerrit-Change-Number: 34337 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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-Comment-Date: Wed, 27 Sep 2023 10:30:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: IuUP_Emulation: fix AMR SID SDU size

by osmith

Attention is currently required from: neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34537?usp=email ) Change subject: IuUP_Emulation: fix AMR SID SDU size ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34537?usp=email 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: I9afb28ca6e23f7976edcc130ea012be34e04eb4b Gerrit-Change-Number: 34537 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Sep 2023 10:29:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: osmo-mgw.cfg syntax fix

by osmith

Attention is currently required from: neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34538?usp=email ) Change subject: osmo-mgw.cfg syntax fix ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34538?usp=email 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: I5d4d1af40410bfdcc1280f45b85a8ae0c7b94a80 Gerrit-Change-Number: 34538 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Sep 2023 10:28:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in docker-playground[master]: make/Makefile: update DISTRO, UPSTREAM_DISTRO

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34544?usp=email ) Change subject: make/Makefile: update DISTRO, UPSTREAM_DISTRO ...................................................................... make/Makefile: update DISTRO, UPSTREAM_DISTRO Update the Makefile, so it does not pick the wrong base distribution when running make in e.g. osmo-bsc-master directly (without going through ttcn3-*/jenkins.sh as jenkins does). Change-Id: I31b2a1b8c70b973f4ec0f93d6e9e5e417afec994 --- M make/Makefile 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/44/34544/1 diff --git a/make/Makefile b/make/Makefile index 126fd94..f007f2a 100644 --- a/make/Makefile +++ b/make/Makefile @@ -42,8 +42,8 @@ OPEN5GS_BRANCH?=main BUILD_ARGS?= RUN_ARGS?=-it -UPSTREAM_DISTRO?=debian:bullseye -DISTRO?=debian-bullseye +UPSTREAM_DISTRO?=debian:bookworm +DISTRO?=debian-bookworm # Full OBS repository mirror consists of: # ${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION} -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34544?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I31b2a1b8c70b973f4ec0f93d6e9e5e417afec994 Gerrit-Change-Number: 34544 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email ) Change subject: vty: make NCC Permitted (SI2) configurable ...................................................................... vty: make NCC Permitted (SI2) configurable Related: SYS#6579 Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e --- M src/osmo-bsc/bts_vty.c M tests/bts_features.vty 2 files changed, 102 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/34543/1 diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 6602ad1..69b9dc8 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -1405,6 +1405,54 @@ return CMD_SUCCESS; } +#define NCC_STR "Network Colour Code\n" + +DEFUN_USRATTR(cfg_bts_ncc_permitted, + cfg_bts_ncc_permitted_cmd, + X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), + "ncc-permitted <1-8> [<1-8>] [<1-8>] [<1-8>] [<1-8>] [<1-8>] [<1-8>]\n", + "Set permitted " NCC_STR "s\n" + NCC_STR NCC_STR NCC_STR NCC_STR NCC_STR NCC_STR NCC_STR) +{ + struct gsm_bts *bts = vty->index; + int i; + int ncc; + int ncc_prev = -1; + + /* Check if NCCs are in order (like get_amr_from_arg) */ + for (i = 0; i < argc; i++) { + ncc = atoi(argv[i]); + if (ncc_prev > ncc) { + vty_out(vty, "%% NCCs must be listed in order%s", VTY_NEWLINE); + return CMD_WARNING; + } + + if (ncc_prev == ncc) { + vty_out(vty, "%% NCCs must be unique%s", VTY_NEWLINE); + return CMD_WARNING; + } + ncc_prev = ncc; + } + + bts->si_common.ncc_permitted = 0x00; + for (i = 0; i < argc; i++) + bts->si_common.ncc_permitted |= 1 << (atoi(argv[i]) - 1); + + return CMD_SUCCESS; +} + +DEFUN_USRATTR(cfg_bts_no_ncc_permitted, + cfg_bts_no_ncc_permitted_cmd, + X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), + "no ncc-permitted", + NO_STR "Permit all " NCC_STR "s (default)\n") +{ + struct gsm_bts *bts = vty->index; + + bts->si_common.ncc_permitted = 0xff; + return CMD_SUCCESS; +} + DEFUN_USRATTR(cfg_bts_radio_link_timeout, cfg_bts_radio_link_timeout_cmd, X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK), @@ -4343,6 +4391,24 @@ #undef cfg_out +static void config_write_bts_ncc_permitted(struct vty *vty, struct gsm_bts *bts) +{ + int i; + uint8_t ncc_permitted = bts->si_common.ncc_permitted; + + if (ncc_permitted == 0xff) + return; + + vty_out(vty, " ncc-permitted"); + + for (i = 0; i < 8; i++) { + if ((ncc_permitted & (1 << i))) + vty_out(vty, " %d", i + 1); + } + + vty_out(vty, "%s", VTY_NEWLINE); +} + static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts) { int i; @@ -4722,6 +4788,8 @@ config_write_power_ctrl(vty, 2, bts, &bts->bs_power_ctrl); config_write_power_ctrl(vty, 2, bts, &bts->ms_power_ctrl); + config_write_bts_ncc_permitted(vty, bts); + config_write_bts_model(vty, bts); } @@ -4904,6 +4972,8 @@ install_element(BTS_NODE, &cfg_bts_immediate_assignment_cmd); install_element(BTS_NODE, &cfg_bts_nch_position_cmd); install_element(BTS_NODE, &cfg_bts_no_nch_position_cmd); + install_element(BTS_NODE, &cfg_bts_ncc_permitted_cmd); + install_element(BTS_NODE, &cfg_bts_no_ncc_permitted_cmd); neighbor_ident_vty_init(); /* See also handover commands added on bts level from handover_vty.c */ diff --git a/tests/bts_features.vty b/tests/bts_features.vty index 3768a4d..38f11d3 100644 --- a/tests/bts_features.vty +++ b/tests/bts_features.vty @@ -25,3 +25,25 @@ OsmoBSC(config-net-bts-trx-ts)# exit OsmoBSC(config-net-bts-trx)# exit OsmoBSC(config-net-bts)# exit + +OsmoBSC(config-net)# exit +OsmoBSC(config)# exit + +OsmoBSC# ### test ncc-permitted +OsmoBSC# show running-config +... !ncc-permitted +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 0 +OsmoBSC(config-net-bts)# ncc-permitted 3 2 +% NCCs must be listed in order +OsmoBSC(config-net-bts)# ncc-permitted 2 2 +% NCCs must be unique +OsmoBSC(config-net-bts)# ncc-permitted 2 3 4 5 6 7 8 +OsmoBSC(config-net-bts)# exit +OsmoBSC(config-net)# exit +OsmoBSC(config)# exit +OsmoBSC# show running-config +... + ncc-permitted 2 3 4 5 6 7 8 +... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: add test TC_ncc_permitted_si2

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email ) Change subject: bsc: add test TC_ncc_permitted_si2 ...................................................................... bsc: add test TC_ncc_permitted_si2 Related: SYS#6579 Change-Id: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272 --- M bsc/BSC_Tests.ttcn 1 file changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/34542/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 7773153..0fe9d63 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -12396,6 +12396,56 @@ f_shutdown_helper(ho := true); } +/* Verify NCC Permitted in System Information Type 2 + * 3GPP TS 44.018 § 10.5.2.27 */ +testcase TC_ncc_permitted_si2() runs on test_CT { + var ASP_RSL_Unitdata rx_rsl_ud; + timer T := 5.0; + var BIT8 exp; + + f_init_vty(); + + /* Set NCC Permitted to 6 7 8 */ + f_vty_enter_cfg_bts(BSCVTY, 0); + f_vty_transceive(BSCVTY, "ncc-permitted 6 7 8"); + f_vty_transceive(BSCVTY, "end"); + exp := '11100000'B; + + f_init(1); + T.start; + + /* Check value in SI 2 */ + alt { + [] IPA_RSL[0][0].receive(tr_ASP_RSL_UD(tr_RSL_BCCH_INFO(RSL_SYSTEM_INFO_2))) -> value rx_rsl_ud { + var RSL_IE_Body ie := rx_rsl_ud.rsl.ies[2].body; /* FULL BCCH Information IE */ + var SystemInformation si := dec_SystemInformation(ie.other.payload); + + if (si.header.message_type != SYSTEM_INFORMATION_TYPE_2) { + setverdict(fail, "RSL FULL BCCH Information IE contains: ", si); + repeat; + } + + if (si.payload.si2.ncc_permitted != exp) { + setverdict(fail, "NCC Permitted is ", si.payload.si2.ncc_permitted, " but expected ", exp); + break; + } + + } + [] IPA_RSL[0][0].receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for RSL BCCH INFOrmation (SI2)"); + } + } + + /* Reset NCC Permitted to default (all permitted). This is already + * getting tested in TC_si_default(). */ + f_vty_enter_cfg_bts(BSCVTY, 0); + f_vty_transceive(BSCVTY, "no ncc-permitted"); + f_vty_transceive(BSCVTY, "end"); + + f_shutdown_helper(); +} + control { /* CTRL interface testing */ execute( TC_ctrl_msc_connection_status() ); @@ -12745,6 +12795,8 @@ execute( TC_ho_meas_rep_multi_band() ); + execute( TC_ncc_permitted_si2() ); + /* Run TC_ho_out_of_this_bsc last, because it may trigger a segfault before osmo-bsc's patch * with change-id I5a3345ab0005a73597f5c27207480912a2f5aae6 */ execute( TC_ho_out_of_this_bsc() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email 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: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272 Gerrit-Change-Number: 34542 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Init struct msghdr to zero

by daniel

Attention is currently required from: daniel, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34337?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified+1 by Jenkins Builder Change subject: osmo_io: Init struct msghdr to zero ...................................................................... osmo_io: Init struct msghdr to zero Avoid uninitialized read, found with valgrind Syscall param recvmsg(msg) points to uninitialised byte(s) at 0x49FD865: __recvmsg_syscall (recvmsg.c:27) by 0x49FD865: recvmsg (recvmsg.c:41) by 0x4891FAE: iofd_poll_ofd_cb_recvmsg_sendmsg (osmo_io_poll.c:66) by 0x48921B2: iofd_poll_ofd_cb_dispatch (osmo_io_poll.c:119) by 0x48941F1: poll_disp_fds (select.c:419) by 0x4894299: _osmo_select_main (select.c:457) by 0x4894304: osmo_select_main (select.c:496) by 0x10DC3E: test_segm_ipa_stream_srv_run (stream_test.c:628) by 0x10E2A5: main (stream_test.c:879) Address 0x1ffefffa68 is on thread 1's stack in frame #1, created by iofd_poll_ofd_cb_recvmsg_sendmsg (osmo_io_poll.c:45) Change-Id: I21114ad57784126cfdeb4a932ed44dbf23946fbe --- M src/core/osmo_io_poll.c 1 file changed, 30 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/34337/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34337?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I21114ad57784126cfdeb4a932ed44dbf23946fbe Gerrit-Change-Number: 34337 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[S] Change in osmo-pcu[master]: systemd: remove RestartPreventExitStatus=1

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34541?usp=email ) Change subject: systemd: remove RestartPreventExitStatus=1 ...................................................................... systemd: remove RestartPreventExitStatus=1 Fix OsmoPCU not restarting if e.g. an external gsmtap IP is configured that is currently not available. Also make the service files more consistent with other Osmocom projects. Revert f81e2f76 ("systemd: Do not re-start in case of exit(1) (e.g. a config issue)"). Related: SYS#6581 Change-Id: I061206a6f61abddfa698a4ce809afcbdf0cbce9c --- M contrib/systemd/osmo-pcu.service 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/41/34541/1 diff --git a/contrib/systemd/osmo-pcu.service b/contrib/systemd/osmo-pcu.service index 5324883..f688d7f 100644 --- a/contrib/systemd/osmo-pcu.service +++ b/contrib/systemd/osmo-pcu.service @@ -10,7 +10,6 @@ WorkingDirectory=%S/osmocom Restart=always RestartSec=2 -RestartPreventExitStatus=1 # CPU scheduling policy: CPUSchedulingPolicy=rr # For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34541?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I061206a6f61abddfa698a4ce809afcbdf0cbce9c Gerrit-Change-Number: 34541 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023