Attention is currently required from: laforge.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36114?usp=email )
Change subject: fix regression in sctp-proto / transport-proto
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
FYI: I reported https://osmocom.org/issues/6380.
V-1: The VTY transcript needs to be updated, shall I do this?
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36114?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ic666b62948880445e030c637298d4e369b4c7e8e
Gerrit-Change-Number: 36114
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 28 Feb 2024 18:53:29 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: laforge.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36115?usp=email )
Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
......................................................................
Patch Set 2:
(1 comment)
File src/osmo_ss7_asp.c:
https://gerrit.osmocom.org/c/libosmo-sccp/+/36115/comment/d7b7aaab_2899dd33
PS2, Line 990: asp->asp_id = rand() & 0xf;
asp_id is not used in the SCTP/M3UA case?
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36115?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733
Gerrit-Change-Number: 36115
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 28 Feb 2024 18:49:18 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: laforge.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sccp/+/36115?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
......................................................................
ipa: Use pseudo-random number for SLS in IPA->M3UA direction
In Change-Id Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 we introduced
code that would make the LSB of the file descriptor be used as SLS
when passing packets from IPA in M3UA direction.
This did however not achieve sufficient entropy in real-world use cases.
In this change, we change over to allocating a pseudo-random SLS to each
IPA connection at the time it is established; We then assign that SLS
to each packet received on that IPA connection.
Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733
Related: SYS#6543
Closes: SYS#6802
---
M src/osmo_ss7_asp.c
M stp/stp_main.c
2 files changed, 32 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/15/36115/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36115?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733
Gerrit-Change-Number: 36115
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newpatchset
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36115?usp=email )
Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
......................................................................
ipa: Use pseudo-random number for SLS in IPA->M3UA direction
In Change-Id Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 we introduced
code that would make the LSB of the file descriptor be used as SLS
when passing packets from IPA in M3UA direction.
This did however not achieve sufficient entropy in real-world use cases.
In this change, we change over to allocating a pseudo-random SLS to each
IPA connection at the time it is established; We then assign that SLS
to each packet received on that IPA connection.
Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733
Related: SYS#6543
Closes: SYS#6802
---
M src/osmo_ss7_asp.c
M stp/stp_main.c
2 files changed, 29 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/15/36115/1
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index f211872..cfbf616 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -816,9 +816,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);
}
/* netif code tells us we can read something from the socket */
@@ -983,6 +983,9 @@
if (asp->cfg.trans_proto == IPPROTO_SCTP) {
rc = ss7_asp_apply_peer_primary_address(asp);
rc = ss7_asp_apply_primary_address(asp);
+ /* we use the lower 4 bits of the asp_id feld 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/stp/stp_main.c b/stp/stp_main.c
index 01d1865..d630032 100644
--- a/stp/stp_main.c
+++ b/stp/stp_main.c
@@ -213,6 +213,8 @@
{
int rc;
+ srand(time(NULL));
+
tall_stp_ctx = talloc_named_const(NULL, 1, "osmo-stp");
msgb_talloc_ctx_init(tall_stp_ctx, 0);
osmo_init_logging2(tall_stp_ctx, &log_info);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36115?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733
Gerrit-Change-Number: 36115
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
Attention is currently required from: laforge, lynxis lazus, osmith, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093?usp=email )
Change subject: epdg: Add tests to validate concurrent connections
......................................................................
Patch Set 2:
(2 comments)
File epdg/EPDG_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093/comment/41a7efa1_c5f0…
PS2, Line 797: -> sender vc_conn
> Definetly we don't want vc_conn_list[i] there, since in "sender X", X is an output param.
I am not sure if we understand each other. My suggestion was to use `from vc_conn_list[i]` (not `sender -> vc_conn_list[i]`), so that we make sure that each component in the list sends `COORD_CMD_READY`. You current logic would be satisfied even if the same component generates `num_ues` times `COORD_CMD_READY`. In other words, you just count messages but do not check where they're coming from.
> I actually left the sender part on purpose so that it is easier for anybody adding new tests to figure out how to pass a message back to the specific vc_conn.
This repository contains a good amount of examples, and I would not say looking this up in the Quick Reference Card is a big deal. IMO, it's more likely to confuse the reader rather than educate them.
In any case, this is not critical and you can keep it as you like. Just sharing my thoughts.
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093/comment/5aeb0ca4_3dfb…
PS2, Line 805: -> sender vc_conn
> Likewise here.
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I842dacda56abe47afb19e951eaae746b5e8d9fe7
Gerrit-Change-Number: 36093
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Comment-Date: Wed, 28 Feb 2024 18:20:46 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment