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

[S] Change in libosmocore[master]: Fix building in environments that define _GNU_SOURCE
by laforge 07 Oct '24

07 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/38003?usp=email ) Change subject: Fix building in environments that define _GNU_SOURCE ...................................................................... Fix building in environments that define _GNU_SOURCE On Debian unstable, this is now the case as liburing 2.7 has the following in its pkg-config file: Cflags: -I${includedir} -D_GNU_SOURCE As our configure script inherits that, we are building all of the source with that, and we will get compilation errors about re-defining something that's already defined... Change-Id: I36cb3a5555cb35ddc44f06d447268bd9cc0ce9b4 --- M src/core/exec.c M src/core/socket.c M src/core/thread.c M src/vty/cpu_sched_vty.c M tests/fr/fr_test.c M tests/logging/logging_vty_test.c M tests/tdef/tdef_vty_config_root_test.c M tests/tdef/tdef_vty_config_subnode_test.c M tests/tdef/tdef_vty_dynamic_test.c 9 files changed, 19 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/core/exec.c b/src/core/exec.c index 2e33788..2d1df82 100644 --- a/src/core/exec.c +++ b/src/core/exec.c @@ -19,7 +19,9 @@ #include "config.h" #ifndef EMBEDDED +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <unistd.h> #include <errno.h> diff --git a/src/core/socket.c b/src/core/socket.c index 90cf4ca..915c70e 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -26,7 +26,9 @@ * \file socket.c */ #ifdef HAVE_SYS_SOCKET_H +#ifndef _GNU_SOURCE #define _GNU_SOURCE /* for struct ucred on glibc >= 2.8 */ +#endif #include <osmocom/core/logging.h> #include <osmocom/core/select.h> diff --git a/src/core/thread.c b/src/core/thread.c index d9a9842..116eaea 100644 --- a/src/core/thread.c +++ b/src/core/thread.c @@ -28,8 +28,10 @@ /* If HAVE_GETTID, then "_GNU_SOURCE" may need to be defined to use gettid() */ #if HAVE_GETTID +#ifndef _GNU_SOURCE #define _GNU_SOURCE -#endif +#endif /* ifndef _GNU_SOURCE */ +#endif /* if HAVE_GETTID */ #include <unistd.h> #include <sys/types.h> diff --git a/src/vty/cpu_sched_vty.c b/src/vty/cpu_sched_vty.c index 7198f74..60fe930 100644 --- a/src/vty/cpu_sched_vty.c +++ b/src/vty/cpu_sched_vty.c @@ -23,7 +23,9 @@ * SPDX-License-Identifier: GPLv2+ */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include "config.h" diff --git a/tests/fr/fr_test.c b/tests/fr/fr_test.c index cdcdb43..64ae710 100644 --- a/tests/fr/fr_test.c +++ b/tests/fr/fr_test.c @@ -14,7 +14,9 @@ * */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <osmocom/core/application.h> #include <osmocom/gprs/gprs_ns.h> diff --git a/tests/logging/logging_vty_test.c b/tests/logging/logging_vty_test.c index c1a2853..16a8277 100644 --- a/tests/logging/logging_vty_test.c +++ b/tests/logging/logging_vty_test.c @@ -17,7 +17,9 @@ * */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <getopt.h> #include <signal.h> diff --git a/tests/tdef/tdef_vty_config_root_test.c b/tests/tdef/tdef_vty_config_root_test.c index 8c46d95..7810c0b 100644 --- a/tests/tdef/tdef_vty_config_root_test.c +++ b/tests/tdef/tdef_vty_config_root_test.c @@ -19,7 +19,9 @@ * GNU General Public License for more details. */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <getopt.h> #include <signal.h> #include <limits.h> diff --git a/tests/tdef/tdef_vty_config_subnode_test.c b/tests/tdef/tdef_vty_config_subnode_test.c index e3e165d..a249f46 100644 --- a/tests/tdef/tdef_vty_config_subnode_test.c +++ b/tests/tdef/tdef_vty_config_subnode_test.c @@ -19,7 +19,9 @@ * GNU General Public License for more details. */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <getopt.h> #include <signal.h> #include <limits.h> diff --git a/tests/tdef/tdef_vty_dynamic_test.c b/tests/tdef/tdef_vty_dynamic_test.c index b646c54..f901f6c 100644 --- a/tests/tdef/tdef_vty_dynamic_test.c +++ b/tests/tdef/tdef_vty_dynamic_test.c @@ -19,7 +19,9 @@ * GNU General Public License for more details. */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <getopt.h> #include <signal.h> #include <limits.h> -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38003?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I36cb3a5555cb35ddc44f06d447268bd9cc0ce9b4 Gerrit-Change-Number: 38003 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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>

