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

[S] Change in osmo-ttcn3-hacks[master]: stp: Test TCAP routing with a different called address answering
by daniel 26 Apr '26

26 Apr '26

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42682?usp=email ) Change subject: stp: Test TCAP routing with a different called address answering ...................................................................... stp: Test TCAP routing with a different called address answering Change-Id: I6d586b17b767219d20646f7cd1b59d6719cdbcdb Related: SYS#5423 --- M stp/STP_Tests_TCAP.ttcn 1 file changed, 41 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/42682/1 diff --git a/stp/STP_Tests_TCAP.ttcn b/stp/STP_Tests_TCAP.ttcn index ebacbc1..d488910 100644 --- a/stp/STP_Tests_TCAP.ttcn +++ b/stp/STP_Tests_TCAP.ttcn @@ -272,7 +272,7 @@ private function f_asp_tx_tcap_m3ua_ipa_transaction(integer o_asp_idx, integer t_asp_idx, OCT4 o_tid, - OCT4 t_tid) + OCT4 t_tid, integer alt_asp_idx := -1) runs on TCAP_CT { var template (value) TCMessage tcap_msg; @@ -283,7 +283,11 @@ /* TCAP Continue: O <- T */ tcap_msg := ts_TCAP_Continue(t_tid, o_tid); - f_asp_tx_tcap_exp_any(tcap_msg, t_asp_idx); + if (alt_asp_idx == -1) { + f_asp_tx_tcap_exp_any(tcap_msg, t_asp_idx); + } else { + f_asp_tx_tcap_exp_any(tcap_msg, alt_asp_idx); + } /* TCAP Continue: O -> T */ tcap_msg := ts_TCAP_Continue(o_tid, t_tid); @@ -377,6 +381,40 @@ setverdict(pass); } +/* test routing TCAP traffic from IPA AS to M3UA AS + The answer is sent from a different point code than the request dpc */ +testcase TC_tcap_loadshare_m3ua_to_ipa_different_opc () runs on TCAP_CT { + var template (value) IPA_EXT_TCAP_ROUTING_Message tcap_rt_msg; + var Misc_Helpers.ro_charstring tcap_asps := { "asp-m3ua-loadshare-0-0", + "asp-m3ua-loadshare-0-1", + "asp-ipa-loadshare-0-0", + "asp-ipa-loadshare-0-1" }; + var TCAP_CT_Configurations tcap_configs := tcap_build_configs(tcap_asps); + + /* Patch own PC from asp-m3ua-loadshare-0-1 to test a TCAP continue + from a differen PC. */ + tcap_configs[1].cfg.own_pc := 42; + + f_init_tcap(tcap_configs); + + /* Configure TCAP routing on ASP "asp-ipa-loadshare-0-0": */ + tcap_rt_msg := ts_IPA_EXT_TCAP_ROUTING_ADD_RANGE(seq_nr := 0, + tid_start := 0, + tid_end := 99, + pc := tcap_configs[2].cfg.own_pc, + ssn := tcap_configs[2].cfg.own_ssn); + f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 2); + + /* Configure TCAP routing on ASP "asp-ipa-loadshare-0-1": */ + tcap_rt_msg.u.add_range.tid_start := 100; + tcap_rt_msg.u.add_range.tid_end := 199; + f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 3); + + f_asp_tx_tcap_m3ua_ipa_transaction(0, 2, int2oct(77, 4), int2oct(42, 4), 1); + + setverdict(pass); +} + /* Test m3ua routing towards IPA/TCAP and register for wildcards ssn/pc */ @@ -700,6 +738,7 @@ control { execute( TC_tcap_loadshare_ipa_to_ipa() ); execute( TC_tcap_loadshare_m3ua_to_ipa() ); + execute( TC_tcap_loadshare_m3ua_to_ipa_different_opc() ); execute( TC_tcap_loadshare_m3ua_to_ipa_50() ); execute( TC_tcap_loadshare_m3ua_to_ipa_wildcard() ); execute( TC_tcap_loadshare_ipa_tcap_range_fail_overlap_same() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42682?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6d586b17b767219d20646f7cd1b59d6719cdbcdb Gerrit-Change-Number: 42682 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Make TCAP tests more realistic
by daniel 26 Apr '26

