- gerrit-log - lists.osmocom.org

[S] Change in aram-applet[master]: AccessRuleMaster: allow locking of STORE DATA commands
by laforge 11 Mar '25

11 Mar '25

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/aram-applet/+/39615?usp=email ) Change subject: AccessRuleMaster: allow locking of STORE DATA commands ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/aram-applet/+/39615?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: aram-applet Gerrit-Branch: master Gerrit-Change-Id: I86437844585c22fc4280cc48b99edbb56e3159db Gerrit-Change-Number: 39615 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Mar 2025 16:45:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in docker-playground[master]: nplab-m3ua-test: Record pcap of all testsuite run
by laforge 11 Mar '25

11 Mar '25

Attention is currently required from: osmith, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email ) Change subject: nplab-m3ua-test: Record pcap of all testsuite run ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10 Gerrit-Change-Number: 39770 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Mar 2025 16:44:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: m3ua: Fix fsm dispatch failure not generating tx ERR msg to peer
by laforge 11 Mar '25

11 Mar '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39771?usp=email ) Change subject: m3ua: Fix fsm dispatch failure not generating tx ERR msg to peer ...................................................................... m3ua: Fix fsm dispatch failure not generating tx ERR msg to peer Recent commit reworked those code paths to return an error type instead of an err message, but wrongly left the negative error of osmo_fsm_inst_dispatch() code path as is, without converting it to a positive m3ua error code value, which ended up in an ERR msg not being generated. Fixes: 82c1d2c8c6699349258869bce690293b590a6b0d Change-Id: I16042c97453854c78e55bfe6bd6925506eae82c5 --- M src/m3ua.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/m3ua.c b/src/m3ua.c index 39c799e..04ee7c5 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -734,6 +734,8 @@ /* deliver that event to the ASP FSM */ rc = osmo_fsm_inst_dispatch(asp->fi, event, xua); + if (rc < 0) + rc = M3UA_ERR_UNEXPECTED_MSG; ret_free: xua_msg_free(xua); return rc; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39771?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: I16042c97453854c78e55bfe6bd6925506eae82c5 Gerrit-Change-Number: 39771 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: sccp: Use protoClass 0 to transmit SSA
by laforge 11 Mar '25

11 Mar '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39766?usp=email ) Change subject: sccp: Use protoClass 0 to transmit SSA ...................................................................... sccp: Use protoClass 0 to transmit SSA Recent commit added the possibility to set proto Class 0 vs 1 based on Sequence Control parameter present in UNITDATA.req, but forgot to extend it to the special code path used tro transmit SSA. As a result, libosmo-sigtran started transmitting SSA with protoClass 1 instead of previous 0. This is actually not bad, but there's no need to use protocClass1 here since we don't care about other messages being sent together with this one, so protoClass0 is better fit here. Fixes: 0061e8d0bcba3b0ed5ea255588619627d0975380 Change-Id: I906094a14be670e665ed8ffd0383dd8da690cb9a --- M src/sccp_scmg.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c index a8ac766..755d272 100644 --- a/src/sccp_scmg.c +++ b/src/sccp_scmg.c @@ -166,7 +166,7 @@ }; static int sccp_scmg_tx(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *calling_addr, - const struct osmo_sccp_addr *called_addr, + const struct osmo_sccp_addr *called_addr, const uint32_t *seq_ctrl, uint8_t msg_type, uint8_t ssn, uint16_t pc, uint8_t smi, uint8_t *ssc_cong_lvl) { struct msgb *msg = sccp_msgb_alloc(__func__); @@ -179,6 +179,7 @@ param = &prim->u.unitdata; memcpy(&param->calling_addr, calling_addr, sizeof(*calling_addr)); memcpy(&param->called_addr, called_addr, sizeof(*called_addr)); + param->in_sequence_control = seq_ctrl ? *seq_ctrl : OSMO_SCU_UNITDATA_REQ_P_SEQUENCE_CONTROL_NOT_PRESENT; osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_REQUEST, msg); /* Fill the actual SCMG message */ @@ -243,7 +244,7 @@ if (0 /* !subsys_available(scu) */) return 0; - return sccp_scmg_tx(scu, called_addr, calling_addr, SCCP_SCMG_MSGT_SSA, + return sccp_scmg_tx(scu, called_addr, calling_addr, NULL, SCCP_SCMG_MSGT_SSA, sst->affected_ssn, sst->affected_pc, 0, NULL); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39766?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: I906094a14be670e665ed8ffd0383dd8da690cb9a Gerrit-Change-Number: 39766 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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>

