January 2026 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-pcu[master]: csn1.h: Fix missing include stddef.h for offsetof()
by pespin 20 Jan '26

20 Jan '26

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcu/+/41886?usp=email ) Change subject: csn1.h: Fix missing include stddef.h for offsetof() ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: This is already fixed in the libosmo-gprs version of csn1.h. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/41886?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3ddd10dd67e7850ace36ac996598cbfd4bbaa40e Gerrit-Change-Number: 41886 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jan 2026 12:55:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in osmo-pcu[master]: csn1.h: Fix missing include stddef.h for offsetof()
by pespin 20 Jan '26

20 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/41886?usp=email ) Change subject: csn1.h: Fix missing include stddef.h for offsetof() ...................................................................... csn1.h: Fix missing include stddef.h for offsetof() Fixes following compiler error: """ In file included from /osmo-pcu/src/gsm_rlcmac.c:32: /osmo-pcu/src/csn1.h:310:32: error: implicit declaration of function 'offsetof' [-Wimplicit-function-declaration] 310 | {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} | ^~~~~~~~ /osmo-pcu/src/gsm_rlcmac.c:43:3: note: in expansion of macro 'M_UINT' 43 | M_UINT (PLMN_t, MCC2, 4), | ^~~~~~ /osmo-pcu/src/gsm_rlcmac.c:38:1: note: 'offsetof' is defined in header '<stddef.h>'; this is probably fixable by adding '#include <stddef.h>' 37 | #include <gprs_debug.h> +++ |+#include <stddef.h> """ Change-Id: I3ddd10dd67e7850ace36ac996598cbfd4bbaa40e --- M src/csn1.h 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/86/41886/1 diff --git a/src/csn1.h b/src/csn1.h index 6607b02..66e67ba 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -24,6 +24,8 @@ #ifndef _PACKET_CSN1_H_ #define _PACKET_CSN1_H_ +#include <stddef.h> + #include <osmocom/core/bitvec.h> #include "wireshark_compat.h" -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/41886?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3ddd10dd67e7850ace36ac996598cbfd4bbaa40e Gerrit-Change-Number: 41886 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bts[master]: tests: Use log_set_category_filter() libosmocore API
by pespin 20 Jan '26

20 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41885?usp=email ) Change subject: tests: Use log_set_category_filter() libosmocore API ...................................................................... tests: Use log_set_category_filter() libosmocore API Change-Id: I70d885110d5dd8295136c16f2365efeed443ff1a --- M tests/handover/handover_test.c M tests/power/bs_power_loop_test.c M tests/power/ms_power_loop_test.c M tests/tx_power/tx_power_test.c 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/41885/1 diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index f1235f5..60496ad 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -70,7 +70,7 @@ msgb_talloc_ctx_init(tall_bts_ctx, 0); osmo_init_logging2(tall_bts_ctx, &bts_log_info); - osmo_stderr_target->categories[DHO].loglevel = LOGL_DEBUG; + log_set_category_filter(osmo_stderr_target, DHO, 1, LOGL_DEBUG); g_bts_sm = gsm_bts_sm_alloc(tall_bts_ctx); if (!g_bts_sm) { diff --git a/tests/power/bs_power_loop_test.c b/tests/power/bs_power_loop_test.c index c01aa5f..7042c34 100644 --- a/tests/power/bs_power_loop_test.c +++ b/tests/power/bs_power_loop_test.c @@ -490,8 +490,8 @@ msgb_talloc_ctx_init(tall_bts_ctx, 0); osmo_init_logging2(tall_bts_ctx, &bts_log_info); - osmo_stderr_target->categories[DLOOP].loglevel = LOGL_DEBUG; - osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; + log_set_category_filter(osmo_stderr_target, DLOOP, 1, LOGL_DEBUG); + log_set_category_filter(osmo_stderr_target, DL1C, 1, LOGL_DEBUG); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); diff --git a/tests/power/ms_power_loop_test.c b/tests/power/ms_power_loop_test.c index 55a70ed..cb394c8 100644 --- a/tests/power/ms_power_loop_test.c +++ b/tests/power/ms_power_loop_test.c @@ -413,8 +413,8 @@ msgb_talloc_ctx_init(tall_bts_ctx, 0); osmo_init_logging2(tall_bts_ctx, &bts_log_info); - osmo_stderr_target->categories[DLOOP].loglevel = LOGL_DEBUG; - osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; + log_set_category_filter(osmo_stderr_target, DLOOP, 1, LOGL_DEBUG); + log_set_category_filter(osmo_stderr_target, DL1C, 1, LOGL_DEBUG); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); diff --git a/tests/tx_power/tx_power_test.c b/tests/tx_power/tx_power_test.c index e0f88bc..a18a331 100644 --- a/tests/tx_power/tx_power_test.c +++ b/tests/tx_power/tx_power_test.c @@ -247,7 +247,7 @@ msgb_talloc_ctx_init(tall_bts_ctx, 0); osmo_init_logging2(tall_bts_ctx, &bts_log_info); - osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; + log_set_category_filter(osmo_stderr_target, DL1C, 1, LOGL_DEBUG); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I70d885110d5dd8295136c16f2365efeed443ff1a Gerrit-Change-Number: 41885 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: build: move netns/tun conditionals to configure.ac Move Linux-/embedd...
by Timur Davydov 20 Jan '26

