daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sigtran/+/41523?usp=email )
Change subject: Use DLTCAP for TCAP log messages
......................................................................
Use DLTCAP for TCAP log messages
Change-Id: Ic2fba30208a11d562fc67bb6f5c4586451a275df
---
M src/tcap_as_loadshare.c
M src/tcap_trans_tracking.c
2 files changed, 30 insertions(+), 30 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran
refs/changes/23/41523/1
diff --git a/src/tcap_as_loadshare.c b/src/tcap_as_loadshare.c
index ea735c1..32e9f54 100644
--- a/src/tcap_as_loadshare.c
+++ b/src/tcap_as_loadshare.c
@@ -76,7 +76,7 @@
asn_rc = ber_decode(0, &asn_DEF_TCAP_TCMessage, (void **)&tcapmsg,
data, len);
if (asn_rc.code != RC_OK) {
- LOGPAS(as, DLSS7, LOGL_DEBUG, "Error decoding TCAP message rc:
%d, message: %s\n",
+ LOGPAS(as, DLTCAP, LOGL_DEBUG, "Error decoding TCAP message rc:
%d, message: %s\n",
asn_rc.code, osmo_hexdump(data, len));
rc = -EINVAL;
goto free_asn;
@@ -287,7 +287,7 @@
int rc;
struct xua_msg *sua = osmo_sccp_to_xua(sccp_msg);
if (!sua) {
- LOGPAS(as, DLSS7, LOGL_ERROR, "Unable to parse SCCP message\n");
+ LOGPAS(as, DLTCAP, LOGL_ERROR, "Unable to parse SCCP
message\n");
return -1;
}
@@ -297,14 +297,14 @@
rc = sua_addr_parse(&calling_addr, sua, SUA_IEI_SRC_ADDR);
if (rc < 0) {
- LOGPAS(as, DLSS7, LOGL_ERROR, "Unable to parse SCCP Destination
Address\n");
+ LOGPAS(as, DLTCAP, LOGL_ERROR, "Unable to parse SCCP
Destination Address\n");
return -3;
}
/* retrieve + decode destination address */
rc = sua_addr_parse(&called_addr, sua, SUA_IEI_DEST_ADDR);
if (rc < 0) {
- LOGPAS(as, DLSS7, LOGL_ERROR, "Unable to parse SCCP Destination
Address\n");
+ LOGPAS(as, DLTCAP, LOGL_ERROR, "Unable to parse SCCP
Destination Address\n");
return -4;
}
@@ -332,11 +332,11 @@
rc = parse_tcap(as, ie_data->dat, ie_data->len, &parsed);
if (rc <= 0) {
- LOGPAS(as, DLSS7, LOGL_ERROR, "TCAP: failed get otid/dtid.\n");
+ LOGPAS(as, DLTCAP, LOGL_ERROR, "Failed get TCAP otid/dtid.\n");
return -7;
}
- LOGPAS(as, DLSS7, LOGL_INFO, "TCAP: Looking up transaction for type
0x%02x, otid=%u dtid=%u\n", parsed.present, parsed.otid, parsed.dtid);
+ LOGPAS(as, DLTCAP, LOGL_INFO, "Looking up transaction for type 0x%02x,
otid=%u dtid=%u\n", parsed.present, parsed.otid, parsed.dtid);
/* TCAP messages towards the IPAC nodes */
switch (parsed.present) {
case TCAP_TCMessage_PR_begin:
@@ -414,7 +414,7 @@
if (!sua)
return -ENOMEM;
- LOGPAS(as, DLSS7, LOGL_INFO, "TCAP: Tx UDTS: %s\n", xua_msg_dump(sua,
&xua_dialect_sua));
+ LOGPAS(as, DLTCAP, LOGL_INFO, "Tx UDTS: %s\n", xua_msg_dump(sua,
&xua_dialect_sua));
msg = osmo_sua_to_sccp(sua);
if (!msg) {
@@ -458,7 +458,7 @@
/* decode SCCP and convert to a SUA/xUA representation */
sua = osmo_sccp_to_xua(sccp_msg);
if (!sua) {
- LOGPAS(as, DLSS7, LOGL_ERROR, "Unable to parse SCCP message\n");
+ LOGPAS(as, DLTCAP, LOGL_ERROR, "Unable to parse SCCP
message\n");
rc = -EPROTONOSUPPORT;
goto out_free_msgb;
}
@@ -472,13 +472,13 @@
rc = sua_addr_parse(&calling_addr, sua, SUA_IEI_SRC_ADDR);
if (rc < 0) {
- LOGPAS(as, DLSS7, LOGL_ERROR, "Unable to parse SCCP Source
Address\n");
+ LOGPAS(as, DLTCAP, LOGL_ERROR, "Unable to parse SCCP Source
Address\n");
goto out_free_sua;
}
rc = sua_addr_parse(&called_addr, sua, SUA_IEI_DEST_ADDR);
if (rc < 0) {
- LOGPAS(as, DLSS7, LOGL_ERROR, "Unable to parse SCCP Destination
Address\n");
+ LOGPAS(as, DLTCAP, LOGL_ERROR, "Unable to parse SCCP
Destination Address\n");
goto out_free_sua;
}
@@ -508,11 +508,11 @@
}
rc = parse_tcap(as, ie_data->dat, ie_data->len, &parsed);
- LOGPAS(as, DLSS7, LOGL_DEBUG, "TCAP: decoded rc=%d otid=%u dtid=%u\n",
rc, parsed.otid, parsed.dtid);
+ LOGPAS(as, DLTCAP, LOGL_DEBUG, "TCAP decoded rc=%d otid=%u dtid=%u\n",
rc, parsed.otid, parsed.dtid);
if (rc <= 0) {
rate_ctr_inc2(as->ctrg, SS7_AS_CTR_RX_TCAP_FAILED);
- LOGPAS(as, DLSS7, LOGL_ERROR, "TCAP: failed get otid/dtid.\n");
+ LOGPAS(as, DLTCAP, LOGL_ERROR, "Failed get TCAP otid/dtid.\n");
rc = -EINVAL;
goto out_free_sua;
}
@@ -539,7 +539,7 @@
else {
/* couldn't find a suitable canditate for OTID
*/
rate_ctr_inc2(as->ctrg,
SS7_AS_CTR_TCAP_ASP_FAILED);
- LOGPAS(as, DLSS7, LOGL_DEBUG, "TCAP: couldn't
find a suitable canditate for otid %u\n", parsed.otid);
+ LOGPAS(as, DLTCAP, LOGL_DEBUG, "Couldn't find a
suitable canditate for otid %u\n", parsed.otid);
rc = -ENOKEY;
goto out_free_sua;
}
@@ -620,13 +620,13 @@
* extract the SCCP payload and convert to a msgb */
m3ua_data_ie = xua_msg_find_tag(xua, M3UA_IEI_PROT_DATA);
if (!m3ua_data_ie) {
- LOGPAS(as, DLSS7, LOGL_ERROR, "Couldn't find M3UA protocol
data\n");
+ LOGPAS(as, DLTCAP, LOGL_ERROR, "Couldn't find M3UA protocol
data\n");
return -EPROTONOSUPPORT;
}
sccp_msg = msgb_alloc(m3ua_data_ie->len, "loadshare_tcap");
if (!sccp_msg) {
- LOGPAS(as, DLSS7, LOGL_ERROR, "Unable to allocate SCCP message
buffer\n");
+ LOGPAS(as, DLTCAP, LOGL_ERROR, "Unable to allocate SCCP message
buffer\n");
return -ENOMEM;
}
cur = msgb_put(sccp_msg, m3ua_data_ie->len);
@@ -717,7 +717,7 @@
enum ipa_tcap_routing_msg_types routing_msg;
if (!as) {
- LOGPASP(asp, DLSS7, LOGL_ERROR, "Rx message for IPA ASP without
AS?!\n");
+ LOGPASP(asp, DLTCAP, LOGL_ERROR, "Rx message for IPA ASP
without AS?!\n");
rc = -ENOENT;
goto out;
}
@@ -725,7 +725,7 @@
/* pull the IPA and OSMO_EXT header */
hdr = (struct ipa_tcap_routing_hdr *) msgb_data(msg);
if (msgb_length(msg) < sizeof(struct ipa_tcap_routing_hdr)) {
- LOGPASP(asp, DLSS7, LOGL_ERROR, "TCAP routing message too
short\n");
+ LOGPASP(asp, DLTCAP, LOGL_ERROR, "TCAP routing message too
short\n");
rc = -EINVAL;
goto out;
}
@@ -737,10 +737,10 @@
struct ipa_tcap_routing_add_range tcar = {};
if (!as->cfg.loadshare.tcap.enabled || as->cfg.mode !=
OSMO_SS7_AS_TMOD_LOADSHARE)
- LOGPASP(asp, DLSS7, LOGL_NOTICE, "Wrong traffic mode %s
on AS %s will not use TCAP Ranges\n",
osmo_ss7_as_traffic_mode_name(as->cfg.mode), as->cfg.name);
+ LOGPASP(asp, DLTCAP, LOGL_NOTICE, "Wrong traffic mode
%s on AS %s will not use TCAP Ranges\n",
osmo_ss7_as_traffic_mode_name(as->cfg.mode), as->cfg.name);
if (msgb_length(msg) < sizeof(*hdr) + sizeof(struct
ipa_tcap_routing_add_range)) {
- LOGPASP(asp, DLSS7, LOGL_ERROR, "TCAP routing message
is too small\n");
+ LOGPASP(asp, DLTCAP, LOGL_ERROR, "TCAP routing message
is too small\n");
rc = -EINVAL;
goto out;
}
@@ -752,11 +752,11 @@
tcar.pc = msgb_pull_u32(msg);
tcar.ssn = msgb_pull_u8(msg);
- LOGPASP(asp, DLSS7, LOGL_INFO, "Rx: TCAP Add Range command:
seq: %u pc: %u ssn: %u [%u-%u]\n", osmo_ntohl(hdr->seq), tcar.pc, tcar.ssn,
tcar.tid_start, tcar.tid_end);
+ LOGPASP(asp, DLTCAP, LOGL_INFO, "Rx: TCAP Add Range command:
seq: %u pc: %u ssn: %u [%u-%u]\n", osmo_ntohl(hdr->seq), tcar.pc, tcar.ssn,
tcar.tid_start, tcar.tid_end);
tcrng = tcap_overlap_tid(as, tcar.pc, tcar.ssn, tcar.tid_start,
tcar.tid_end);
if (tcrng) {
- LOGPASP(asp, DLSS7, LOGL_ERROR, "New TCAP Range
overlaps with existing range to ASP %s [%u-%u]. Rejecting Add Range Command
seq: %u pc: %u ssn: %u [%u-%u]\n",
+ LOGPASP(asp, DLTCAP, LOGL_ERROR, "New TCAP Range
overlaps with existing range to ASP %s [%u-%u]. Rejecting Add Range Command
seq: %u pc: %u ssn: %u [%u-%u]\n",
tcrng->asp->cfg.name, tcrng->tid_start,
tcrng->tid_end, osmo_ntohl(hdr->seq), tcar.pc, tcar.ssn, tcar.tid_start,
tcar.tid_end);
rc = ipa_tx_tcap_routing_nack(asp,
osmo_ntohl(hdr->seq), NACK_ERR_EALREADY);
goto out;
@@ -764,7 +764,7 @@
tcrng = tcap_range_alloc(as, asp, tcar.tid_start, tcar.tid_end,
tcar.pc, tcar.ssn);
if (!tcrng) {
- LOGPASP(asp, DLSS7, LOGL_ERROR, "TCAP Add Range: failed
to allocate memory\n");
+ LOGPASP(asp, DLTCAP, LOGL_ERROR, "TCAP Add Range:
failed to allocate memory\n");
rc = ipa_tx_tcap_routing_nack(asp,
osmo_ntohl(hdr->seq), NACK_ERR_SYS_FAILURE);
goto out;
}
diff --git a/src/tcap_trans_tracking.c b/src/tcap_trans_tracking.c
index 2123b34..a5a0ca6 100644
--- a/src/tcap_trans_tracking.c
+++ b/src/tcap_trans_tracking.c
@@ -121,7 +121,7 @@
/* TODO: optimisation: add a llist to asp to allow cleaning it up
easier */
- LOGPASP(entry->asp, DLSS7, LOGL_DEBUG, "Creating tcap cache, entry
(own) pc/ssn/tid %s/%u/%u -> %s/%u/%u\n",
+ LOGPASP(entry->asp, DLTCAP, LOGL_DEBUG, "Creating tcap cache, entry
(own) pc/ssn/tid %s/%u/%u -> %s/%u/%u\n",
osmo_ss7_pointcode_print_buf(own_pc, sizeof(own_pc), as->inst,
entry->own_addr->pc),
entry->own_addr->ssn, entry->own_tid.tid,
osmo_ss7_pointcode_print_buf(peer_pc, sizeof(peer_pc),
as->inst, entry->peer_addr->pc),
@@ -318,7 +318,7 @@
hash_for_each_safe(as->tcap.trans_track_own, i, tmp, entry,
own_tid.list) {
if (entry->tstamp < expiry) {
count++;
- LOGPASP(entry->asp, DLSS7, LOGL_DEBUG, "Remove Cache
entry for tcap own tid %u (expired)\n", entry->own_tid.tid);
+ LOGPASP(entry->asp, DLTCAP, LOGL_DEBUG, "Remove Cache
entry for tcap own tid %u (expired)\n", entry->own_tid.tid);
tcap_trans_track_entry_free(entry);
}
}
@@ -326,7 +326,7 @@
hash_for_each_safe(as->tcap.trans_track_peer, i, tmp, entry,
peer_tid.list) {
if (entry->tstamp < expiry) {
count++;
- LOGPASP(entry->asp, DLSS7, LOGL_DEBUG, "Remove Cache
entry for tcap peer tid %u (expired)\n", entry->peer_tid.tid);
+ LOGPASP(entry->asp, DLTCAP, LOGL_DEBUG, "Remove Cache
entry for tcap peer tid %u (expired)\n", entry->peer_tid.tid);
tcap_trans_track_entry_free(entry);
}
}
@@ -340,7 +340,7 @@
int counts = tcap_trans_track_garbage_collect(as);
if (counts)
- LOGPAS(as, DLSS7, LOGL_DEBUG, "Removed %d cache entry
(expired)", counts);
+ LOGPAS(as, DLTCAP, LOGL_DEBUG, "Removed %d cache entry
(expired)", counts);
osmo_timer_schedule(&as->tcap.gc_timer,
as->cfg.loadshare.tcap.timeout_s, 0);
}
@@ -366,7 +366,7 @@
hash_for_each_safe(as->tcap.trans_track_own, i, tmp, entry,
own_tid.list) {
if (entry->asp == asp) {
count++;
- LOGPASP(entry->asp, DLSS7, LOGL_DEBUG, "Remove Cache
entry for tcap own tid %u (asp removed)", entry->own_tid.tid);
+ LOGPASP(entry->asp, DLTCAP, LOGL_DEBUG, "Remove Cache
entry for tcap own tid %u (asp removed)", entry->own_tid.tid);
tcap_trans_track_entry_free(entry);
}
}
@@ -374,7 +374,7 @@
hash_for_each_safe(as->tcap.trans_track_peer, i, tmp, entry,
peer_tid.list) {
if (entry->asp == asp) {
count++;
- LOGPASP(entry->asp, DLSS7, LOGL_DEBUG, "Remove Cache
entry for tcap own tid %u (asp removed)", entry->peer_tid.tid);
+ LOGPASP(entry->asp, DLTCAP, LOGL_DEBUG, "Remove Cache
entry for tcap own tid %u (asp removed)", entry->peer_tid.tid);
tcap_trans_track_entry_free(entry);
}
}
@@ -390,13 +390,13 @@
hash_for_each_safe(as->tcap.trans_track_own, i, tmp, entry,
own_tid.list) {
count++;
- LOGPASP(entry->asp, DLSS7, LOGL_DEBUG, "Remove Cache entry for
tcap own tid %u (as removed)", entry->own_tid.tid);
+ LOGPASP(entry->asp, DLTCAP, LOGL_DEBUG, "Remove Cache entry for
tcap own tid %u (as removed)", entry->own_tid.tid);
tcap_trans_track_entry_free(entry);
}
hash_for_each_safe(as->tcap.trans_track_peer, i, tmp, entry,
peer_tid.list) {
count++;
- LOGPASP(entry->asp, DLSS7, LOGL_DEBUG, "Remove Cache entry for
tcap own tid %u (as removed)", entry->peer_tid.tid);
+ LOGPASP(entry->asp, DLTCAP, LOGL_DEBUG, "Remove Cache entry for
tcap own tid %u (as removed)", entry->peer_tid.tid);
tcap_trans_track_entry_free(entry);
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41523?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: Ic2fba30208a11d562fc67bb6f5c4586451a275df
Gerrit-Change-Number: 41523
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <[email protected]>
