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

[S] Change in osmo-ttcn3-hacks[master]: library/RSL_Emulation: make use of IpaUnitId codec

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36611?usp=email ) Change subject: library/RSL_Emulation: make use of IpaUnitId codec ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36611?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: I20e1ac35707affc6aab60397a22e33fe2bd1106e Gerrit-Change-Number: 36611 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 09:21:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library/IPA_Types: add codec for IPA UnitID

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26458?usp=email ) Change subject: library/IPA_Types: add codec for IPA UnitID ...................................................................... library/IPA_Types: add codec for IPA UnitID Change-Id: I68eb0d9e28bbf5d2d8ffe916aae5a66a0fdb9bd0 --- M library/IPA_Types.ttcn 1 file changed, 41 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/IPA_Types.ttcn b/library/IPA_Types.ttcn index 95623ef..fc729fb 100644 --- a/library/IPA_Types.ttcn +++ b/library/IPA_Types.ttcn @@ -132,6 +132,38 @@ extension "decode(RAW)" } +/* Example: 1234/0/0 (site_id=1234, bts_id=0, trx_id=0) */ +type record IpaUnitId { + integer site_id, + integer bts_id, + integer trx_id +} with { + encode "TEXT" + variant "SEPARATOR('/')" + /* workaround for https://gitlab.eclipse.org/eclipse/titan/titan.core/-/issues/725 */ + variant (trx_id) "TEXT_CODING(,,'\d+')" +}; + +external function enc_IpaUnitId(in IpaUnitId unit_id) return charstring + with { extension "prototype(convert) encode(TEXT)" } +external function dec_IpaUnitId(in charstring stream) return IpaUnitId + with { extension "prototype(convert) decode(TEXT)" } + +template (value) IpaUnitId ts_IpaUnitId(integer site_id := 1234, + integer bts_id := 0, + integer trx_id := 0) := { + site_id := site_id, + bts_id := bts_id, + trx_id := trx_id +}; +template (present) IpaUnitId tr_IpaUnitId(template (present) integer site_id := ?, + template (present) integer bts_id := ?, + template (present) integer trx_id := ?) := { + site_id := site_id, + bts_id := bts_id, + trx_id := trx_id +}; + /* Finds an IE with the given tag in IPA IDENTITY RESPONSE. * Returns index of an IE if found, -1 otherwise. */ function f_ipa_id_resp_find_ie(in IpaCcmIdResp resp, IpaCcmIdTag tag) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26458?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: I68eb0d9e28bbf5d2d8ffe916aae5a66a0fdb9bd0 Gerrit-Change-Number: 26458 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library/IPA_Types: add codec for IPA UnitID

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26458?usp=email ) Change subject: library/IPA_Types: add codec for IPA UnitID ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26458?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: I68eb0d9e28bbf5d2d8ffe916aae5a66a0fdb9bd0 Gerrit-Change-Number: 26458 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 08:49:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library/IPA_Types: WIP codec for IPA UnitID (site/bts/trx)

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26458?usp=email ) Change subject: library/IPA_Types: WIP codec for IPA UnitID (site/bts/trx) ...................................................................... Patch Set 3: (1 comment) File library/IPA_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26458/comment/96dd60e7_53a1… PS1, Line 172: log("Dec: ", dec_IpaUnitId(unit_id_enc & "\00")); > https://gitlab.eclipse.org/eclipse/titan/titan. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26458?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: I68eb0d9e28bbf5d2d8ffe916aae5a66a0fdb9bd0 Gerrit-Change-Number: 26458 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 08:48:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-upf[master]: .deb/.rpm: various fixes related to non-root

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/36666?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... .deb/.rpm: various fixes related to non-root * Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions. Related: OS#4107 Change-Id: Ib129217f6aff713d1d0e7aa831b4b54823e9bade --- M contrib/osmo-upf.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/contrib/osmo-upf.spec.in b/contrib/osmo-upf.spec.in index fb8438c..bc6c5ed 100644 --- a/contrib/osmo-upf.spec.in +++ b/contrib/osmo-upf.spec.in @@ -84,6 +84,8 @@ chmod 0660 /etc/osmocom/osmo-upf.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) diff --git a/debian/control b/debian/control index 7681c46..5c26faf 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Package: osmo-upf Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${shlibs:Depends} Description: OsmoUPF: Osmocom User Plane Function Package: osmo-upf-dbg diff --git a/debian/postinst b/debian/postinst index a84d9b2..4310e7e 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-upf.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi - ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-upf.cfg + chmod 0660 /etc/osmocom/osmo-upf.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac # dh_installdeb(1) will replace this with shell code automatically -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36666?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ib129217f6aff713d1d0e7aa831b4b54823e9bade Gerrit-Change-Number: 36666 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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-MessageType: merged

