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

[M] Change in osmo-hnbgw[master]: Improve paging to support Paging Area ID

by pespin

Attention is currently required from: fixeria, lynxis lazus, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995?usp=email ) Change subject: Improve paging to support Paging Area ID ...................................................................... Patch Set 2: (1 comment) File src/osmo-hnbgw/hnbgw_ranap.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995/comment/8c8890af_f26eff67?u… : PS2, Line 401: cnlink->name > Isn't this redundant? AFAICS, `LOG_CNLINK` does log `cnlink->name`. Acknowledged -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I915254a39ee04898aa740674b4632a328f281955 Gerrit-Change-Number: 39995 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 10 Apr 2025 17:02:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[XS] Change in libosmo-sigtran[master]: ipa: Use pseudo-random number for SLS in TCP-client too

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40001?usp=email ) Change subject: ipa: Use pseudo-random number for SLS in TCP-client too ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40001?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: I837505868b608ac5ed658a7e98bb3eeebe3e852c Gerrit-Change-Number: 40001 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Apr 2025 16:52:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[XS] Change in libosmo-sigtran[master]: AS loadsharing: Pick 1st ASP upon 1st roundrobin assignment

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40000?usp=email ) Change subject: AS loadsharing: Pick 1st ASP upon 1st roundrobin assignment ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40000?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: I9ac08d371dde2cfd433be22f1fb6cd01d6ef12be Gerrit-Change-Number: 40000 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Apr 2025 16:50:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[M] Change in osmo-hnbgw[master]: Improve paging to support Paging Area ID

by fixeria

Attention is currently required from: lynxis lazus, osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995?usp=email ) Change subject: Improve paging to support Paging Area ID ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/osmo-hnbgw/hnbgw_ranap.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995/comment/d9f56c16_773a6371?u… : PS2, Line 401: cnlink->name Isn't this redundant? AFAICS, `LOG_CNLINK` does log `cnlink->name`. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I915254a39ee04898aa740674b4632a328f281955 Gerrit-Change-Number: 39995 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 10 Apr 2025 16:49:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[M] Change in libosmo-sigtran[master]: ipa: Try picking unused asp_id in AS to use as SLS

by pespin

Attention is currently required from: daniel, fixeria, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40003?usp=email ) Change subject: ipa: Try picking unused asp_id in AS to use as SLS ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: This should fix sporadic failure in STP_Tests_IPA.TC_unknown_client_dynamic_tmt_loadshare seen in https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-stp-test-asan/306/ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40003?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: I723eac25e59002630dca87a738c8eb7c62edec75 Gerrit-Change-Number: 40003 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> 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-CC: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Apr 2025 16:48:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

4 months, 1 week

1
0
0 0

