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

[M] Change in osmocom-bb[master]: trxcon/l1sched: pre-populate MR cache during lchan allocation
by fixeria 23 Jan '26

23 Jan '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41902?usp=email ) Change subject: trxcon/l1sched: pre-populate MR cache during lchan allocation ...................................................................... trxcon/l1sched: pre-populate MR cache during lchan allocation Instead of checking if the MR cache is populated in prim_compose_mr() and populating it there, let's do this during lchan allocation. Take a chance to move lchan allocation logic into its own function. Change-Id: I079074a402f9c27fff7e25b49bfd1dd409c0f8c3 --- M src/host/trxcon/src/sched_prim.c M src/host/trxcon/src/sched_trx.c 2 files changed, 28 insertions(+), 30 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index fa46d91..95be35e 100644 --- a/src/host/trxcon/src/sched_prim.c +++ b/src/host/trxcon/src/sched_prim.c @@ -86,7 +86,6 @@ { struct l1sched_prim *prim; struct msgb *msg; - bool cached; /* Allocate a new primitive */ msg = l1sched_prim_alloc(L1SCHED_PRIM_T_DATA, PRIM_OP_REQUEST); @@ -98,13 +97,6 @@ .link_id = L1SCHED_CH_LID_SACCH, }; - /* Check if the MR cache is populated (verify LAPDm header) */ - cached = (lchan->sacch.mr_cache[2] != 0x00 - && lchan->sacch.mr_cache[3] != 0x00 - && lchan->sacch.mr_cache[4] != 0x00); - if (!cached) /* populate from the global UL SACCH cache (if needed) */ - l1sched_sacch_cache_read(lchan->ts->sched, lchan->sacch.mr_cache); - /* Compose a new Measurement Report primitive */ memcpy(msgb_put(msg, GSM_MACBLOCK_LEN), &lchan->sacch.mr_cache[0], diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 237daca..ced3d99 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -254,13 +254,39 @@ l1sched_cfg_pchan_comb_ind(sched, tn, GSM_PCHAN_NONE); } +static struct l1sched_lchan_state * +l1sched_ts_add_lchan(struct l1sched_ts *ts, + enum l1sched_lchan_type type) +{ + struct l1sched_lchan_state *lchan; + + lchan = talloc_zero(ts, struct l1sched_lchan_state); + if (!lchan) + return NULL; + + lchan->type = type; + lchan->ts = ts; + + /* Init the Tx queue */ + INIT_LLIST_HEAD(&lchan->tx_prims); + /* Pre-populate UL SACCH cache */ + l1sched_sacch_cache_read(ts->sched, lchan->sacch.mr_cache); + /* Add to the list of channel states */ + llist_add_tail(&lchan->list, &ts->lchans); + + /* Enable channel automatically if required */ + if (l1sched_lchan_desc[type].flags & L1SCHED_CH_FLAG_AUTO) + l1sched_activate_lchan(ts, type); + + return lchan; +} + #define LAYOUT_HAS_LCHAN(layout, lchan) \ (layout->lchan_mask & ((uint64_t) 0x01 << lchan)) int l1sched_configure_ts(struct l1sched_state *sched, int tn, enum gsm_phys_chan_config config) { - struct l1sched_lchan_state *lchan; enum l1sched_lchan_type type; struct l1sched_ts *ts; @@ -294,27 +320,7 @@ for (type = 0; type < _L1SCHED_CHAN_MAX; type++) { if (!LAYOUT_HAS_LCHAN(ts->mf_layout, type)) continue; - - /* Allocate a channel state */ - lchan = talloc_zero(ts, struct l1sched_lchan_state); - if (!lchan) - return -ENOMEM; - - /* set backpointer */ - lchan->ts = ts; - - /* Set channel type */ - lchan->type = type; - - /* Init the Tx queue */ - INIT_LLIST_HEAD(&lchan->tx_prims); - - /* Add to the list of channel states */ - llist_add_tail(&lchan->list, &ts->lchans); - - /* Enable channel automatically if required */ - if (l1sched_lchan_desc[type].flags & L1SCHED_CH_FLAG_AUTO) - l1sched_activate_lchan(ts, type); + l1sched_ts_add_lchan(ts, type); } /* Notify transceiver about TS activation */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41902?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I079074a402f9c27fff7e25b49bfd1dd409c0f8c3 Gerrit-Change-Number: 41902 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>