20 Jan '26

Attention is currently required from: pespin. Timur Davydov has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmocore/+/41878?usp=email ) Change subject: build: move netns/tun conditionals to configure.ac Move Linux-/embedded-specific conditional compilation out of the sources and into configure.ac. ...................................................................... Patch Set 1: (5 comments) Patchset: PS1: > You are again mixing different unrelated stuff in the same patch, which is confusing when reviewing […] Got it. I'll rework this and resend it split into separate orthogonal commits. Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/41878/comment/ecdd1cef_93022584?… : PS1, Line 12: - Detect struct in6_addr.s6_addr32 via AC_CHECK_MEMBER and use > This should be a separate commit, since it's not related at all to the other ones. Got it. I'll rework this and resend it split into separate orthogonal commits. File configure.ac: https://gerrit.osmocom.org/c/libosmocore/+/41878/comment/6f740b5a_8c5b3fab?… : PS1, Line 242: AM_CONDITIONAL(ENABLE_TUN, test "x$embedded" != "xyes") > Why are you adding ENABLE_TUN? It's never set to "no". ENABLE_TUN is meant to be the inverse of EMBEDDED, so that tun.c is not built for --enable-embedded. I added it for readability and to make extending the condition easier later (e.g. Emscripten). File include/osmocom/core/netns.h: https://gerrit.osmocom.org/c/libosmocore/+/41878/comment/4b1a0aa0_944ca6a8?… : PS1, Line 5: #if (USE_NETNS) > if netns is not supported, modify Makefile.am to avoid adding this file to the buildset. Understood. I'll handle this in a separate patch. File src/core/Makefile.am: https://gerrit.osmocom.org/c/libosmocore/+/41878/comment/8d202844_7c4aa79a?… : PS1, Line 83: if ENABLE_TUN > WHy this? AFAICT it can ever be false? ENABLE_TUN is meant to be the inverse of EMBEDDED, so that tun.c is not built for --enable-embedded. I added it for readability and to make extending the condition easier later (e.g. Emscripten). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41878?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: I2322eb2936bea35596f1fd6b6a713ea5f997b1ea Gerrit-Change-Number: 41878 Gerrit-PatchSet: 1 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jan 2026 12:50:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmocore[master]: gb: Avoid accessing struct log_target members directly
by pespin 20 Jan '26

20 Jan '26

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/41883?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: gb: Avoid accessing struct log_target members directly ...................................................................... gb: Avoid accessing struct log_target members directly Change-Id: Idb2f7f3736f0a22a091a702e23ef7cf58e56cfa9 --- M src/gb/common_vty.c M src/gb/gprs_bssgp_vty.c M src/gb/gprs_ns2_vty.c M src/gb/gprs_ns_vty.c 4 files changed, 29 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/83/41883/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41883?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idb2f7f3736f0a22a091a702e23ef7cf58e56cfa9 Gerrit-Change-Number: 41883 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[S] Change in osmo-bsc[master]: Avoid accessing struct log_target members directly
by pespin 20 Jan '26

