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

[S] Change in libosmo-sigtran[master]: Fix combined linkset lookup when inserting route

by pespin

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40551?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Fix combined linkset lookup when inserting route ...................................................................... Fix combined linkset lookup when inserting route The early loop termiantion logic was wrong, which meant ss7_route_table_find_combined_linkset() may return earlier than expected and hence a new combined linkset may have been created when adding a route instead of adding it to a previous existing matching one. The fix can be spotted by the fact that now "show cs7 instance 0 route" shows the 3 3.2.0/11 prio=1 routes properly in the same combined linkset in osmo_stp_route_prio.vty. Change-Id: I44d7545a3c6a3ea4839e983104112f8afa6b981a --- M src/ss7_route_table.c M tests/vty/osmo_stp_route_prio.vty 2 files changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/51/40551/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40551?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: I44d7545a3c6a3ea4839e983104112f8afa6b981a Gerrit-Change-Number: 40551 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

2 months

1
0
0 0

[XS] Change in libosmo-sigtran[master]: ss7_vty: Improve VTY output of vty_dump_rtable()

by pespin

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40550?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: ss7_vty: Improve VTY output of vty_dump_rtable() ...................................................................... ss7_vty: Improve VTY output of vty_dump_rtable() This same outputting hint is used by Cisco ITP. This commit doesn't change any .vty file because there's actually a bug when adding routes into existing combined linksets, hence the scenario in the .vty file doesn't end up containing a combined linkset with multiple routes, but actually multiple combined linksets each with 1 route. This issue is fixed in the follow-up commit. Change-Id: I87511084278976889ab031fcfd10c09cc60c7595 --- M src/ss7_vty.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/50/40550/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40550?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: I87511084278976889ab031fcfd10c09cc60c7595 Gerrit-Change-Number: 40550 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

2 months

1
0
0 0