26 Apr '26

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42683?usp=email ) Change subject: stp: Make TCAP tests more realistic ...................................................................... stp: Make TCAP tests more realistic Use a TCAP id outside of the TCAP routing range for the M3UA TCAP id. Test both directions IPA -> M3UA and M3UA -> IPA. Change-Id: Ia807c2b26e5188b700365650311cabc0f9095674 Related: SYS#5423 --- M stp/STP_Tests_TCAP.ttcn 1 file changed, 159 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/42683/1 diff --git a/stp/STP_Tests_TCAP.ttcn b/stp/STP_Tests_TCAP.ttcn index d488910..755aae7 100644 --- a/stp/STP_Tests_TCAP.ttcn +++ b/stp/STP_Tests_TCAP.ttcn @@ -269,6 +269,36 @@ as_asp_rx_tcap_any(tcap_msg, tx_asp_idx); } +private function f_asp_tx_tcap_exp_alt(template (value) TCMessage tcap_msg, + integer tx_asp_idx, + integer rx_asp_idx1, + integer rx_asp_idx2) +runs on TCAP_CT return integer +{ + f_asp_tx_tcap(tcap_msg, tx_asp_idx); + + var template (present) TCAP_N_UNITDATA_ind exp_sccp_unitdata_ind := + tr_TCAP_UNITDATA_ind(g_tcap[tx_asp_idx].sccp_addr_peer, + g_tcap[tx_asp_idx].sccp_addr_own, + tcap_msg); + + alt { + [] SCCP_TCAP[rx_asp_idx1].receive(exp_sccp_unitdata_ind) { + setverdict(pass); + return rx_asp_idx1; + } + [] SCCP_TCAP[rx_asp_idx2].receive(exp_sccp_unitdata_ind) { + setverdict(pass); + return rx_asp_idx2; + } + [] any from SCCP_TCAP.receive(exp_sccp_unitdata_ind) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx TCAP at unexpected ASP with idx != ", rx_asp_idx1, " or ", rx_asp_idx2)); + } + } + return -1; +} + private function f_asp_tx_tcap_m3ua_ipa_transaction(integer o_asp_idx, integer t_asp_idx, OCT4 o_tid, @@ -298,6 +328,39 @@ f_asp_tx_tcap_exp_any(tcap_msg, t_asp_idx); } +private function f_asp_tx_tcap_m3ua_ipa_transaction_alt(integer o_asp_idx, + OCT4 o_tid, + integer t_asp_idx1, OCT4 t_tid1, + integer t_asp_idx2, OCT4 t_tid2) +runs on TCAP_CT +{ + var template (value) TCMessage tcap_msg; + var integer t_asp_idx; + var OCT4 t_tid; + + /* TCAP Being: O -> T */ + tcap_msg := ts_TCAP_Begin(o_tid); + t_asp_idx := f_asp_tx_tcap_exp_alt(tcap_msg, o_asp_idx, t_asp_idx1, t_asp_idx2); + + if (t_asp_idx == t_asp_idx1) { + t_tid := t_tid1; + } else { + t_tid := t_tid2; + } + + /* TCAP Continue: O <- T */ + tcap_msg := ts_TCAP_Continue(t_tid, o_tid); + f_asp_tx_tcap_exp_any(tcap_msg, t_asp_idx); + + /* TCAP Continue: O -> T */ + tcap_msg := ts_TCAP_Continue(o_tid, t_tid); + f_asp_tx_tcap_exp(tcap_msg, o_asp_idx, t_asp_idx); + + /* TCAP End O <- T */ + tcap_msg := ts_TCAP_End(o_tid); + f_asp_tx_tcap_exp_any(tcap_msg, t_asp_idx); +} + private function f_tcap_loadshare_register(integer node_a, integer tid_a_start, integer tid_a_stop, integer node_b, integer tid_b_start, integer tid_b_stop, boolean exp_ack := true, integer seq_nr := 1) @@ -352,7 +415,94 @@ setverdict(pass); } -/* test routing TCAP traffic from IPA AS to M3UA AS */ +/* test routing TCAP traffic from IPA AS to M3UA AS + Use a TCAP ID outside of any range for the M3UA side + (which is not participating in the TCAP routing) */ +testcase TC_tcap_loadshare_ipa_to_m3ua() runs on TCAP_CT { + var template (value) IPA_EXT_TCAP_ROUTING_Message tcap_rt_msg; + var Misc_Helpers.ro_charstring tcap_asps := { "asp-m3ua-loadshare-0-0", + "asp-ipa-loadshare-0-0", + "asp-ipa-loadshare-0-1" }; + var TCAP_CT_Configurations tcap_configs := tcap_build_configs(tcap_asps); + + f_init_tcap(tcap_configs); + + /* Configure TCAP routing on ASP "asp-ipa-loadshare-0-0": */ + tcap_rt_msg := ts_IPA_EXT_TCAP_ROUTING_ADD_RANGE(seq_nr := 0, + tid_start := 0, + tid_end := 99, + pc := tcap_configs[1].cfg.own_pc, + ssn := tcap_configs[1].cfg.own_ssn); + f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 1); + + /* Configure TCAP routing on ASP "asp-ipa-loadshare-0-1": */ + tcap_rt_msg.u.add_range.tid_start := 100; + tcap_rt_msg.u.add_range.tid_end := 199; + f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 2); + + f_asp_tx_tcap_m3ua_ipa_transaction(1, 0, int2oct(23, 4), int2oct(2345, 4)); + f_asp_tx_tcap_m3ua_ipa_transaction(2, 0, int2oct(123, 4), int2oct(2346, 4)); + + setverdict(pass); +} + +/* test routing TCAP traffic from IPA AS to M3UA AS + The answer is sent from a different address than the request */ +testcase TC_tcap_loadshare_ipa_to_m3ua_different_opc () runs on TCAP_CT { + var template (value) IPA_EXT_TCAP_ROUTING_Message tcap_rt_msg; + var Misc_Helpers.ro_charstring tcap_asps := { "asp-m3ua-loadshare-0-0", + "asp-m3ua-loadshare-0-1", + "asp-ipa-loadshare-0-0", + "asp-ipa-loadshare-0-1" }; + var TCAP_CT_Configurations tcap_configs := tcap_build_configs(tcap_asps); + var template (value) TCMessage tcap_msg; + var integer m3ua_asp_idx; + var OCT4 o_tid := int2oct(2345, 4); + var OCT4 t_tid := int2oct(42, 4); + + /* Patch own PC from asp-m3ua-loadshare-0-1 to test a TCAP continue + from a differen PC. */ + tcap_configs[1].cfg.own_pc := 42; + + f_init_tcap(tcap_configs); + + /* Configure TCAP routing on ASP "asp-ipa-loadshare-0-0": */ + tcap_rt_msg := ts_IPA_EXT_TCAP_ROUTING_ADD_RANGE(seq_nr := 0, + tid_start := 0, + tid_end := 99, + pc := tcap_configs[2].cfg.own_pc, + ssn := tcap_configs[2].cfg.own_ssn); + f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 2); + + /* Configure TCAP routing on ASP "asp-ipa-loadshare-0-1": */ + tcap_rt_msg.u.add_range.tid_start := 100; + tcap_rt_msg.u.add_range.tid_end := 199; + f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 3); + + + + /* TCAP Begin: IPA -> M3UA */ + tcap_msg := ts_TCAP_Begin(o_tid); + m3ua_asp_idx := f_asp_tx_tcap_exp_alt(tcap_msg, 2, 0, 1); + + /* TCAP Continue: (different) M3UA -> IPA */ + tcap_msg := ts_TCAP_Continue(t_tid, o_tid); + f_asp_tx_tcap_exp(tcap_msg, 1-m3ua_asp_idx, 2); + + /* TCAP Continue: IPA -> M3UA */ + tcap_msg := ts_TCAP_Continue(o_tid, t_tid); + f_asp_tx_tcap_exp_alt(tcap_msg, 2, 0, 1); + + /* TCAP End M3UA -> IPA */ + tcap_msg := ts_TCAP_End(o_tid); + f_asp_tx_tcap_exp_any(tcap_msg, 1-m3ua_asp_idx); + + setverdict(pass); +} + +/* test routing TCAP traffic from M3UA AS to IPA AS + Use a TCAP ID outside of any range for the M3UA side + (which is not participating in the TCAP routing) */ testcase TC_tcap_loadshare_m3ua_to_ipa() runs on TCAP_CT { var template (value) IPA_EXT_TCAP_ROUTING_Message tcap_rt_msg; var Misc_Helpers.ro_charstring tcap_asps := { "asp-m3ua-loadshare-0-0", @@ -376,47 +526,11 @@ tcap_rt_msg.u.add_range.tid_end := 199; f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 3); - f_asp_tx_tcap_m3ua_ipa_transaction(0, 2, int2oct(77, 4), int2oct(42, 4)); + f_asp_tx_tcap_m3ua_ipa_transaction(0, 2, int2oct(2345, 4), int2oct(42, 4)); setverdict(pass); } -/* test routing TCAP traffic from IPA AS to M3UA AS - The answer is sent from a different point code than the request dpc */ -testcase TC_tcap_loadshare_m3ua_to_ipa_different_opc () runs on TCAP_CT { - var template (value) IPA_EXT_TCAP_ROUTING_Message tcap_rt_msg; - var Misc_Helpers.ro_charstring tcap_asps := { "asp-m3ua-loadshare-0-0", - "asp-m3ua-loadshare-0-1", - "asp-ipa-loadshare-0-0", - "asp-ipa-loadshare-0-1" }; - var TCAP_CT_Configurations tcap_configs := tcap_build_configs(tcap_asps); - - /* Patch own PC from asp-m3ua-loadshare-0-1 to test a TCAP continue - from a differen PC. */ - tcap_configs[1].cfg.own_pc := 42; - - f_init_tcap(tcap_configs); - - /* Configure TCAP routing on ASP "asp-ipa-loadshare-0-0": */ - tcap_rt_msg := ts_IPA_EXT_TCAP_ROUTING_ADD_RANGE(seq_nr := 0, - tid_start := 0, - tid_end := 99, - pc := tcap_configs[2].cfg.own_pc, - ssn := tcap_configs[2].cfg.own_ssn); - f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 2); - - /* Configure TCAP routing on ASP "asp-ipa-loadshare-0-1": */ - tcap_rt_msg.u.add_range.tid_start := 100; - tcap_rt_msg.u.add_range.tid_end := 199; - f_asp_tx_ipa_ext_tcap_routing(tcap_rt_msg, 3); - - f_asp_tx_tcap_m3ua_ipa_transaction(0, 2, int2oct(77, 4), int2oct(42, 4), 1); - - setverdict(pass); -} - - - /* Test m3ua routing towards IPA/TCAP and register for wildcards ssn/pc */ testcase TC_tcap_loadshare_m3ua_to_ipa_wildcard() runs on TCAP_CT { var template (value) IPA_EXT_TCAP_ROUTING_Message tcap_rt_msg; @@ -432,7 +546,7 @@ f_tcap_loadshare_register(2, 0, 99, 3, 100, 199); f_sleep(1.0); - f_asp_tx_tcap_m3ua_ipa_transaction(0, 2, int2oct(77, 4), int2oct(75, 4)); + f_asp_tx_tcap_m3ua_ipa_transaction_alt(0, int2oct(2342, 4), 2, int2oct(75, 4), 3, int2oct(175, 4)); setverdict(pass); } @@ -453,9 +567,11 @@ var integer rand_tid := f_rnd_int(298); for (var integer i := 0; i < loops; i := i + 1) { - var integer otid := 1 + i; + /* OTID is from M3UA side. Use a value outside of the TCAP ranges to ensure + it doesn't affect routing. */ + var integer otid := 1000 + i; var integer dtid := 1 + ((rand_tid + i) mod 298); - f_asp_tx_tcap_m3ua_ipa_transaction(0, 2, int2oct(otid, 4), int2oct(dtid, 4)); + f_asp_tx_tcap_m3ua_ipa_transaction_alt(0, int2oct(otid, 4), 2, int2oct(dtid, 4), 3, int2oct(dtid+300, 4)); } setverdict(pass); @@ -737,8 +853,9 @@ control { execute( TC_tcap_loadshare_ipa_to_ipa() ); + execute( TC_tcap_loadshare_ipa_to_m3ua() ); + execute( TC_tcap_loadshare_ipa_to_m3ua_different_opc() ); execute( TC_tcap_loadshare_m3ua_to_ipa() ); - execute( TC_tcap_loadshare_m3ua_to_ipa_different_opc() ); execute( TC_tcap_loadshare_m3ua_to_ipa_50() ); execute( TC_tcap_loadshare_m3ua_to_ipa_wildcard() ); execute( TC_tcap_loadshare_ipa_tcap_range_fail_overlap_same() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42683?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia807c2b26e5188b700365650311cabc0f9095674 Gerrit-Change-Number: 42683 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>