[M] Change in libosmo-sigtran[master]: ipa: Try picking unused asp_id in AS to use as SLS

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40003?usp=email ) Change subject: ipa: Try picking unused asp_id in AS to use as SLS ...................................................................... ipa: Try picking unused asp_id in AS to use as SLS Initially (b93e1d01205cdd7bd7a65e15945f664f31fb4bcb), incoming traffic from IPA sockets was tagged with SLS using the LSB of the socket file descriptor. that did however not achieve sufficient entropy in real world use cases. Later on (2c9ba16c2c0210a189c72064eafad5ef336254cd), SLS tagging was changed to pseudo-random generation. Still it has been found too that it may create bad entropy under certain condtions, with eg. havig only 2 incoming ASPs and both ending up with the same asp_id/SLS, which won't allow for proper load sharing towards other peers. This commit changes the previous method by delaying SLS assignment decision of the socket until the ASP becomes assigned to an AS (basically during IPA handshake, when we receive IPA IDENTITY RESPONSE with the Unit-Name, or when we receive the IPA IDENTITY ACK for it). It is fine delaying SLS assignment to that point, since it's impossible to receive any userplane data before that handhsake ocurrs. Once the ASP is assigned to the AS (IPA ASPs can only be part of one AS), we lookup the other ASPs in the AS to try to allocate an unused 4-bit asp_id which will end up being used as SLS. Related: SYS#6543 Related: SYS#6802 Change-Id: I723eac25e59002630dca87a738c8eb7c62edec75 --- M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c M src/xua_asp_fsm.c 3 files changed, 41 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/03/40003/1 diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index f785264..7e444b4 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -979,12 +979,6 @@ 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; - } } if (asp->lm && asp->lm->prim_cb) { diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index 35e360f..52a3508 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -180,12 +180,6 @@ 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 */ diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index ec149d1..0c5159f 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -1104,6 +1104,41 @@ } } +static bool _ipa_asp_fsm_handshake_done(struct osmo_ss7_asp *asp) +{ + if (!asp->fi) + return false; + return asp->fi->state == XUA_ASP_S_INACTIVE || asp->fi->state == XUA_ASP_S_ACTIVE; +} + +/* Assign a 4 bit asp_id (as unqiue as possible) which will be used as SLS for incoming IPA PDUs.*/ +static void _ss7_asp_pick_unused_asp_id_as_sls(struct osmo_ss7_asp *asp, const struct osmo_ss7_as *as) +{ + for (unsigned int asp_id = 0; asp_id <= 0x0f; asp_id++) { + bool used = false; + for (unsigned i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { + if (!as->cfg.asps[i]) + continue; + if (as->cfg.asps[i] == asp) + continue; + if (!_ipa_asp_fsm_handshake_done(as->cfg.asps[i])) + continue; + if (as->cfg.asps[i]->asp_id == asp_id) { + used = true; + break; + } + } + if (used) + continue; + /* Found an unused asp_id, use it: */ + asp->asp_id = asp_id; + LOGPASP(asp, DLSS7, LOGL_DEBUG, "Assigned unsued asp_id = %u to be used as SLS\n", asp_id); + return; + } + LOGPASP(asp, DLSS7, LOGL_INFO, "All asp_ids in IPA AS picked, unique SLS not possible, picking random one\n"); + asp->asp_id = rand() & 0x0f; +} + static void ipa_asp_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct ipa_asp_fsm_priv *iafp = fi->priv; @@ -1130,6 +1165,12 @@ case XUA_ASP_E_AS_ASSIGNED: as = data; osmo_talloc_replace_string(iafp->ipa_unit, &iafp->ipa_unit->unit_name, as->cfg.name); + /* In IPA, asp_id is not really used on the wire, and we + * actually use it internally the lower 4 bits of the field to + * fill in a potentailly unique SLS to apply to PDUs received from the IPA socket. + * Now that AS is known, try picking an unused asp_id inside the AS. + * we use the lower 4 bits of the asp_id field as SLS; */ + _ss7_asp_pick_unused_asp_id_as_sls(iafp->asp, as); /* Now that the AS is known, start the client side: */ if (iafp->role == OSMO_SS7_ASP_ROLE_ASP && fi->state == IPA_ASP_S_DOWN) { LOGPFSML(fi, LOGL_NOTICE, "Bringing up ASP now once it has been assigned to an AS\n"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40003?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: I723eac25e59002630dca87a738c8eb7c62edec75 Gerrit-Change-Number: 40003 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: stp: Fix typo in comment

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40002?usp=email ) Change subject: stp: Fix typo in comment ...................................................................... stp: Fix typo in comment Change-Id: I9f4a1e5ec0b0d2614b3cec0768e8847fce3e3cdf --- M stp/STP_Tests_IPA.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/40002/1 diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 66e7262..ae7e1da 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -309,8 +309,8 @@ } } - /* All traffic should not still be sent to the same receiver, since - * OPC+SLS cannot change in IPA ASPs. + /* All traffic should still be sent to the same receiver, since + * OPC+DPC+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 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40002?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: I9f4a1e5ec0b0d2614b3cec0768e8847fce3e3cdf Gerrit-Change-Number: 40002 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[XS] Change in libosmo-sigtran[master]: ipa: Use pseudo-random number for SLS in TCP-client too

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40001?usp=email ) Change subject: ipa: Use pseudo-random number for SLS in TCP-client too ...................................................................... ipa: Use pseudo-random number for SLS in TCP-client too Previous commit (see below) replaced the SLS generation from using the LSB of the file descriptor to a pseudo-random SLS since the former didn't really achieve enough entropy in real world use cases. However, that commit only applied it for TCP-server conns, but forgot to update TCP-client ones. Present commit fixes that missing part. asp->asp_id is already being set using a pseudo-randome number in xua_cli_connect_cb(). Fixes: 2c9ba16c2c0210a189c72064eafad5ef336254cd Related: SYS#6543 Related: SYS#6802 Change-Id: I837505868b608ac5ed658a7e98bb3eeebe3e852c --- M src/osmo_ss7_asp.c 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/01/40001/1 diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 3f6500c..f785264 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -1027,7 +1027,6 @@ /* read call-back for IPA/SCCPlite socket */ static int ipa_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg) { - int fd = osmo_stream_cli_get_fd(conn); struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); if (res <= 0) { @@ -1042,9 +1041,9 @@ msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - /* we can use the 'fd' return value of osmo_stream_srv_get_fd() here unverified as all we do - * is 'roll the dice' to obtain a 4-bit SLS value. */ - return ipa_rx_msg(asp, msg, fd & 0xf); + /* we simply use the lower 4 bits of the asp_id, which is initialized to a pseudo-random value upon + * connect */ + return ipa_rx_msg(asp, msg, asp->asp_id & 0xf); } /* read call-back for M3UA-over-TCP socket */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40001?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: I837505868b608ac5ed658a7e98bb3eeebe3e852c Gerrit-Change-Number: 40001 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[XS] Change in libosmo-sigtran[master]: AS loadsharing: Pick 1st ASP upon 1st roundrobin assignment

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40000?usp=email ) Change subject: AS loadsharing: Pick 1st ASP upon 1st roundrobin assignment ...................................................................... AS loadsharing: Pick 1st ASP upon 1st roundrobin assignment Before this patch, the AS started filling it's loadsharing tables with the 2nd ASP in the list, which is actually fine too but a bit unexpected when debugging. Change-Id: I9ac08d371dde2cfd433be22f1fb6cd01d6ef12be --- M src/osmo_ss7_as.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/00/40000/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40000?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I9ac08d371dde2cfd433be22f1fb6cd01d6ef12be Gerrit-Change-Number: 40000 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

