October 2024 - gerrit-log - lists.osmocom.org

[M] Change in docker-playground[master]: osmo-gsm-tester: use debian-bookworm-build
by osmith 16 Oct '24

16 Oct '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/38440?usp=email ) Change subject: osmo-gsm-tester: use debian-bookworm-build ...................................................................... osmo-gsm-tester: use debian-bookworm-build osmo-gsm-tester was the last user of debian-buster-jenkins, and it just broke again for some reason. Instead of adjusting debian-buster-jenkins again this time, I've adjusted osmo-gsm-tester to run with debian-bookworm-build instead so we can avoid the maintenance effort of keeping debian-buster-jenkins working, as well as the additional time needed to build this container. We held off from upgrading to debian-bookworm-build, because no mongodb debian packages are available for bookworm. However in the meantime we have just installed the bullseye mongodb package in bookworm together with the older libssl from bullseye that it was build against - we did this in other containers already, so do this here too. Other adjustments: * Pip needs --break-system-packages now (it is fine in a docker container) * Patchelf in bookworm is >= 0.11 (getting installed in the apt install call already), so we don't need to build it from source anymore. * Remove 'if [ "$(arch)" = "x86_64" ];' around the mongodb code. This was needed earlier when we used to build this container on arm devices too, but AFAIK we don't do that anymore and it wasn't really useful in the first place. (And if we do we can bring this back easily.) * Add rpm2cpio and cpio, because these are used during the osmo-gsm-tester_build-osmocom-bb job which will use this docker image with an upcoming osmo-ci patch (currently it is not using docker to build the Osmocom programs, but that leads to missing library errors once we upgrade to bookworm here). IMHO the build process should be reworked so that this is not necessary, but given that osmo-gsm-tester isn't really maintained currently, this is the bare minimum needed to migrate it away from debian buster. Related: OS#6126 Change-Id: I5ed3b92f07f23c96b8f953e0a93991cc89476a12 --- M osmo-gsm-tester/Dockerfile 1 file changed, 21 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/40/38440/1 diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile index 0105e47..b38706d 100644 --- a/osmo-gsm-tester/Dockerfile +++ b/osmo-gsm-tester/Dockerfile @@ -1,8 +1,7 @@ ARG USER -FROM $USER/debian-buster-jenkins +FROM $USER/debian-bookworm-build ARG OGT_MASTER_ADDR="172.18.50.2" - # Create jenkins user RUN useradd -ms /bin/bash jenkins # Create osmo-gsm-tester group and add user to it @@ -12,6 +11,7 @@ # install osmo-gsm-tester dependencies RUN apt-get update && \ apt-get install -y --no-install-recommends \ + cpio \ dbus \ tcpdump \ sqlite3 \ @@ -25,6 +25,7 @@ python3-watchdog \ ofono \ patchelf \ + rpm2cpio \ sudo \ libcap2-bin \ python3-pip \ @@ -33,7 +34,7 @@ locales # install osmo-gsm-tester pip dependencies -RUN pip3 install \ +RUN pip3 install --break-system-packages \ "git+https://github.com/podshumok/python-smpplib.git@master#egg=smpplib" \ pydbus \ pyusb \ @@ -63,16 +64,6 @@ update-locale LANG=en_US.UTF-8 ENV LANG en_US.UTF-8 -# We require a newer patchelf 0.11 (OS#4389) -ADD https://github.com/NixOS/patchelf/archive/0.11.tar.gz /tmp/patchelf-0.11.tar.gz -RUN cd /tmp && \ - tar -zxf /tmp/patchelf-0.11.tar.gz && \ - cd patchelf-0.11 && \ - autoreconf -fi && \ - ./configure --prefix=/usr/local && \ - make && \ - make install - RUN apt-get update && \ apt-get install -y --no-install-recommends \ telnet \ @@ -109,23 +100,23 @@ gnuradio && \ apt-get clean -# install open5gs dependencies: (mongodb not available in Debian) -# systemctl stuff: workaround for https://jira.mongodb.org/browse/SERVER-54386 -ADD https://www.mongodb.org/static/pgp/server-4.4.asc /tmp/mongodb-server-4.4.asc -RUN if [ "$(arch)" = "x86_64" ]; then \ - apt-key add /tmp/mongodb-server-4.4.asc && \ - echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" \ - > /etc/apt/sources.list.d/mongodb-org-4.4.list; \ - fi -RUN if [ "$(arch)" = "x86_64" ]; then \ - apt-get update && \ - systemctl_path=$(which systemctl) && \ - mv $systemctl_path /tmp/systemctl && \ - apt-get install -y --no-install-recommends mongodb-org && \ - apt-get clean && \ - mv /tmp/systemctl $systemctl_path && \ - sed -i "s/127.0.0.1/$OGT_MASTER_ADDR/g" /etc/mongod.conf; \ - fi +# Add mongodb using the package from bullseye since a bookworm mongodb-org +# package is not available. Furthermore, manually install required libssl1.1. +RUN set -x && \ + mkdir -p /tmp/mongodb && \ + cd /tmp/mongodb && \ + wget "https://pgp.mongodb.com/server-5.0.asc" -O "/mongodb.key" && \ + wget "http://security.debian.org/debian-security/pool/updates/main/o/openssl/libs…" && \ + dpkg -i "libssl1.1_1.1.1n-0+deb10u6_amd64.deb" && \ + echo "deb [signed-by=/mongodb.key] http://repo.mongodb.org/apt/debian bullseye/mongodb-org/5.0 main" \ + > /etc/apt/sources.list.d/mongodb-org.list && \ + apt-get update && \ + apt-get install -y mongodb-org && \ + apt-get clean && \ + cd / && \ + rm -rf /tmp/mongodb && \ + rm /etc/apt/sources.list.d/mongodb-org.list && \ + sed -i "s/127.0.0.1/$OGT_MASTER_ADDR/g" /etc/mongod.conf # install open5gs dependencies: RUN if [ "$(arch)" = "x86_64" ]; then \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38440?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5ed3b92f07f23c96b8f953e0a93991cc89476a12 Gerrit-Change-Number: 38440 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: vlr: add the location update type to the callbacks tx_lu_acc/tx_lu_rej
by pespin 16 Oct '24