20 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/41884?usp=email ) Change subject: Avoid accessing struct log_target members directly ...................................................................... Avoid accessing struct log_target members directly Use newly available APIs instead. Change-Id: I48a823c591748528e762b1cd8e0e8418c0d0be3b Depends: libosmocore.git Change-Id Ie48e7e635feb91509b9c034394df4fb16cb931a3 --- M TODO-RELEASE M src/osmo-bsc/bsc_subscriber.c M src/osmo-bsc/osmo_bsc_main.c 3 files changed, 17 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/41884/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index fa4fe07..df1b8b1 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line libosmo-mgcp-client >1.15.0 new API of fmtp in struct ptmap libosmogsm >1.12.0 OSMO_AOIP_RTP_PT_TWTS007 in gsm_48_103.h +libosmocore >1.12.0 log_get_context(), log_{get,set}_filter(_data)() diff --git a/src/osmo-bsc/bsc_subscriber.c b/src/osmo-bsc/bsc_subscriber.c index 1f69d44..556965f 100644 --- a/src/osmo-bsc/bsc_subscriber.c +++ b/src/osmo-bsc/bsc_subscriber.c @@ -345,20 +345,22 @@ void log_set_filter_bsc_subscr(struct log_target *target, struct bsc_subscr *bsc_subscr) { - struct bsc_subscr **fsub = (void*)&target->filter_data[LOG_FLT_BSC_SUBSCR]; + struct bsc_subscr *fsub = log_get_filter_data(target, LOG_FLT_BSC_SUBSCR); /* free the old data */ - if (*fsub) { - bsc_subscr_put(*fsub, BSUB_USE_LOG_FILTER); - *fsub = NULL; + if (fsub) { + log_set_filter_data(target, LOG_FLT_BSC_SUBSCR, NULL); + bsc_subscr_put(fsub, BSUB_USE_LOG_FILTER); } if (bsc_subscr) { - target->filter_map |= (1 << LOG_FLT_BSC_SUBSCR); - *fsub = bsc_subscr; - bsc_subscr_get(*fsub, BSUB_USE_LOG_FILTER); - } else - target->filter_map &= ~(1 << LOG_FLT_BSC_SUBSCR); + bsc_subscr_get(bsc_subscr, BSUB_USE_LOG_FILTER); + log_set_filter_data(target, LOG_FLT_BSC_SUBSCR, bsc_subscr); + log_set_filter(target, LOG_FLT_BSC_SUBSCR, true); + } else { + log_set_filter_data(target, LOG_FLT_BSC_SUBSCR, NULL); + log_set_filter(target, LOG_FLT_BSC_SUBSCR, false); + } } void bsc_subscr_add_active_paging_request(struct bsc_subscr *bsub, struct gsm_paging_request *req) diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 77506c8..f4a4c4c 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -831,12 +831,12 @@ static int filter_fn(const struct log_context *ctx, struct log_target *tar) { - const struct bsc_subscr *bsub_ctx = ctx->ctx[LOG_CTX_BSC_SUBSCR]; - const struct bsc_subscr *bsub_filter = tar->filter_data[LOG_FLT_BSC_SUBSCR]; + const struct bsc_subscr *bsub_ctx = log_get_context(ctx, LOG_CTX_BSC_SUBSCR); + const struct bsc_subscr *bsub_filter = log_get_filter_data(tar, LOG_FLT_BSC_SUBSCR); - if ((tar->filter_map & (1 << LOG_FLT_BSC_SUBSCR)) != 0 - && bsub_ctx && bsub_filter - && strncmp(bsub_ctx->imsi, bsub_filter->imsi, sizeof(bsub_ctx->imsi)) == 0) + if (log_get_filter(tar, LOG_FLT_BSC_SUBSCR) && + bsub_ctx && bsub_filter && + strncmp(bsub_ctx->imsi, bsub_filter->imsi, sizeof(bsub_ctx->imsi)) == 0) return 1; return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/41884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I48a823c591748528e762b1cd8e0e8418c0d0be3b Gerrit-Change-Number: 41884 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmocore[master]: Add Emscripten build support and JS callback logging backend
by pespin 20 Jan '26

20 Jan '26

Attention is currently required from: Timur Davydov, laforge, neels. pespin has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmocore/+/41813?usp=email ) Change subject: Add Emscripten build support and JS callback logging backend ...................................................................... Patch Set 9: (1 comment) File src/core/netdev.c: https://gerrit.osmocom.org/c/libosmocore/+/41813/comment/6b70f3e2_d5628dee?… : PS5, Line 67: #if (!EMBEDDED) && !defined(__EMSCRIPTEN__) > Done, the changes have been submitted as a separate patch. And yet afaict the new version of this patch doesn't depend on those ones? I have the feeling you are doing something wrong there ;) Make sure you have the patches in the same branch and push them together to gerrit. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41813?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: Ia8d5f4bb6570b5e055826f3a051e5e5896866e31 Gerrit-Change-Number: 41813 Gerrit-PatchSet: 9 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Comment-Date: Tue, 20 Jan 2026 12:08:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: Timur Davydov <dtv.comp(a)gmail.com>