1 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: l1sched_reset(): remove unused param
by fixeria 23 Jan '26

23 Jan '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41903?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: trxcon/l1sched: l1sched_reset(): remove unused param ...................................................................... trxcon/l1sched: l1sched_reset(): remove unused param The l1sched no longer has its own clock source, so there's nothing to reset. This parameter is no-op and can be safely removed. Change-Id: I88dfa8770c9cd205006f569315b07f4d91cc08de --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 8 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 283f388..d145929 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -334,7 +334,7 @@ /* Scheduler management functions */ struct l1sched_state *l1sched_alloc(void *ctx, const struct l1sched_cfg *cfg, void *priv); -void l1sched_reset(struct l1sched_state *sched, bool reset_clock); +void l1sched_reset(struct l1sched_state *sched); void l1sched_free(struct l1sched_state *sched); void l1sched_sacch_cache_read(struct l1sched_state *sched, uint8_t *out); diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index ced3d99..a2ee464 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -180,15 +180,14 @@ talloc_free(sched); } -void l1sched_reset(struct l1sched_state *sched, bool reset_clock) +void l1sched_reset(struct l1sched_state *sched) { unsigned int tn; if (sched == NULL) return; - LOGP_SCHEDC(sched, LOGL_NOTICE, "Reset scheduler %s\n", - reset_clock ? "and clock counter" : ""); + LOGP_SCHEDC(sched, LOGL_NOTICE, "Reset scheduler\n"); /* Free all potentially allocated timeslots */ for (tn = 0; tn < ARRAY_SIZE(sched->ts); tn++) diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index ce3c0dd..34ca21b 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -59,7 +59,7 @@ TALLOC_FREE(trxcon->fi_data); if (fi->state != TRXCON_ST_RESET) osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); - l1sched_reset(trxcon->sched, true); + l1sched_reset(trxcon->sched); /* Reset the L1 parameters */ trxcon->l1p.band_arfcn = 0xffff; @@ -70,7 +70,7 @@ trxcon_phyif_handle_cmd(trxcon->phyif, &phycmd); break; case TRXCON_EV_RESET_SCHED_REQ: - l1sched_reset(trxcon->sched, false); + l1sched_reset(trxcon->sched); break; case TRXCON_EV_SET_PHY_CONFIG_REQ: { @@ -352,7 +352,7 @@ } /* Remove all active timeslots */ - l1sched_reset(trxcon->sched, false); + l1sched_reset(trxcon->sched); rc = l1sched_configure_ts(trxcon->sched, req->chan_nr & 0x07, config); if (rc) @@ -435,7 +435,7 @@ handle_dch_est_req(fi, (const struct trxcon_param_dch_est_req *)data); break; case TRXCON_EV_DCH_REL_REQ: - l1sched_reset(trxcon->sched, false); + l1sched_reset(trxcon->sched); /* TODO: switch to (not implemented) TRXCON_ST_DCH_TUNING? */ break; case TRXCON_EV_SET_TCH_MODE_REQ: @@ -664,7 +664,7 @@ handle_dch_est_req(fi, (const struct trxcon_param_dch_est_req *)data); break; case TRXCON_EV_DCH_REL_REQ: - l1sched_reset(trxcon->sched, false); + l1sched_reset(trxcon->sched); /* TODO: switch to (not implemented) TRXCON_ST_DCH_TUNING? */ break; default: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41903?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I88dfa8770c9cd205006f569315b07f4d91cc08de Gerrit-Change-Number: 41903 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: add and use l1sched_del_all_ts()
by fixeria 23 Jan '26

