<p>ipse has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18112">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stats: Add counters for received BSSMAP messages.<br><br>Change-Id: I3f08d71b58b4e8d6f61376d85c2051e194aa8e43<br>---<br>M include/osmocom/bsc/bsc_msc_data.h<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>M src/osmo-bsc/osmo_bsc_msc.c<br>3 files changed, 44 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/18112/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>index f8fb0f0..e241e59 100644</span><br><span>--- a/include/osmocom/bsc/bsc_msc_data.h</span><br><span>+++ b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>@@ -56,6 +56,23 @@</span><br><span> MSC_CON_TYPE_LOCAL,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Constants for the MSC rate counters */</span><br><span style="color: hsl(120, 100%, 40%);">+enum {</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_NUM_RX_UDT_RESET_ACKNOWLEDGE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_NUM_RX_UDT_RESET,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_NUM_RX_UDT_PAGING,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_NUM_RX_UDT_UNKNOWN,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_NUM_RX_DT1_CLEAR_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_NUM_RX_DT1_CIPHER_MODE_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_NUM_RX_DT1_ASSIGMENT_RQST,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_NUM_RX_DT1_LCLS_CONNECT_CTRL,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_NUM_RX_DT1_HANDOVER_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_NUM_RX_DT1_CLASSMARK_RQST,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_NUM_RX_DT1_UNKNOWN,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_NUM_RX_DTAP_MSG,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_NUM_RX_DTAP_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Constants for the MSC stats */</span><br><span> enum {</span><br><span> MSC_STAT_NUM_MSC_LINKS_ACTIVE,</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index e79ce9d..b1db851 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -1018,15 +1018,19 @@</span><br><span> </span><br><span> switch (msg->l4h[0]) {</span><br><span> case BSS_MAP_MSG_RESET_ACKNOWLEDGE:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_NUM_RX_UDT_RESET_ACKNOWLEDGE]);</span><br><span> ret = bssmap_handle_reset_ack(msc, msg, length);</span><br><span> break;</span><br><span> case BSS_MAP_MSG_RESET:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_NUM_RX_UDT_RESET]);</span><br><span> ret = bssmap_handle_reset(msc, msg, length);</span><br><span> break;</span><br><span> case BSS_MAP_MSG_PAGING:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_NUM_RX_UDT_PAGING]);</span><br><span> ret = bssmap_handle_paging(msc, msg, length);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_NUM_RX_UDT_UNKNOWN]);</span><br><span> LOGP(DMSC, LOGL_NOTICE, "Received unimplemented BSSMAP UDT %s\n",</span><br><span> gsm0808_bssmap_name(msg->l4h[0]));</span><br><span> break;</span><br><span>@@ -1050,24 +1054,31 @@</span><br><span> </span><br><span> switch (msg->l4h[0]) {</span><br><span> case BSS_MAP_MSG_CLEAR_CMD:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->sccp.msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_NUM_RX_DT1_CLEAR_CMD]);</span><br><span> ret = bssmap_handle_clear_cmd(conn, msg, length);</span><br><span> break;</span><br><span> case BSS_MAP_MSG_CIPHER_MODE_CMD:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->sccp.msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_NUM_RX_DT1_CIPHER_MODE_CMD]);</span><br><span> ret = bssmap_handle_cipher_mode(conn, msg, length);</span><br><span> break;</span><br><span> case BSS_MAP_MSG_ASSIGMENT_RQST:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->sccp.msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_NUM_RX_DT1_ASSIGMENT_RQST]);</span><br><span> ret = bssmap_handle_assignm_req(conn, msg, length);</span><br><span> break;</span><br><span> case BSS_MAP_MSG_LCLS_CONNECT_CTRL:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->sccp.msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_NUM_RX_DT1_LCLS_CONNECT_CTRL]);</span><br><span> ret = bssmap_handle_lcls_connect_ctrl(conn, msg, length);</span><br><span> break;</span><br><span> case BSS_MAP_MSG_HANDOVER_CMD:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->sccp.msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_NUM_RX_DT1_HANDOVER_CMD]);</span><br><span> ret = bssmap_handle_handover_cmd(conn, msg, length);</span><br><span> break;</span><br><span> case BSS_MAP_MSG_CLASSMARK_RQST:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->sccp.msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_NUM_RX_DT1_CLASSMARK_RQST]);</span><br><span> ret = gsm48_send_rr_classmark_enquiry(conn->lchan);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->sccp.msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_NUM_RX_DT1_UNKNOWN]);</span><br><span> LOGP(DMSC, LOGL_NOTICE, "Unimplemented msg type: %s\n",</span><br><span> gsm0808_bssmap_name(msg->l4h[0]));</span><br><span> break;</span><br><span>@@ -1102,17 +1113,20 @@</span><br><span> </span><br><span> header = (struct dtap_header *) msg->l3h;</span><br><span> if (sizeof(*header) >= length) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->sccp.msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_NUM_RX_DTAP_ERROR]);</span><br><span> LOGP(DMSC, LOGL_ERROR, "The DTAP header does not fit. Wanted: %zu got: %u, hex: %s\n",</span><br><span> sizeof(*header), length, osmo_hexdump(msg->l3h, length));</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span> if (header->length > length - sizeof(*header)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->sccp.msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_NUM_RX_DTAP_ERROR]);</span><br><span> LOGP(DMSC, LOGL_ERROR, "The DTAP l4 information does not fit. Wanted: %u got: %zu, hex: %s\n",</span><br><span> header->length, length - sizeof(*header), osmo_hexdump(msg->l3h, length));</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->sccp.msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_NUM_RX_DTAP_MSG]);</span><br><span> LOGP(DMSC, LOGL_INFO, "Rx MSC DTAP, SAPI: %u CHAN: %u\n", header->link_id & 0x07, header->link_id & 0xC0);</span><br><span> </span><br><span> /* forward the data */</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>index c9052cb..9588a1a 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>@@ -44,6 +44,19 @@</span><br><span> #include <unistd.h></span><br><span> </span><br><span> static const struct rate_ctr_desc msc_ctr_description[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_NUM_RX_UDT_RESET_ACKNOWLEDGE] = {"bssmap:num_rx_udt_reset_acknowledge", "Number of received BSSMAP UDT RESET ACKNOWLEDGE messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_NUM_RX_UDT_RESET] = {"bssmap:num_rx_udt_reset", "Number of received BSSMAP UDT RESET messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_NUM_RX_UDT_PAGING] = {"bssmap:num_rx_udt_paging", "Number of received BSSMAP UDT PAGING messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_NUM_RX_UDT_UNKNOWN] = {"bssmap:num_rx_udt_unknown", "Number of received BSSMAP unknown UDT messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_NUM_RX_DT1_CLEAR_CMD] = {"bssmap:num_rx_dt1_clear_cmd", "Number of received BSSMAP DT1 CLEAR CMD messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_NUM_RX_DT1_CIPHER_MODE_CMD] = {"bssmap:num_rx_dt1_cipher_mode_cmd", "Number of received BSSMAP DT1 CIPHER MODE CMD messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_NUM_RX_DT1_ASSIGMENT_RQST] = {"bssmap:num_rx_dt1_assignment_rqst", "Number of received BSSMAP DT1 ASSIGMENT RQST messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_NUM_RX_DT1_LCLS_CONNECT_CTRL] = {"bssmap:num_rx_dt1_lcls_connect_ctrl", "Number of received BSSMAP DT1 LCLS CONNECT CTRL messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_NUM_RX_DT1_HANDOVER_CMD] = {"bssmap:num_rx_dt1_handover_cmd", "Number of received BSSMAP DT1 HANDOVER CMD messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_NUM_RX_DT1_CLASSMARK_RQST] = {"bssmap:num_rx_dt1_classmark_rqst", "Number of received BSSMAP DT1 CLASSMARK RQST messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_NUM_RX_DT1_UNKNOWN] = {"bssmap:num_rx_dt1_unknown", "Number of received BSSMAP unknown DT1 messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_NUM_RX_DTAP_MSG] = {"bssmap:num_rx_dtap_msg", "Number of received BSSMAP DTAP messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_NUM_RX_DTAP_ERROR] = {"bssmap:num_rx_dtap_error", "Number of received BSSMAP DATP messages with errors"},</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_group_desc msc_ctrg_desc = {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18112">change 18112</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/18112"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3f08d71b58b4e8d6f61376d85c2051e194aa8e43 </div>
<div style="display:none"> Gerrit-Change-Number: 18112 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: ipse <Alexander.Chemeris@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>