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

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

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40284?usp=email ) Change subject: sccp: Introduce LOGPSCC() log macro ...................................................................... sccp: Introduce LOGPSCC() log macro Change-Id: I8b79987153ba16b3fe940a5cad2f43f3780d89f0 --- M src/sccp_scoc.c 1 file changed, 24 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 204fd19..4e390af 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -127,6 +127,10 @@ struct osmo_timer_list t_int; struct osmo_timer_list t_rep_rel; }; +#define _LOGPSCC(scc, subsys, level, fmt, args ...) \ + _LOGPSCU((scc)->user, subsys, level, "CONN(%d) " fmt, (conn)->conn_id, ## args) +#define LOGPSCC(scc, level, fmt, args ...) \ + _LOGPSCC(scc, DLSCCP, level, fmt, ## args) /*********************************************************************** * various helper functions @@ -642,8 +646,9 @@ * Compare this information with source of Optional Data recorded while caching * to make sure we're on the same page. */ - LOGP(DLSCCP, LOGL_ERROR, "unexpected message type %s != cache source %s\n", - xua_class_msg_name(xmc, exp_type), xua_class_msg_name(xmc, conn->opt_data_cache->cb[0])); + LOGPSCC(conn, LOGL_ERROR, "unexpected message type %s != cache source %s\n", + xua_class_msg_name(xmc, exp_type), + xua_class_msg_name(xmc, conn->opt_data_cache->cb[0])); } else { osmo_sccp_tx_data(conn->user, conn->conn_id, msgb_data(conn->opt_data_cache), msgb_length(conn->opt_data_cache)); } @@ -676,8 +681,8 @@ if (msgb_l2len(prim->oph.msg) > max_optional_data) { if (conn->opt_data_cache) { /* Caching optional data, but there already is optional data occupying the cache: */ - LOGP(DLSCCP, LOGL_ERROR, "replacing unsent %u bytes of optional data cache with %s optional data\n", - msgb_length(conn->opt_data_cache), osmo_scu_prim_name(&prim->oph)); + LOGPSCC(conn, LOGL_ERROR, "replacing unsent %u bytes of optional data cache with %s optional data\n", + msgb_length(conn->opt_data_cache), osmo_scu_prim_name(&prim->oph)); msgb_trim(conn->opt_data_cache, 0); } else { conn->opt_data_cache = msgb_alloc_c(conn, SCCP_MAX_DATA, "SCCP optional data cache for CR/CC/RLSD"); @@ -844,7 +849,7 @@ break; /* FIXME */ default: - LOGP(DLSCCP, LOGL_ERROR, "Don't know how to encode msg_type %u\n", msg_type); + LOGPSCC(conn, LOGL_ERROR, "Don't know how to encode msg_type %u\n", msg_type); xua_msg_free(xua); return NULL; } @@ -852,8 +857,8 @@ prim_needed: xua_msg_free(xua); - LOGP(DLSCCP, LOGL_ERROR, "%s must be called with valid 'prim' " - "pointer for msg_type=%u\n", __func__, msg_type); + LOGPSCC(conn, LOGL_ERROR, "%s must be called with valid 'prim' pointer for msg_type=%u\n", + __func__, msg_type); return NULL; } @@ -1748,9 +1753,9 @@ struct xua_msg *xua, uint32_t inval_src_ref) { - LOGP(DLSCCP, LOGL_NOTICE, - "Received message for source ref %u on conn with mismatching remote ref %u\n", - inval_src_ref, conn->remote_ref); + LOGPSCC(conn, LOGL_NOTICE, + "Received message for source ref %u on conn with mismatching remote ref %u\n", + inval_src_ref, conn->remote_ref); /* we have received a message with invalid source local * reference and thus apply the action indicated in Table @@ -1770,8 +1775,7 @@ /* DISCARD */ break; default: - LOGP(DLSCCP, LOGL_NOTICE, "Unhandled %s\n", - xua_hdr_dump(xua, &xua_dialect_sua)); + LOGPSCC(conn, LOGL_NOTICE, "Unhandled %s\n", xua_hdr_dump(xua, &xua_dialect_sua)); break; } } @@ -1780,11 +1784,11 @@ static void sccp_scoc_rx_inval_opc(struct sccp_connection *conn, struct xua_msg *xua) { - LOGP(DLSCCP, LOGL_NOTICE, - "Received message %s for opc=%u=%s on conn with mismatching remote pc=%u=%s\n", - xua_hdr_dump(xua, &xua_dialect_sua), - xua->mtp.opc, osmo_ss7_pointcode_print(conn->inst->ss7, xua->mtp.opc), - conn->remote_pc, osmo_ss7_pointcode_print2(conn->inst->ss7, conn->remote_pc)); + LOGPSCC(conn, LOGL_NOTICE, + "Received message %s for opc=%u=%s on conn with mismatching remote pc=%u=%s\n", + xua_hdr_dump(xua, &xua_dialect_sua), + xua->mtp.opc, osmo_ss7_pointcode_print(conn->inst->ss7, xua->mtp.opc), + conn->remote_pc, osmo_ss7_pointcode_print2(conn->inst->ss7, conn->remote_pc)); /* we have received a message with invalid origin PC and thus * apply the action indicated in Table B.2/Q.714 */ switch (xua->hdr.msg_type) { @@ -1801,7 +1805,7 @@ /* DISCARD */ break; default: - LOGP(DLSCCP, LOGL_NOTICE, "Unhandled %s\n", + LOGPSCC(conn, LOGL_NOTICE, "Unhandled %s\n", xua_hdr_dump(xua, &xua_dialect_sua)); break; } @@ -1850,8 +1854,7 @@ OSMO_ASSERT(conn); OSMO_ASSERT(conn->fi); - DEBUGP(DLSCCP, "Received %s for local reference %u\n", - xua_hdr_dump(xua, &xua_dialect_sua), conn->conn_id); + LOGPSCC(conn, LOGL_DEBUG, "Received %s\n", xua_hdr_dump(xua, &xua_dialect_sua)); if (xua->hdr.msg_type != SUA_CO_CORE && xua->hdr.msg_type != SUA_CO_COAK && @@ -1876,7 +1879,7 @@ /* Map from XUA message to event */ event = xua_msg_event_map(xua, sua_scoc_event_map, ARRAY_SIZE(sua_scoc_event_map)); if (event < 0) { - LOGP(DLSCCP, LOGL_ERROR, "Cannot map SCRC msg %s to event\n", + LOGPSCC(conn, LOGL_ERROR, "Cannot map SCRC msg %s to event\n", xua_hdr_dump(xua, &xua_dialect_sua)); /* Table B.1/Q714 states DISCARD for any message with * unknown type */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40284?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: I8b79987153ba16b3fe940a5cad2f43f3780d89f0 Gerrit-Change-Number: 40284 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: Introduce LOGPSCU() log macro

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40283?usp=email ) Change subject: sccp: Introduce LOGPSCU() log macro ...................................................................... sccp: Introduce LOGPSCU() log macro Change-Id: I576a1783be57dead99cdf2a29d5539aee0becd0c --- M src/sccp_helpers.c M src/sccp_internal.h M src/sccp_sclc.c M src/sccp_scmg.c M src/sccp_scoc.c M src/sccp_user.c 6 files changed, 24 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved daniel: Looks good to me, but someone else must approve diff --git a/src/sccp_helpers.c b/src/sccp_helpers.c index 6dd9ab8..6643e4e 100644 --- a/src/sccp_helpers.c +++ b/src/sccp_helpers.c @@ -33,6 +33,7 @@ #include <osmocom/sigtran/sccp_sap.h> #include <osmocom/sigtran/sccp_helpers.h> +#include "ss7_internal.h" #include "sccp_internal.h" #define SCU_MSG_SIZE 2048 @@ -159,12 +160,12 @@ struct osmo_scu_prim *prim; if (!osmo_sccp_conn_id_exists(scu->inst, conn_id)) { - LOGP(DLSCCP, LOGL_ERROR, "N-DATA.req TX error: unable to find connection ID (local_ref) %u\n", conn_id); + LOGPSCU(scu, LOGL_ERROR, "N-DATA.req TX error: unable to find connection ID (local_ref) %u\n", conn_id); return -ENOTCONN; } if (len > SCCP_MAX_DATA) { - LOGP(DLSCCP, LOGL_ERROR, "N-DATA.req TX error: amount of data %u > %u - ITU-T Rec. Q.713 §4.7 limit\n", + LOGPSCU(scu, LOGL_ERROR, "N-DATA.req TX error: amount of data %u > %u - ITU-T Rec. Q.713 §4.7 limit\n", len, SCCP_MAX_DATA); return -EMSGSIZE; } @@ -203,7 +204,7 @@ struct osmo_scu_disconn_param *param; if (!osmo_sccp_conn_id_exists(scu->inst, conn_id)) { - LOGP(DLSCCP, LOGL_ERROR, "N-DISCONNECT.req TX error: unable to find connection ID (local_ref) %u\n", conn_id); + LOGPSCU(scu, LOGL_ERROR, "N-DISCONNECT.req TX error: unable to find connection ID (local_ref) %u\n", conn_id); return -ENOTCONN; } @@ -244,7 +245,7 @@ struct osmo_scu_connect_param *param; if (!osmo_sccp_conn_id_exists(scu->inst, conn_id)) { - LOGP(DLSCCP, LOGL_ERROR, "N-CONNECT.resp TX error: unable to find connection ID (local_ref) %u\n", conn_id); + LOGPSCU(scu, LOGL_ERROR, "N-CONNECT.resp TX error: unable to find connection ID (local_ref) %u\n", conn_id); return -ENOTCONN; } diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 1421c64..37ada11 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -86,6 +86,10 @@ /* Application Server FSM Instance */ struct osmo_fsm_inst *as_fi; }; +#define _LOGPSCU(scu, subsys, level, fmt, args ...) \ + _LOGPSCI((scu)->inst, subsys, level, "SCU(%s) " fmt, osmo_sccp_user_name(scu), ## args) +#define LOGPSCU(scu, level, fmt, args ...) \ + _LOGPSCU(scu, DLSCCP, level, fmt, ## args) extern int DSCCP; diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c index 416c6a0..e012114 100644 --- a/src/sccp_sclc.c +++ b/src/sccp_sclc.c @@ -159,9 +159,8 @@ /* Connectionless by-passes this altogether */ return xua_gen_encode_and_send(scu, -1, prim, SUA_CL_CLDT); default: - LOGP(DLSCCP, LOGL_ERROR, "Received unknown SCCP User " - "primitive %s from user\n", - osmo_scu_prim_name(&prim->oph)); + LOGPSCU(scu, LOGL_ERROR, "Received unknown SCCP User primitive %s from user\n", + osmo_scu_prim_name(&prim->oph)); return -1; } } diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c index 755d272..6f7383c 100644 --- a/src/sccp_scmg.c +++ b/src/sccp_scmg.c @@ -34,6 +34,7 @@ #include <osmocom/sccp/sccp_types.h> #include "xua_internal.h" +#include "ss7_internal.h" #include "sccp_internal.h" /* ITU-T Q.714 5.3.3 Subsystem allowed */ @@ -262,7 +263,7 @@ case SCCP_SCMG_MSGT_SOG: case SCCP_SCMG_MSGT_SSC: default: - LOGP(DLSCCP, LOGL_NOTICE, "Rx unsupported SCCP SCMG %s, ignoring\n", + LOGPSCU(scu, LOGL_NOTICE, "Rx unsupported SCCP SCMG %s, ignoring\n", sccp_scmg_msgt_name(scmg->msg_type)); break; } @@ -296,10 +297,10 @@ rc = scmg_rx(scu, &param->calling_addr, &param->called_addr, scmg); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_PCSTATE, PRIM_OP_INDICATION): - LOGP(DLSCCP, LOGL_DEBUG, "Ignoring SCCP user primitive %s\n", osmo_scu_prim_name(oph)); + LOGPSCU(scu, LOGL_DEBUG, "Ignoring SCCP user primitive %s\n", osmo_scu_prim_name(oph)); break; default: - LOGP(DLSCCP, LOGL_ERROR, "unsupported SCCP user primitive %s\n", + LOGPSCU(scu, LOGL_ERROR, "unsupported SCCP user primitive %s\n", osmo_scu_prim_name(oph)); break; } diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index f2ea766..204fd19 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1917,7 +1917,7 @@ int rc = 0; int event; - LOGP(DLSCCP, LOGL_DEBUG, "Received SCCP User Primitive (%s)\n", + LOGPSCU(scu, LOGL_DEBUG, "Received SCCP User Primitive (%s)\n", osmo_scu_prim_name(&prim->oph)); switch (OSMO_PRIM_HDR(&prim->oph)) { @@ -1930,8 +1930,8 @@ conn = conn_create_id(scu, prim->u.connect.conn_id); if (!conn) { /* FIXME: inform SCCP user with proper reply */ - LOGP(DLSCCP, LOGL_ERROR, "Cannot create conn-id for primitive %s\n", - osmo_scu_prim_name(&prim->oph)); + LOGPSCU(scu, LOGL_ERROR, "Cannot create conn-id for primitive %s\n", + osmo_scu_prim_name(&prim->oph)); return rc; } break; @@ -1943,13 +1943,13 @@ conn = conn_find_by_id(inst, scu_prim_conn_id(prim)); if (!conn) { /* FIXME: inform SCCP user with proper reply */ - LOGP(DLSCCP, LOGL_ERROR, "Received unknown conn-id %u for primitive %s\n", - scu_prim_conn_id(prim), osmo_scu_prim_name(&prim->oph)); + LOGPSCU(scu, LOGL_ERROR, "Received unknown conn-id %u for primitive %s\n", + scu_prim_conn_id(prim), osmo_scu_prim_name(&prim->oph)); return rc; } break; default: - LOGP(DLSCCP, LOGL_ERROR, "Received unknown primitive %s\n", + LOGPSCU(scu, LOGL_ERROR, "Received unknown primitive %s\n", osmo_scu_prim_name(&prim->oph)); return -1; } diff --git a/src/sccp_user.c b/src/sccp_user.c index e283f29..18561c4 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -169,9 +169,7 @@ * at the time this function returns. */ void osmo_sccp_user_unbind(struct osmo_sccp_user *scu) { - LOGP(DLSCCP, LOGL_INFO, "Unbinding user '%s' from SSN=%u PC=%s\n", - scu->name, scu->ssn, - osmo_ss7_pointcode_print(scu->inst->ss7, scu->pc)); + LOGPSCU(scu, LOGL_INFO, "Unbinding user\n"); /* FIXME: free/release all connections held by this user? */ llist_del(&scu->list); talloc_free(scu); @@ -196,8 +194,8 @@ */ int sccp_user_prim_up(struct osmo_sccp_user *scu, struct osmo_scu_prim *prim) { - LOGP(DLSCCP, LOGL_DEBUG, "Delivering %s to SCCP User '%s'\n", - osmo_scu_prim_name(&prim->oph), scu->name); + LOGPSCU(scu, LOGL_DEBUG, "Delivering to SCCP User: %s\n", + osmo_scu_prim_name(&prim->oph)); return scu->prim_cb(&prim->oph, scu); } -- 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: merged 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: 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

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40282?usp=email ) Change subject: sccp: Introduce LOGPSCI() log macro ...................................................................... sccp: Introduce LOGPSCI() log macro Change-Id: I0f04ff064d3693c6d71aa4977e0c593c7f157f7e --- M src/sccp_internal.h M src/sccp_sclc.c M src/sccp_scoc.c M src/sccp_scrc.c M src/sccp_user.c 5 files changed, 47 insertions(+), 43 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 45df22d..1421c64 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -1,5 +1,7 @@ #pragma once +#include <inttypes.h> + #include <osmocom/core/fsm.h> #include <osmocom/core/prim.h> #include <osmocom/core/linuxlist.h> @@ -56,6 +58,11 @@ uint32_t max_optional_data; }; +#define _LOGPSCI(sci, subsys, level, fmt, args ...) \ + _LOGSS7((sci)->ss7, subsys, level, "SCCP(rctx=%" PRIu32 ") " fmt, (sci)->route_ctx, ## args) +#define LOGPSCI(sci, level, fmt, args ...) \ + _LOGPSCI(sci, DLSCCP, level, fmt, ## args) + struct osmo_sccp_user { /*! \brief entry in list of sccp users of \ref osmo_sccp_instance */ diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c index e0a2844..416c6a0 100644 --- a/src/sccp_sclc.c +++ b/src/sccp_sclc.c @@ -56,6 +56,7 @@ #include <osmocom/sccp/sccp_types.h> #include "xua_internal.h" +#include "ss7_internal.h" #include "sccp_internal.h" /* generate a 'struct xua_msg' of requested type from primitive data */ @@ -190,7 +191,7 @@ uint32_t protocol_class; if (!data_ie) { - LOGP(DLSCCP, LOGL_ERROR, "SCCP/SUA CLDT without user data?!?\n"); + LOGPSCI(inst, LOGL_ERROR, "SCCP/SUA CLDT without user data?!?\n"); return -1; } @@ -212,8 +213,8 @@ if (!scu) { /* FIXME: Send destination unreachable? */ - LOGP(DLSUA, LOGL_NOTICE, "Received SUA message for unequipped SSN %u\n", - param->called_addr.ssn); + _LOGPSCI(inst, DLSUA, LOGL_NOTICE, "Received SUA message for unequipped SSN %u\n", + param->called_addr.ssn); msgb_free(upmsg); return 0; } @@ -238,7 +239,7 @@ struct osmo_sccp_user *scu; if (!data_ie) { - LOGP(DLSCCP, LOGL_ERROR, "SCCP/SUA CLDR without user data?!?\n"); + LOGPSCI(inst, LOGL_ERROR, "SCCP/SUA CLDR without user data?!?\n"); return -1; } @@ -258,8 +259,8 @@ param->called_addr.pc); if (!scu) { /* FIXME: Send destination unreachable? */ - LOGP(DLSUA, LOGL_NOTICE, "Received CLDR for unequipped SSN %u\n", - param->called_addr.ssn); + _LOGPSCI(inst, DLSUA, LOGL_NOTICE, "Received CLDR for unequipped SSN %u\n", + param->called_addr.ssn); msgb_free(upmsg); return 0; } @@ -294,8 +295,8 @@ rc = sclc_rx_cldr(inst, xua); break; default: - LOGP(DLSUA, LOGL_NOTICE, "Received unknown/unsupported " - "message %s\n", xua_hdr_dump(xua, &xua_dialect_sua)); + _LOGPSCI(inst, DLSUA, LOGL_NOTICE, "Received unknown/unsupported message %s\n", + xua_hdr_dump(xua, &xua_dialect_sua)); break; } diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 8222bde..f2ea766 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -437,8 +437,8 @@ } else if (conn->conn_id > it->conn_id) { n = &((*n)->rb_right); } else { - LOGP(DLSCCP, LOGL_ERROR, - "Trying to reserve already reserved conn_id %u\n", conn->conn_id); + LOGPSCI(inst, LOGL_ERROR, "Trying to reserve already reserved conn_id %u\n", + conn->conn_id); return -EEXIST; } } @@ -1546,14 +1546,14 @@ rc = sua_addr_parse(&called_addr, xua, SUA_IEI_DEST_ADDR); if (rc < 0) { - LOGP(DLSCCP, LOGL_ERROR, "Cannot find SCCP User for XUA " + LOGPSCI(inst, LOGL_ERROR, "Cannot find SCCP User for XUA " "Message %s without valid DEST_ADDR\n", xua_hdr_dump(xua, &xua_dialect_sua)); return NULL; } if (!(called_addr.presence & OSMO_SCCP_ADDR_T_SSN)) { - LOGP(DLSCCP, LOGL_ERROR, "Cannot resolve SCCP User for " + LOGPSCI(inst, LOGL_ERROR, "Cannot resolve SCCP User for " "XUA Message %s without SSN in CalledAddr\n", xua_hdr_dump(xua, &xua_dialect_sua)); return NULL; @@ -1572,8 +1572,8 @@ uint32_t conn_id; struct sccp_connection *conn; - LOGP(DLSCCP, LOGL_NOTICE, "SCRC Routing Failure for message %s\n", - xua_hdr_dump(xua, &xua_dialect_sua)); + LOGPSCI(inst, LOGL_NOTICE, "SCRC Routing Failure for message %s\n", + xua_hdr_dump(xua, &xua_dialect_sua)); /* try to dispatch to connection FSM (if any) */ conn_id = xua_msg_get_u32(xua, SUA_IEI_DEST_REF); @@ -1738,8 +1738,7 @@ tx_relco_from_xua(inst, xua); break; default: - LOGP(DLSCCP, LOGL_NOTICE, "Unhandled %s\n", - xua_hdr_dump(xua, &xua_dialect_sua)); + LOGPSCI(inst, LOGL_NOTICE, "Unhandled %s\n", xua_hdr_dump(xua, &xua_dialect_sua)); break; } } @@ -1830,8 +1829,7 @@ /* this shouldn't happen, as the caller should * have already verified that a local user is * equipped for this SSN */ - LOGP(DLSCCP, LOGL_ERROR, "Cannot find user for " - "CORE ?!?\n"); + LOGPSCI(inst, LOGL_ERROR, "Cannot find user for CORE ?!?\n"); return; } /* Allocate new connection */ @@ -1843,8 +1841,8 @@ conn_id = xua_msg_get_u32(xua, SUA_IEI_DEST_REF); conn = conn_find_by_id(inst, conn_id); if (!conn) { - LOGP(DLSCCP, LOGL_NOTICE, "Received %s: Cannot find connection for " - "local reference %u\n", xua_hdr_dump(xua, &xua_dialect_sua), conn_id); + LOGPSCI(inst, LOGL_NOTICE, "Received %s: Cannot find connection for " + "local reference %u\n", xua_hdr_dump(xua, &xua_dialect_sua), conn_id); sccp_scoc_rx_unass_local_ref(inst, xua); return; } diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index 63ded9d..543a464 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -87,7 +87,7 @@ /* 1) encode the SUA in xua_msg to SCCP message */ msg = osmo_sua_to_sccp(sua); if (!msg) { - LOGP(DLSCCP, LOGL_ERROR, "Cannot encode SUA to SCCP\n"); + LOGPSCI(inst, LOGL_ERROR, "Cannot encode SUA to SCCP\n"); return -1; } @@ -101,8 +101,8 @@ param->opc = sua->mtp.opc; else { if (!osmo_ss7_pc_is_valid(s7i->cfg.primary_pc)) { - LOGP(DLSCCP, LOGL_ERROR, "SS7 instance %u: no primary point-code set\n", - s7i->cfg.id); + LOGPSCI(inst, LOGL_ERROR, "SS7 instance %u: no primary point-code set\n", + s7i->cfg.id); return -1; } param->opc = s7i->cfg.primary_pc; @@ -140,8 +140,7 @@ if (called->presence & OSMO_SCCP_ADDR_T_PC) xua->mtp.dpc = called->pc; if (!xua->mtp.dpc) { - LOGP(DLSCCP, LOGL_ERROR, "MTP-TRANSFER.req from SCCP " - "without DPC?!? called=%s\n", + LOGPSCI(inst, LOGL_ERROR, "MTP-TRANSFER.req from SCCP without DPC?!? called=%s\n", osmo_sccp_addr_dump(called)); return -1; } @@ -155,8 +154,8 @@ rt = ss7_instance_lookup_route(inst->ss7, &rtlabel); if (!rt) { char buf[256]; - LOGP(DLSCCP, LOGL_ERROR, "MTP-TRANSFER.req from SCCP for %s: no route!\n", - ss7_route_label_to_str(buf, sizeof(buf), inst->ss7, &rtlabel)); + LOGPSCI(inst, LOGL_ERROR, "MTP-TRANSFER.req from SCCP for %s: no route!\n", + ss7_route_label_to_str(buf, sizeof(buf), inst->ss7, &rtlabel)); return -1; } @@ -169,12 +168,12 @@ case OSMO_SS7_ASP_PROT_IPA: return sua2sccp_tx_m3ua(inst, xua); default: - LOGP(DLSCCP, LOGL_ERROR, "MTP-TRANSFER.req for " + LOGPSCI(inst, LOGL_ERROR, "MTP-TRANSFER.req for " "unknown protocol %u\n", as->cfg.proto); break; } } else if (rt->dest.linkset) { - LOGP(DLSCCP, LOGL_ERROR, "MTP-TRANSFER.req from SCCP for " + LOGPSCI(inst, LOGL_ERROR, "MTP-TRANSFER.req from SCCP for " "linkset %s unsupported\n", rt->dest.linkset->cfg.name); } else { OSMO_ASSERT(0); @@ -292,7 +291,7 @@ if (translated.ri != OSMO_SCCP_RI_SSN_PC && translated.ri != OSMO_SCCP_RI_SSN_IP) { /* TODO: GT Routing */ - LOGP(DLSCCP, LOGL_NOTICE, "GT Routing not implemented yet\n"); + LOGPSCI(inst, LOGL_NOTICE, "GT Routing not implemented yet\n"); #if 1 /* Prevent endless recursion, see OS#2666. */ sccp_sclc_rx_scrc_rout_fail(inst, xua, @@ -335,9 +334,8 @@ /* Is subsystem equipped? */ if (!scu) { /* Error: unequipped user */ - LOGP(DLSCCP, LOGL_NOTICE, - "Unable to find user for SSN=%u PC=%s\n", - called->ssn, osmo_ss7_pointcode_print(inst->ss7, called->pc)); + LOGPSCI(inst, LOGL_NOTICE, "Unable to find user for SSN=%u PC=%s\n", + called->ssn, osmo_ss7_pointcode_print(inst->ss7, called->pc)); return scrc_node_4(inst, xua, SCCP_RETURN_CAUSE_UNEQUIPPED_USER); } @@ -412,7 +410,7 @@ { struct osmo_sccp_addr called; - LOGP(DLSS7, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); + LOGPSCI(inst, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); @@ -434,7 +432,7 @@ { struct osmo_sccp_addr called; - LOGP(DLSS7, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); + LOGPSCI(inst, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); @@ -483,7 +481,7 @@ uint32_t proto_class; struct xua_msg_part *hop_ctr_part; - LOGP(DLSS7, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); + LOGPSCI(inst, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); /* TODO: SCCP or nodal congestion? */ /* CR or CL message? */ diff --git a/src/sccp_user.c b/src/sccp_user.c index 62ae9ed..e283f29 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -108,14 +108,14 @@ scu = sccp_user_find(inst, ssn, pc); if (scu) { - LOGP(DLSCCP, LOGL_ERROR, - "Cannot bind user '%s' to SSN=%u PC=%s, this SSN and PC" - " is already bound by '%s'\n", - name, ssn, osmo_ss7_pointcode_print(inst->ss7, pc), scu->name); + LOGPSCI(inst, LOGL_ERROR, + "Cannot bind user '%s' to SSN=%u PC=%s, this SSN and PC" + " is already bound by '%s'\n", + name, ssn, osmo_ss7_pointcode_print(inst->ss7, pc), scu->name); return NULL; } - LOGP(DLSCCP, LOGL_INFO, "Binding user '%s' to SSN=%u PC=%s\n", + LOGPSCI(inst, LOGL_INFO, "Binding user '%s' to SSN=%u PC=%s\n", name, ssn, osmo_ss7_pointcode_print(inst->ss7, pc)); scu = talloc_zero(inst, struct osmo_sccp_user); @@ -216,7 +216,7 @@ /* Convert from SCCP to SUA in xua_msg format */ xua = osmo_sccp_to_xua(oph->msg); if (!xua) { - LOGP(DLSCCP, LOGL_ERROR, "Couldn't convert SCCP to SUA: %s\n", + LOGPSCI(inst, LOGL_ERROR, "Couldn't convert SCCP to SUA: %s\n", msgb_hexdump(oph->msg)); rc = -1; break; @@ -227,7 +227,7 @@ xua_msg_free(xua); break; default: - LOGP(DLSCCP, LOGL_ERROR, "Unknown primitive %u:%u receivd\n", + LOGPSCI(inst, LOGL_ERROR, "Unknown primitive %u:%u receivd\n", oph->primitive, oph->operation); rc = -1; } -- 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: merged 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

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

by osmith

Attention is currently required from: daniel, fixeria, laforge, neels, pespin. osmith 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 6: Code-Review+1 (1 comment) File src/sccp_scrc.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250/comment/ab279aef_2dd2d… : PS2, Line 87: LOGL_INFO > ACK will change format like done in already other logging functions. Done -- 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: 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: 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> Gerrit-Comment-Date: Tue, 13 May 2025 09:47:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(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 osmith

Attention is currently required from: pespin. osmith 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 -- 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 09:45:31 +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 osmith

Attention is currently required from: pespin. osmith 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+1 -- 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 09:45:04 +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 osmith

Attention is currently required from: pespin. osmith 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+1 -- 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 09:44:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

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

by osmith

Attention is currently required from: pespin. osmith 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+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: 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 09:43:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

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

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40284?usp=email ) Change subject: sccp: Introduce LOGPSCC() log macro ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40284?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: I8b79987153ba16b3fe940a5cad2f43f3780d89f0 Gerrit-Change-Number: 40284 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 09:41:59 +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 osmith

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

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025