16 Oct '24

Attention is currently required from: lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38407?usp=email ) Change subject: vlr: add the location update type to the callbacks tx_lu_acc/tx_lu_rej ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38407?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I980a637333e92b15f2d516683feeaded910105b6 Gerrit-Change-Number: 38407 Gerrit-PatchSet: 4 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, 16 Oct 2024 13:46:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-msc[master]: vlr: set the correct CN domain on GSUP messages
by pespin 16 Oct '24

16 Oct '24

Attention is currently required from: lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38406?usp=email ) Change subject: vlr: set the correct CN domain on GSUP messages ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38406?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I045f29647b0f122a653881030d09de35b64f4dd1 Gerrit-Change-Number: 38406 Gerrit-PatchSet: 4 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, 16 Oct 2024 13:45:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-msc[master]: vlr: add functions for vlr_is_cs() vlr_is_ps()
by pespin 16 Oct '24

16 Oct '24

Attention is currently required from: lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38405?usp=email ) Change subject: vlr: add functions for vlr_is_cs() vlr_is_ps() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38405?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I88810f3703813e98be8a37d0445ad641b0cac11d Gerrit-Change-Number: 38405 Gerrit-PatchSet: 4 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, 16 Oct 2024 13:45:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-msc[master]: vlr: set the correct CN domain on GSUP messages
by laforge 16 Oct '24

16 Oct '24

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38406?usp=email ) Change subject: vlr: set the correct CN domain on GSUP messages ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: > never-ending then. s/never-ending/nevermind/ (shitty android autocorrection, sigh). -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38406?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I045f29647b0f122a653881030d09de35b64f4dd1 Gerrit-Change-Number: 38406 Gerrit-PatchSet: 4 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, 16 Oct 2024 12:47:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in upf-benchmark[master]: Rename osmo-pfcp-tool to osmo-upf-load-gen
by laforge 16 Oct '24