1 0

[S] Change in libosmocore[master]: build: move netns/tun conditionals to configure.ac Move Linux-/embedd...
by pespin 20 Jan '26

20 Jan '26

Attention is currently required from: Timur Davydov. pespin has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmocore/+/41878?usp=email ) Change subject: build: move netns/tun conditionals to configure.ac Move Linux-/embedded-specific conditional compilation out of the sources and into configure.ac. ...................................................................... Patch Set 1: (5 comments) Patchset: PS1: You are again mixing different unrelated stuff in the same patch, which is confusing when reviewing the patch. Please split this into separate orthogonal topics. Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/41878/comment/c5f24c56_cb0ca592?… : PS1, Line 12: - Detect struct in6_addr.s6_addr32 via AC_CHECK_MEMBER and use This should be a separate commit, since it's not related at all to the other ones. File configure.ac: https://gerrit.osmocom.org/c/libosmocore/+/41878/comment/14fc29ce_10129c84?… : PS1, Line 242: AM_CONDITIONAL(ENABLE_TUN, test "x$embedded" != "xyes") Why are you adding ENABLE_TUN? It's never set to "no". File include/osmocom/core/netns.h: https://gerrit.osmocom.org/c/libosmocore/+/41878/comment/e98278ba_4c7b1c2f?… : PS1, Line 5: #if (USE_NETNS) if netns is not supported, modify Makefile.am to avoid adding this file to the buildset. File src/core/Makefile.am: https://gerrit.osmocom.org/c/libosmocore/+/41878/comment/82f9dd24_be2f883e?… : PS1, Line 83: if ENABLE_TUN WHy this? AFAICT it can ever be false? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41878?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: I2322eb2936bea35596f1fd6b6a713ea5f997b1ea Gerrit-Change-Number: 41878 Gerrit-PatchSet: 1 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Comment-Date: Tue, 20 Jan 2026 12:07:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in libosmocore[master]: gb: Avoid accessing struct log_target members directly
by pespin 20 Jan '26

