laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/18191 )
Change subject: stats: Rename BSSMAP Rx message counters to match Tx ones.
......................................................................
stats: Rename BSSMAP Rx message counters to match Tx ones.
Change-Id: I29e42687ac084a60007f0b1ec6ec0a102fb4007f
---
M include/osmocom/bsc/bsc_msc_data.h
M src/osmo-bsc/osmo_bsc_bssap.c
M src/osmo-bsc/osmo_bsc_msc.c
3 files changed, 19 insertions(+), 19 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/include/osmocom/bsc/bsc_msc_data.h
b/include/osmocom/bsc/bsc_msc_data.h
index 7db0625..74a6f3c 100644
--- a/include/osmocom/bsc/bsc_msc_data.h
+++ b/include/osmocom/bsc/bsc_msc_data.h
@@ -70,8 +70,8 @@
MSC_CTR_BSSMAP_RX_DT1_HANDOVER_CMD,
MSC_CTR_BSSMAP_RX_DT1_CLASSMARK_RQST,
MSC_CTR_BSSMAP_RX_DT1_UNKNOWN,
- MSC_CTR_BSSMAP_RX_DTAP_MSG,
- MSC_CTR_BSSMAP_RX_DTAP_ERROR,
+ MSC_CTR_BSSMAP_RX_DT1_DTAP,
+ MSC_CTR_BSSMAP_RX_DT1_DTAP_ERROR,
/* Tx message counters (per connection type) */
MSC_CTR_BSSMAP_TX_BSS_MANAGEMENT,
diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c
index 276657f..6f5aaa8 100644
--- a/src/osmo-bsc/osmo_bsc_bssap.c
+++ b/src/osmo-bsc/osmo_bsc_bssap.c
@@ -1120,20 +1120,20 @@
ctrs = conn->sccp.msc->msc_ctrs->ctr;
header = (struct dtap_header *) msg->l3h;
if (sizeof(*header) >= length) {
- rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DTAP_ERROR]);
+ rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_DTAP_ERROR]);
LOGP(DMSC, LOGL_ERROR, "The DTAP header does not fit. Wanted:
%zu got: %u, hex: %s\n",
sizeof(*header), length, osmo_hexdump(msg->l3h, length));
return -1;
}
if (header->length > length - sizeof(*header)) {
- rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DTAP_ERROR]);
+ rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_DTAP_ERROR]);
LOGP(DMSC, LOGL_ERROR, "The DTAP l4 information does not fit.
Wanted: %u got: %zu, hex: %s\n",
header->length, length - sizeof(*header),
osmo_hexdump(msg->l3h, length));
return -1;
}
- rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DTAP_MSG]);
+ rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_DTAP]);
LOGP(DMSC, LOGL_INFO, "Rx MSC DTAP, SAPI: %u CHAN: %u\n",
header->link_id & 0x07, header->link_id & 0xC0);
/* forward the data */
diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c
index 0dbe9d4..db3ffe4 100644
--- a/src/osmo-bsc/osmo_bsc_msc.c
+++ b/src/osmo-bsc/osmo_bsc_msc.c
@@ -44,20 +44,20 @@
#include <unistd.h>
static const struct rate_ctr_desc msc_ctr_description[] = {
- /* Rx message counters */
- [MSC_CTR_BSSMAP_RX_UDT_RESET_ACKNOWLEDGE] =
{"bssmap:rx_udt_reset_acknowledge", "Number of received BSSMAP UDT RESET
ACKNOWLEDGE messages"},
- [MSC_CTR_BSSMAP_RX_UDT_RESET] = {"bssmap:rx_udt_reset", "Number of
received BSSMAP UDT RESET messages"},
- [MSC_CTR_BSSMAP_RX_UDT_PAGING] = {"bssmap:rx_udt_paging", "Number of
received BSSMAP UDT PAGING messages"},
- [MSC_CTR_BSSMAP_RX_UDT_UNKNOWN] = {"bssmap:rx_udt_unknown", "Number of
received BSSMAP unknown UDT messages"},
- [MSC_CTR_BSSMAP_RX_DT1_CLEAR_CMD] = {"bssmap:rx_dt1_clear_cmd", "Number
of received BSSMAP DT1 CLEAR CMD messages"},
- [MSC_CTR_BSSMAP_RX_DT1_CIPHER_MODE_CMD] =
{"bssmap:rx_dt1_cipher_mode_cmd", "Number of received BSSMAP DT1 CIPHER MODE
CMD messages"},
- [MSC_CTR_BSSMAP_RX_DT1_ASSIGMENT_RQST] =
{"bssmap:rx_dt1_assignment_rqst", "Number of received BSSMAP DT1 ASSIGMENT RQST
messages"},
- [MSC_CTR_BSSMAP_RX_DT1_LCLS_CONNECT_CTRL] =
{"bssmap:rx_dt1_lcls_connect_ctrl", "Number of received BSSMAP DT1 LCLS CONNECT
CTRL messages"},
- [MSC_CTR_BSSMAP_RX_DT1_HANDOVER_CMD] = {"bssmap:rx_dt1_handover_cmd",
"Number of received BSSMAP DT1 HANDOVER CMD messages"},
- [MSC_CTR_BSSMAP_RX_DT1_CLASSMARK_RQST] =
{"bssmap:rx_dt1_classmark_rqst", "Number of received BSSMAP DT1 CLASSMARK RQST
messages"},
- [MSC_CTR_BSSMAP_RX_DT1_UNKNOWN] = {"bssmap:rx_dt1_unknown", "Number of
received BSSMAP unknown DT1 messages"},
- [MSC_CTR_BSSMAP_RX_DTAP_MSG] = {"bssmap:rx_dtap_msg", "Number of
received BSSMAP DTAP messages"},
- [MSC_CTR_BSSMAP_RX_DTAP_ERROR] = {"bssmap:rx_dtap_error", "Number of
received BSSMAP DTAP messages with errors"},
+ /* Rx message counters (per specific message) */
+ [MSC_CTR_BSSMAP_RX_UDT_RESET_ACKNOWLEDGE] = {"bssmap:rx:udt:reset:ack",
"Number of received BSSMAP UDT RESET ACKNOWLEDGE messages"},
+ [MSC_CTR_BSSMAP_RX_UDT_RESET] =
{"bssmap:rx:udt:reset:request", "Number of received BSSMAP UDT RESET messages"},
+ [MSC_CTR_BSSMAP_RX_UDT_PAGING] = {"bssmap:rx:udt:paging",
"Number of received BSSMAP UDT PAGING messages"},
+ [MSC_CTR_BSSMAP_RX_UDT_UNKNOWN] =
{"bssmap:rx:udt:err_unknown", "Number of received BSSMAP unknown UDT messages"},
+ [MSC_CTR_BSSMAP_RX_DT1_CLEAR_CMD] = {"bssmap:rx:dt1:clear:cmd",
"Number of received BSSMAP DT1 CLEAR CMD messages"},
+ [MSC_CTR_BSSMAP_RX_DT1_CIPHER_MODE_CMD] =
{"bssmap:rx:dt1:cipher_mode:cmd", "Number of received BSSMAP DT1 CIPHER MODE
CMD messages"},
+ [MSC_CTR_BSSMAP_RX_DT1_ASSIGMENT_RQST] =
{"bssmap:rx:dt1:assignment:rqst", "Number of received BSSMAP DT1 ASSIGMENT RQST
messages"},
+ [MSC_CTR_BSSMAP_RX_DT1_LCLS_CONNECT_CTRL] =
{"bssmap:rx:dt1:lcls_connect_ctrl:cmd", "Number of received BSSMAP DT1 LCLS
CONNECT CTRL messages"},
+ [MSC_CTR_BSSMAP_RX_DT1_HANDOVER_CMD] =
{"bssmap:rx:dt1:handover:cmd", "Number of received BSSMAP DT1 HANDOVER CMD
messages"},
+ [MSC_CTR_BSSMAP_RX_DT1_CLASSMARK_RQST] =
{"bssmap:rx:dt1:classmark:rqst", "Number of received BSSMAP DT1 CLASSMARK RQST
messages"},
+ [MSC_CTR_BSSMAP_RX_DT1_UNKNOWN] =
{"bssmap:rx:dt1:err_unknown", "Number of received BSSMAP unknown DT1 messages"},
+ [MSC_CTR_BSSMAP_RX_DT1_DTAP] = {"bssmap:rx:dt1:dtap:good",
"Number of received BSSMAP DTAP messages"},
+ [MSC_CTR_BSSMAP_RX_DT1_DTAP_ERROR] =
{"bssmap:rx:dt1:dtap:error", "Number of received BSSMAP DTAP messages with
errors"},
/* Tx message counters (per message type)
*
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18191
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I29e42687ac084a60007f0b1ec6ec0a102fb4007f
Gerrit-Change-Number: 18191
Gerrit-PatchSet: 3
Gerrit-Owner: ipse <alexander.cheme...@gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: ipse <alexander.cheme...@gmail.com>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
