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

[S] Change in osmo-ttcn3-hacks[master]: GTP_Templates: Fix several template type incongruencies

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261 ) Change subject: GTP_Templates: Fix several template type incongruencies ...................................................................... Patch Set 1: (3 comments) File library/GTP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261/comment/8caeb75e_93a1… PS1, Line 285: lengthf := 2 As I said in the IRC, hard-coding `lengthf` to 2 is wrong. It's only valid if `ip_addr` is `omit`, and would not match otherwise. I suggest to use `f_eua_ipv4_len()` here and drop `tr_EuaIPv4`. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261/comment/933c7df9_b28e… PS1, Line 306: lengthf := 2, Same here. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261/comment/f4fd442f_72d7… PS1, Line 328: lengthf := 2, Same here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261 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: I3846d2a077e4bc53a772e354fcc3c38ca952b38f Gerrit-Change-Number: 34261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 14:39:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Change parent of msghdr to iofd (instead of msg)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34256 ) Change subject: osmo_io: Change parent of msghdr to iofd (instead of msg) ...................................................................... osmo_io: Change parent of msghdr to iofd (instead of msg) msg was made a parent of msghdr after discussion in change I3a279b55a3adff96948120683c844e1508d0ba94 It turns out this violates some assumptions made in osmo_io, specifically that the user read callback shall free msg, but we expect msghdr to remain valid until after that callback returns. In general I think it is cleaner to make iofd a parent of msghdr. Change-Id: I41277190e3020cd8fa625bd57a743973e2a65c4b --- M src/core/osmo_io.c 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index e176099..c67787b 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -120,7 +120,7 @@ talloc_steal(iofd, msg); } - hdr = talloc_zero(msg, struct iofd_msghdr); + hdr = talloc_zero(iofd, struct iofd_msghdr); if (!hdr) { if (free_msg) talloc_free(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I41277190e3020cd8fa625bd57a743973e2a65c4b Gerrit-Change-Number: 34256 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Use local variable to reference msghdr->msg

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34257 ) Change subject: osmo_io: Use local variable to reference msghdr->msg ...................................................................... osmo_io: Use local variable to reference msghdr->msg Change-Id: I336ef7a5460dd18bf8e0f4ac5e97747f9fec5a35 --- M src/core/osmo_io_uring.c 1 file changed, 17 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index 84b7b4c..a6395fe 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -182,6 +182,7 @@ static void iofd_uring_handle_tx(struct iofd_msghdr *msghdr, int rc) { struct osmo_io_fd *iofd = msghdr->iofd; + struct msgb *msg = msghdr->msg; if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED)) goto out_free; @@ -189,27 +190,27 @@ /* Error during write */ if (rc < 0) { if (msghdr->action == IOFD_ACT_WRITE) - iofd->io_ops.write_cb(iofd, rc, msghdr->msg); + iofd->io_ops.write_cb(iofd, rc, msg); else if (msghdr->action == IOFD_ACT_SENDTO) - iofd->io_ops.sendto_cb(iofd, rc, msghdr->msg, &msghdr->osa); + iofd->io_ops.sendto_cb(iofd, rc, msg, &msghdr->osa); else OSMO_ASSERT(0); goto out_free; } /* Incomplete write */ - if (rc < msgb_length(msghdr->msg)) { + if (rc < msgb_length(msg)) { /* Re-enqueue remaining data */ - msgb_pull(msghdr->msg, rc); - msghdr->iov[0].iov_len = msgb_length(msghdr->msg); + msgb_pull(msg, rc); + msghdr->iov[0].iov_len = msgb_length(msg); iofd_txqueue_enqueue_front(iofd, msghdr); goto out; } if (msghdr->action == IOFD_ACT_WRITE) - iofd->io_ops.write_cb(iofd, rc, msghdr->msg); + iofd->io_ops.write_cb(iofd, rc, msg); else if (msghdr->action == IOFD_ACT_SENDTO) - iofd->io_ops.sendto_cb(iofd, rc, msghdr->msg, &msghdr->osa); + iofd->io_ops.sendto_cb(iofd, rc, msg, &msghdr->osa); else OSMO_ASSERT(0); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I336ef7a5460dd18bf8e0f4ac5e97747f9fec5a35 Gerrit-Change-Number: 34257 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Use local variable to reference msghdr->msg

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34257 ) Change subject: osmo_io: Use local variable to reference msghdr->msg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I336ef7a5460dd18bf8e0f4ac5e97747f9fec5a35 Gerrit-Change-Number: 34257 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 14:28:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Change parent of msghdr to iofd (instead of msg)

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34256 ) Change subject: osmo_io: Change parent of msghdr to iofd (instead of msg) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I41277190e3020cd8fa625bd57a743973e2a65c4b Gerrit-Change-Number: 34256 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 14:28:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: GTP_Templates: Fix several template type incongruencies

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261 ) Change subject: GTP_Templates: Fix several template type incongruencies ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261 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: I3846d2a077e4bc53a772e354fcc3c38ca952b38f Gerrit-Change-Number: 34261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 14:27:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: GTP_Templates: Fix several template type incongruencies

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261 ) Change subject: GTP_Templates: Fix several template type incongruencies ...................................................................... GTP_Templates: Fix several template type incongruencies This fixes following error while running test GGSN_Tests.TC_pdp46_act_deact_apn4: "GTP_Templates.ttcn:315 Dynamic test case error: Restriction `omit' on template of type octetstring violated." Change-Id: I3846d2a077e4bc53a772e354fcc3c38ca952b38f --- M library/GTP_Templates.ttcn 1 file changed, 24 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/34261/1 diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 8ab830e..06ba208 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -241,7 +241,7 @@ gtpc := ts_GTP1C_PDU(echoRequest, '00000000'O, valueof(ts_EchoReqPDU), seq) } - private function f_eua_ipv4_len(template (present) OCT4 ip_addr) return template integer { + private function f_eua_ipv4_len(template OCT4 ip_addr) return template (present) integer { if (istemplatekind(ip_addr, "omit")) { return 2; } else if (istemplatekind(ip_addr, "*")) { @@ -252,7 +252,7 @@ return 6; } - private function f_eua_ipv6_len(template (omit) OCT16 ip_addr) return template (present) integer { + private function f_eua_ipv6_len(template OCT16 ip_addr) return template (present) integer { if (istemplatekind(ip_addr, "omit")) { return 2; } else if (istemplatekind(ip_addr, "*")) { @@ -263,7 +263,7 @@ return 18; } - private function f_eua_ipv4v6_len(template (omit) OCT4 ip_addr4, template (omit) OCT16 ip_addr6) return template (present) integer { + private function f_eua_ipv4v6_len(template OCT4 ip_addr4, template OCT16 ip_addr6) return template (present) integer { var integer len := 2; if (istemplatekind(ip_addr4, "*") or istemplatekind(ip_addr6, "*")) { @@ -278,7 +278,7 @@ return len; } - template EndUserAddress t_EuaIPv4(template OCT4 ip_addr) := { + template (present) EndUserAddress t_EuaIPv4(template OCT4 ip_addr) := { type_gtpc := '80'O, endUserAddress := { endUserAddressIPv4 := { @@ -290,7 +290,7 @@ } } } - template EndUserAddress t_EuaIPv4Dyn := t_EuaIPv4(omit); + template (present) EndUserAddress t_EuaIPv4Dyn := t_EuaIPv4(omit); template (present) EndUserAddress tr_EuaIPv4(template (present) OCT4 ip_addr) modifies t_EuaIPv4 := { endUserAddress := { endUserAddressIPv4 := { @@ -299,7 +299,7 @@ } } - template EndUserAddress t_EuaIPv6(template OCT16 ip_addr) := { + template (present) EndUserAddress t_EuaIPv6(template OCT16 ip_addr) := { type_gtpc := '80'O, endUserAddress := { endUserAddressIPv6 := { @@ -311,7 +311,7 @@ } } } - template EndUserAddress t_EuaIPv6Dyn := t_EuaIPv6(omit); + template (present) EndUserAddress t_EuaIPv6Dyn := t_EuaIPv6(omit); template (present) EndUserAddress tr_EuaIPv6(template (present) OCT16 ip_addr) modifies t_EuaIPv6 := { endUserAddress := { endUserAddressIPv6 := { @@ -321,7 +321,7 @@ } /* 3GPP TS 29.060 Figure 37A: End User Address Information Element for IPv4v6 (both static) */ - template EndUserAddress t_EuaIPv4v6(template OCT4 ip_addr4, template OCT16 ip_addr6) := { + template (present) EndUserAddress t_EuaIPv4v6(template OCT4 ip_addr4, template OCT16 ip_addr6) := { type_gtpc := '80'O, endUserAddress := { endUserAddressIPv4andIPv6 := { @@ -334,7 +334,7 @@ } } } - template EndUserAddress t_EuaIPv4Dynv6Dyn := t_EuaIPv4v6(omit, omit); + template (present) EndUserAddress t_EuaIPv4Dynv6Dyn := t_EuaIPv4v6(omit, omit); template (present) EndUserAddress tr_EuaIPv4v6(template (present) OCT4 ip_addr4, template (present) OCT16 ip_addr6) modifies t_EuaIPv4v6 := { endUserAddress := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261 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: I3846d2a077e4bc53a772e354fcc3c38ca952b38f Gerrit-Change-Number: 34261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in libosmocore[master]: debian: fix build on ubuntu 20.04 without liburing

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34260 ) Change subject: debian: fix build on ubuntu 20.04 without liburing ...................................................................... debian: fix build on ubuntu 20.04 without liburing Ubuntu 20.04 is based on debian 11, but does not have liburing. Extend the logic to cover this distribution too, so building packages for it isn't stuck anymore on libosmocore not being able to resolve the liburing-dev dependency. I have verified that this makes libosmocore properly build with/without liburing on debian 10, 11 and ubuntu 20.04 and 22.04. Fixes: e486e012 ("debian: depend on liburing-dev for debian >= 11") Change-Id: If18d6543fae9537c8b188e90499491bda3fdfe59 --- M debian/control M debian/rules 2 files changed, 23 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/debian/control b/debian/control index 1f1975e..e6b96e1 100644 --- a/debian/control +++ b/debian/control @@ -2,6 +2,7 @@ Maintainer: Osmocom team <openbsc(a)lists.osmocom.org> Section: libs Priority: optional +# liburing-dev: don't try to install it on debian 10 and ubuntu 20.04 Build-Depends: debhelper (>= 10), autotools-dev, autoconf, @@ -19,7 +20,7 @@ libusb-1.0-0-dev, libmnl-dev, libsystemd-dev, - base-files (<< 11) | liburing-dev, + liburing-dev | base-files (<< 11) | ubuntu-keyring (<< 2021), python3:native Standards-Version: 3.9.8 Vcs-Git: https://gitea.osmocom.org/osmocom/libosmocore diff --git a/debian/rules b/debian/rules index efa5adc..f0105b4 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -# Set --disable-uring for debian < 11 based distributions +# Set --disable-uring for debian 10 and ubuntu 20.04 override_dh_auto_configure: set -x && \ CONFIGURE_FLAGS=" \ @@ -33,8 +33,8 @@ --enable-static \ --enable-systemd-logging \ "; \ - base_ver="$$(dpkg -l base-files | grep "^ii" | awk '{print $$3}')"; \ - if dpkg --compare-versions "$$base_ver" lt 11; then \ + distro_v=$$(. /etc/os-release && echo $$VERSION_ID); \ + if [ "$$distro_v" = 10 ] || [ "$$distro_v" = 20.04 ]; then \ CONFIGURE_FLAGS="$$CONFIGURE_FLAGS --disable-uring"; \ fi; \ dh_auto_configure -- $$CONFIGURE_FLAGS -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If18d6543fae9537c8b188e90499491bda3fdfe59 Gerrit-Change-Number: 34260 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[S] Change in libosmocore[master]: debian: fix build on ubuntu 20.04 without liburing

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34260 ) Change subject: debian: fix build on ubuntu 20.04 without liburing ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: > Seeing how much fallout we had after making libosmocore depend on liburing by default (unless `--dis […] FWIW we would still have required this logic for the debian packaging, it would just be in reverse. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If18d6543fae9537c8b188e90499491bda3fdfe59 Gerrit-Change-Number: 34260 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 14:19:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in libosmocore[master]: debian: fix build on ubuntu 20.04 without liburing

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34260 ) Change subject: debian: fix build on ubuntu 20.04 without liburing ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: Seeing how much fallout we had after making libosmocore depend on liburing by default (unless `--disable-uring` is specified), I am again starting to think that it would have been safer to not require this problematic dependency unless explicitly configured (i.e. by passing `--enable-uring`). This way we could enable it only when building for known-to-have-it distributions. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If18d6543fae9537c8b188e90499491bda3fdfe59 Gerrit-Change-Number: 34260 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 14:17:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023