1 0

[S] Change in libosmocore[master]: Fix building in environments that define _GNU_SOURCE
by laforge 07 Oct '24

07 Oct '24

laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/libosmocore/+/38003?usp=email ) Change subject: Fix building in environments that define _GNU_SOURCE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38003?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I36cb3a5555cb35ddc44f06d447268bd9cc0ce9b4 Gerrit-Change-Number: 38003 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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: Mon, 07 Oct 2024 16:55:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: jobs: gerrit-verifications.yml: Add job for upf-benchmark.git
by laforge 07 Oct '24

07 Oct '24

Attention is currently required from: osmith, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ci/+/38330?usp=email ) The change is no longer submittable: Code-Review is unsatisfied now. Change subject: jobs: gerrit-verifications.yml: Add job for upf-benchmark.git ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38330?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: I7212e8f88c731993af01e0e42ddaad6dd7291c37 Gerrit-Change-Number: 38330 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 16:53:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: vty: Fix 'update route' parameter comment descriptions
by fixeria 07 Oct '24

07 Oct '24

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38351?usp=email ) Change subject: vty: Fix 'update route' parameter comment descriptions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38351?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: Idb9d7d1b0eb260f6dea916287472c088d9719d8a Gerrit-Change-Number: 38351 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 16:53:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: jobs: gerrit-verifications.yml: Add job for upf-benchmark.git
by laforge 07 Oct '24

07 Oct '24

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ci/+/38330?usp=email ) Change subject: jobs: gerrit-verifications.yml: Add job for upf-benchmark.git ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38330?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: I7212e8f88c731993af01e0e42ddaad6dd7291c37 Gerrit-Change-Number: 38330 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 16:53:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: src/osmo_ss7_vty.c: Improve error formatting in 'update route' cmd
by fixeria 07 Oct '24

07 Oct '24

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38350?usp=email ) Change subject: src/osmo_ss7_vty.c: Improve error formatting in 'update route' cmd ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/osmo_ss7_vty.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/38350/comment/ba3d6b00_a34d6… : PS1, Line 399: Invalid arg count %d I find this message over-complicated a bit, maybe say `Incomplete command (missing an argument?)`? Not critical, feel free to merge as-is. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38350?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: I4fd5b30093425f1831348282d3563467c889e27f Gerrit-Change-Number: 38350 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 16:53:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: ctrl, hnbgw: access rate counter groups by given ID instead of index
by laforge 07 Oct '24

07 Oct '24

Attention is currently required from: neels, pespin. laforge has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37882?usp=email ) Change subject: ctrl, hnbgw: access rate counter groups by given ID instead of index ...................................................................... Patch Set 4: (1 comment) Patchset: PS2: > There is another compound to this: when we revert this patch to osmo-hnbgw that revert was just merged. we can abandon this here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37882?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: I70e74e7554482df67aa1d90bc04314124dea444f Gerrit-Change-Number: 37882 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 16:53:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-hnbgw[master]: Revert "hnb_persistent: Use incrementing counter for rate_ctr + stat_...
by laforge 07 Oct '24