1 0

[XS] Change in osmo-e1d[master]: HDLC timeslots: fix Rx of maximum-sized frames
by falconia 26 Apr '26

26 Apr '26

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/42681?usp=email ) Change subject: HDLC timeslots: fix Rx of maximum-sized frames ...................................................................... HDLC timeslots: fix Rx of maximum-sized frames E1D protocol sets the maximum permitted size of an HDLC frame to 264 bytes of useful payload, not counting the 2 bytes of FCS. This limit is fair enough, as it matches GSM TS 08.56, the primary intended application. However, osmo_isdnhdlc engine used internally by the daemon requires an Rx buffer 2 bytes larger than the maximum payload length, for temporary storage of FCS bytes: by the nature of HDLC, a receiver has no way of identifying FCS bytes as such until after they have been received and stored in the Rx buffer. This bug was caught when bringing up OsmoBSC with Nokia Flexi Multiradio BTS. This BTS emits some long OML messages that get broken into segments, with each not-last segment traveling over HDLC as a maximum-sized frame - and these frames then get dropped by osmo-e1d, causing further breakage downstream. Change-Id: I479e8fe5118c8eb7d4e6b16b49047a3278bc9808 --- M src/e1d.h 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/81/42681/1 diff --git a/src/e1d.h b/src/e1d.h index 5015761..7d2d4c6 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -101,7 +101,8 @@ struct osmo_isdnhdlc_vars tx; struct osmo_isdnhdlc_vars rx; - uint8_t rx_buf[E1DP_MAX_SIZE_HDLC]; + /* extra 2 bytes needed for FCS */ + uint8_t rx_buf[E1DP_MAX_SIZE_HDLC + 2]; uint8_t tx_buf[E1DP_MAX_SIZE_HDLC]; int tx_ofs; int tx_len; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/42681?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I479e8fe5118c8eb7d4e6b16b49047a3278bc9808 Gerrit-Change-Number: 42681 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[S] Change in libosmo-abis[master]: cosmetic: fix white space in lapd_sap_{start,stop}()
by falconia 26 Apr '26