23 Jan '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41905?usp=email ) Change subject: trxcon/l1sched: add and use l1sched_del_all_ts() ...................................................................... trxcon/l1sched: add and use l1sched_del_all_ts() Change-Id: I35ce97459dcd0e2cac4ab8927f02fe0232aa6142 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_trx.c 2 files changed, 12 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index d145929..b2fc99d 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -343,6 +343,7 @@ /* Timeslot management functions */ struct l1sched_ts *l1sched_add_ts(struct l1sched_state *sched, int tn); void l1sched_del_ts(struct l1sched_state *sched, int tn); +void l1sched_del_all_ts(struct l1sched_state *sched); int l1sched_reset_ts(struct l1sched_state *sched, int tn); int l1sched_configure_ts(struct l1sched_state *sched, int tn, enum gsm_phys_chan_config config); diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index e3b1674..f9bd0da 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -166,33 +166,26 @@ void l1sched_free(struct l1sched_state *sched) { - unsigned int tn; - if (sched == NULL) return; LOGP_SCHEDC(sched, LOGL_NOTICE, "Shutdown scheduler\n"); /* Free all potentially allocated timeslots */ - for (tn = 0; tn < ARRAY_SIZE(sched->ts); tn++) - l1sched_del_ts(sched, tn); + l1sched_del_all_ts(sched); talloc_free(sched); } void l1sched_reset(struct l1sched_state *sched) { - unsigned int tn; - if (sched == NULL) return; LOGP_SCHEDC(sched, LOGL_NOTICE, "Reset scheduler\n"); /* Free all potentially allocated timeslots */ - for (tn = 0; tn < ARRAY_SIZE(sched->ts); tn++) - l1sched_del_ts(sched, tn); - + l1sched_del_all_ts(sched); /* Reset UL SACCH cache */ l1sched_sacch_cache_update(sched, meas_rep_dummy); @@ -255,6 +248,15 @@ l1sched_cfg_pchan_comb_ind(sched, tn, GSM_PCHAN_NONE); } +void l1sched_del_all_ts(struct l1sched_state *sched) +{ + for (unsigned int tn = 0; tn < ARRAY_SIZE(sched->ts); tn++) { + if (sched->ts[tn] == NULL) + continue; + l1sched_del_ts(sched, tn); + } +} + static struct l1sched_lchan_state * l1sched_ts_add_lchan(struct l1sched_ts *ts, enum l1sched_lchan_type type) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41905?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I35ce97459dcd0e2cac4ab8927f02fe0232aa6142 Gerrit-Change-Number: 41905 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>

1 0

[XS] Change in osmocom-bb[master]: trxcon/l1sched: l1sched_reset(): also reset bsic
by fixeria 23 Jan '26

23 Jan '26

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41904?usp=email ) Change subject: trxcon/l1sched: l1sched_reset(): also reset bsic ...................................................................... trxcon/l1sched: l1sched_reset(): also reset bsic Change-Id: I4dfe5663fac12548d33393fe3b1426e5d80f50e7 Related: 8428b1ea0 ("trxcon: abstract out the scheduler API from L1CTL/TRXD/TRXC") --- M src/host/trxcon/src/sched_trx.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index a2ee464..e3b1674 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -195,6 +195,8 @@ /* Reset UL SACCH cache */ l1sched_sacch_cache_update(sched, meas_rep_dummy); + + sched->bsic = 0; } void l1sched_sacch_cache_read(struct l1sched_state *sched, uint8_t *out) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41904?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4dfe5663fac12548d33393fe3b1426e5d80f50e7 Gerrit-Change-Number: 41904 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>

1 0

[S] Change in osmocom-bb[master]: trxcon/l1ctl: print an error for uhnandled DATA.req / TRAFFIC.req
by fixeria 23 Jan '26

23 Jan '26

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41900?usp=email ) Change subject: trxcon/l1ctl: print an error for uhnandled DATA.req / TRAFFIC.req ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1d965c2882eb72dc845bea85a4ffaa26d37cee05 Gerrit-Change-Number: 41900 Gerrit-PatchSet: 1 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: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Jan 2026 08:02:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmocom-bb[master]: trxcon/l1ctl: print an error for uhnandled DATA.req / TRAFFIC.req
by osmith 23 Jan '26

23 Jan '26

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41900?usp=email ) Change subject: trxcon/l1ctl: print an error for uhnandled DATA.req / TRAFFIC.req ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1d965c2882eb72dc845bea85a4ffaa26d37cee05 Gerrit-Change-Number: 41900 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Jan 2026 07:55:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[master]: build: keep netns API public and gate features with HAVE_*
by Timur Davydov 23 Jan '26

