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

[S] Change in libosmo-sigtran[master]: Use osmo_ss7_pointcode_print_buf() instead of static buffer API

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40286?usp=email ) Change subject: Use osmo_ss7_pointcode_print_buf() instead of static buffer API ...................................................................... Use osmo_ss7_pointcode_print_buf() instead of static buffer API During logging, the logging macro may already be using the static buffer API to log context about a related PC. Hence, calling it here may overwrite it. Instead, use osmo_ss7_pointcode_print_buf(). Change-Id: I5daeecfae77932e2e52e1a36a620349efa878bbd --- M src/osmo_ss7_combined_linkset.c M src/osmo_ss7_route_table.c 2 files changed, 16 insertions(+), 22 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ss7_combined_linkset.c b/src/osmo_ss7_combined_linkset.c index 412555f..6f4f506 100644 --- a/src/osmo_ss7_combined_linkset.c +++ b/src/osmo_ss7_combined_linkset.c @@ -241,6 +241,7 @@ struct osmo_ss7_instance *inst = clset->rtable->inst; ext_sls_t esls = osmo_ss7_instance_calc_itu_ext_sls(inst, rtlabel); struct osmo_ss7_esls_entry *eslse = &clset->esls_table[esls]; + char buf[256]; /* First check if we have a cached route for this ESLS */ rt = current_rt(eslse); @@ -249,20 +250,16 @@ /* We can transmit over normal route. * Clean up alternative route since it's not needed anymore */ if (eslse->alt_rt) { - LOGPCLSET(clset, DLSS7, LOGL_NOTICE, "RT lookup: OPC=%u=%s,DPC=%u=%s,SLS=%u -> eSLS=%u: " + LOGPCLSET(clset, DLSS7, LOGL_NOTICE, "RT lookup: %s -> eSLS=%u: " "Normal Route via '%s' became available, drop use of Alternative Route via '%s'\n", - rtlabel->opc, osmo_ss7_pointcode_print(inst, rtlabel->opc), - rtlabel->dpc, osmo_ss7_pointcode_print2(inst, rtlabel->dpc), - rtlabel->sls, esls, + ss7_route_label_to_str(buf, sizeof(buf), inst, rtlabel), esls, eslse->normal_rt->dest.as ? eslse->normal_rt->dest.as->cfg.name : "<linkset>", eslse->alt_rt->dest.as ? eslse->alt_rt->dest.as->cfg.name : "<linkset>"); eslse->alt_rt = NULL; } LOGPCLSET(clset, DLSS7, LOGL_DEBUG, - "RT lookup: OPC=%u=%s,DPC=%u=%s,SLS=%u -> eSLS=%u: use Normal Route via '%s'\n", - rtlabel->opc, osmo_ss7_pointcode_print(inst, rtlabel->opc), - rtlabel->dpc, osmo_ss7_pointcode_print2(inst, rtlabel->dpc), - rtlabel->sls, esls, + "RT lookup: %s -> eSLS=%u: use Normal Route via '%s'\n", + ss7_route_label_to_str(buf, sizeof(buf), inst, rtlabel), esls, eslse->normal_rt->dest.as ? eslse->normal_rt->dest.as->cfg.name : "<linkset>"); return rt; } @@ -282,11 +279,9 @@ return NULL; eslse->normal_rt = rt; rt_avail = ss7_route_is_available(eslse->normal_rt); - LOGPCLSET(clset, DLSS7, LOGL_INFO, "RT loookup: OPC=%u=%s,DPC=%u=%s,SLS=%u -> eSLS=%u: " + LOGPCLSET(clset, DLSS7, LOGL_INFO, "RT loookup: %s -> eSLS=%u: " "picked Normal Route via '%s' round-robin style (%s)\n", - rtlabel->opc, osmo_ss7_pointcode_print(inst, rtlabel->opc), - rtlabel->dpc, osmo_ss7_pointcode_print2(inst, rtlabel->dpc), - rtlabel->sls, esls, + ss7_route_label_to_str(buf, sizeof(buf), inst, rtlabel), esls, rt->dest.as ? rt->dest.as->cfg.name : "<linkset>", rt_avail ? "available" : "unavailable"); if (rt_avail) { @@ -302,20 +297,16 @@ rt = ss7_combined_linkset_select_route_roundrobin(clset); if (rt) { eslse->alt_rt = rt; - LOGPCLSET(clset, DLSS7, LOGL_NOTICE, "RT Lookup: OPC=%u=%s,DPC=%u=%s,SLS=%u -> eSLS=%u: " + LOGPCLSET(clset, DLSS7, LOGL_NOTICE, "RT Lookup: %s -> eSLS=%u: " "Normal Route via '%s' unavailable, picked Alternative Route via '%s' round-robin style\n", - rtlabel->opc, osmo_ss7_pointcode_print(inst, rtlabel->opc), - rtlabel->dpc, osmo_ss7_pointcode_print2(inst, rtlabel->dpc), - rtlabel->sls, esls, + ss7_route_label_to_str(buf, sizeof(buf), inst, rtlabel), esls, eslse->normal_rt->dest.as ? eslse->normal_rt->dest.as->cfg.name : "<linkset>", eslse->alt_rt->dest.as ? eslse->alt_rt->dest.as->cfg.name : "<linkset>"); } else { /* No alternative route found, NULL is returned. */ - LOGPCLSET(clset, DLSS7, LOGL_INFO, "RT Lookup: OPC=%u=%s,DPC=%u=%s,SLS=%u -> eSLS=%u: " + LOGPCLSET(clset, DLSS7, LOGL_INFO, "RT Lookup: %s -> eSLS=%u: " "Normal Route via '%s' unavailable, all Alternative Routes unavailable\n", - rtlabel->opc, osmo_ss7_pointcode_print(inst, rtlabel->opc), - rtlabel->dpc, osmo_ss7_pointcode_print2(inst, rtlabel->dpc), - rtlabel->sls, esls, + ss7_route_label_to_str(buf, sizeof(buf), inst, rtlabel), esls, eslse->normal_rt->dest.as ? eslse->normal_rt->dest.as->cfg.name : "<linkset>"); } return rt; diff --git a/src/osmo_ss7_route_table.c b/src/osmo_ss7_route_table.c index 734db88..d2f34a6 100644 --- a/src/osmo_ss7_route_table.c +++ b/src/osmo_ss7_route_table.c @@ -38,11 +38,14 @@ char *ss7_route_label_to_str(char *buf, size_t buf_len, const struct osmo_ss7_instance *inst, const struct osmo_ss7_route_label *rtlb) { + char buf_opc[MAX_PC_STR_LEN]; + char buf_dpc[MAX_PC_STR_LEN]; + if (buf_len == 0) return NULL; snprintf(buf, buf_len, "OPC=%u=%s,DPC=%u=%s,SLS=%u", - rtlb->opc, osmo_ss7_pointcode_print(inst, rtlb->opc), - rtlb->dpc, osmo_ss7_pointcode_print2(inst, rtlb->dpc), + rtlb->opc, osmo_ss7_pointcode_print_buf(buf_opc, sizeof(buf_opc), inst, rtlb->opc), + rtlb->dpc, osmo_ss7_pointcode_print_buf(buf_dpc, sizeof(buf_dpc), inst, rtlb->dpc), rtlb->sls); return buf; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40286?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: I5daeecfae77932e2e52e1a36a620349efa878bbd Gerrit-Change-Number: 40286 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: SCOC -> SCRC: Delay called addr lookup until needed [2/3]

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40291?usp=email ) Change subject: sccp: SCOC -> SCRC: Delay called addr lookup until needed [2/3] ...................................................................... Patch Set 1: (1 comment) File src/sccp_scrc.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40291/comment/9c534268_265f5… : PS1, Line 464: if (0) { > I know you just moved this, but this is commented out code without the actual comments (and also exa […] I actually prefer keeping it this way without touching it, it denotes better we really have a whole block from the diagram missing there. Because what we are actually missing is the condition check which is a new function. Having the call to scrc_node_2() there forces us to take it into account when refactoring code, like I did now. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40291?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: I1dda9b9288f3f34dfad6064e3f9fff6dcd6abbd7 Gerrit-Change-Number: 40291 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 14:16:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: osmo_ss7_hmrt.c: Use LOGSS7()

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40285?usp=email ) Change subject: osmo_ss7_hmrt.c: Use LOGSS7() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40285?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: I8e1a9bc4178fcb1f5411c65a7149f8fde031999f Gerrit-Change-Number: 40285 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 13:55:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: m3ua: Discard rx MSUs for non-active AS

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40294?usp=email ) Change subject: m3ua: Discard rx MSUs for non-active AS ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/m3ua.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40294/comment/1df0c92c_07137… : PS1, Line 625: if (rc) { I thought our linter explicitly flagged braces in single if statements, also the (optically more complex) if-else in line 617 is without braces. (I don't really care for enforcing that rule, just pointing it out) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40294?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: Ibd3c85b9c5ac24fe1447c82b1f2cff4453105b84 Gerrit-Change-Number: 40294 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 13:53:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: Rename files in src: s/osmo_ss7/ss7/g

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40293?usp=email ) Change subject: Rename files in src: s/osmo_ss7/ss7/g ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40293?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: I946f787e7bf7d4948d61f50a6cc8ec9a6253f074 Gerrit-Change-Number: 40293 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 13:43:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: Use osmo_ss7_pointcode_print_buf() instead of static buffer API

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40286?usp=email ) Change subject: Use osmo_ss7_pointcode_print_buf() instead of static buffer API ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40286?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: I5daeecfae77932e2e52e1a36a620349efa878bbd Gerrit-Change-Number: 40286 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 13:39:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: m3ua: Log SLS of incoming data header

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40287?usp=email ) Change subject: m3ua: Log SLS of incoming data header ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40287?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: I8b0afbbaffd0827df04b80252be4802f6863648d Gerrit-Change-Number: 40287 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 13:37:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: sccp_sclc.c: Fix potential memory leak

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40288?usp=email ) Change subject: sccp_sclc.c: Fix potential memory leak ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40288/comment/a74523ba_2a93f… : PS2, Line 9: not? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40288?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: I5acea9b98e590dcdea4b53f7588428a327b83046 Gerrit-Change-Number: 40288 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 13:35:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: sccp: Improve spec references in code documentation

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40290?usp=email ) Change subject: sccp: Improve spec references in code documentation ...................................................................... Patch Set 1: (1 comment) File src/sccp_scrc.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40290/comment/5db70781_54792… : PS1, Line 245: /* "Figure C.1/Q.714 - SCCP routing control procedures (SCRC) (sheet 5 of 12)" Not sure if that's too pedantic, but could you change it to ``` /* ITU Q.714: Figure X.Y ``` (and below as well)? It wasn't clear to me what the spec was so I scrolled all the way to the top of the file to find it's Q.714. That's also how I found an existing comment (in the proposed format) in line 65. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40290?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: Ie43f9472322e7b6ed3ce8fc91408c074ddb98378 Gerrit-Change-Number: 40290 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 13:33:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: SCOC -> SCRC: Use DPC provided from conn info in msg_type != CR...

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40292?usp=email ) Change subject: sccp: SCOC -> SCRC: Use DPC provided from conn info in msg_type != CR [3/3] ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40292?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: I602c5be73d7fe6ef2af1cbfe6888227a9f602562 Gerrit-Change-Number: 40292 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 13:26:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025