stats: Add counters for received BSSMAP messages.

Change-Id: I3f08d71b58b4e8d6f61376d85c2051e194aa8e43

3 files changed, 47 insertions, 0 deletions

diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h
index 7d797eb9e..dc9628bd1 100644
--- a/include/osmocom/bsc/bsc_msc_data.h
+++ b/include/osmocom/bsc/bsc_msc_data.h
@@ -56,6 +56,23 @@ enum {
 	MSC_CON_TYPE_LOCAL,
 };
 
+/* Constants for the MSC rate counters */
+enum {
+	MSC_CTR_BSSMAP_RX_UDT_RESET_ACKNOWLEDGE,
+	MSC_CTR_BSSMAP_RX_UDT_RESET,
+	MSC_CTR_BSSMAP_RX_UDT_PAGING,
+	MSC_CTR_BSSMAP_RX_UDT_UNKNOWN,
+	MSC_CTR_BSSMAP_RX_DT1_CLEAR_CMD,
+	MSC_CTR_BSSMAP_RX_DT1_CIPHER_MODE_CMD,
+	MSC_CTR_BSSMAP_RX_DT1_ASSIGMENT_RQST,
+	MSC_CTR_BSSMAP_RX_DT1_LCLS_CONNECT_CTRL,
+	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,
+};
+
 /* Constants for the MSC stats */
 enum {
 	MSC_STAT_MSC_LINKS_ACTIVE,
diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c
index e79ce9de6..f1e43be5a 100644
--- a/src/osmo-bsc/osmo_bsc_bssap.c
+++ b/src/osmo-bsc/osmo_bsc_bssap.c
@@ -1007,6 +1007,7 @@ static int bssmap_rcvmsg_udt(struct bsc_msc_data *msc,
 			     struct msgb *msg, unsigned int length)
 {
 	int ret = 0;
+	struct rate_ctr *ctrs = msc->msc_ctrs->ctr;
 
 	if (length < 1) {
 		LOGP(DMSC, LOGL_ERROR, "Not enough room: %d\n", length);
@@ -1018,15 +1019,19 @@ static int bssmap_rcvmsg_udt(struct bsc_msc_data *msc,
 
 	switch (msg->l4h[0]) {
 	case BSS_MAP_MSG_RESET_ACKNOWLEDGE:
+		rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_UDT_RESET_ACKNOWLEDGE]);
 		ret = bssmap_handle_reset_ack(msc, msg, length);
 		break;
 	case BSS_MAP_MSG_RESET:
+		rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_UDT_RESET]);
 		ret = bssmap_handle_reset(msc, msg, length);
 		break;
 	case BSS_MAP_MSG_PAGING:
+		rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_UDT_PAGING]);
 		ret = bssmap_handle_paging(msc, msg, length);
 		break;
 	default:
+		rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_UDT_UNKNOWN]);
 		LOGP(DMSC, LOGL_NOTICE, "Received unimplemented BSSMAP UDT %s\n",
 			gsm0808_bssmap_name(msg->l4h[0]));
 		break;
@@ -1039,6 +1044,7 @@ static int bssmap_rcvmsg_dt1(struct gsm_subscriber_connection *conn,
 			     struct msgb *msg, unsigned int length)
 {
 	int ret = 0;
+	struct rate_ctr *ctrs = conn->sccp.msc->msc_ctrs->ctr;
 
 	if (length < 1) {
 		LOGP(DMSC, LOGL_ERROR, "Not enough room: %d\n", length);
@@ -1050,24 +1056,31 @@ static int bssmap_rcvmsg_dt1(struct gsm_subscriber_connection *conn,
 
 	switch (msg->l4h[0]) {
 	case BSS_MAP_MSG_CLEAR_CMD:
+		rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_CLEAR_CMD]);
 		ret = bssmap_handle_clear_cmd(conn, msg, length);
 		break;
 	case BSS_MAP_MSG_CIPHER_MODE_CMD:
+		rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_CIPHER_MODE_CMD]);
 		ret = bssmap_handle_cipher_mode(conn, msg, length);
 		break;
 	case BSS_MAP_MSG_ASSIGMENT_RQST:
+		rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_ASSIGMENT_RQST]);
 		ret = bssmap_handle_assignm_req(conn, msg, length);
 		break;
 	case BSS_MAP_MSG_LCLS_CONNECT_CTRL:
+		rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_LCLS_CONNECT_CTRL]);
 		ret = bssmap_handle_lcls_connect_ctrl(conn, msg, length);
 		break;
 	case BSS_MAP_MSG_HANDOVER_CMD:
+		rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_HANDOVER_CMD]);
 		ret = bssmap_handle_handover_cmd(conn, msg, length);
 		break;
 	case BSS_MAP_MSG_CLASSMARK_RQST:
+		rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_CLASSMARK_RQST]);
 		ret = gsm48_send_rr_classmark_enquiry(conn->lchan);
 		break;
 	default:
+		rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_UNKNOWN]);
 		LOGP(DMSC, LOGL_NOTICE, "Unimplemented msg type: %s\n",
 			gsm0808_bssmap_name(msg->l4h[0]));
 		break;
@@ -1091,6 +1104,7 @@ static int dtap_rcvmsg(struct gsm_subscriber_connection *conn,
 	struct msgb *gsm48;
 	uint8_t *data;
 	int rc, dtap_rc;
+	struct rate_ctr *ctrs = conn->sccp.msc->msc_ctrs->ctr;
 
 	LOGP(DMSC, LOGL_DEBUG, "Rx MSC DTAP: %s\n",
 		osmo_hexdump(msg->l3h, length));
@@ -1102,17 +1116,20 @@ static int dtap_rcvmsg(struct gsm_subscriber_connection *conn,
 
 	header = (struct dtap_header *) msg->l3h;
 	if (sizeof(*header) >= length) {
+		rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_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]);
 		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]);
 	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 1704a73a8..d4d7bec1f 100644
--- a/src/osmo-bsc/osmo_bsc_msc.c
+++ b/src/osmo-bsc/osmo_bsc_msc.c
@@ -44,6 +44,19 @@
 #include <unistd.h>
 
 static const struct rate_ctr_desc msc_ctr_description[] = {
+	[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 DATP messages with errors"},
 };
 
 static const struct rate_ctr_group_desc msc_ctrg_desc = {