pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38706?usp=email )
Change subject: hnbgw: Fix wrong map object retrieved from hashtable
......................................................................
hnbgw: Fix wrong map object retrieved from hashtable
If several map objects (mapping between RUA and SCCP transports for a
given Iu connection) ended up in the same hashtable bucket, then the
first one was always returned by map_from_conn_id().
As a result, when such collisions happened (e.g. when a big number of
connections were inserted) a user could see a Iu message coming from SCCP
connection "A" end up being forwarded to an unrelated RUA connection
"B".
Related: SYS#6602
Fixes: f3caea850bc892551cd09bbaf49f798c172590c4
Change-Id: I107f461bf5bcb92262422c893b23d190659f6f72
---
M src/osmo-hnbgw/hnbgw_cn.c
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/06/38706/1
diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c
index 6618fb9..7bfe526 100644
--- a/src/osmo-hnbgw/hnbgw_cn.c
+++ b/src/osmo-hnbgw/hnbgw_cn.c
@@ -446,8 +446,10 @@
const struct osmo_prim_hdr *oph)
{
struct hnbgw_context_map *map;
- hash_for_each_possible(hsu->hnbgw_context_map_by_conn_id, map, hnbgw_sccp_user_entry, conn_id)
- return map;
+ hash_for_each_possible(hsu->hnbgw_context_map_by_conn_id, map, hnbgw_sccp_user_entry, conn_id) {
+ if (map->scu_conn_id == conn_id)
+ return map;
+ }
LOGP(DRANAP, LOGL_ERROR, "Rx for unknown SCCP connection ID: %u: %s\n",
conn_id, osmo_scu_prim_hdr_name_c(OTC_SELECT, oph));
return NULL;
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38706?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: pespin/rel-1.6.0
Gerrit-Change-Id: I107f461bf5bcb92262422c893b23d190659f6f72
Gerrit-Change-Number: 38706
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria, pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-msc/+/38654?usp=email )
Change subject: Use new libosmo-sigtran APIs to access osmo_ss7_instance
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38654?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I4c4f833cfcc4e65ee5372e7736dbef9c65c2f3de
Gerrit-Change-Number: 38654
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 08 Nov 2024 13:49:59 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: fixeria, pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38655?usp=email )
Change subject: Use new libosmo-sigtran APIs to access osmo_ss7_instance
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38655?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: I3549ff3ace641f0b0574a9ddec14120299446434
Gerrit-Change-Number: 38655
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 08 Nov 2024 13:48:43 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38661?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: Use new libosmo-sigtran API osmo_ss7_instances_llist_entry()
......................................................................
Use new libosmo-sigtran API osmo_ss7_instances_llist_entry()
Depends: libosmo-sigtran.git Change-Id I148438aecd64bdd66848d4b3404d379a380c5e9c
Change-Id: Iacbe2944957ab2e2a627f2dabdaa66d9fc8eabe3
---
M src/osmo-bsc/osmo_bsc_sigtran.c
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c
index 66d38bf..f51aa0a 100644
--- a/src/osmo-bsc/osmo_bsc_sigtran.c
+++ b/src/osmo-bsc/osmo_bsc_sigtran.c
@@ -559,7 +559,7 @@
{
struct bsc_msc_data *msc;
uint32_t default_pc;
- struct osmo_ss7_instance *inst;
+ struct llist_head *ll_it;
int create_instance_0_for_msc_nr = -1;
osmo_ss7_register_rx_unknown_cb(&asp_rx_unknown);
@@ -615,7 +615,8 @@
* Iterate cs7 instance indexes and see for each one whether an MSC is configured for it.
* The 'msc' / 'msc-addr' command selects the cs7 instance used for an MSC.
*/
- llist_for_each_entry(inst, &osmo_ss7_instances, list) {
+ llist_for_each(ll_it, &osmo_ss7_instances) {
+ struct osmo_ss7_instance *inst = osmo_ss7_instances_llist_entry(ll_it);
char inst_name[32];
enum osmo_ss7_asp_protocol used_proto = OSMO_SS7_ASP_PROT_NONE;
int prev_msc_nr;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38661?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Iacbe2944957ab2e2a627f2dabdaa66d9fc8eabe3
Gerrit-Change-Number: 38661
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria, osmith.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38650?usp=email )
Change subject: Use new libosmo-sigtran API osmo_ss7_instance_get_id()
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38650?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ic0a468de0e8852ddd1ebd99f25a6400475af9a1f
Gerrit-Change-Number: 38650
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 08 Nov 2024 13:29:48 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: fixeria, osmith.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-msc/+/38654?usp=email )
Change subject: Use new libosmo-sigtran APIs to access osmo_ss7_instance
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
In here jenkins is only failing because newer libosmo-sigtran is not yet built in debian OBS. Please review so we can merge when we retrigger.
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38654?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I4c4f833cfcc4e65ee5372e7736dbef9c65c2f3de
Gerrit-Change-Number: 38654
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 08 Nov 2024 13:29:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Attention is currently required from: fixeria, osmith.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38655?usp=email )
Change subject: Use new libosmo-sigtran APIs to access osmo_ss7_instance
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
In here jenkins is only failing because newer libosmo-sigtran is not yet built in debian OBS. Please review so we can merge when we retrigger.
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38655?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: I3549ff3ace641f0b0574a9ddec14120299446434
Gerrit-Change-Number: 38655
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 08 Nov 2024 13:29:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No