1 0

[XS] Change in libosmo-sigtran[master]: sccp: Use protoClass 0 to transmit SSA
by laforge 11 Mar '25

11 Mar '25

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39766?usp=email ) Change subject: sccp: Use protoClass 0 to transmit SSA ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: My gut tells me that I'd be quite certain that the SCCP MGMT specs would require the use of class 0. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39766?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: I906094a14be670e665ed8ffd0383dd8da690cb9a Gerrit-Change-Number: 39766 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Mar 2025 16:44:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: m3ua: Fix fsm dispatch failure not generating tx ERR msg to peer
by laforge 11 Mar '25

11 Mar '25

Attention is currently required from: daniel, fixeria, osmith, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39771?usp=email ) Change subject: m3ua: Fix fsm dispatch failure not generating tx ERR msg to peer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39771?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: I16042c97453854c78e55bfe6bd6925506eae82c5 Gerrit-Change-Number: 39771 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Mar 2025 16:43:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: sccp: Fix test rx SLS expectancies
by pespin 11 Mar '25

11 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39768?usp=email ) Change subject: sccp: Fix test rx SLS expectancies ...................................................................... sccp: Fix test rx SLS expectancies The SLS is the same for all messages in conn being sent in one direction, but doesn't need to be the same value on both directions. Since the SLS value on the other direction is not selected by the test itself, we cannot expect a given specifi value. Update the test expectancies. This started to fail since recently libosmo-sigtran started properly setting SLS values, eg libosmo-sigtran.git 7781eb275da41a9b6b1ea5d8b0e802e87a8e9d53 and 0061e8d0bcba3b0ed5ea255588619627d0975380. Change-Id: Ic288b58629361de9cfadb568a27b51b7e02c9e99 --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index f7c5357..f0d716a 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -131,7 +131,7 @@ sio := g_param.sio, opc := g_param.dpc, dpc := g_param.opc, - sls := g_param.sls, + sls := ?, data := sccp }; return exp; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39768?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic288b58629361de9cfadb568a27b51b7e02c9e99 Gerrit-Change-Number: 39768 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: sccp: Improve logging receiving unexpected msg
by pespin 11 Mar '25

