November 2024 - gerrit-log - lists.osmocom.org

[M] Change in libosmo-sigtran[master]: sigtran: Add API osmo_ss7_as_select_asp()

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38719?usp=email ) Change subject: sigtran: Add API osmo_ss7_as_select_asp() ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38719?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: I8b866b45ac4a24238c55171d25e11b9625e8f50c Gerrit-Change-Number: 38719 Gerrit-PatchSet: 4 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: Tue, 12 Nov 2024 08:42:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_asp struct private

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38645?usp=email ) Change subject: sigtran: Make osmo_ss7_asp struct private ...................................................................... Patch Set 11: Code-Review+1 (1 comment) File src/ipa.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/38645/comment/0cfb2e70_497f6… : PS3, Line 50: #i > Since they are in the same directory as the source file, hence included with "" it already becomes clear it's a private header imho. right > That being said, I have no strong opinion, so if you really think another option is better, I'm fine to easily move all headers at the end in a follow-up commit when this gets merged, as suggested by osmith. I think making it consistent either way would be useful (at least within one Osmocom project), e.g. all with _internal (as it seems Harald prefers) or all without internal and just relying on the location of the header file to indicate that they are internal. I'm fine with either, and I think this could be done after this patchset too so IMHO not worth blocking the patch over this. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38645?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: I5839b4dd04468af20d1836386dcc722e7a83ac5f Gerrit-Change-Number: 38645 Gerrit-PatchSet: 11 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 08:41:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: Fix sporadic failure in .TC_ho_in_fail_ipa_crcx_timeout

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38726?usp=email ) Change subject: bsc: Fix sporadic failure in .TC_ho_in_fail_ipa_crcx_timeout ...................................................................... bsc: Fix sporadic failure in .TC_ho_in_fail_ipa_crcx_timeout The code path was not waiting to receive DLCX if parameter ignore_mgw_mdcx was set to false. It should wait for DLCX in any case. Since it didn't wait, te ConnHdlr would finish earlier than expected and MGCP_Emulation would fail when forwarding the DLCX to ConnHdlr: """ MGCP_Emulation.ttcn:257 Dynamic test case error: Sending data on the connection of port MGCP_CLIENT to 2023:MGCP failed. (Broken pipe) """ Change-Id: I322b070c369500979e3cc13814de1e4bf067726f --- M bsc/BSC_Tests.ttcn 1 file changed, 9 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4d60ea8..83389a6 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6456,15 +6456,17 @@ /* When we let MGCP MDCX run into a timeout, it's still in the * queue and additionally after BSSAP HandoverFailure, two DLCX * get sent (for AoIP, for SCCPlite one DLCX). */ - if (g_pars.ignore_mgw_mdcx) { - if (g_pars.aoip) { + if (g_pars.aoip) { + if (g_pars.ignore_mgw_mdcx) { MGCP.receive(tr_MDCX); - MGCP.receive(tr_DLCX); - MGCP.receive(tr_DLCX); - } else { - MGCP_MULTI.receive(tr_MGCP_RecvFrom_any({command := tr_MDCX})); - MGCP_MULTI.receive(tr_MGCP_RecvFrom_any({command := tr_DLCX})); } + MGCP.receive(tr_DLCX); + MGCP.receive(tr_DLCX); + } else { + if (g_pars.ignore_mgw_mdcx) { + MGCP_MULTI.receive(tr_MGCP_RecvFrom_any({command := tr_MDCX})); + } + MGCP_MULTI.receive(tr_MGCP_RecvFrom_any({command := tr_DLCX})); } return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38726?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I322b070c369500979e3cc13814de1e4bf067726f Gerrit-Change-Number: 38726 Gerrit-PatchSet: 1 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>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: Fix sporadic failure in .TC_ho_in_fail_ipa_crcx_timeout

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38726?usp=email ) Change subject: bsc: Fix sporadic failure in .TC_ho_in_fail_ipa_crcx_timeout ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38726?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: I322b070c369500979e3cc13814de1e4bf067726f Gerrit-Change-Number: 38726 Gerrit-PatchSet: 1 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-Comment-Date: Mon, 11 Nov 2024 21:18:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: route: Fix rt pointer use-after-free

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38728?usp=email ) Change subject: route: Fix rt pointer use-after-free ...................................................................... route: Fix rt pointer use-after-free The code path is accessing the integer fields of a struct just freed. Fixes: 64e70ab8c20b5acc8e4717d5bcb08fcecf46bd98 Change-Id: I7966c554f1ce92946e828afeb1e07c735be341bf --- M src/osmo_ss7_route.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo_ss7_route.c b/src/osmo_ss7_route.c index 32e3eb7..dc48e28 100644 --- a/src/osmo_ss7_route.c +++ b/src/osmo_ss7_route.c @@ -228,7 +228,7 @@ /* Keep old behavior, return already existing route: */ if (rc == -EADDRINUSE) { talloc_free(rt); - return ss7_route_table_find_route_by_dpc_mask(rtbl, rt->cfg.pc, rt->cfg.mask); + return ss7_route_table_find_route_by_dpc_mask(rtbl, pc, mask); } return rt; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38728?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: I7966c554f1ce92946e828afeb1e07c735be341bf Gerrit-Change-Number: 38728 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: route: Fix rt pointer use-after-free