26 Apr '26

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/42679?usp=email ) Change subject: cosmetic: fix white space in lapd_sap_{start,stop}() ...................................................................... cosmetic: fix white space in lapd_sap_{start,stop}() Change-Id: Iadf8629bc3bdf18260b1b83290ce95483d8aac2c --- M src/input/lapd.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/79/42679/1 diff --git a/src/input/lapd.c b/src/input/lapd.c index 130e4c3..88cc26f 100644 --- a/src/input/lapd.c +++ b/src/input/lapd.c @@ -521,10 +521,10 @@ /* prepare prim */ msg = msgb_alloc_headroom(DLSAP_MSGB_SIZE, DLSAP_MSGB_HEADROOM, "DL EST"); msg->l3h = msg->data; - osmo_prim_init(&dp.oph, 0, PRIM_DL_EST, PRIM_OP_REQUEST, msg); + osmo_prim_init(&dp.oph, 0, PRIM_DL_EST, PRIM_OP_REQUEST, msg); - /* send to L2 */ - return lapd_recv_dlsap(&dp, &sap->dl.lctx); + /* send to L2 */ + return lapd_recv_dlsap(&dp, &sap->dl.lctx); } /* Stop a (user-side) SAP for the specified TEI/SAPI on the LAPD instance */ @@ -548,10 +548,10 @@ /* prepare prim */ msg = msgb_alloc_headroom(DLSAP_MSGB_SIZE, DLSAP_MSGB_HEADROOM, "DL REL"); msg->l3h = msg->data; - osmo_prim_init(&dp.oph, 0, PRIM_DL_REL, PRIM_OP_REQUEST, msg); + osmo_prim_init(&dp.oph, 0, PRIM_DL_REL, PRIM_OP_REQUEST, msg); - /* send to L2 */ - return lapd_recv_dlsap(&dp, &sap->dl.lctx); + /* send to L2 */ + return lapd_recv_dlsap(&dp, &sap->dl.lctx); } /* Transmit Data (DL-DATA request) on the given LAPD Instance / TEI / SAPI */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/42679?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Iadf8629bc3bdf18260b1b83290ce95483d8aac2c Gerrit-Change-Number: 42679 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[XS] Change in libosmo-abis[master]: lapd_sap_stop(): fix use of uninitialized stack memory
by falconia 26 Apr '26