07 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38002?usp=email ) Change subject: Revert "hnb_persistent: Use incrementing counter for rate_ctr + stat_item index" ...................................................................... Revert "hnb_persistent: Use incrementing counter for rate_ctr + stat_item index" This reverts commit 61e278a452bf4fd240e45f1fe8c094a4b3795317 as it created errors in our test suite. Let's live with the cosmetic error message but have working tests instead. We should probably consider removing the printing of the message from libosmocore, at least in case the counters also have names set? Closes: OS#6557 Change-Id: I2f7d3f3c88775e2926661e4760ec1d8723c0400c --- M src/osmo-hnbgw/hnbgw.c 1 file changed, 2 insertions(+), 5 deletions(-) Approvals: neels: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 90b8147..d4515a8 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -497,22 +497,19 @@ osmo_timer_schedule(&hnbp->disconnected_timeout, period_s, 0); } -static unsigned int g_hnbp_ctr_id; - struct hnb_persistent *hnb_persistent_alloc(const struct umts_cell_id *id) { struct hnb_persistent *hnbp = talloc_zero(g_hnbgw, struct hnb_persistent); - unsigned int ctr_id = g_hnbp_ctr_id++; if (!hnbp) return NULL; hnbp->id = *id; hnbp->id_str = talloc_strdup(hnbp, umts_cell_id_to_str(id)); - hnbp->ctrs = rate_ctr_group_alloc(hnbp, &hnb_ctrg_desc, ctr_id); + hnbp->ctrs = rate_ctr_group_alloc(hnbp, &hnb_ctrg_desc, 0); if (!hnbp->ctrs) goto out_free; rate_ctr_group_set_name(hnbp->ctrs, hnbp->id_str); - hnbp->statg = osmo_stat_item_group_alloc(hnbp, &hnb_statg_desc, ctr_id); + hnbp->statg = osmo_stat_item_group_alloc(hnbp, &hnb_statg_desc, 0); if (!hnbp->statg) goto out_free_ctrs; osmo_stat_item_group_set_name(hnbp->statg, hnbp->id_str); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38002?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2f7d3f3c88775e2926661e4760ec1d8723c0400c Gerrit-Change-Number: 38002 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-hnbgw[master]: Revert "hnb_persistent: Use incrementing counter for rate_ctr + stat_...
by laforge 07 Oct '24

07 Oct '24

Attention is currently required from: fixeria. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38002?usp=email ) Change subject: Revert "hnb_persistent: Use incrementing counter for rate_ctr + stat_item index" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38002?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2f7d3f3c88775e2926661e4760ec1d8723c0400c Gerrit-Change-Number: 38002 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 16:51:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in ...pyosmocom[master]: tlv/cosmetic: improve import of osmocom functions
by laforge 07 Oct '24

07 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38288?usp=email ) Change subject: tlv/cosmetic: improve import of osmocom functions ...................................................................... tlv/cosmetic: improve import of osmocom functions We can import osmocom and then reference build/parse_construct using osmocom.construct.build/parse_construct. Change-Id: I6ce3cffbce9b276de7b223d88268d35cf2706d6a --- M src/osmocom/tlv.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmocom/tlv.py b/src/osmocom/tlv.py index d24f2aa..93e4e87 100644 --- a/src/osmocom/tlv.py +++ b/src/osmocom/tlv.py @@ -21,7 +21,7 @@ import re from typing import List, Tuple, Optional -from osmocom.construct import build_construct, parse_construct +import osmocom ######################################################################### # poor man's COMPREHENSION-TLV decoder. @@ -383,9 +383,9 @@ if self.decoded is None: do = b'' elif self._construct: - do = build_construct(self._construct, self.decoded, context) + do = osmocom.construct.build_construct(self._construct, self.decoded, context) elif self.__class__._construct: - do = build_construct(self.__class__._construct, self.decoded, context) + do = osmocom.construct.build_construct(self.__class__._construct, self.decoded, context) else: do = self._to_bytes() self.encoded = do @@ -402,9 +402,9 @@ if self.encoded == b'': self.decoded = None elif self._construct: - self.decoded = parse_construct(self._construct, do, context=context) + self.decoded = osmocom.construct.parse_construct(self._construct, do, context=context) elif self.__class__._construct: - self.decoded = parse_construct(self.__class__._construct, do, context=context) + self.decoded = osmocom.construct.parse_construct(self.__class__._construct, do, context=context) else: self.decoded = self._from_bytes(do) return self.decoded -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38288?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I6ce3cffbce9b276de7b223d88268d35cf2706d6a Gerrit-Change-Number: 38288 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

1 0