1 year, 1 month

1
0
0 0

[M] Change in osmo-upf[master]: .deb/.rpm: various fixes related to non-root

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/36666?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36666?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ib129217f6aff713d1d0e7aa831b4b54823e9bade Gerrit-Change-Number: 36666 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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-Comment-Date: Tue, 30 Apr 2024 08:48:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-upf[master]: contrib/systemd: AmbientCapabilities=CAP_NET_ADMIN

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/36670?usp=email ) Change subject: contrib/systemd: AmbientCapabilities=CAP_NET_ADMIN ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I17b21ad92837ad360d667248f3f002d44251891c Gerrit-Change-Number: 36670 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 08:45:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-upf[master]: .deb/.rpm: various fixes related to non-root

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/36666?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36666?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ib129217f6aff713d1d0e7aa831b4b54823e9bade Gerrit-Change-Number: 36666 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 08:43:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-upf[master]: contrib/systemd: AmbientCapabilities=CAP_NET_ADMIN

by osmith

osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-upf/+/36670?usp=email ) Change subject: contrib/systemd: AmbientCapabilities=CAP_NET_ADMIN ...................................................................... contrib/systemd: AmbientCapabilities=CAP_NET_ADMIN Set CAP_NET_ADMIN so osmo-upf can set up GTP tunends and tunmaps even if running as user. Fix for: Operation not permitted (you must be root) netlink: Error: cache initialization failed: Operation not permitted 20240430095022378 DNFT ERROR error running nft ruleset: rc=-1 ruleset="add table inet osmo-upf { flags owner; };\n" (upf_nft.c:79) 20240430095022378 DNFT ERROR Failed to create nft table "osmo-upf" (upf_nft.c:111) Fixes: OS#6444 Change-Id: I17b21ad92837ad360d667248f3f002d44251891c --- M contrib/systemd/osmo-upf.service 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/70/36670/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I17b21ad92837ad360d667248f3f002d44251891c Gerrit-Change-Number: 36670 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 1 month

1
0
0 0

[S] Change in osmo-upf[master]: contrib/systemd: AmbientCapabilities=CAP_NET_ADMIN

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/36670?usp=email ) Change subject: contrib/systemd: AmbientCapabilities=CAP_NET_ADMIN ...................................................................... contrib/systemd: AmbientCapabilities=CAP_NET_ADMIN Set CAP_NET_ADMIN so osmo-upf can set up GTP tunends and tunmaps even if running as user. Fix for: Operation not permitted (you must be root) netlink: Error: cache initialization failed: Operation not permitted 20240430095022378 DNFT ERROR error running nft ruleset: rc=-1 ruleset="add table inet osmo-upf { flags owner; };\n" (upf_nft.c:79) 20240430095022378 DNFT ERROR Failed to create nft table "osmo-upf" (upf_nft.c:111) Fixes: OS#6444 Change-Id: I17b21ad92837ad360d667248f3f002d44251891c --- M contrib/systemd/osmo-upf.service 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/70/36670/1 diff --git a/contrib/systemd/osmo-upf.service b/contrib/systemd/osmo-upf.service index 93dd84f..7e658d5 100644 --- a/contrib/systemd/osmo-upf.service +++ b/contrib/systemd/osmo-upf.service @@ -12,6 +12,8 @@ Group=osmocom ExecStart=/usr/bin/osmo-upf -c /etc/osmocom/osmo-upf.cfg RestartSec=2 +AmbientCapabilities=CAP_NET_ADMIN + [Install] WantedBy=multi-user.target -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I17b21ad92837ad360d667248f3f002d44251891c Gerrit-Change-Number: 36670 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2024