by fixeria

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38728?usp=email ) Change subject: route: Fix rt pointer use-after-free ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38728?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: I7966c554f1ce92946e828afeb1e07c735be341bf Gerrit-Change-Number: 38728 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: 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-Comment-Date: Mon, 11 Nov 2024 17:41:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: route: Fix rt pointer use-after-free

by pespin

Attention is currently required from: fixeria, laforge, osmith, pespin. Hello Jenkins Builder, fixeria, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38728?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+2 by fixeria The change is no longer submittable: Code-Review is unsatisfied now. Change subject: route: Fix rt pointer use-after-free ...................................................................... route: Fix rt pointer use-after-free The code path is accessing the integer fields of a struct just freed. Fixes: 64e70ab8c20b5acc8e4717d5bcb08fcecf46bd98 Change-Id: I7966c554f1ce92946e828afeb1e07c735be341bf --- M src/osmo_ss7_route.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/28/38728/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38728?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: I7966c554f1ce92946e828afeb1e07c735be341bf Gerrit-Change-Number: 38728 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: rout: Fix rt pointer use-after-free

by fixeria

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38728?usp=email ) Change subject: rout: Fix rt pointer use-after-free ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38728?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: I7966c554f1ce92946e828afeb1e07c735be341bf Gerrit-Change-Number: 38728 Gerrit-PatchSet: 1 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: 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-Comment-Date: Mon, 11 Nov 2024 17:33:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: Move code to delete routes by as/linkset to helper functions

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38730?usp=email ) Change subject: Move code to delete routes by as/linkset to helper functions ...................................................................... Move code to delete routes by as/linkset to helper functions This really fits into a helper function, allowig for further reuse in the future and removing complexity from other code functions. It also makes the logic independent on the implementation of the routing table. Change-Id: Ic36fd6a0466cc0338132f2e34eb7c916115c9d4a --- M src/osmo_ss7_as.c M src/osmo_ss7_linkset.c M src/osmo_ss7_route_table.c M src/ss7_route_table.h 4 files changed, 28 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/30/38730/1 diff --git a/src/osmo_ss7_as.c b/src/osmo_ss7_as.c index 3540fde..eb655ca 100644 --- a/src/osmo_ss7_as.c +++ b/src/osmo_ss7_as.c @@ -167,8 +167,6 @@ * \param[in] as Application Server to destroy */ void osmo_ss7_as_destroy(struct osmo_ss7_as *as) { - struct osmo_ss7_route *rt, *rt2; - OSMO_ASSERT(ss7_initialized); LOGPAS(as, DLSS7, LOGL_INFO, "Destroying AS\n"); @@ -176,10 +174,7 @@ osmo_fsm_inst_term(as->fi, OSMO_FSM_TERM_REQUEST, NULL); /* find any routes pointing to this AS and remove them */ - llist_for_each_entry_safe(rt, rt2, &as->inst->rtable_system->routes, list) { - if (rt->dest.as == as) - ss7_route_destroy(rt); - } + ss7_route_table_del_routes_by_as(as->inst->rtable_system, as); as->inst = NULL; llist_del(&as->list); diff --git a/src/osmo_ss7_linkset.c b/src/osmo_ss7_linkset.c index 9e0b17b..146ec92 100644 --- a/src/osmo_ss7_linkset.c +++ b/src/osmo_ss7_linkset.c @@ -39,18 +39,14 @@ * \param[in] lset Linkset to be destroyed */ void ss7_linkset_destroy(struct osmo_ss7_linkset *lset) { - struct osmo_ss7_route *rt, *rt2; unsigned int i; OSMO_ASSERT(ss7_initialized); LOGSS7(lset->inst, LOGL_INFO, "Destroying Linkset %s\n", lset->cfg.name); - /* find any routes pointing to this AS and remove them */ - llist_for_each_entry_safe(rt, rt2, &lset->inst->rtable_system->routes, list) { - if (rt->dest.linkset == lset) - ss7_route_destroy(rt); - } + /* find any routes pointing to this linkset and remove them */ + ss7_route_table_del_routes_by_linkset(lset->inst->rtable_system, lset); for (i = 0; i < ARRAY_SIZE(lset->links); i++) { struct osmo_ss7_link *link = lset->links[i]; diff --git a/src/osmo_ss7_route_table.c b/src/osmo_ss7_route_table.c index 910633b..03596d0 100644 --- a/src/osmo_ss7_route_table.c +++ b/src/osmo_ss7_route_table.c @@ -122,3 +122,25 @@ } return NULL; } + +/* find any routes pointing to this linkset and remove them */ +void ss7_route_table_del_routes_by_linkset(struct osmo_ss7_route_table *rtbl, struct osmo_ss7_linkset *lset) +{ + struct osmo_ss7_route *rt, *rt2; + + llist_for_each_entry_safe(rt, rt2, &rtbl->routes, list) { + if (rt->dest.linkset == lset) + ss7_route_destroy(rt); + } +} + +/* find any routes pointing to this AS and remove them */ +void ss7_route_table_del_routes_by_as(struct osmo_ss7_route_table *rtbl, struct osmo_ss7_as *as) +{ + struct osmo_ss7_route *rt, *rt2; + + llist_for_each_entry_safe(rt, rt2, &rtbl->routes, list) { + if (rt->dest.as == as) + ss7_route_destroy(rt); + } +} diff --git a/src/ss7_route_table.h b/src/ss7_route_table.h index 5c70c4c..38cff31 100644 --- a/src/ss7_route_table.h +++ b/src/ss7_route_table.h @@ -34,3 +34,6 @@ struct osmo_ss7_route * ss7_route_table_find_route_by_dpc_mask(struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask); + +void ss7_route_table_del_routes_by_as(struct osmo_ss7_route_table *rtbl, struct osmo_ss7_as *as); +void ss7_route_table_del_routes_by_linkset(struct osmo_ss7_route_table *rtbl, struct osmo_ss7_linkset *lset); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38730?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: Ic36fd6a0466cc0338132f2e34eb7c916115c9d4a Gerrit-Change-Number: 38730 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: route_table: Split allocation code to its own function

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38729?usp=email ) Change subject: route_table: Split allocation code to its own function ...................................................................... route_table: Split allocation code to its own function Change-Id: Id081d6de14be84b05ed38f3f8211ba91e675cff0 --- M src/osmo_ss7_route_table.c 1 file changed, 19 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/29/38729/1 diff --git a/src/osmo_ss7_route_table.c b/src/osmo_ss7_route_table.c index 4ab4594..910633b 100644 --- a/src/osmo_ss7_route_table.c +++ b/src/osmo_ss7_route_table.c @@ -32,6 +32,23 @@ * SS7 Route Tables ***********************************************************************/ +static struct osmo_ss7_route_table *ss7_route_table_alloc(struct osmo_ss7_instance *inst, const char *name) +{ + struct osmo_ss7_route_table *rtbl; + + OSMO_ASSERT(name); + LOGSS7(inst, LOGL_INFO, "Creating Route Table %s\n", name); + + rtbl = talloc_zero(inst, struct osmo_ss7_route_table); + OSMO_ASSERT(rtbl); + + rtbl->inst = inst; + rtbl->cfg.name = talloc_strdup(rtbl, name); + INIT_LLIST_HEAD(&rtbl->routes); + llist_add_tail(&rtbl->list, &inst->rtable_list); + return rtbl; +} + struct osmo_ss7_route_table * ss7_route_table_find(struct osmo_ss7_instance *inst, const char *name) { @@ -51,14 +68,8 @@ OSMO_ASSERT(ss7_initialized); rtbl = ss7_route_table_find(inst, name); - if (!rtbl) { - LOGSS7(inst, LOGL_INFO, "Creating Route Table %s\n", name); - rtbl = talloc_zero(inst, struct osmo_ss7_route_table); - rtbl->inst = inst; - rtbl->cfg.name = talloc_strdup(rtbl, name); - INIT_LLIST_HEAD(&rtbl->routes); - llist_add_tail(&rtbl->list, &inst->rtable_list); - } + if (!rtbl) + rtbl = ss7_route_table_alloc(inst, name); return rtbl; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38729?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: Id081d6de14be84b05ed38f3f8211ba91e675cff0 Gerrit-Change-Number: 38729 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024