26 Apr '26

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/42680?usp=email ) Change subject: lapd_sap_stop(): fix use of uninitialized stack memory ...................................................................... lapd_sap_stop(): fix use of uninitialized stack memory DL-RELEASE in lapd_core can be done in two ways: by sending DISC and waiting for UA, or a purely local clearing of state. The selection between these two modes is communicated via an extended field in struct osmo_dlsap_prim that extends beyond the standard struct osmo_prim_hdr. lapd_sap_stop() is a wrapper function that sends DL-RELEASE to lapd_core; its only current users are the vendor-specific E1 BTS handlers for Ericsson and Nokia in OsmoBSC, and both of those need local release handling. This wrapper function does allocate correctly-sized struct osmo_dlsap_prim on the stack, but until now it failed to initialize the extended field - hence the actual behavior was subject to laws of chance, depending on uninitialized content of stack memory. Change-Id: Ic1469698ee8edf9b6fb55df8f79cc062be711f61 --- M src/input/lapd.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/80/42680/1 diff --git a/src/input/lapd.c b/src/input/lapd.c index 88cc26f..b335923 100644 --- a/src/input/lapd.c +++ b/src/input/lapd.c @@ -550,6 +550,13 @@ msg->l3h = msg->data; osmo_prim_init(&dp.oph, 0, PRIM_DL_REL, PRIM_OP_REQUEST, msg); + /* DL-RELEASE can be done in two ways: by sending DISC and waiting + * for UA, or a purely local clearing of state. The only current + * users of this lapd_sap_stop() API are vendor-specific E1 BTS + * handlers for Ericsson and Nokia in OsmoBSC, and both of them + * need local release handling. */ + dp.u.rel_req.mode = 1; + /* send to L2 */ return lapd_recv_dlsap(&dp, &sap->dl.lctx); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/42680?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic1469698ee8edf9b6fb55df8f79cc062be711f61 Gerrit-Change-Number: 42680 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[XL] Change in pysim[master]: generate sdkey classes from a list
by fixeria 25 Apr '26

