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

[L] Change in osmo-trx[master]: Transceiver52M: migrate to libosmo-trx
by Jenkins Builder 05 Aug '26

05 Aug '26

Attention is currently required from: Hoernchen, pespin, tnt. Jenkins Builder has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-trx/+/43115?usp=email ) Change subject: Transceiver52M: migrate to libosmo-trx ...................................................................... Patch Set 5: (3 comments) File Transceiver52M/Transceiver.h: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-trx/+/43115/comment/4beecc5a_9d34acbc?usp… : PS5, Line 158: char data[OSMO_TRXC_MSG_BUF_SIZE]; please, no spaces at the start of a line Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-trx/+/43115/comment/67a3562f_145c7ee2?usp… : PS5, Line 210: int pullRadioVector(size_t chan, struct osmo_trxd_burst_ind *ind); please, no spaces at the start of a line Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-trx/+/43115/comment/dbd92392_f856290a?usp… : PS5, Line 277: void logRxBurst(size_t chan, const struct osmo_trxd_burst_ind *bi); please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/43115?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I458ec85c56e2101d073c8c35f11c147191c4ea0c Gerrit-Change-Number: 43115 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-CC: tnt <tnt(a)246tNt.com> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Aug 2026 17:59:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XL] Change in osmo-trx[master]: libosmo-trx/ep: add TRX endpoint module
by fixeria 05 Aug '26

05 Aug '26

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-trx/+/43111?usp=email ) Change subject: libosmo-trx/ep: add TRX endpoint module ...................................................................... Patch Set 4: (1 comment) File libosmo-trx/src/trx_ep.c: https://gerrit.osmocom.org/c/osmo-trx/+/43111/comment/e55dae76_6b070fec?usp… : PS3, Line 66: char *laddr, *raddr; /* local/remote IP address */ > one field per line in the struct pleaseeeee Done -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/43111?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I767fa43a9ca88be40c385f6dcb9de22891a6afc3 Gerrit-Change-Number: 43111 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Aug 2026 17:50:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-trx[master]: Transceiver52M: implement TRXDv2 support
by fixeria 05 Aug '26

05 Aug '26

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-trx/+/43116?usp=email ) Change subject: Transceiver52M: implement TRXDv2 support ...................................................................... Patch Set 5: (1 comment) File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/43116/comment/4b6ac3e6_052181e9?usp… : PS1, Line 1200: } while (br.flags & OSMO_TRXD_F_BATCH_IND); > I wonder whether we can end in a infinite loop here with req_parse returning eg. rc=0 above. I've modified the check above to return early on `rc <= 0`. So if for whatever reason `osmo_trxd_burst_req_parse()` returns 0 (e.g. somebody changes it some day), we're safe. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/43116?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie6a33e3980b3ca4ab05a3d4221d5a8ba0132233d Gerrit-Change-Number: 43116 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Aug 2026 17:50:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-trx[master]: Transceiver52M: migrate to libosmo-trx
by fixeria 05 Aug '26

05 Aug '26

Attention is currently required from: Hoernchen, pespin, tnt. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-trx/+/43115?usp=email ) Change subject: Transceiver52M: migrate to libosmo-trx ...................................................................... Patch Set 4: (6 comments) File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/43115/comment/be111e64_cada4a94?usp… : PS4, Line 764: bi->rssi = (int8_t) lround(-(20.0 * log10(rxFullScale / avg) + rssi_offset)); > so there's no nois calculation now? Noise calculation was moved to `Transceiver::logRxBurst()`. It's not needed for TRXD BURST.ind because it's never sent over the wire. > I find this line quite difficult to read with all the operations, parenthesis and casts. Can you split it into ... Moved the calculation into an inline function. https://gerrit.osmocom.org/c/osmo-trx/+/43115/comment/85477170_0e078302?usp… : PS4, Line 801: bi->toa256 = (int16_t) lround(ebp.toa * 256.0); > I wonder whether doing the multiplication before rounding is correct here. @tnt@246tNt. […] It's correct. With the current logic, e.g. `ebp.toa = -0.3` becomes `-77` (`-0.3 * 256.0 = -76.8`). If you multiply after `lround()`, you loose the fractional part: `ebp.toa = -0.3` becomes `0 * 256.0 = 0`. https://gerrit.osmocom.org/c/osmo-trx/+/43115/comment/94133de8_9a477ab1?usp… : PS4, Line 815: bi->burst, float_soft_bit_to_sbit); > Can you pass an inline static func to a std::transform?I also wonder whether the change from a loop […] `std::transform` is a template function, and at least with `-O2` the compiler does inline `float_soft_bit_to_sbit()` (I checked). That `inline` itself is not necessary, since it's up to the compiler, but it does not hurt either. This whole construction should be equivalent to a plain for-loop in terms of performance. https://gerrit.osmocom.org/c/osmo-trx/+/43115/comment/64bb5437_904b4815?usp… : PS4, Line 1200: double noise_dbfs = 20.0 * log10(rxFullScale / mStates[chan].mNoiseLev) + rssi_offset; > aah noise calculation happens here now, it's only needed for logging, fine. Done https://gerrit.osmocom.org/c/osmo-trx/+/43115/comment/db6dc920_7aa8bd2a?usp… : PS4, Line 1244: msgb_free(msg); > Since you are doing a synchrnonous write here: Why allocating and freeing a msgb every time? Can't y […] Good idea. Changed to pre-allocate msgbs for each channel. https://gerrit.osmocom.org/c/osmo-trx/+/43115/comment/5dc8b3ef_45e66dec?usp… : PS4, Line 1311: char command[64]; > why was this changed? Looks like not really related to this patch or at least can be done in a separ […] This change was unintentional, reverted back. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/43115?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I458ec85c56e2101d073c8c35f11c147191c4ea0c Gerrit-Change-Number: 43115 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-CC: tnt <tnt(a)246tNt.com> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Aug 2026 17:50:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XL] Change in osmo-trx[master]: libosmo-trx/ep: add TRX endpoint module
by fixeria 05 Aug '26

