pespin has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40396?usp=email )
Change subject: sccp_scoc: Match local conn by src_ref, not dest_ref
......................................................................
Abandoned
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40396?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: abandon
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: pespin/rel-2.1.0
Gerrit-Change-Id: I7c94faea6e446097b54143055d05d7f9d19afede
Gerrit-Change-Number: 40396
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40385?usp=email )
Change subject: deps: Depend on osmocom fork of forge.etsi.org nas.git
......................................................................
deps: Depend on osmocom fork of forge.etsi.org nas.git
This module provides types, templates and functions to operate NG NAS
(5G).
A fork is needed because:
* Upstream code doesn't compile against eclipse titan (A PR has been
submitted upstream and we should eventually be able to compile ttcn3
code just fine in that regard).
* Some system/external functions need to be implemented, such as
fx_GetSystemTime(). We currently do that in our fork.
Related: SYS#7073
Change-Id: I004fc26e5d691ee7e3be984e28f5516e2b55258c
---
M deps/Makefile
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, approved
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/deps/Makefile b/deps/Makefile
index 0c5a033..b4a411a 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -69,7 +69,8 @@
OSMOGERRIT_REPOS= osmo-uecups
-OSMOGITEA_REPOS= titan.ProtocolModules.BSSMAP \
+OSMOGITEA_REPOS= nas \
+ titan.ProtocolModules.BSSMAP \
titan.ProtocolModules.MAP \
titan.TestPorts.AF_PACKET \
titan.TestPorts.USB
@@ -84,6 +85,7 @@
# Do not put references to branches here, except for local testing: this breaks the caching
# logic of docker containers, which only invalidate their cached ttcn3 dependencies if this
# file changed.
+nas_commit= 205e24167517500ba2d49322dfa1754ab8a0fc43
titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da
titan.ProtocolEmulations.M3UA_commit= b58f92046e48a7b1ed531e243a2319ebca53bf4c
titan.ProtocolEmulations.SCCP_commit= 750a3e836831e58eae59d4757ef5d0c759f9ca5d
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40385?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: I004fc26e5d691ee7e3be984e28f5516e2b55258c
Gerrit-Change-Number: 40385
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: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40386?usp=email )
Change subject: 5gc: Initial support encoding NG NAS UL messages
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40386?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: Id59564114cf18ae745e3e385e2c91779a453e545
Gerrit-Change-Number: 40386
Gerrit-PatchSet: 1
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-Comment-Date: Wed, 28 May 2025 14:39:16 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40394?usp=email )
Change subject: ipa: Fix asp_id/SLS unset in tcp-server mode
......................................................................
ipa: Fix asp_id/SLS unset in tcp-server mode
Commit changing the value set to asp_id (used to derive SLS) for IPA
conns only updated the asp_id value on the stream_cli code path, but not
on the stream_srv one.
As a result, on IPA conns with an underlaying TCP server conn, asp_id
and SLS was always 0.
Fixes: 2c9ba16 "ipa: Use pseudo-random number for SLS in IPA->M3UA direction
(cherry picked from commit a3232c4b7ba8d90f852211c987a4a438c8970aa6)
Change-Id: I4e8e8d58e9425fc6fce5e4e15a79e86ff4518270
---
M src/osmo_ss7_asp.c
M src/osmo_ss7_xua_srv.c
2 files changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/94/40394/1
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index d81d25c..57ebc82 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -945,8 +945,8 @@
rc = ss7_asp_apply_primary_address(asp);
} else {
if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) {
- /* we use the lower 4 bits of the asp_id feld as SLS; let's initialize it here from a
- * pseudo-random value */
+ /* we use the lower 4 bits of the asp_id field as SLS;
+ * let's initialize it here from a pseudo-random value */
asp->asp_id = rand() & 0xf;
}
}
diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c
index 4962bfd..35e360f 100644
--- a/src/osmo_ss7_xua_srv.c
+++ b/src/osmo_ss7_xua_srv.c
@@ -61,7 +61,7 @@
* SS7 xUA Server
***********************************************************************/
-/* server has accept()ed a new SCTP association, let's find the ASP for
+/* Server has accept()ed a new SCTP association / TCP connection, let's find the ASP for
* it (if any) */
static int xua_accept_cb(struct osmo_stream_srv_link *link, int fd)
{
@@ -177,9 +177,15 @@
* data */
osmo_stream_srv_set_data(srv, asp);
- if (oxs->cfg.trans_proto == IPPROTO_SCTP) {
+ if (asp->cfg.trans_proto == IPPROTO_SCTP) {
rc = ss7_asp_apply_peer_primary_address(asp);
rc = ss7_asp_apply_primary_address(asp);
+ } else {
+ if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) {
+ /* we use the lower 4 bits of the asp_id field as SLS;
+ * let's initialize it here from a pseudo-random value */
+ asp->asp_id = rand() & 0xf;
+ }
}
/* send M-SCTP_ESTABLISH.ind to Layer Manager */
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40394?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: pespin/rel-2.1.0
Gerrit-Change-Id: I4e8e8d58e9425fc6fce5e4e15a79e86ff4518270
Gerrit-Change-Number: 40394
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40396?usp=email )
Change subject: sccp_scoc: Match local conn by src_ref, not dest_ref
......................................................................
sccp_scoc: Match local conn by src_ref, not dest_ref
SCRC Routing Failure is dispatched when a local SCCP Connection Oriented
message fails to be routed to a peer.
Hence, in order to figure out if the msg belons to a local conn, we need
to use the src_ref (the sender), not the dst_ref (the peer's id).
As a result, event SCOC_E_RCOC_ROUT_FAIL_IND was potentially being set
to the wrong connection FSM.
(cherry picked from commit 0a5161a0a8922a383e9478340a46c139428ed343)
Change-Id: I7c94faea6e446097b54143055d05d7f9d19afede
---
M src/sccp_scoc.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/96/40396/1
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index c11dddf..0b6bd98 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -1545,7 +1545,7 @@
xua_hdr_dump(xua, &xua_dialect_sua));
/* try to dispatch to connection FSM (if any) */
- conn_id = xua_msg_get_u32(xua, SUA_IEI_DEST_REF);
+ conn_id = xua_msg_get_u32(xua, SUA_IEI_SRC_REF);
conn = conn_find_by_id(inst, conn_id);
if (conn) {
osmo_fsm_inst_dispatch(conn->fi,
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40396?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: pespin/rel-2.1.0
Gerrit-Change-Id: I7c94faea6e446097b54143055d05d7f9d19afede
Gerrit-Change-Number: 40396
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>