20 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41883?usp=email ) Change subject: gb: Avoid accessing struct log_target members directly ...................................................................... gb: Avoid accessing struct log_target members directly Change-Id: Idb2f7f3736f0a22a091a702e23ef7cf58e56cfa9 --- M src/gb/common_vty.c 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/83/41883/1 diff --git a/src/gb/common_vty.c b/src/gb/common_vty.c index ad3dea2..da88475 100644 --- a/src/gb/common_vty.c +++ b/src/gb/common_vty.c @@ -40,23 +40,23 @@ int gprs_log_filter_fn(const struct log_context *ctx, struct log_target *tar) { - const void *nse = ctx->ctx[LOG_CTX_GB_NSE]; - const void *nsvc = ctx->ctx[LOG_CTX_GB_NSVC]; - const void *bvc = ctx->ctx[LOG_CTX_GB_BVC]; + const void *nse = log_get_context(ctx, LOG_CTX_GB_NSE); + const void *nsvc = log_get_context(ctx, LOG_CTX_GB_NSVC); + const void *bvc = log_get_context(ctx, LOG_CTX_GB_BVC); /* Filter on the NS Entity */ - if ((tar->filter_map & (1 << LOG_FLT_GB_NSE)) != 0 - && nse && (nse == tar->filter_data[LOG_FLT_GB_NSE])) + if (log_get_filter(tar, LOG_FLT_GB_NSE) && + nse && (nse == log_get_filter_data(tar, LOG_FLT_GB_NSE))) return 1; /* Filter on the NS Virtual Connection */ - if ((tar->filter_map & (1 << LOG_FLT_GB_NSVC)) != 0 - && nsvc && (nsvc == tar->filter_data[LOG_FLT_GB_NSVC])) + if (log_get_filter(tar, LOG_FLT_GB_NSVC) && + nsvc && (nsvc == log_get_filter_data(tar, LOG_FLT_GB_NSVC))) return 1; /* Filter on the BSSGP Virtual Connection */ - if ((tar->filter_map & (1 << LOG_FLT_GB_BVC)) != 0 - && bvc && (bvc == tar->filter_data[LOG_FLT_GB_BVC])) + if (log_get_filter(tar, LOG_FLT_GB_BVC) && + bvc && (bvc == log_get_filter_data(tar, LOG_FLT_GB_BVC))) return 1; return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41883?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idb2f7f3736f0a22a091a702e23ef7cf58e56cfa9 Gerrit-Change-Number: 41883 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bts[master]: Avoid accessing struct log_target members directly
by pespin 20 Jan '26

20 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41882?usp=email ) Change subject: Avoid accessing struct log_target members directly ...................................................................... Avoid accessing struct log_target members directly Use newly available APIs instead. Change-Id: Icd48874cf51d6af78305a30faeae48ba518e46b3 Depends: libosmocore.git Change-Id Ie48e7e635feb91509b9c034394df4fb16cb931a3 --- M TODO-RELEASE M src/common/logging.c M src/common/vty.c 3 files changed, 23 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/82/41882/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..fb115da 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmocore >1.12.0 log_get_context(), log_{get,set}_filter(_data)() diff --git a/src/common/logging.c b/src/common/logging.c index 15c126a..cbc4a19 100644 --- a/src/common/logging.c +++ b/src/common/logging.c @@ -136,12 +136,12 @@ static int osmo_bts_filter_fn(const struct log_context *ctx, struct log_target *tgt) { - uint8_t *sapi = ctx->ctx[LOG_CTX_L1_SAPI]; - uint16_t *sapi_mask = tgt->filter_data[LOG_FLT_L1_SAPI]; + uint8_t *sapi = log_get_context(ctx, LOG_CTX_L1_SAPI); + uint16_t *sapi_mask = log_get_filter_data(tgt, LOG_FLT_L1_SAPI); - if ((tgt->filter_map & (1 << LOG_FLT_L1_SAPI)) != 0 - && sapi_mask && sapi - && (*sapi_mask & (1 << *sapi)) != 0) + if (log_get_filter(tgt, LOG_FLT_L1_SAPI) && + sapi_mask && sapi && + (*sapi_mask & (1 << *sapi)) != 0) return 1; return 0; diff --git a/src/common/vty.c b/src/common/vty.c index d169342..62ebff2 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -2663,20 +2663,21 @@ { int sapi = get_string_value(l1sap_common_sapi_names, argv[0]); struct log_target *tgt = osmo_log_vty2tgt(vty); - uint16_t **sapi_mask; + uint16_t *sapi_mask; OSMO_ASSERT(sapi >= 0); + OSMO_ASSERT(sapi <= 31); if (!tgt) return CMD_WARNING; - sapi_mask = (uint16_t **)&tgt->filter_data[LOG_FLT_L1_SAPI]; + sapi_mask = log_get_filter_data(tgt, LOG_FLT_L1_SAPI); - if (!*sapi_mask) - *sapi_mask = talloc(tgt, uint16_t); + if (!sapi_mask) + sapi_mask = talloc_zero(tgt, uint16_t); - OSMO_ASSERT(sapi <= 31); - **sapi_mask |= (1 << sapi); - tgt->filter_map |= (1 << LOG_FLT_L1_SAPI); + *sapi_mask |= (1 << sapi); + log_set_filter_data(tgt, LOG_FLT_L1_SAPI, sapi_mask); + log_set_filter(tgt, LOG_FLT_L1_SAPI, true); return CMD_SUCCESS; } @@ -2688,15 +2689,20 @@ uint16_t *sapi_mask; OSMO_ASSERT(sapi >= 0); + OSMO_ASSERT(sapi <= 31); if (!tgt) return CMD_WARNING; - if (!tgt->filter_data[LOG_FLT_L1_SAPI]) + sapi_mask = (uint16_t *)log_get_filter_data(tgt, LOG_FLT_L1_SAPI); + if (!sapi_mask) return CMD_SUCCESS; - - OSMO_ASSERT(sapi <= 31); - sapi_mask = (uint16_t *)tgt->filter_data[LOG_FLT_L1_SAPI]; *sapi_mask &= ~(1 << sapi); + if (*sapi_mask == 0x0000) { + log_set_filter_data(tgt, LOG_FLT_L1_SAPI, NULL); + log_set_filter(tgt, LOG_FLT_L1_SAPI, false); + talloc_free(sapi_mask); + } + return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41882?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icd48874cf51d6af78305a30faeae48ba518e46b3 Gerrit-Change-Number: 41882 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log January 2026