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

[M] Change in libosmo-sigtran[master]: sccp: Introduce LOGPSCI() log macro

by osmith

Attention is currently required from: daniel, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40282?usp=email ) Change subject: sccp: Introduce LOGPSCI() log macro ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40282?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: I0f04ff064d3693c6d71aa4977e0c593c7f157f7e Gerrit-Change-Number: 40282 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-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 09:37:53 +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 pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40286?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder 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(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/86/40286/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: newpatchset 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

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: Implement dpc_accessible()

by pespin

Attention is currently required from: daniel, fixeria, laforge, neels, osmith, pespin. Hello Jenkins Builder, daniel, fixeria, laforge, neels, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by daniel, Verified+1 by Jenkins Builder Change subject: sccp: Implement dpc_accessible() ...................................................................... sccp: Implement dpc_accessible() Change-Id: I16b0aa71db5be2daf7a8c52da829a38ad564eb7b --- M src/sccp_scrc.c 1 file changed, 31 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/50/40250/6 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?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: I16b0aa71db5be2daf7a8c52da829a38ad564eb7b Gerrit-Change-Number: 40250 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40288?usp=email ) Change subject: sccp_sclc.c: Fix potential memory leak ...................................................................... sccp_sclc.c: Fix potential memory leak If data_ie is 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/1 diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c index e012114..9d424fa 100644 --- a/src/sccp_sclc.c +++ b/src/sccp_sclc.c @@ -185,7 +185,7 @@ struct osmo_scu_prim *prim; struct osmo_scu_unitdata_param *param; struct xua_msg_part *data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA); - struct msgb *upmsg = sccp_msgb_alloc(__func__); + struct msgb *upmsg; struct osmo_sccp_user *scu; uint32_t protocol_class; @@ -194,6 +194,7 @@ return -1; } + upmsg = sccp_msgb_alloc(__func__); /* fill primitive */ prim = (struct osmo_scu_prim *) msgb_put(upmsg, sizeof(*prim)); param = &prim->u.unitdata; @@ -234,7 +235,7 @@ struct osmo_scu_prim *prim; struct osmo_scu_notice_param *param; struct xua_msg_part *data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA); - struct msgb *upmsg = sccp_msgb_alloc(__func__); + struct msgb *upmsg; struct osmo_sccp_user *scu; if (!data_ie) { @@ -242,6 +243,7 @@ return -1; } + upmsg = sccp_msgb_alloc(__func__); /* fill primitive */ prim = (struct osmo_scu_prim *) msgb_put(upmsg, sizeof(*prim)); param = &prim->u.notice; -- 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: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5acea9b98e590dcdea4b53f7588428a327b83046 Gerrit-Change-Number: 40288 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: sccp: Validate SUA address parsing succeeds

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40289?usp=email ) Change subject: sccp: Validate SUA address parsing succeeds ...................................................................... sccp: Validate SUA address parsing succeeds Change-Id: I36387eb53e160425844b20a296fa5dc75db1ec54 --- M src/sccp_sclc.c M src/sccp_scrc.c 2 files changed, 75 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/89/40289/1 diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c index 9d424fa..7fee2a3 100644 --- a/src/sccp_sclc.c +++ b/src/sccp_sclc.c @@ -44,6 +44,7 @@ */ #include <string.h> +#include <errno.h> #include <osmocom/core/utils.h> #include <osmocom/core/linuxlist.h> @@ -188,6 +189,7 @@ struct msgb *upmsg; struct osmo_sccp_user *scu; uint32_t protocol_class; + int rc; if (!data_ie) { LOGPSCI(inst, LOGL_ERROR, "SCCP/SUA CLDT without user data?!?\n"); @@ -201,8 +203,23 @@ osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION, upmsg); - sua_addr_parse(&param->called_addr, xua, SUA_IEI_DEST_ADDR); - sua_addr_parse(&param->calling_addr, xua, SUA_IEI_SRC_ADDR); + + rc = sua_addr_parse(&param->called_addr, xua, SUA_IEI_DEST_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + msgb_free(upmsg); + return -EINVAL; + } + + rc = sua_addr_parse(&param->calling_addr, xua, SUA_IEI_SRC_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + msgb_free(upmsg); + return -EINVAL; + } + param->in_sequence_control = xua_msg_get_u32(xua, SUA_IEI_SEQ_CTRL); protocol_class = xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS); param->return_option = protocol_class & 0x80; @@ -210,7 +227,6 @@ scu = sccp_user_find(inst, param->called_addr.ssn, param->called_addr.pc); - if (!scu) { /* FIXME: Send destination unreachable? */ _LOGPSCI(inst, DLSUA, LOGL_NOTICE, "Received SUA message for unequipped SSN %u\n", @@ -237,6 +253,7 @@ struct xua_msg_part *data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA); struct msgb *upmsg; struct osmo_sccp_user *scu; + int rc; if (!data_ie) { LOGPSCI(inst, LOGL_ERROR, "SCCP/SUA CLDR without user data?!?\n"); @@ -251,8 +268,22 @@ OSMO_SCU_PRIM_N_NOTICE, PRIM_OP_INDICATION, upmsg); - sua_addr_parse(&param->called_addr, xua, SUA_IEI_DEST_ADDR); - sua_addr_parse(&param->calling_addr, xua, SUA_IEI_SRC_ADDR); + rc = sua_addr_parse(&param->called_addr, xua, SUA_IEI_DEST_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + msgb_free(upmsg); + return -EINVAL; + } + + rc = sua_addr_parse(&param->calling_addr, xua, SUA_IEI_SRC_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + msgb_free(upmsg); + return -EINVAL; + } + param->importance = xua_msg_get_u32(xua, SUA_IEI_IMPORTANCE); param->cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE); @@ -335,13 +366,14 @@ /* Optional: Data */ xua_msg_copy_part(xua_out, SUA_IEI_DATA, xua_in, SUA_IEI_DATA); - sua_addr_parse(&called, xua_out, SUA_IEI_DEST_ADDR); + OSMO_ASSERT(sua_addr_parse(&called, xua_out, SUA_IEI_DEST_ADDR) == 0); + /* Route on PC + SSN ? */ if (called.ri == OSMO_SCCP_RI_SSN_PC) { /* if no PC, copy OPC into called addr */ if (!(called.presence & OSMO_SCCP_ADDR_T_PC)) { struct osmo_sccp_addr calling; - sua_addr_parse(&calling, xua_out, SUA_IEI_SRC_ADDR); + OSMO_ASSERT(sua_addr_parse(&calling, xua_out, SUA_IEI_SRC_ADDR) == 0); called.presence |= OSMO_SCCP_ADDR_T_PC; called.pc = calling.pc; /* Re-encode / replace called address */ diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index 8fc8b30..d5cb2de 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -21,6 +21,7 @@ */ #include <stdbool.h> +#include <errno.h> #include <osmocom/core/logging.h> #include <osmocom/core/msgb.h> @@ -173,6 +174,8 @@ return -1; } + /* TODO: SUA_IEI_SRC_ADDR*/ + rtlabel = (struct osmo_ss7_route_label){ .opc = xua->mtp.opc, .dpc = xua->mtp.dpc, @@ -437,10 +440,16 @@ struct xua_msg *xua) { struct osmo_sccp_addr called; + int rc; LOGPSCI(inst, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); - sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + rc = sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + return -EINVAL; + } /* Is this a CR message ? */ if (xua->hdr.msg_type != SUA_CO_CORE) @@ -459,10 +468,16 @@ struct xua_msg *xua) { struct osmo_sccp_addr called; + int rc; LOGPSCI(inst, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); - sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + rc = sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + return -EINVAL; + } /* Message Type */ if (xua->hdr.msg_type == SUA_CL_CLDR) { @@ -481,12 +496,18 @@ } /* ensure the CallingParty address doesn't just contain SSN, but at least SSN+PC */ -static void ensure_opc_in_calling_ssn(struct osmo_sccp_instance *inst, +static int ensure_opc_in_calling_ssn(struct osmo_sccp_instance *inst, struct xua_msg *xua) { struct osmo_sccp_addr calling; + int rc; - sua_addr_parse(&calling, xua, SUA_IEI_SRC_ADDR); + rc = sua_addr_parse(&calling, xua, SUA_IEI_SRC_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + return -EINVAL; + } /* if we route on SSN and only have a SSN in the address... */ if (calling.ri == OSMO_SCCP_RI_SSN_PC && @@ -498,6 +519,7 @@ xua_msg_free_tag(xua, SUA_IEI_SRC_ADDR); xua_msg_add_sccp_addr(xua, SUA_IEI_SRC_ADDR, &calling); } + return 0; } /* Figure C.1/Q.714 Sheet 1 of 12, after we converted the @@ -508,6 +530,7 @@ struct osmo_sccp_addr called; uint32_t proto_class; struct xua_msg_part *hop_ctr_part; + int rc; LOGPSCI(inst, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); /* TODO: SCCP or nodal congestion? */ @@ -522,9 +545,16 @@ /* We only treat connectionless and CR below */ /* ensure we have at least OPC+SSN and not just SSN in CallingParty (OS#5146) */ - ensure_opc_in_calling_ssn(inst, xua); + rc = ensure_opc_in_calling_ssn(inst, xua); + if (rc < 0) + return -EINVAL; - sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + rc = sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + return -EINVAL; + } /* Route on GT? */ if (called.ri != OSMO_SCCP_RI_GT) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40289?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: I36387eb53e160425844b20a296fa5dc75db1ec54 Gerrit-Change-Number: 40289 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/87/40287/1 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: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I8b0afbbaffd0827df04b80252be4802f6863648d Gerrit-Change-Number: 40287 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

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 pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/86/40286/1 diff --git a/src/osmo_ss7_combined_linkset.c b/src/osmo_ss7_combined_linkset.c index 412555f..583b82b 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[512]; /* 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..f3c03e2 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[64]; + char buf_dpc[64]; + 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: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5daeecfae77932e2e52e1a36a620349efa878bbd Gerrit-Change-Number: 40286 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: sccp: Introduce LOGPSCI() log macro

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40282?usp=email ) Change subject: sccp: Introduce LOGPSCI() log macro ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Funny that this is the longest message of the bunch (but the macro only adds the first part). Yeah sorry that's the first one I found in the pcap I had opened :D indeed, no need to look at most of the line since it's the one printing the whole decoded xua_msg. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40282?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: I0f04ff064d3693c6d71aa4977e0c593c7f157f7e Gerrit-Change-Number: 40282 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> Gerrit-Comment-Date: Mon, 12 May 2025 16:29:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: Implement dpc_accessible()

by daniel

Attention is currently required from: fixeria, laforge, neels, osmith, pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email ) Change subject: sccp: Implement dpc_accessible() ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?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: I16b0aa71db5be2daf7a8c52da829a38ad564eb7b Gerrit-Change-Number: 40250 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 16:28:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: Introduce LOGPSCU() log macro

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40283?usp=email ) Change subject: sccp: Introduce LOGPSCU() log macro ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > 0: SCCP(rctx=0) SCU(cs7-0-sccp-OsmoHNBGW-RANAP:RI=SSN_PC,PC=0.23. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40283?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: I576a1783be57dead99cdf2a29d5539aee0becd0c Gerrit-Change-Number: 40283 Gerrit-PatchSet: 2 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: Mon, 12 May 2025 16:28:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025