11 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39767?usp=email ) Change subject: sccp: Improve logging receiving unexpected msg ...................................................................... sccp: Improve logging receiving unexpected msg Change-Id: I90c5236882e96fc038fee0d2f4551cfc58767c78 --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 11 insertions(+), 6 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 5d5b0ab..f7c5357 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -14,6 +14,7 @@ import from General_Types all; import from Osmocom_Types all; +import from Misc_Helpers all; import from M3UA_Emulation all; @@ -136,9 +137,9 @@ return exp; } -private function f_exp_sccp(template PDU_SCCP sccp) +private function f_exp_sccp(template (present) PDU_SCCP sccp := ?) runs on SCCP_Test_RAW_CT return SCCP_MTP3_TRANSFERind { - var template SCCP_MTP3_TRANSFERind exp := tr_SCCP_MTP3_TRANSFERind(sccp); + var template (present) SCCP_MTP3_TRANSFERind exp := tr_SCCP_MTP3_TRANSFERind(sccp); var SCCP_MTP3_TRANSFERind rx; timer T := 10.0; T.start; @@ -146,13 +147,17 @@ [] MTP3.receive(exp) -> value rx { return rx; } + [] MTP3.receive(tr_SCCP_MTP3_TRANSFERind(*)) -> value rx { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unexpected MTP/SCCP received: got ", rx, " vs exp ", exp)); + } [] MTP3.receive { - setverdict(fail, "Unexpected MTP/SCCP received"); - self.stop + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unexpected MTP/SCCP received: got (ASP_MTP3_PAUSE|ASP_MTP3_RESUME|ASP_MTP3_STATUS) vs exp ", exp)); } [] T.timeout { - setverdict(fail, "Timeout waiting for ", exp); - self.stop + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for ", exp)); } } return rx; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39767?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90c5236882e96fc038fee0d2f4551cfc58767c78 Gerrit-Change-Number: 39767 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: SCCP_Templates: Expect either proto class0 or class1 upon rx SCCP
by pespin 11 Mar '25

11 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39769?usp=email ) Change subject: SCCP_Templates: Expect either proto class0 or class1 upon rx SCCP ...................................................................... SCCP_Templates: Expect either proto class0 or class1 upon rx SCCP Until recently, libosmo-sigtran only sent class0, but it is now able to send class1 too (0061e8d0bcba3b0ed5ea255588619627d0975380). Adapt the test expectancies. Change-Id: Ia1e05b24f1b56404d951eece0e9314d784d375db --- M library/SCCP_Templates.ttcn 1 file changed, 8 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn index f36dc5a..8f84d83 100644 --- a/library/SCCP_Templates.ttcn +++ b/library/SCCP_Templates.ttcn @@ -85,6 +85,8 @@ } /* connection oriented SCCP */ +const SCCP_param_ProtocolClass c_class0 := { class:='0000'B, messageHandling:='0000'B };//class 0 +const SCCP_param_ProtocolClass c_class1 := { class:='0001'B, messageHandling:='0000'B };//class 1 const SCCP_param_ProtocolClass c_class2 := { class:='0010'B, messageHandling:='0000'B };//class 2 function ts_SCCP_CR(OCT3 source_lref, SCCP_PAR_Address calling, SCCP_PAR_Address called) @@ -210,10 +212,10 @@ template PDU_SCCP tr_SCCP_UDT(template (present) SCCP_PAR_Address calling, template (present) SCCP_PAR_Address called, template octetstring data := ?, - template BIT4 msg_hdl := '0000'B) := { + template (present) SCCP_param_ProtocolClass protClass := (c_class0, c_class1)) := { unitdata := { messageType := udt, - protClass := {'0000'B, msg_hdl}, + protClass := protClass, pointer1 := ?, pointer2 := ?, pointer3 := ?, @@ -251,11 +253,11 @@ template PDU_SCCP tr_SCCP_XUDT(template (present) SCCP_PAR_Address calling, template (present) SCCP_PAR_Address called, template octetstring data := ?, - template BIT4 msg_hdl := '0000'B, + template (present) SCCP_param_ProtocolClass protClass := (c_class0, c_class1), template integer hop_ctr := ?) := { extudata := { messageType := xudt, - protClass := {'0000'B, msg_hdl}, + protClass := protClass, hopCounter := hop_ctr, pointer1 := ?, pointer2 := ?, @@ -297,11 +299,11 @@ template PDU_SCCP tr_SCCP_LUDT(template (present) SCCP_PAR_Address calling, template (present) SCCP_PAR_Address called, template octetstring data := ?, - template BIT4 msg_hdl := '0000'B, + template (present) SCCP_param_ProtocolClass protClass := (c_class0, c_class1), template integer hop_ctr := ?) := { longudata := { messageType := ludt, - protClass := {'0000'B, msg_hdl}, + protClass := protClass, hopCounter := hop_ctr, pointer1 := ?, pointer2 := ?, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39769?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia1e05b24f1b56404d951eece0e9314d784d375db Gerrit-Change-Number: 39769 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: sccp: Improve logging receiving unexpected msg
by pespin 11 Mar '25

11 Mar '25

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39767?usp=email ) Change subject: sccp: Improve logging receiving unexpected msg ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39767?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90c5236882e96fc038fee0d2f4551cfc58767c78 Gerrit-Change-Number: 39767 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 11 Mar 2025 16:27:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log