March 2025 - gerrit-log - lists.osmocom.org

[XS] Change in libosmo-sigtran[master]: Fix osmo_ss7_tmode_to_xua(OSMO_SS7_AS_TMOD_ROUNDROBIN)
by pespin 03 Mar '25

03 Mar '25

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>

1 0

[S] Change in libosmo-sigtran[master]: Improve docuemntation of enum osmo_ss7_as_traffic_mode
by pespin 03 Mar '25

03 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39658?usp=email ) Change subject: Improve docuemntation of enum osmo_ss7_as_traffic_mode ...................................................................... Improve docuemntation of enum osmo_ss7_as_traffic_mode Change-Id: Icc4dcbe37208a64b73a07d4432d353edf03af978 --- M include/osmocom/sigtran/osmo_ss7.h M include/osmocom/sigtran/protocol/m3ua.h 2 files changed, 12 insertions(+), 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/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index d35b870..51c1cbd 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -172,10 +172,20 @@ * SS7 AS Traffic Mode ***********************************************************************/ + /* Traffic mode implementations which can be configured on an AS, either by + * peer (eg. RFC4666 M3UA "Traffic Mode Type") or locally through VTY. + * Note: This is related but not exactly RFC4666 M3UA "Traffic Mode Type" (enum + * m3ua_traffic_mode). */ enum osmo_ss7_as_traffic_mode { - OSMO_SS7_AS_TMOD_OVERRIDE = 0, /* default */ + /* RFC4666 M3UA "Traffic Mode Type" "Override". Default traffic mode: */ + OSMO_SS7_AS_TMOD_OVERRIDE = 0, + /* RFC4666 M3UA "Traffic Mode Type" "Broadcast": */ OSMO_SS7_AS_TMOD_BCAST, + /* RFC4666 M3UA "Traffic Mode Type" "Loadshare", + * traffic distribution based on OPC+SLS: */ OSMO_SS7_AS_TMOD_LOADSHARE, + /* RFC4666 M3UA "Traffic Mode Type" "Loadshare", + * traffic distribution implemented as round-robin: */ OSMO_SS7_AS_TMOD_ROUNDROBIN, _NUM_OSMO_SS7_ASP_TMOD }; diff --git a/include/osmocom/sigtran/protocol/m3ua.h b/include/osmocom/sigtran/protocol/m3ua.h index ecbe37b..0f237d4 100644 --- a/include/osmocom/sigtran/protocol/m3ua.h +++ b/include/osmocom/sigtran/protocol/m3ua.h @@ -172,6 +172,7 @@ M3UA_ERR_NO_CONFGD_AS_FOR_ASP = 0x1a, }; +/* Traffic Mode Type */ enum m3ua_traffic_mode { M3UA_TMOD_OVERRIDE = 1, M3UA_TMOD_LOADSHARE = 2, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39658?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: Icc4dcbe37208a64b73a07d4432d353edf03af978 Gerrit-Change-Number: 39658 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>

1 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Pass M3UA conn idx to f_M3UA_rkm_register()
by laforge 03 Mar '25

03 Mar '25

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39644?usp=email ) Change subject: stp: Pass M3UA conn idx to f_M3UA_rkm_register() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39644?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: I9295a2c3518f82e8c82625fb573e414b1d634146 Gerrit-Change-Number: 39644 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Mar 2025 12:45:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: Fix osmo_ss7_tmode_to_xua(OSMO_SS7_AS_TMOD_ROUNDROBIN)
by laforge 03 Mar '25

03 Mar '25

Attention is currently required from: daniel, fixeria, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39659?usp=email ) Change subject: Fix osmo_ss7_tmode_to_xua(OSMO_SS7_AS_TMOD_ROUNDROBIN) ...................................................................... Patch Set 1: Code-Review+2 -- 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: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I56447024936c8518cfd3f947971e3d7d0616e4f7 Gerrit-Change-Number: 39659 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Mar 2025 12:45:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: Improve docuemntation of enum osmo_ss7_as_traffic_mode
by laforge 03 Mar '25

03 Mar '25

Attention is currently required from: daniel, fixeria, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39658?usp=email ) Change subject: Improve docuemntation of enum osmo_ss7_as_traffic_mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39658?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: Icc4dcbe37208a64b73a07d4432d353edf03af978 Gerrit-Change-Number: 39658 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Mar 2025 12:45:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: es9p_Types_JSON: add decoder/encoder functions for opposite direction
by laforge 03 Mar '25

03 Mar '25

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

1 0

[S] Change in osmo-ttcn3-hacks[master]: RSPDefinitions_Templates: add missing default values
by laforge 03 Mar '25

03 Mar '25

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39655?usp=email ) Change subject: RSPDefinitions_Templates: add missing default values ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39655?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: Ia55d17a00462c7c7729eb0d8d24ab0556c4c6918 Gerrit-Change-Number: 39655 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:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: es9p_Types_JSON: split headers into separate module
by laforge 03 Mar '25

03 Mar '25

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

1 0

[S] Change in libosmo-sigtran[master]: ipa: Fix asp_id/SLS unset in tcp-server mode
by pespin 03 Mar '25

03 Mar '25

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>

1 0

[S] Change in libosmo-sigtran[master]: ipa: Fix asp_id/SLS unset in tcp-server mode
by pespin 03 Mar '25

03 Mar '25

Attention is currently required from: daniel, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39660?usp=email ) Change subject: ipa: Fix asp_id/SLS unset in tcp-server mode ...................................................................... Patch Set 2: Code-Review+2 -- 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: comment 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> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Mar 2025 12:37:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0