05 Aug '26

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/43111?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified-1 by Jenkins Builder Change subject: libosmo-trx/ep: add TRX endpoint module ...................................................................... libosmo-trx/ep: add TRX endpoint module Add the osmo_trx_ep module, encapsulating the clock/ctrl/data UDP socket management of the TRX protocol on top of osmo_io. One endpoint serves an (optional) clock socket plus N channels, each channel being a ctrl + data socket pair. The module is role-neutral: struct osmo_trx_ep_cfg carries a mode (OSMO_TRX_EP_MODE_{L1,TRX}) selecting which side of the protocol the endpoint implements. The mode is needed to parse datagrams received on the data sockets, as the wire format alone does not identify the direction (BURST.ind vs BURST.req). All local and remote ports are derived from a single base port (default: 5700). To avoid indirect calls on the hot path, the decoded Rx handlers (osmo_trx_ep_rx_*) are plain function prototypes bound at link-time, not function pointers. The library provides weak default stubs to stay link-complete (-no-undefined), so applications only implement the handlers for the directions they consume, overriding the stubs. The Tx path implements TRXDv2 PDU batching for burst requests: osmo_trx_ep_send_burst_req() accumulates PDUs until it is called with br == NULL (the batching breaker), like in osmo-bts-trx. osmo-trx itself will not adopt this module: its per-channel/thread socket ownership model (dedicated blocking-read threads per socket) is incompatible with osmo_io's single-select-loop dispatch. It is meant for osmo-bts, osmocom-bb/trxcon, and the upcoming C rewrite of fake_trx. Change-Id: I767fa43a9ca88be40c385f6dcb9de22891a6afc3 --- M .gitignore M libosmo-trx/include/Makefile.am A libosmo-trx/include/osmocom/trx/ep.h M libosmo-trx/src/Makefile.am A libosmo-trx/src/trx_ep.c M tests/libosmo-trx/Makefile.am A tests/libosmo-trx/trx_ep_test.c A tests/libosmo-trx/trx_ep_test.err A tests/libosmo-trx/trx_ep_test.ok M tests/testsuite.at 10 files changed, 1,016 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/11/43111/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/43111?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I767fa43a9ca88be40c385f6dcb9de22891a6afc3 Gerrit-Change-Number: 43111 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XL] Change in osmo-trx[master]: libosmo-trx: generate Doxygen API documentation
by fixeria 05 Aug '26

05 Aug '26

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/43113?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified-1 by Jenkins Builder Change subject: libosmo-trx: generate Doxygen API documentation ...................................................................... libosmo-trx: generate Doxygen API documentation Add Doxyfile.trx.in (based on Doxyfile.core.in from libosmocore.git, upgraded using 'doxygen -u' to get rid of obsolete tags) and the usual rules to build and install the HTML documentation, as well as the --disable-doxygen configure option, like in other libosmo-* projects. Change-Id: I54cf8c0c60215c666d8fa55dafec53379a2382d5 --- M .gitignore M configure.ac A libosmo-trx/Doxyfile.trx.in M libosmo-trx/Makefile.am 4 files changed, 3,027 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/13/43113/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/43113?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I54cf8c0c60215c666d8fa55dafec53379a2382d5 Gerrit-Change-Number: 43113 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[L] Change in osmo-trx[master]: Transceiver52M: migrate to libosmo-trx
by fixeria 05 Aug '26

