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(¶m->calling_addr, calling_addr, sizeof(*calling_addr));
memcpy(¶m->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>
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
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>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39765?usp=email )
Change subject: stp: STP_Tests_IPA.TC_tmt_loadshare_sls: Fix test expectancies
......................................................................
stp: STP_Tests_IPA.TC_tmt_loadshare_sls: Fix test expectancies
Change-Id: I68856e11a92b707eb11ab4813390e6faf3c54b69
---
M stp/STP_Tests_IPA.ttcn
1 file changed, 8 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn
index 088b280..88c9312 100644
--- a/stp/STP_Tests_IPA.ttcn
+++ b/stp/STP_Tests_IPA.ttcn
@@ -304,9 +304,14 @@
}
}
- /* All traffic should have still be sent to the first receiver, since OPC+SLS cannot change in IPA ASPs. */
- if (num_rx_1 != iter_per_asp and num_rx_2 != 0) {
- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Expected all traffic through 1st receiver!");
+ /* All traffic should not still be sent to the same receiver, since
+ * OPC+SLS cannot change in IPA ASPs.
+ * However, depending on how the SLS seed tables were allocated, it can
+ * be that STP was routing through Alternative Route and now that the
+ * 2nd receiver is up it is now routing to it (Normal Route). Account
+ * for both scenarios. */
+ if (not ((num_rx_1 == iter_per_asp and num_rx_2 == 0) or (num_rx_2 == iter_per_asp and num_rx_1 == 0))) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Expected all traffic through same receiver!");
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39765?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: I68856e11a92b707eb11ab4813390e6faf3c54b69
Gerrit-Change-Number: 39765
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>
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:
(1 comment)
File sccp/SCCP_Tests_RAW.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39767/comment/bf31647d_40ba… :
PS2, Line 154: {
: 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
> this is a bit "unelegant" as it basically is the default case. […]
still easier to find out the log message with those in it than without. One still needs to debug further in this event, but at least it's easier now.
This patch helped me in debugging related issues.
--
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-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 11 Mar 2025 16:17:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>