25 Apr '26

Attention is currently required from: fixeria, laforge, neels. fixeria has uploaded a new patch set (#9) to the change originally created by neels. ( https://gerrit.osmocom.org/c/pysim/+/41771?usp=email ) The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: generate sdkey classes from a list ...................................................................... generate sdkey classes from a list Change-Id: Ic92ddea6e1fad8167ea75baf78ffc3eb419838c4 Jenkins: skip-card-test --- M pySim/esim/saip/personalization.py M pyproject.toml M tests/unittests/test_configurable_parameters.py M tests/unittests/test_esim_saip.py M tests/unittests/xo/test_configurable_parameters 5 files changed, 2,395 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/71/41771/9 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41771?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic92ddea6e1fad8167ea75baf78ffc3eb419838c4 Gerrit-Change-Number: 41771 Gerrit-PatchSet: 9 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[L] Change in osmo-trx[master]: trx: add JSON serialization for 'show trx'
by Timur Davydov 25 Apr '26

25 Apr '26

Timur Davydov has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/42678?usp=email ) Change subject: trx: add JSON serialization for 'show trx' ...................................................................... trx: add JSON serialization for 'show trx' Introduce trx_to_json() helper to serialize the output of 'show trx' into JSON format. Also initialize talloc/VTY context in websdr entrypoint to allow accessing TRX configuration programmatically. Intended for external consumers (e.g. WebSDR frontend). Change-Id: Icbfb754580daa6db9b5646cc6698a6a6ee1c1610 --- M CommonLibs/Makefile.am A CommonLibs/trx_stats_json.c A CommonLibs/trx_stats_json.h M Transceiver52M/osmo-trx-websdr.cpp 4 files changed, 290 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/78/42678/1 diff --git a/CommonLibs/Makefile.am b/CommonLibs/Makefile.am index 4a0652d..23feb98 100644 --- a/CommonLibs/Makefile.am +++ b/CommonLibs/Makefile.am @@ -59,3 +59,8 @@ debug.h \ osmo_signal.h \ config_defs.h + +if ENABLE_WEBSDR +libcommon_la_SOURCES += trx_stats_json.c +include_HEADERS = trx_stats_json.h +endif diff --git a/CommonLibs/trx_stats_json.c b/CommonLibs/trx_stats_json.c new file mode 100644 index 0000000..8eff19d --- /dev/null +++ b/CommonLibs/trx_stats_json.c @@ -0,0 +1,243 @@ +/* JSON helpers for OsmoTRX: trx serialization API implementation + * + * Copyright (C) 2026 Timur Davydov <dtv.comp(a)gmail.com> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include <inttypes.h> +#include <stdbool.h> +#include <stdarg.h> + +#include <osmocom/core/utils.h> + +#include "trx_vty.h" +#include "config_defs.h" + +#include "trx_stats_json.h" + +/* function trx_from_vty is implemented in trx_vty.c */ +struct trx_ctx *trx_from_vty(struct vty *v); + +/* JSON serialization context for transceiver config */ +struct trx_stats_json_ctx { + char *buf; + size_t buflen; + size_t off; +}; + +/* append a single character into ctx->buf */ +static int tsj_append_char(struct trx_stats_json_ctx *ctx, char c) +{ + if (ctx->off + 1 >= ctx->buflen) + return -ENOSPC; + + ctx->buf[ctx->off++] = c; + ctx->buf[ctx->off] = '\0'; + + return 0; +} + +/* append a formatted string into ctx->buf */ +static int tsj_append_fmt(struct trx_stats_json_ctx *ctx, const char *fmt, ...) +{ + va_list ap; + int rc; + size_t rem; + + if (ctx->off >= ctx->buflen) + return -ENOSPC; + + rem = ctx->buflen - ctx->off; + va_start(ap, fmt); + rc = vsnprintf(ctx->buf + ctx->off, rem, fmt, ap); + va_end(ap); + + if (rc < 0) + return -EIO; + if ((size_t)rc >= rem) + return -ENOSPC; + + ctx->off += rc; + return 0; +} + +/* simple JSON string escaper that appends into ctx->buf */ +static int tsj_append_json_str(struct trx_stats_json_ctx *ctx, const char *s) +{ + int rc; + + if (!s) s = ""; + + rc = tsj_append_char(ctx, '"'); + if (rc) + return rc; + + for (size_t j = 0; s[j] != '\0'; j++) { + char c = s[j]; + if (c == '"' || c == '\\') { + rc = tsj_append_char(ctx, '\\'); + if (rc) + return rc; + rc = tsj_append_char(ctx, c); + if (rc) + return rc; + } else if ((unsigned char)c < 0x20) { + rc = tsj_append_char(ctx, ' '); + if (rc) + return rc; + } else { + rc = tsj_append_char(ctx, c); + if (rc) + return rc; + } + } + + return tsj_append_char(ctx, '"'); +} + +/* Build JSON for 'show trx' by enumerating transceivers */ +int trx_to_json(char *buf, size_t buflen) +{ + struct trx_ctx *trx = trx_from_vty(NULL); + struct trx_stats_json_ctx ctx = { + .buf = buf, + .buflen = buflen, + }; + int rc; + + if (!buf || buflen == 0) + return -EINVAL; + + rc = tsj_append_char(&ctx, '{'); + if (rc) + return rc; + + if (!trx) { + rc = tsj_append_fmt(&ctx, "\"trx_config\":null"); + if (rc) + return rc; + } else { + rc = tsj_append_fmt(&ctx, "\"trx_config\":{"); + if (rc) + return rc; + + rc = tsj_append_fmt(&ctx, "\"local_ip\":"); + if (rc) + return rc; + + rc = tsj_append_json_str(&ctx, trx->cfg.bind_addr); + if (rc) + return rc; + + rc = tsj_append_fmt(&ctx, ",\"remote_ip\":"); + if (rc) + return rc; + + rc = tsj_append_json_str(&ctx, trx->cfg.remote_addr); + if (rc) + return rc; + + rc = tsj_append_fmt(&ctx, ",\"base_port\":%u,\"dev_args\":", trx->cfg.base_port); + if (rc) + return rc; + + rc = tsj_append_json_str(&ctx, trx->cfg.dev_args); + if (rc) + return rc; + + const char *filler_str = get_value_string(filler_names, trx->cfg.filler); + const char *clock_ref_str = get_value_string(clock_ref_names, trx->cfg.clock_ref); + + rc = tsj_append_fmt(&ctx, ",\"tx_sps\":%u,\"rx_sps\":%u,\"filler\":", + trx->cfg.tx_sps, trx->cfg.rx_sps); + if (rc) + return rc; + + rc = tsj_append_json_str(&ctx, filler_str); + if (rc) + return rc; + + rc = tsj_append_fmt(&ctx, ",\"rtsc\":%u,\"rach_delay\":%u,\"clock_ref\":", + trx->cfg.rtsc, trx->cfg.rach_delay); + if (rc) + return rc; + + rc = tsj_append_json_str(&ctx, clock_ref_str); + if (rc) + return rc; + + rc = tsj_append_fmt(&ctx, + ",\"multi_arfcn\":%s,\"offset\":%f,\"rssi_offset\":%f" + ",\"swap_channels\":%s,\"egprs\":%s,\"ext_rach\":%s,\"sched_rr\":%u,\"stack_size\":%u" + ",\"channels\":[", + trx->cfg.multi_arfcn ? "true" : "false", + trx->cfg.offset, trx->cfg.rssi_offset, + trx->cfg.swap_channels ? "true" : "false", + trx->cfg.egprs ? "true" : "false", + trx->cfg.ext_rach ? "true" : "false", + trx->cfg.sched_rr, trx->cfg.stack_size); + if (rc) + return rc; + + for (unsigned int i = 0; i < trx->cfg.num_chans; i++) { + struct trx_chan *chan = &trx->cfg.chans[i]; + if (i != 0) { + rc = tsj_append_char(&ctx, ','); + if (rc) + return rc; + } + rc = tsj_append_fmt(&ctx, "{\"idx\":%u,\"rx_path\":", chan->idx); + if (rc) + return rc; + + rc = tsj_append_json_str(&ctx, chan->rx_path); + if (rc) + return rc; + + rc = tsj_append_fmt(&ctx, ",\"tx_path\":"); + if (rc) + return rc; + + rc = tsj_append_json_str(&ctx, chan->tx_path); + if (rc) + return rc; + + rc = tsj_append_char(&ctx, '}'); + if (rc) + return rc; + } + + rc = tsj_append_char(&ctx, ']'); + if (rc) + return rc; + + rc = tsj_append_char(&ctx, '}'); + if (rc) + return rc; + } + + rc = tsj_append_char(&ctx, '}'); + if (rc) + return rc; + + return (int)ctx.off; +} diff --git a/CommonLibs/trx_stats_json.h b/CommonLibs/trx_stats_json.h new file mode 100644 index 0000000..37f331f --- /dev/null +++ b/CommonLibs/trx_stats_json.h @@ -0,0 +1,36 @@ +/* JSON helpers for OsmoTXR: trx serialization API + * + * Copyright (C) 2026 Timur Davydov <dtv.comp(a)gmail.com> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#ifndef TRX_STATS_JSON_H +#define TRX_STATS_JSON_H +#include <stddef.h> + +#ifdef __cplusplus +extern "C" { +#endif + +int trx_to_json(char *buf, size_t buflen); + +#ifdef __cplusplus +} +#endif + +#endif /* TRX_STATS_JSON_H */ diff --git a/Transceiver52M/osmo-trx-websdr.cpp b/Transceiver52M/osmo-trx-websdr.cpp index 8913893..69265af 100644 --- a/Transceiver52M/osmo-trx-websdr.cpp +++ b/Transceiver52M/osmo-trx-websdr.cpp @@ -40,6 +40,7 @@ uint32_t g_tx_ts; uint32_t g_tx_len; +static void *tall_trx_ctx; static struct trx_ctx *g_trx_ctx; static RadioDevice *usrp; @@ -201,6 +202,9 @@ convolve_init(); convert_init(); + tall_trx_ctx = talloc_named_const(NULL, 0, "OsmoTRX"); + g_trx_ctx = vty_trx_ctx_alloc(tall_trx_ctx); + g_trx_ctx->cfg.tx_sps = 4; g_trx_ctx->cfg.rx_sps = 4; g_trx_ctx->cfg.base_port = 5700; @@ -218,6 +222,8 @@ srandom(time(NULL)); + trx_vty_init(g_trx_ctx); + if(trx_start(g_trx_ctx) < 0) return EXIT_FAILURE; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/42678?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icbfb754580daa6db9b5646cc6698a6a6ee1c1610 Gerrit-Change-Number: 42678 Gerrit-PatchSet: 1 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com>

