- gerrit-log - lists.osmocom.org

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

by pespin

Attention is currently required from: daniel, osmith. pespin 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 3: Code-Review+2 -- 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: 3 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> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 14:20:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

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

by pespin

Attention is currently required from: daniel. Hello Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40294?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by daniel, Verified+1 by Jenkins Builder Change subject: m3ua: Discard rx MSUs for non-active AS ...................................................................... m3ua: Discard rx MSUs for non-active AS TODO originally added long time ago in d11fa298c5f179a03307c185b0d433e6ba61d40f. Change-Id: Ibd3c85b9c5ac24fe1447c82b1f2cff4453105b84 --- M src/m3ua.c M src/ss7_as.c M src/ss7_as.h 3 files changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/94/40294/2 -- 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: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ibd3c85b9c5ac24fe1447c82b1f2cff4453105b84 Gerrit-Change-Number: 40294 Gerrit-PatchSet: 2 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>

1 month, 3 weeks

1
0
0 0

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

by pespin

Attention is currently required from: daniel, osmith. Hello Jenkins Builder, daniel, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40288?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by daniel, Code-Review+1 by osmith Change subject: sccp_sclc.c: Fix potential memory leak ...................................................................... sccp_sclc.c: Fix potential memory leak If data_ie is not found, msgb will be leaked. Change-Id: I5acea9b98e590dcdea4b53f7588428a327b83046 --- M src/sccp_sclc.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/88/40288/3 -- 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: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5acea9b98e590dcdea4b53f7588428a327b83046 Gerrit-Change-Number: 40288 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

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

by pespin

