- gerrit-log - lists.osmocom.org

[S] Change in libosmo-sigtran[master]: sccp: Introduce LOGPSCC() 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/+/40284?usp=email ) Change subject: sccp: Introduce LOGPSCC() log macro ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Could you provide a sample log line in the commit message? 0: SCCP(rctx=0) SCU(cs7-0-sccp-OsmoHNBGW-RANAP:RI=SSN_PC,PC=0.23.5,SSN=RANAP) CONN(1) Received CO:COAK -- 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-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 16:19:22 +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

[S] Change in libosmo-sigtran[master]: sccp: Introduce LOGPSCU() 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/+/40283?usp=email ) Change subject: sccp: Introduce LOGPSCU() log macro ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Could you provide a sample log line in the commit message? 0: SCCP(rctx=0) SCU(cs7-0-sccp-OsmoHNBGW-RANAP:RI=SSN_PC,PC=0.23.5,SSN=RANAP) Received SCCP User Primitive (N-UNITDATA.request) -- 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: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 16:18: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

[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: > Could you provide a sample log line in the commit message? 0: SCCP(rctx=0) sccp_scrc_rx_sclc_msg: HDR=(CL:CLDT,V=0,LEN=0), PART(T=Routing Context,L=4,D=00000000), PART(T=Protocol Class,L=4,D=00000000), PART(T=Source Address,L=20,D=0002000380020008000000bd800300080000008e), PART(T=Destination Address,L=20,D=0002000380020008000000bc800300080000008e), PART(T=Sequence Control,L=4,D=00000000), PART(T=Data,L=26,D=00090016000003000440011000030001000056400500f1100017) We can always improve as needed the macro. At least we now get more uniform output with at least some context. -- 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:18:23 +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

[S] Change in libosmo-sigtran[master]: sccp: Introduce LOGPSCC() 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/+/40284?usp=email ) Change subject: sccp: Introduce LOGPSCC() log macro ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: Could you provide a sample log line in the commit message? -- 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 16:17:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 month, 3 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: Code-Review+1 (1 comment) Patchset: PS2: Could you provide a sample log line in the commit message? -- 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:15:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: sccp: Introduce LOGPSCI() 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/+/40282?usp=email ) Change subject: sccp: Introduce LOGPSCI() log macro ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: Could you provide a sample log line in the commit message? -- 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 16:15:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

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

by pespin

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

1 month, 3 weeks

1
0
0 0

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

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40282?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: 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(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/82/40282/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: newpatchset 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-Attention: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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, 26 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/83/40283/1 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 75afb96..e012114 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 */ @@ -158,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; } } @@ -294,7 +294,7 @@ rc = sclc_rx_cldr(inst, xua); break; default: - _LOGPSCI(sccp, DLSUA, LOGL_NOTICE, "Received unknown/unsupported message %s\n", + _LOGPSCI(inst, DLSUA, LOGL_NOTICE, "Received unknown/unsupported message %s\n", xua_hdr_dump(xua, &xua_dialect_sua)); break; } 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: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I576a1783be57dead99cdf2a29d5539aee0becd0c Gerrit-Change-Number: 40283 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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, 46 insertions(+), 43 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/82/40282/1 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..75afb96 100644 --- a/src/sccp_sclc.c +++ b/src/sccp_sclc.c @@ -190,7 +190,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 +212,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 +238,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 +258,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 +294,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(sccp, 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: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I0f04ff064d3693c6d71aa4977e0c593c7f157f7e Gerrit-Change-Number: 40282 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log