05 Aug '26

Attention is currently required from: Hoernchen, fixeria, tnt. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/43115?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Transceiver52M: migrate to libosmo-trx ...................................................................... Transceiver52M: migrate to libosmo-trx Replace the local TRXC/TRXD implementation with libosmo-trx's shared osmo_trxc_msg/osmo_trxd_burst_{ind,req} API, including SETSLOT parsing via osmo_trxc_setslot_parse()/_build(). Take a chance to fix SETSLOT to always send a response, distinguishing bogus input from unsupported VAMOS channel combinations. Only the TRXC/TRXD build/parse API is used here, not the osmo_trx_ep endpoint API: osmo-trx runs its socket I/O on dedicated threads that don't drive osmo_select_main(), which osmo_trx_ep depends on. Change-Id: I458ec85c56e2101d073c8c35f11c147191c4ea0c Related: OS#5283 --- M Transceiver52M/Makefile.am M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h D Transceiver52M/proto_trxd.c D Transceiver52M/proto_trxd.h M Transceiver52M/sigProcLib.cpp M Transceiver52M/sigProcLib.h 7 files changed, 308 insertions(+), 496 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/15/43115/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/43115?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I458ec85c56e2101d073c8c35f11c147191c4ea0c Gerrit-Change-Number: 43115 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-CC: tnt <tnt(a)246tNt.com> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-trx[master]: Transceiver52M: implement TRXDv2 support
by fixeria 05 Aug '26

05 Aug '26

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/43116?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified-1 by Jenkins Builder Change subject: Transceiver52M: implement TRXDv2 support ...................................................................... Transceiver52M: implement TRXDv2 support TRXDv2 was proposed and implemented in osmo-bts a while ago, but osmo-trx was still stuck at TRXDv1. This patch implements TRXDv2 and UL/DL burst batching using libosmo-trx API. DL: driveTxPriorityQueue() now loops over osmo_trxd_burst_req_parse() to handle datagrams potentially containing multiple batched BURST.req, dispatching each via the new handleBurstReq(). UL: accumulate BURST.ind PDUs for the same FN into one msgb per channel and flush as a single datagram once the next frame's PDU arrives or the channel stops; TRXDv0/v1 channels keep sending one PDU per datagram via sendBurstInd(). Batching is unconditional for now; making it configurable is left as a follow-up. Change-Id: Ie6a33e3980b3ca4ab05a3d4221d5a8ba0132233d Related: OS#5283 --- M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h 2 files changed, 173 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/16/43116/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/43116?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie6a33e3980b3ca4ab05a3d4221d5a8ba0132233d Gerrit-Change-Number: 43116 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: asp: vty: Explicitly test timer lm value ranges
by pespin 05 Aug '26

05 Aug '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43157?usp=email ) Change subject: asp: vty: Explicitly test timer lm value ranges ...................................................................... Patch Set 1: (1 comment) File src/ss7_asp_vty.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/43157/comment/de16bdc1_f4770… : PS1, Line 906: return CMD_WARNING; > same here as in the previous patch, print a message here? Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43157?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: I9b2c426a1eaceb6e7c5fbe35872ada324fef5733 Gerrit-Change-Number: 43157 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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-Comment-Date: Tue, 04 Aug 2026 15:09:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: asp: vty: Explicitly test timer lm value ranges
by pespin 05 Aug '26