1 0

[S] Change in pysim[master]: personalization audit: optionally audit all (unknown) SD keys
by fixeria 25 Apr '26

25 Apr '26

Attention is currently required from: fixeria, laforge. fixeria has uploaded a new patch set (#12) to the change originally created by neels. ( https://gerrit.osmocom.org/c/pysim/+/40209?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: personalization audit: optionally audit all (unknown) SD keys ...................................................................... personalization audit: optionally audit all (unknown) SD keys By a flag, allow to audit also all Security Domain KVN that we have *not* created ConfigurableParameter subclasses for. For example, SCP80 has reserved kvn 0x01..0x0f, but we offer only Scp80Kvn01, Scp80Kvn02, Scp80Kvn03. So we would not show kvn 0x03..0x0f in an audit. This patch includes audits of all SD key kvn there may be in the UPP. This will help to spot SD keys that may already be present in a UPP template, with unexpected / unusual kvn. Change-Id: Icaf6f7b589f117868633c0968a99f2f0252cf612 Jenkins: skip-card-test --- M pySim/esim/saip/batch.py 1 file changed, 26 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/09/40209/12 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40209?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icaf6f7b589f117868633c0968a99f2f0252cf612 Gerrit-Change-Number: 40209 Gerrit-PatchSet: 12 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in pysim[master]: personalization: add int as input type for BinaryParameter
by fixeria 25 Apr '26

25 Apr '26

Attention is currently required from: fixeria, laforge, neels. fixeria has uploaded a new patch set (#10) to the change originally created by neels. ( https://gerrit.osmocom.org/c/pysim/+/40825?usp=email ) The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: personalization: add int as input type for BinaryParameter ...................................................................... personalization: add int as input type for BinaryParameter Change-Id: I31d8142cb0847a8b291f8dc614d57cb4734f0190 Jenkins: skip-card-test --- M pySim/esim/saip/personalization.py M tests/unittests/test_configurable_parameters.py M tests/unittests/xo/test_configurable_parameters 3 files changed, 186 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/25/40825/10 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40825?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I31d8142cb0847a8b291f8dc614d57cb4734f0190 Gerrit-Change-Number: 40825 Gerrit-PatchSet: 10 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XL] Change in pysim[master]: generate sdkey classes from a list
by fixeria 25 Apr '26

25 Apr '26

Attention is currently required from: laforge, neels. fixeria has uploaded a new patch set (#8) to the change originally created by neels. ( https://gerrit.osmocom.org/c/pysim/+/41771?usp=email ) The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: generate sdkey classes from a list ...................................................................... generate sdkey classes from a list Change-Id: Ic92ddea6e1fad8167ea75baf78ffc3eb419838c4 Jenkins: skip-card-test --- M pySim/esim/saip/personalization.py M pyproject.toml M tests/unittests/test_configurable_parameters.py M tests/unittests/test_esim_saip.py M tests/unittests/xo/test_configurable_parameters 5 files changed, 2,267 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/71/41771/8 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41771?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic92ddea6e1fad8167ea75baf78ffc3eb419838c4 Gerrit-Change-Number: 41771 Gerrit-PatchSet: 8 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org>

1 0

2026

2025

2024

2023

2022

gerrit-log April 2026