pespin has uploaded this change for review. ( 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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/39768/1
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: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ic288b58629361de9cfadb568a27b51b7e02c9e99
Gerrit-Change-Number: 39768
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
pespin has uploaded this change for review. ( 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(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/66/39766/1
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: newchange
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>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/39753?usp=email )
Change subject: iuup: Explicitly discard Iu-UP-DATA.req in Initialization state
......................................................................
iuup: Explicitly discard Iu-UP-DATA.req in Initialization state
Since Initialization procedure is asynchronous (need to wait for IuUP
ACK from peer), it may be that the user initializes the IuUP layer and
starts sending/forarding IuUP data to it before the initialization
finishes.
Before this patch, an error would be logged for each such Data request.
Let's instead explicitly expect this event and hence avoid logging a
generic FSM error log "{Initialisation}: Event IuUP-DATA-req not
permitted" and log in INFO level and discard the message.
Change-Id: I424be5718cdd12cfd0ce80108a002ce68d3e17aa
---
M src/gsm/iuup.c
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/src/gsm/iuup.c b/src/gsm/iuup.c
index 4991213..df303e5 100644
--- a/src/gsm/iuup.c
+++ b/src/gsm/iuup.c
@@ -714,6 +714,13 @@
/* the only permitted 'config req' type is the request to release the instance */
osmo_fsm_inst_state_chg(fi, IUUP_FSM_ST_NULL, 0, 0);
break;
+ case IUUP_FSM_EVT_IUUP_DATA_REQ:
+ /* Data coming down from RNL (user) towards TNL (transport).
+ * Discard since we are still not in Data Transfer Ready State. */
+ irp = data;
+ LOGPFSML(fi, LOGL_INFO, "Iu-UP-DATA.req while still initializing, discarding\n");
+ msgb_free(irp->oph.msg);
+ break;
case IUUP_FSM_EVT_INIT:
itp = data;
if (iuup_rx_initialization(iui, itp))
@@ -825,6 +832,7 @@
},
[IUUP_FSM_ST_INIT] = {
.in_event_mask = S(IUUP_FSM_EVT_IUUP_CONFIG_REQ) |
+ S(IUUP_FSM_EVT_IUUP_DATA_REQ) |
S(IUUP_FSM_EVT_INIT) |
S(IUUP_FSM_EVT_LAST_INIT_ACK) |
S(IUUP_FSM_EVT_INIT_NACK),
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39753?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I424be5718cdd12cfd0ce80108a002ce68d3e17aa
Gerrit-Change-Number: 39753
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>