[S] Change in libosmo-sigtran[master]: route: Introduce LOGPRT macro to improve logging

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40554?usp=email ) Change subject: route: Introduce LOGPRT macro to improve logging ...................................................................... route: Introduce LOGPRT macro to improve logging Change-Id: I00823f4b61d082d2de848c81e8592a4a1b2697e5 --- M src/ss7_route.c M src/ss7_route.h 2 files changed, 19 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/54/40554/1 diff --git a/src/ss7_route.c b/src/ss7_route.c index e40f1bc..ec41a8a 100644 --- a/src/ss7_route.c +++ b/src/ss7_route.c @@ -109,12 +109,12 @@ struct osmo_ss7_route_table *rtbl = rt->rtable; if (rt->cfg.linkset_name) { - LOGSS7(rtbl->inst, LOGL_ERROR, "Attempt setting linkset on route already configured!\n"); + LOGPRT(rt, DLSS7, LOGL_ERROR, "Attempt setting linkset on route already configured!\n"); return -EBUSY; } if (ss7_route_inserted(rt)) { - LOGSS7(rtbl->inst, LOGL_ERROR, "Attempt setting linkset on route already in the routing table!\n"); + LOGPRT(rt, DLSS7, LOGL_ERROR, "Attempt setting linkset on route already in the routing table!\n"); return -EALREADY; } @@ -128,15 +128,10 @@ rt->cfg.linkset_name = talloc_strdup(rt, linkset_name); if (lset) { rt->dest.linkset = lset; - LOGSS7(rtbl->inst, LOGL_INFO, "Creating route: pc=%u=%s mask=0x%x via linkset '%s'\n", - rt->cfg.pc, osmo_ss7_pointcode_print(rtbl->inst, rt->cfg.pc), - rt->cfg.mask, lset->cfg.name); } else { rt->dest.as = as; - LOGSS7(rtbl->inst, LOGL_INFO, "Creating route: pc=%u=%s mask=0x%x via AS '%s'\n", - rt->cfg.pc, osmo_ss7_pointcode_print(rtbl->inst, rt->cfg.pc), - rt->cfg.mask, as->cfg.name); } + LOGPRT(rt, DLSS7, LOGL_INFO, "Creating route: %s\n", osmo_ss7_route_name(rt, false)); return 0; } @@ -154,12 +149,12 @@ struct osmo_ss7_route_table *rtbl = rt->rtable; if (ss7_route_inserted(rt)) { - LOGSS7(rtbl->inst, LOGL_ERROR, "Attempt insert of route already in the routing table!\n"); + LOGPRT(rt, DLSS7, LOGL_ERROR, "Attempt insert of route already in the routing table!\n"); return -EALREADY; } if (!rt->cfg.linkset_name) { - LOGSS7(rtbl->inst, LOGL_ERROR, "Attempt insert of route with unset linkset!\n"); + LOGPRT(rt, DLSS7, LOGL_ERROR, "Attempt insert of route with unset linkset!\n"); return -EINVAL; } @@ -169,10 +164,8 @@ llist_for_each_entry(prev_rt, &clset->routes, list) { if (strcmp(prev_rt->cfg.linkset_name, rt->cfg.linkset_name) == 0 && prev_rt->cfg.dyn_allocated == rt->cfg.dyn_allocated) { - LOGSS7(rtbl->inst, LOGL_ERROR, - "Refusing to create route with existing linkset name: pc=%u=%s mask=0x%x via linkset/AS '%s'\n", - rt->cfg.pc, osmo_ss7_pointcode_print(rtbl->inst, rt->cfg.pc), - rt->cfg.mask, rt->cfg.linkset_name); + LOGPRT(rt, DLSS7, LOGL_ERROR, + "Refusing to create route with existing linkset/AS name '%s'\n", rt->cfg.linkset_name); return -EADDRINUSE; } } @@ -234,11 +227,8 @@ return; if (ss7_route_inserted(rt)) { - struct osmo_ss7_instance *inst = rt->rtable->inst; - LOGSS7(inst, LOGL_INFO, - "Destroying route: pc=%u=%s mask=0x%x via linkset/ASP '%s'\n", - rt->cfg.pc, osmo_ss7_pointcode_print(inst, rt->cfg.pc), - rt->cfg.mask, rt->cfg.linkset_name); + LOGPRT(rt, DLSS7, LOGL_INFO, + "Destroying route: %s\n", osmo_ss7_route_name(rt, false)); ss7_combined_linkset_del_route(rt); } talloc_free(rt); diff --git a/src/ss7_route.h b/src/ss7_route.h index 4bb7a2b..c7ed609 100644 --- a/src/ss7_route.h +++ b/src/ss7_route.h @@ -60,3 +60,13 @@ int ss7_route_insert(struct osmo_ss7_route *rt); bool ss7_route_is_available(const struct osmo_ss7_route *rt); +#define LOGPRT(rt, subsys, level, fmt, args ...) do { \ + char _pc_str[MAX_PC_STR_LEN]; \ + char _mask_str[MAX_PC_STR_LEN]; \ + _LOGSS7((rt)->rtable->inst, subsys, level, \ + "RT(dpc=%u=%s,mask=0x%x=%s,prio=%u) " fmt, \ + (rt)->cfg.pc, osmo_ss7_pointcode_print_buf(_pc_str, MAX_PC_STR_LEN, (rt)->rtable->inst, (rt)->cfg.pc), \ + (rt)->cfg.mask, osmo_ss7_pointcode_print_buf(_mask_str, MAX_PC_STR_LEN, (rt)->rtable->inst, (rt)->cfg.mask), \ + (rt)->cfg.priority, \ + ## args); \ + } while (0) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40554?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: I00823f4b61d082d2de848c81e8592a4a1b2697e5 Gerrit-Change-Number: 40554 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months

1
0
0 0

[S] Change in libosmo-sigtran[master]: ss7_vty: Improve VTY output of vty_dump_rtable()

by pespin

Attention is currently required from: laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40550?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: ss7_vty: Improve VTY output of vty_dump_rtable() ...................................................................... ss7_vty: Improve VTY output of vty_dump_rtable() This same outputting hint is used by Cisco ITP. Change-Id: I87511084278976889ab031fcfd10c09cc60c7595 --- M src/ss7_vty.c 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/50/40550/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40550?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: I87511084278976889ab031fcfd10c09cc60c7595 Gerrit-Change-Number: 40550 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org>

2 months

1
0
0 0

[M] Change in libosmo-sigtran[master]: Differentiate between dynamic and static routes

by pespin