05 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43157?usp=email ) Change subject: asp: vty: Explicitly test timer lm value ranges ...................................................................... asp: vty: Explicitly test timer lm value ranges Validate the value to be set provided by user over VTY is actually within the range of the specific tdef being set. Mark all of them explicitly as min_val=1 in its tdef, since they are not expected to be set to 0 (see also gen_asp_timer_lm_cmd_strs() defining a VTY range <1..999999>). Change-Id: I9b2c426a1eaceb6e7c5fbe35872ada324fef5733 --- M src/ss7_asp_vty.c M src/xua_default_lm_fsm.c M tests/vty/osmo_stp_test.vty M tests/vty/ss7_asp_test.vty 4 files changed, 34 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index 21d19d6..5136105 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -891,13 +891,27 @@ { struct osmo_ss7_asp *asp = vty->index; enum ss7_asp_lm_timer timer = get_string_value(ss7_asp_lm_timer_names, argv[0]); + int rc; + unsigned long new_val = atoi(argv[1]); if (timer <= 0 || timer >= SS7_ASP_LM_TIMERS_LEN) { vty_out(vty, "%% Invalid timer: %s%s", argv[0], VTY_NEWLINE); return CMD_WARNING; } - osmo_tdef_set(asp->cfg.T_defs_lm, timer, atoi(argv[1]), OSMO_TDEF_S); + rc = osmo_tdef_set(asp->cfg.T_defs_lm, timer, new_val, OSMO_TDEF_S); + if (rc < 0) { + struct osmo_tdef *t = osmo_tdef_get_entry(asp->cfg.T_defs_lm, timer); + if (!t) + return CMD_WARNING; + if (!osmo_tdef_val_in_range(t, new_val)) { + char range_str[64]; + osmo_tdef_range_str_buf(range_str, sizeof(range_str), t); + vty_out(vty, "%% Timer %s value %lu is out of range %s%s", + argv[0], new_val, range_str, VTY_NEWLINE); + } + return CMD_WARNING; + } return CMD_SUCCESS; } diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index 73c4fdc..db84e6e 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -102,13 +102,17 @@ const struct osmo_tdef ss7_asp_lm_timer_defaults[SS7_ASP_LM_TIMERS_LEN] = { { .T = SS7_ASP_LM_T_WAIT_ASP_UP, .default_val = 20, .unit = OSMO_TDEF_S, - .desc = "Restart ASP after timeout waiting for ASP UP (SG role) / ASP UP ACK (ASP role) (s)" }, + .desc = "Restart ASP after timeout waiting for ASP UP (SG role) / ASP UP ACK (ASP role) (s)", + .min_val = 1 }, { .T = SS7_ASP_LM_T_WAIT_NOTIFY, .default_val = 2, .unit = OSMO_TDEF_S, - .desc = "Restart ASP after timeout waiting for NOTIFY (s)" }, + .desc = "Restart ASP after timeout waiting for NOTIFY (s)", + .min_val = 1 }, { .T = SS7_ASP_LM_T_WAIT_NOTIY_RKM, .default_val = 20, .unit = OSMO_TDEF_S, - .desc = "Restart ASP after timeout waiting for NOTIFY after RKM registration (s)" }, + .desc = "Restart ASP after timeout waiting for NOTIFY after RKM registration (s)", + .min_val = 1 }, { .T = SS7_ASP_LM_T_WAIT_RK_REG_RESP, .default_val = 10, .unit = OSMO_TDEF_S, - .desc = "Restart ASP after timeout waiting for RK_REG_RESP (s)" }, + .desc = "Restart ASP after timeout waiting for RK_REG_RESP (s)", + .min_val = 1 }, {} }; diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 2dbd5b2..d52ae5f 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -415,6 +415,11 @@ ... !timer xua beat 30 ... +OsmoSTP(config-cs7-asp)# timer lm ? + wait_asp_up Restart ASP after timeout waiting for ASP UP (SG role) / ASP UP ACK (ASP role) (s) (default: 20) + wait_notify Restart ASP after timeout waiting for NOTIFY (s) (default: 2) + wait_notify_rkm Restart ASP after timeout waiting for NOTIFY after RKM registration (s) (default: 20) + wait_rk_reg_resp Restart ASP after timeout waiting for RK_REG_RESP (s) (default: 10) OsmoSTP(config-cs7-asp)# exit % NOTE: Skipping automatic restart of ASP since an explicit '[no] shutdown' command was entered diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index f3193b6..5ea965b 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -432,6 +432,12 @@ ... !timer xua beat 30 ... +ss7_asp_vty_test(config-cs7-asp)# timer lm ? + wait_asp_up Restart ASP after timeout waiting for ASP UP (SG role) / ASP UP ACK (ASP role) (s) (default: 20) + wait_notify Restart ASP after timeout waiting for NOTIFY (s) (default: 2) + wait_notify_rkm Restart ASP after timeout waiting for NOTIFY after RKM registration (s) (default: 20) + wait_rk_reg_resp Restart ASP after timeout waiting for RK_REG_RESP (s) (default: 10) + ss7_asp_vty_test(config-cs7-asp)# exit % NOTE: Make sure to use '[no] shutdown' command in 'asp' node in order to restart the ASP for new configs to be applied. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43157?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I9b2c426a1eaceb6e7c5fbe35872ada324fef5733 Gerrit-Change-Number: 43157 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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>

1 0

2026

2025

2024

2023

2022

gerrit-log August 2026