16 Oct '24

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/upf-benchmark/+/38354?usp=email ) Change subject: Rename osmo-pfcp-tool to osmo-upf-load-gen ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/38354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Ie36379b5dcf4ab86276dfda9e25410fe41db1d93 Gerrit-Change-Number: 38354 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Oct 2024 12:46:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: ss7 vty: Limit route priority range to 1-9
by laforge 16 Oct '24

16 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38426?usp=email ) Change subject: ss7 vty: Limit route priority range to 1-9 ...................................................................... ss7 vty: Limit route priority range to 1-9 This matches route priority ranges used by other vendors. Change-Id: I36ceee5d7cb1b2287c4a2d7ad67f478843300a0b --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_test.vty 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 356090c..e3142c7 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -74,7 +74,7 @@ QOS_CLASS_RANGE_HELP_STR \ "Default QoS Class (0)\n" -#define ROUTE_PRIO_RANGE_STR "<0-4294967295>" +#define ROUTE_PRIO_RANGE_STR "<1-9>" #define ROUTE_PRIO_RANGE_HELP_STR "Priority\n" #define ROUTE_PRIO_VAR_STR "(" ROUTE_PRIO_RANGE_STR "|default)" #define ROUTE_PRIO_VAR_HELP_STR \ diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 7967216..cb24560 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -570,7 +570,7 @@ OsmoSTP(config-cs7)# route-table system OsmoSTP(config-cs7-rt)# list ... - update route POINT_CODE MASK linkset LS_NAME [priority] [(<0-4294967295>|default)] [qos-class] [(<0-7>|default)] + update route POINT_CODE MASK linkset LS_NAME [priority] [(<1-9>|default)] [qos-class] [(<0-7>|default)] remove route POINT_CODE MASK OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset my-ass OsmoSTP(config-cs7-rt)# show running-config -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38426?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I36ceee5d7cb1b2287c4a2d7ad67f478843300a0b Gerrit-Change-Number: 38426 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: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: osmo_ss7_route_destroy(): Fix potential null ptr deref
by laforge 16 Oct '24

16 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38438?usp=email ) Change subject: osmo_ss7_route_destroy(): Fix potential null ptr deref ...................................................................... osmo_ss7_route_destroy(): Fix potential null ptr deref rt ptr was being dereferenced already before checking for null. Related: Coverity CID#425367 Change-Id: Idf7613e174e564fb388cd82dca897ff13001217b --- M src/osmo_ss7.c 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index bcbe76c..93bcfc2 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -908,17 +908,16 @@ /*! \brief Destroy a given SS7 route */ void osmo_ss7_route_destroy(struct osmo_ss7_route *rt) { - struct osmo_ss7_route_table *rtbl = rt->rtable; - OSMO_ASSERT(ss7_initialized); if (!rt) return; if (ss7_route_inserted(rt)) { - LOGSS7(rtbl->inst, LOGL_INFO, + struct osmo_ss7_instance *inst = rt->rtable->inst; + LOGSS7(inst, LOGL_INFO, "Destroying route: pc=%u=%s mask=0x%x via linkset/ASP '%s'\n", - rt->cfg.pc, osmo_ss7_pointcode_print(rtbl->inst, rt->cfg.pc), + rt->cfg.pc, osmo_ss7_pointcode_print(inst, rt->cfg.pc), rt->cfg.mask, rt->cfg.linkset_name); llist_del(&rt->list); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38438?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Idf7613e174e564fb388cd82dca897ff13001217b Gerrit-Change-Number: 38438 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: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: osmo_ss7_route_destroy(): Fix potential null ptr deref
by laforge 16 Oct '24

16 Oct '24

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38438?usp=email ) Change subject: osmo_ss7_route_destroy(): Fix potential null ptr deref ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38438?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Idf7613e174e564fb388cd82dca897ff13001217b Gerrit-Change-Number: 38438 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Oct 2024 12:46:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: sgsn: Introduce test TC_attach_pdp_act_user_addr_itu_x213_ipv4toolarge
by laforge 16 Oct '24

16 Oct '24

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38437?usp=email ) Change subject: sgsn: Introduce test TC_attach_pdp_act_user_addr_itu_x213_ipv4toolarge ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38437?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: Id2501e38565db491a6248552e754f03f7b973997 Gerrit-Change-Number: 38437 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> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Oct 2024 12:46:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0