- gerrit-log - lists.osmocom.org

[S] Change in libosmo-sigtran[master]: route: Introduce LOGPRT macro to improve logging
by pespin 02 Jul '25

02 Jul '25

pespin has submitted this change. ( 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, 20 insertions(+), 19 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve 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..7ba7ba5 100644 --- a/src/ss7_route.h +++ b/src/ss7_route.h @@ -60,3 +60,14 @@ 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,via=%s) " 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, \ + (rt)->cfg.linkset_name ? (rt)->cfg.linkset_name : "", \ + ## 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: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I00823f4b61d082d2de848c81e8592a4a1b2697e5 Gerrit-Change-Number: 40554 Gerrit-PatchSet: 4 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: route: Introduce LOGPRT macro to improve logging
by pespin 02 Jul '25

02 Jul '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40554?usp=email ) Change subject: route: Introduce LOGPRT macro to improve logging ...................................................................... Patch Set 4: Code-Review+2 -- 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: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I00823f4b61d082d2de848c81e8592a4a1b2697e5 Gerrit-Change-Number: 40554 Gerrit-PatchSet: 4 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Jul 2025 13:30:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: Fix combined linkset lookup when inserting route
by pespin 02 Jul '25

02 Jul '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40551?usp=email ) Change subject: Fix combined linkset lookup when inserting route ...................................................................... Patch Set 4: Code-Review+2 -- 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: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I44d7545a3c6a3ea4839e983104112f8afa6b981a Gerrit-Change-Number: 40551 Gerrit-PatchSet: 4 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Jul 2025 13:30:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: xua_asp_fsm: Drop code branch never called in xUA ASP
by pespin 02 Jul '25

02 Jul '25

pespin 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 4: Code-Review+2 -- 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: 4 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Jul 2025 13:30:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-sigtran[master]: Differentiate between dynamic and static routes
by pespin 02 Jul '25

02 Jul '25

Attention is currently required from: laforge, lynxis lazus. 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 5: Code-Review+2 -- 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: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 02 Jul 2025 13:30:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: generic: Introduce test TC_stat_msc_sctp_disconnected
by osmith 02 Jul '25

02 Jul '25

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486?usp=email ) Change subject: bsc: generic: Introduce test TC_stat_msc_sctp_disconnected ...................................................................... Patch Set 4: Code-Review+1 (3 comments) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486/comment/5ad9a2fb_4efa… : PS3, Line 3275: ianctive > inactive Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486/comment/ace969da_1473… : PS3, Line 3321: f_logp(BSCVTY, "Restarting msc0"); > I guess the restart happens implicitly after f_bssap_idx_disconnect(0), but just to be sure: is ther […] Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486/comment/7908b899_cfe9… : PS3, Line 3325: f_ctrl_get_exp(IPA_CTRL, "stat_item.last.bsc.0.num_msc:connected", int2str(1)); > Maybe use f_ctrl_exp_trap here too, so we don't need to wait the full 10s? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486?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: I028a16e2742ff0c58bf3b51ee1233ccf947a5a6a Gerrit-Change-Number: 40486 Gerrit-PatchSet: 4 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Jul 2025 12:21:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: generic: Introduce test TC_stat_msc_sctp_disconnected
by pespin 02 Jul '25

02 Jul '25

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: bsc: generic: Introduce test TC_stat_msc_sctp_disconnected ...................................................................... bsc: generic: Introduce test TC_stat_msc_sctp_disconnected Take the chance to properly configure all ASP/AS data statically, in order to be able to access them through VTY as well as have the setup properly documented in the config files. Change-Id: I028a16e2742ff0c58bf3b51ee1233ccf947a5a6a Related: OS#5917 Related: SYS#7501 --- M bsc/BSC_Tests.default M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_SCCPlite.cfg M bsc/expected-results.xml M bsc/osmo-bsc-sccplite.cfg M bsc/osmo-bsc.cfg M bsc/osmo-stp.cfg 7 files changed, 147 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/40486/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I028a16e2742ff0c58bf3b51ee1233ccf947a5a6a Gerrit-Change-Number: 40486 Gerrit-PatchSet: 4 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-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: generic: Introduce test TC_stat_msc_sctp_disconnected
by osmith 02 Jul '25

02 Jul '25

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486?usp=email ) Change subject: bsc: generic: Introduce test TC_stat_msc_sctp_disconnected ...................................................................... Patch Set 3: (3 comments) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486/comment/240f7850_8d9d… : PS3, Line 3275: ianctive inactive https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486/comment/cf8c90d6_8e03… : PS3, Line 3321: f_logp(BSCVTY, "Restarting msc0"); I guess the restart happens implicitly after f_bssap_idx_disconnect(0), but just to be sure: is there something missing here? Maybe this makes it more obvious? ```suggestion f_logp(BSCVTY, "Waiting for msc0 restart"); ``` https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486/comment/a5916ca0_ad65… : PS3, Line 3325: f_ctrl_get_exp(IPA_CTRL, "stat_item.last.bsc.0.num_msc:connected", int2str(1)); Maybe use f_ctrl_exp_trap here too, so we don't need to wait the full 10s? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486?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: I028a16e2742ff0c58bf3b51ee1233ccf947a5a6a Gerrit-Change-Number: 40486 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Jul 2025 06:35:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in osmo-bsc[master]: bsc: Make sure MSC PC is added to sccp-addressbook
by pespin 01 Jul '25

01 Jul '25

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/40562?usp=email to look at the new patch set (#2). Change subject: bsc: Make sure MSC PC is added to sccp-addressbook ...................................................................... bsc: Make sure MSC PC is added to sccp-addressbook This way they can used by libosmo-sigtran to figure out interesting remote PCs it should track availability for. Related: OS#5917 Related: SYS#7501 Depends: libosmo-sigtran.git Change-Id I9d2452d9cc8e443050927a047b7ebacd2b2f37e1 Change-Id: I57dca92eb5f482e9017d9b19cd7f8feebd9e2721 --- M TODO-RELEASE M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/osmo_bsc_sigtran.c 3 files changed, 70 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/62/40562/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/40562?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I57dca92eb5f482e9017d9b19cd7f8feebd9e2721 Gerrit-Change-Number: 40562 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: generic: Introduce test TC_stat_msc_sctp_disconnected
by pespin 01 Jul '25

01 Jul '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486?usp=email ) Change subject: bsc: generic: Introduce test TC_stat_msc_sctp_disconnected ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40486?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: I028a16e2742ff0c58bf3b51ee1233ccf947a5a6a Gerrit-Change-Number: 40486 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 01 Jul 2025 16:08:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

2026

2025

2024

2023

2022

gerrit-log