Attention is currently required from: daniel. pespin 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: (1 comment) File src/m3ua.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40294/comment/6ad0bb5f_a5e67… : PS1, Line 625: if (rc) { > I thought our linter explicitly flagged braces in single if statements, also the (optically more com […] I forgt to push the new version, pushing now ;) -- 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: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 14:20:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

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

by pespin

Attention is currently required from: daniel. pespin 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/b6ecbb28_d2a4b… : 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 […] I also thought about it, but thought Q.714 in the line is descriptive enough. I know usually we'd do like you mention, but since that spec uses that syntax to name figures, I prefer keeping it that way to make it copy+paste CTRL+F, because it's f*cking complex to find stuff in those state diagrams. -- 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: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 14:19:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

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

by pespin

Attention is currently required from: daniel. pespin 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: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40288/comment/e89e825c_f0fcc… : PS2, Line 9: > not? Done -- 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: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 14:17:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

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

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40287?usp=email ) Change subject: m3ua: Log SLS of incoming data header ...................................................................... m3ua: Log SLS of incoming data header Change-Id: I8b0afbbaffd0827df04b80252be4802f6863648d --- M src/m3ua.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: daniel: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/m3ua.c b/src/m3ua.c index b64bfad..35e2bb7 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -635,9 +635,10 @@ OSMO_ASSERT(dh); m3ua_dh_to_xfer_param(&xua->mtp, dh); LOGPASP(asp, DLM3UA, LOGL_DEBUG, - "%s(): M3UA data header: opc=%u=%s dpc=%u=%s\n", + "%s(): M3UA data header: opc=%u=%s dpc=%u=%s sls=%u\n", __func__, xua->mtp.opc, osmo_ss7_pointcode_print(asp->inst, xua->mtp.opc), - xua->mtp.dpc, osmo_ss7_pointcode_print2(asp->inst, xua->mtp.dpc)); + xua->mtp.dpc, osmo_ss7_pointcode_print2(asp->inst, xua->mtp.dpc), + xua->mtp.sls); OSMO_ASSERT(xua->mtp.sls <= 0xf); rate_ctr_inc2(as->ctrg, SS7_AS_CTR_RX_MSU_SLS_0 + xua->mtp.sls); -- 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: merged 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

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

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40285?usp=email ) Change subject: osmo_ss7_hmrt.c: Use LOGSS7() ...................................................................... osmo_ss7_hmrt.c: Use LOGSS7() Change-Id: I8e1a9bc4178fcb1f5411c65a7149f8fde031999f --- M src/osmo_ss7_hmrt.c 1 file changed, 18 insertions(+), 20 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/src/osmo_ss7_hmrt.c b/src/osmo_ss7_hmrt.c index 654692a..bd5d480 100644 --- a/src/osmo_ss7_hmrt.c +++ b/src/osmo_ss7_hmrt.c @@ -129,8 +129,7 @@ service_ind = mdh->si & 0xf; break; default: - LOGP(DLSS7, LOGL_ERROR, "Unknown M3UA XFER Message " - "Type %u\n", xua->hdr.msg_type); + LOGSS7(inst, LOGL_ERROR, "Unknown M3UA XFER Message Type %u\n", xua->hdr.msg_type); xua_msg_free(xua); return -1; } @@ -141,8 +140,7 @@ /* FIXME: SI = Signalling Network Testing and Maintenance -> SLTC */ default: /* Discard Message */ - LOGP(DLSS7, LOGL_ERROR, "Unknown M3UA Message Class %u\n", - xua->hdr.msg_class); + LOGSS7(inst, LOGL_ERROR, "Unknown M3UA Message Class %u\n", xua->hdr.msg_class); xua_msg_free(xua); return -1; } @@ -152,7 +150,7 @@ if (osu) { return deliver_to_mtp_user(osu, xua); } else { - LOGP(DLSS7, LOGL_NOTICE, "No MTP-User for SI %u\n", service_ind); + LOGSS7(inst, LOGL_NOTICE, "No MTP-User for SI %u\n", service_ind); /* Discard Message */ /* FIXME: User Part Unavailable HMDT -> HMRT */ xua_msg_free(xua); @@ -192,7 +190,7 @@ * osmo_ss7_pointcode_print2(), guard against its static buffer being * overwritten. */ const char *rt_name = osmo_ss7_route_name(rt, false); - DEBUGP(DLSS7, "Found route for dpc=%u=%s: %s\n", + LOGSS7(inst, LOGL_DEBUG, "Found route for dpc=%u=%s: %s\n", dpc, osmo_ss7_pointcode_print(inst, dpc), rt_name); } @@ -202,14 +200,14 @@ switch (as->cfg.proto) { case OSMO_SS7_ASP_PROT_M3UA: - DEBUGP(DLSS7, "rt->dest.as proto is M3UA for dpc=%u=%s\n", + LOGSS7(inst, LOGL_DEBUG, "rt->dest.as proto is M3UA for dpc=%u=%s\n", dpc, osmo_ss7_pointcode_print(inst, dpc)); return m3ua_tx_xua_as(as, xua); case OSMO_SS7_ASP_PROT_IPA: return ipa_tx_xua_as(as, xua); default: - LOGP(DLSS7, LOGL_ERROR, "MTP message for ASP of unknown protocol %u\n", - as->cfg.proto); + LOGSS7(inst, LOGL_ERROR, "MTP message for ASP of unknown protocol %u\n", + as->cfg.proto); break; } } else if (rt->dest.linkset) { @@ -218,15 +216,15 @@ * osmo_ss7_pointcode_print2(), guard against its static buffer being * overwritten. */ const char *rt_name = osmo_ss7_route_name(rt, false); - LOGP(DLSS7, LOGL_ERROR, - "Found route for dpc=%u=%s: %s, but MTP-TRANSFER.req unsupported for linkset.\n", - dpc, osmo_ss7_pointcode_print(inst, dpc), rt_name); + LOGSS7(inst, LOGL_ERROR, + "Found route for dpc=%u=%s: %s, but MTP-TRANSFER.req unsupported for linkset.\n", + dpc, osmo_ss7_pointcode_print(inst, dpc), rt_name); } } else OSMO_ASSERT(0); } else { - LOGP(DLSS7, LOGL_ERROR, "MTP-TRANSFER.req for dpc=%u=%s: no route!\n", - dpc, osmo_ss7_pointcode_print(inst, dpc)); + LOGSS7(inst, LOGL_ERROR, "MTP-TRANSFER.req for dpc=%u=%s: no route!\n", + dpc, osmo_ss7_pointcode_print(inst, dpc)); /* DPC unknown HMRT -> MGMT */ /* Message Received for inaccesible SP HMRT ->RTPC */ /* Discard Message */ @@ -243,12 +241,12 @@ { uint32_t dpc = xua->mtp.dpc; if (osmo_ss7_pc_is_local(inst, dpc)) { - DEBUGP(DLSS7, "%s(): found dpc=%u=%s as local\n", __func__, - dpc, osmo_ss7_pointcode_print(inst, dpc)); + LOGSS7(inst, LOGL_DEBUG, "%s(): found dpc=%u=%s as local\n", + __func__, dpc, osmo_ss7_pointcode_print(inst, dpc)); return hmdt_message_for_distribution(inst, xua); } else { - DEBUGP(DLSS7, "%s(): dpc=%u=%s not local, message is for routing\n", __func__, - dpc, osmo_ss7_pointcode_print(inst, dpc)); + LOGSS7(inst, LOGL_DEBUG, "%s(): dpc=%u=%s not local, message is for routing\n", + __func__, dpc, osmo_ss7_pointcode_print(inst, dpc)); return hmrt_message_for_routing(inst, xua); } } @@ -277,8 +275,8 @@ rc = m3ua_hmdc_rx_from_l2(inst, xua); break; default: - LOGP(DLSS7, LOGL_ERROR, "Ignoring unknown primitive %u:%u\n", - omp->oph.primitive, omp->oph.operation); + LOGSS7(inst, LOGL_ERROR, "Ignoring unknown primitive %u:%u\n", + omp->oph.primitive, omp->oph.operation); rc = -1; } -- 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: merged 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[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, 3 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, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log