Attention is currently required from: laforge, osmith. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40543?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: Differentiate between dynamic and static routes ...................................................................... Differentiate between dynamic and static routes Differentiation is important because for instance * It shall not be possible to delete dynamic routes over VTY "remove route" command. * Dynamic routes should not be stored in config, ie. not appear during "show running-config" or "write running-config". * During VTY "show cs7 instance 0 route", a "dyn" string keyword sohuld be displayed on each dynamic route row. Related: OS#6755 Change-Id: Ic6c6b46084a1e4063ebf1f5d13e0e03386bb4c45 --- M src/sccp_user.c M src/ss7_as_vty.c M src/ss7_route.c M src/ss7_route.h M src/ss7_route_table.c M src/ss7_route_table.h M src/ss7_vty.c M src/xua_as_fsm.c M src/xua_rkm.c M tests/ss7/ss7_test.c M tests/vty/osmo_stp_route_prio.vty 11 files changed, 76 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/43/40543/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40543?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: Ic6c6b46084a1e4063ebf1f5d13e0e03386bb4c45 Gerrit-Change-Number: 40543 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org>

2 months

1
0
0 0

[M] Change in libosmo-sigtran[master]: Differentiate between dynamic and static routes

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40543?usp=email ) Change subject: Differentiate between dynamic and static routes ...................................................................... Patch Set 2: (1 comment) File src/ss7_vty.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40543/comment/dab963a8_8f133… : PS2, Line 521: % > this results in three extraneous blanks at the end of each line, see the modififed text output. […] Regarding missing space: True, I didn't run into this because anyway UNAVAIL or whatever was printed was less than 7 chars. I'll fix that missing space. Regarding the extra 3 spaces, well, we have such spaces in all those VTY commands already because some outputs may have less chars than the padding, so nothing really new, and I leave that as is. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40543?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: Ic6c6b46084a1e4063ebf1f5d13e0e03386bb4c45 Gerrit-Change-Number: 40543 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: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 27 Jun 2025 19:07:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

2 months

1
0
0 0

[XS] Change in libosmo-sigtran[master]: ss7_vty: Improve VTY output of vty_dump_rtable()

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40550?usp=email ) Change subject: ss7_vty: Improve VTY output of vty_dump_rtable() ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > would be useful to have a copy+paste of the output before/after in the commitlog, but not critical. The output can be seen in the follow-up commit, because it didn't change here due to a bug fix there ;) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40550?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: I87511084278976889ab031fcfd10c09cc60c7595 Gerrit-Change-Number: 40550 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 27 Jun 2025 18:46:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

2 months

1
0
0 0

[XS] Change in libosmo-sigtran[master]: ss7_vty: Improve VTY output of vty_dump_rtable()

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40550?usp=email ) Change subject: ss7_vty: Improve VTY output of vty_dump_rtable() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: would be useful to have a copy+paste of the output before/after in the commitlog, but not critical. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40550?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: I87511084278976889ab031fcfd10c09cc60c7595 Gerrit-Change-Number: 40550 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jun 2025 18:41:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

2 months

1
0
0 0

[XS] Change in libosmo-sigtran[master]: xua_asp_fsm: Drop code branch never called in xUA ASP

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40549?usp=email ) Change subject: xua_asp_fsm: Drop code branch never called in xUA ASP ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40549?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: Ic0b8b4fbe31ab2e5206a4f4c7907868f20d2ef10 Gerrit-Change-Number: 40549 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jun 2025 18:40:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months

1
0
0 0

[M] Change in libosmo-sigtran[master]: Differentiate between dynamic and static routes

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40543?usp=email ) Change subject: Differentiate between dynamic and static routes ...................................................................... Patch Set 2: (1 comment) File src/ss7_vty.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40543/comment/991a07c6_23202… : PS2, Line 521: % this results in three extraneous blanks at the end of each line, see the modififed text output. Also, given that there's no space before it, the "dyn" would be printed immediately aftre the avail/UNAVAIL. I think `availdyn` or `UNAVAILdyn` is not the intended output? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40543?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: Ic6c6b46084a1e4063ebf1f5d13e0e03386bb4c45 Gerrit-Change-Number: 40543 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: Fri, 27 Jun 2025 18:39:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2025