23 Jan '26

Attention is currently required from: laforge, pespin. Timur Davydov has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmocore/+/41878?usp=email ) Change subject: build: keep netns API public and gate features with HAVE_* ...................................................................... Patch Set 9: (1 comment) File src/core/netns.c: https://gerrit.osmocom.org/c/libosmocore/+/41878/comment/bf6cfb02_45bdd8fa?… : PS7, Line 92: return -ENOSYS; > unrelated cleanup patches should be a separate patch. […] Yes, thanks, that’s why I asked. I’ll remove the unused headers in a separate cleanup patch. -- 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: 9 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Jan 2026 07:17:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: Timur Davydov <dtv.comp(a)gmail.com>

1 0

[XS] Change in pysim[master]: es2p.py: also allow 18 digit ICCID
by neels 23 Jan '26

23 Jan '26

Attention is currently required from: laforge. neels has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/pysim/+/40341?usp=email ) Change subject: es2p.py: also allow 18 digit ICCID ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > ping? IIRC i leaned on this one: commit 284efda086ee1f590c488310f307ad9d8314e3a4 Refs: 1.0-559-g284efda0 Author: Harald Welte <laforge(a)osmocom.org> AuthorDate: Tue Jul 11 11:08:24 2023 +0200 Commit: Harald Welte <laforge(a)osmocom.org> CommitDate: Tue Jul 11 11:09:00 2023 +0200 pySim-prog: Also accept 18-digit ICCIDs There are cards with 18-digit ICCIDs, so let's be a bit more tolerant. Unfortunately I don't remember the context anymore, let's just abandon...? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40341?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaa6e710132e3f4c6cecc5ff786922f6c0fcfb54e Gerrit-Change-Number: 40341 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 23 Jan 2026 02:34:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[S] Change in libosmocore[master]: core: guard TCP stats on availability of linux/tcp.h and struct tcp_info
by Timur Davydov 23 Jan '26

23 Jan '26