4 months, 1 week

1
0
0 0

[XS] Change in libosmo-sigtran[master]: AS loadsharing: Pick 1st ASP upon 1st roundrobin assignment

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40000?usp=email ) Change subject: AS loadsharing: Pick 1st ASP upon 1st roundrobin assignment ...................................................................... AS loadsharing: Pick 1st ASP upon 1st roundrobin assignment Before this patch, the AS started filling it's loadsharing tables with the 2nd ASP in the list, which is actually fine too but a bit unexpected when debugging. Change-Id: I9ac08d371dde2cfd433be22f1fb6cd01d6ef12be --- M src/osmo_ss7_as.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/00/40000/1 diff --git a/src/osmo_ss7_as.c b/src/osmo_ss7_as.c index e84a36d..c568d8e 100644 --- a/src/osmo_ss7_as.c +++ b/src/osmo_ss7_as.c @@ -127,6 +127,7 @@ as->cfg.mode = OSMO_SS7_AS_TMOD_OVERRIDE; as->cfg.recovery_timeout_msec = 2000; as->cfg.routing_key.l_rk_id = ss7_find_free_l_rk_id(inst); + as->cfg.last_asp_idx_assigned = 0xff; /* Pick 1st ASP upon 1st roundrobin assignment. */ as->fi = xua_as_fsm_start(as, LOGL_DEBUG); llist_add_tail(&as->list, &inst->as_list); @@ -356,7 +357,7 @@ void ss7_as_loadshare_binding_table_reset(struct osmo_ss7_as *as) { memset(&as->aesls_table[0], 0, sizeof(as->aesls_table)); - as->cfg.last_asp_idx_assigned = 0; + as->cfg.last_asp_idx_assigned = 0xff; } static as_ext_sls_t osmo_ss7_instance_calc_itu_as_ext_sls(const struct osmo_ss7_as *as, uint32_t opc, uint8_t sls) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40000?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: I9ac08d371dde2cfd433be22f1fb6cd01d6ef12be Gerrit-Change-Number: 40000 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2025