pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39659?usp=email )
Change subject: Fix osmo_ss7_tmode_to_xua(OSMO_SS7_AS_TMOD_ROUNDROBIN)
......................................................................
Fix osmo_ss7_tmode_to_xua(OSMO_SS7_AS_TMOD_ROUNDROBIN)
As specified in RFC4666, "roundrobin" is not a M3UA traffic mode but
simply a specific possible implementation of "loadshare"
traffic mode.
Hence, when converting to M3UA Traffic Mode Type, if AS was configured
by user as "roundrobin", on the wire it is actually configured as
"loadshare" traffic mode.
Change-Id: I56447024936c8518cfd3f947971e3d7d0616e4f7
---
M src/osmo_ss7.c
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c
index 5965cd5..902479d 100644
--- a/src/osmo_ss7.c
+++ b/src/osmo_ss7.c
@@ -196,6 +196,9 @@
return M3UA_TMOD_LOADSHARE;
case OSMO_SS7_AS_TMOD_BCAST:
return M3UA_TMOD_BCAST;
+ case OSMO_SS7_AS_TMOD_ROUNDROBIN:
+ /* Round-robin is a Loadshare implementation: */
+ return M3UA_TMOD_LOADSHARE;
default:
return -1;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39659?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: I56447024936c8518cfd3f947971e3d7d0616e4f7
Gerrit-Change-Number: 39659
Gerrit-PatchSet: 2
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-Reviewer: pespin <pespin(a)sysmocom.de>
Attention is currently required from: dexter.
laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39656?usp=email )
Change subject: es9p_Types_JSON: add decoder/encoder functions for opposite direction
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39656?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: Ic7e3390bd09cc9e0c91ca90ac60cdde5d2ce1384
Gerrit-Change-Number: 39656
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 03 Mar 2025 12:44:59 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: dexter.
laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39654?usp=email )
Change subject: es9p_Types_JSON: split headers into separate module
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39654?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: I0242c877805003fa67445800960f75ce27752383
Gerrit-Change-Number: 39654
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 03 Mar 2025 12:44:35 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39660?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
Change-Id: I6e166aa67da6103d541084a45e8dc5595241fe60
---
M src/osmo_ss7_asp.c
M src/osmo_ss7_xua_srv.c
2 files changed, 10 insertions(+), 4 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index faf4a0a..503b31c 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -981,8 +981,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/+/39660?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: I6e166aa67da6103d541084a45e8dc5595241fe60
Gerrit-Change-Number: 39660
Gerrit-PatchSet: 2
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-Reviewer: pespin <pespin(a)sysmocom.de>