Timur Davydov has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41922?usp=email ) Change subject: core: guard TCP stats on availability of linux/tcp.h and struct tcp_info ...................................................................... core: guard TCP stats on availability of linux/tcp.h and struct tcp_info Detect availability of linux/tcp.h and struct tcp_info at configure time and build TCP statistics code conditionally based on that. This replaces platform-specific conditionals with proper feature checks and avoids build failures on systems lacking Linux TCP headers or types (e.g. non-Linux or cross-build environments). When TCP_INFO support is unavailable, the TCP stats code is compiled out, while keeping the public API intact. No functional changes on systems where linux/tcp.h and struct tcp_info are available. Change-Id: Ibcd00f15131b0291f0b10eca51401c518b77cc39 --- M configure.ac M src/core/stats_tcp.c 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/22/41922/1 diff --git a/configure.ac b/configure.ac index 5d1bdec..1ef513d 100644 --- a/configure.ac +++ b/configure.ac @@ -627,6 +627,13 @@ CHECK_BUILTIN_SUPPORT([__builtin_cpu_supports], [Runtime SIMD detection will be disabled]) +dnl Check header linux/tcp.h +AC_CHECK_HEADERS([linux/tcp.h]) +AC_CHECK_TYPES([struct tcp_info], + [AC_DEFINE([HAVE_TCP_INFO], 1, [Define if struct tcp_info exists])], + [], + [[#include <linux/tcp.h>]]) + dnl There are some members in struct tcp_info that might not exist on all linux versions AC_CHECK_MEMBER([struct tcp_info.tcpi_notsent_bytes], AC_DEFINE([HAVE_TCP_INFO_TCPI_NOTSENT_BYTES], diff --git a/src/core/stats_tcp.c b/src/core/stats_tcp.c index c6459fe..f79fc6a 100644 --- a/src/core/stats_tcp.c +++ b/src/core/stats_tcp.c @@ -29,7 +29,9 @@ #include <sys/socket.h> #include <netinet/in.h> #include <netinet/ip.h> +#ifdef HAVE_LINUX_TCP_H #include <linux/tcp.h> +#endif #include <errno.h> #include <pthread.h> @@ -74,6 +76,7 @@ STATS_TCP_REORD_SEEN, }; +#if HAVE_TCP_INFO static struct osmo_stat_item_desc stats_tcp_item_desc[] = { [STATS_TCP_UNACKED] = { "tcp:unacked", "unacknowledged packets", "", 60, 0 }, [STATS_TCP_LOST] = { "tcp:lost", "lost packets", "", 60, 0 }, @@ -93,9 +96,11 @@ .num_items = ARRAY_SIZE(stats_tcp_item_desc), .item_desc = stats_tcp_item_desc, }; +#endif /* HAVE_TCP_INFO */ static void fill_stats(struct stats_tcp_entry *stats_tcp_entry) { +#if HAVE_TCP_INFO int rc; struct tcp_info tcp_info; socklen_t tcp_info_len = sizeof(tcp_info); @@ -161,6 +166,7 @@ osmo_stat_item_set(osmo_stat_item_group_get_item(stats_tcp_entry->stats_tcp, STATS_TCP_REORD_SEEN), -1); #endif +#endif /* HAVE_TCP_INFO */ } static bool is_tcp(const struct osmo_fd *fd) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41922?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: Ibcd00f15131b0291f0b10eca51401c518b77cc39 Gerrit-Change-Number: 41922 Gerrit-PatchSet: 1 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com>

1 0

[XS] Change in libosmocore[master]: core: fix printf format casts for struct timeval fields
by Timur Davydov 23 Jan '26

23 Jan '26

Timur Davydov has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41923?usp=email ) Change subject: core: fix printf format casts for struct timeval fields ...................................................................... core: fix printf format casts for struct timeval fields Explicitly cast struct timeval fields to long when passing them to printf-style functions. This avoids compiler warnings/errors on platforms where tv_sec or tv_usec are not exactly of type long, while keeping the existing log and control output unchanged. Change-Id: Icac9e392c728948a7976970658e37f5e0da41709 --- M src/core/fsm.c M src/ctrl/fsm_ctrl_commands.c 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/23/41923/1 diff --git a/src/core/fsm.c b/src/core/fsm.c index 9333cac..a4f1bcb 100644 --- a/src/core/fsm.c +++ b/src/core/fsm.c @@ -660,7 +660,7 @@ else snprintf(trailer, sizeof(trailer), "(keeping " OSMO_T_FMT ", %ld.%03lds remaining)", OSMO_T_FMT_ARGS(fi->T), - (long) remaining.tv_sec, remaining.tv_usec / 1000); + (long) remaining.tv_sec, (long) (remaining.tv_usec / 1000)); } else if (timeout_ms) { if (timeout_ms % 1000 == 0) /* keep log output legacy compatible to avoid autotest failures */ diff --git a/src/ctrl/fsm_ctrl_commands.c b/src/ctrl/fsm_ctrl_commands.c index c93d3a5..76bc481 100644 --- a/src/ctrl/fsm_ctrl_commands.c +++ b/src/ctrl/fsm_ctrl_commands.c @@ -120,7 +120,7 @@ if (osmo_timer_remaining(&fi->timer, NULL, &remaining) < 0) cmd->reply = "0,0,0"; else - cmd->reply = talloc_asprintf(cmd, "%u,%ld,%ld", fi->T, remaining.tv_sec, remaining.tv_usec); + cmd->reply = talloc_asprintf(cmd, "%u,%ld,%ld", fi->T, (long) remaining.tv_sec, (long) remaining.tv_usec); return CTRL_CMD_REPLY; } @@ -149,7 +149,7 @@ rc = osmo_timer_remaining(&fi->timer, NULL, &remaining); if (rc == 0) { cmd->reply = talloc_asprintf_append(cmd->reply, ",timeout_sec=%ld,timeout_usec=%ld", - remaining.tv_sec, remaining.tv_usec); + (long) remaining.tv_sec, (long) remaining.tv_usec); } } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41923?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: Icac9e392c728948a7976970658e37f5e0da41709 Gerrit-Change-Number: 41923 Gerrit-PatchSet: 1 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com>

1 0

2026

2025

2024

2023

2022

gerrit-log January 2026