<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25276">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move MSC level stats and rate counters to bsc_stats.[hc]<br><br>After adding bsc_stats.c, I figured it would make sense to also move the<br>MSC level statistics definitions to this file, so that we have one place<br>to find statistics for any reporting level.<br><br>Related: SYS#5542<br>Change-Id: I03ab34f1c0511016da5b8c7db33d8d76db99f3af<br>---<br>M include/osmocom/bsc/bsc_msc_data.h<br>M include/osmocom/bsc/bsc_stats.h<br>M src/osmo-bsc/bsc_stats.c<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>M src/osmo-bsc/lcs_loc_req.c<br>M src/osmo-bsc/osmo_bsc_msc.c<br>M src/osmo-bsc/osmo_bsc_sigtran.c<br>7 files changed, 188 insertions(+), 180 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/76/25276/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 e5f48d1..eec1b54 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>@@ -50,72 +50,6 @@</span><br><span> struct osmo_bsc_rf;</span><br><span> struct gsm_network;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Constants for the MSC rate counters */</span><br><span style="color: hsl(0, 100%, 40%);">-enum {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Rx message counters */</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_UDT_RESET_ACKNOWLEDGE,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_UDT_RESET,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_UDT_PAGING,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_UDT_UNKNOWN,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_DT1_CLEAR_CMD,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_DT1_CIPHER_MODE_CMD,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_DT1_ASSIGMENT_RQST,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_DT1_LCLS_CONNECT_CTRL,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_DT1_HANDOVER_CMD,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_DT1_CLASSMARK_RQST,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_DT1_CONFUSION,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_DT1_COMMON_ID,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_DT1_UNKNOWN,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_DT1_DTAP,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_DT1_DTAP_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_REQUEST,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_ABORT,</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Tx message counters (per connection type) */</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_BSS_MANAGEMENT,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DTAP,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_UNKNOWN,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_SHORT,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_ERR_CONN_NOT_READY,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_ERR_SEND,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_SUCCESS,</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Tx message counters (per message type) */</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_UDT_RESET,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_UDT_RESET_ACK,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_CLEAR_RQST,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_CLEAR_COMPLETE,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_FAILURE,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_COMPLETE,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_SAPI_N_REJECT,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_CIPHER_COMPLETE,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_CIPHER_REJECT,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_CLASSMARK_UPDATE,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_LCLS_CONNECT_CTRL_ACK,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_HANDOVER_REQUIRED,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_HANDOVER_PERFORMED,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_HANDOVER_RQST_ACKNOWLEDGE,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_HANDOVER_DETECT,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_HANDOVER_COMPLETE,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_HANDOVER_FAILURE,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_DTAP,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_PERFORM_LOCATION_RESPONSE_SUCCESS,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_BSSMAP_TX_DT1_PERFORM_LOCATION_RESPONSE_FAILURE,</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_MSCPOOL_SUBSCR_NEW,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_MSCPOOL_SUBSCR_REATTACH,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_MSCPOOL_SUBSCR_KNOWN,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_MSCPOOL_SUBSCR_PAGED,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_MSCPOOL_SUBSCR_ATTACH_LOST,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_CTR_MSCPOOL_EMERG_FORWARDED,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Constants for the MSC stats */</span><br><span style="color: hsl(0, 100%, 40%);">-enum {</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_STAT_MSC_LINKS_ACTIVE,</span><br><span style="color: hsl(0, 100%, 40%);">- MSC_STAT_MSC_LINKS_TOTAL,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*! /brief Information on a remote MSC for libbsc.</span><br><span> */</span><br><span> struct bsc_msc_data {</span><br><span>diff --git a/include/osmocom/bsc/bsc_stats.h b/include/osmocom/bsc/bsc_stats.h</span><br><span>index 8d2f77f..1c8c0bb 100644</span><br><span>--- a/include/osmocom/bsc/bsc_stats.h</span><br><span>+++ b/include/osmocom/bsc/bsc_stats.h</span><br><span>@@ -269,3 +269,73 @@</span><br><span> };</span><br><span> </span><br><span> extern const struct osmo_stat_item_group_desc bts_statg_desc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* per MSC rate counters */</span><br><span style="color: hsl(120, 100%, 40%);">+enum {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Rx message counters */</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_UDT_RESET_ACKNOWLEDGE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_UDT_RESET,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_UDT_PAGING,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_UDT_UNKNOWN,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_DT1_CLEAR_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_DT1_CIPHER_MODE_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_DT1_ASSIGMENT_RQST,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_DT1_LCLS_CONNECT_CTRL,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_DT1_HANDOVER_CMD,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_DT1_CLASSMARK_RQST,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_DT1_CONFUSION,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_DT1_COMMON_ID,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_DT1_UNKNOWN,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_DT1_DTAP,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_DT1_DTAP_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_REQUEST,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_ABORT,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Tx message counters (per connection type) */</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_BSS_MANAGEMENT,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DTAP,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_UNKNOWN,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_SHORT,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_ERR_CONN_NOT_READY,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_ERR_SEND,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_SUCCESS,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Tx message counters (per message type) */</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_UDT_RESET,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_UDT_RESET_ACK,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_CLEAR_RQST,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_CLEAR_COMPLETE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_FAILURE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_COMPLETE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_SAPI_N_REJECT,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_CIPHER_COMPLETE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_CIPHER_REJECT,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_CLASSMARK_UPDATE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_LCLS_CONNECT_CTRL_ACK,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_HANDOVER_REQUIRED,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_HANDOVER_PERFORMED,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_HANDOVER_RQST_ACKNOWLEDGE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_HANDOVER_DETECT,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_HANDOVER_COMPLETE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_HANDOVER_FAILURE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_DTAP,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_PERFORM_LOCATION_RESPONSE_SUCCESS,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_BSSMAP_TX_DT1_PERFORM_LOCATION_RESPONSE_FAILURE,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_MSCPOOL_SUBSCR_NEW,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_MSCPOOL_SUBSCR_REATTACH,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_MSCPOOL_SUBSCR_KNOWN,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_MSCPOOL_SUBSCR_PAGED,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_MSCPOOL_SUBSCR_ATTACH_LOST,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_CTR_MSCPOOL_EMERG_FORWARDED,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct rate_ctr_group_desc msc_ctrg_desc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* per MSC stat items */</span><br><span style="color: hsl(120, 100%, 40%);">+enum {</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_STAT_MSC_LINKS_ACTIVE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MSC_STAT_MSC_LINKS_TOTAL,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct osmo_stat_item_group_desc msc_statg_desc;</span><br><span>diff --git a/src/osmo-bsc/bsc_stats.c b/src/osmo-bsc/bsc_stats.c</span><br><span>index e12426a..ff953a4 100644</span><br><span>--- a/src/osmo-bsc/bsc_stats.c</span><br><span>+++ b/src/osmo-bsc/bsc_stats.c</span><br><span>@@ -687,3 +687,117 @@</span><br><span> .num_items = ARRAY_SIZE(bts_stat_desc),</span><br><span> .item_desc = bts_stat_desc,</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct rate_ctr_desc msc_ctr_description[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Rx message counters (per specific message) */</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_UDT_RESET_ACKNOWLEDGE] = {"bssmap:rx:udt:reset:ack", "Number of received BSSMAP UDT RESET ACKNOWLEDGE messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_UDT_RESET] = {"bssmap:rx:udt:reset:request", "Number of received BSSMAP UDT RESET messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_UDT_PAGING] = {"bssmap:rx:udt:paging", "Number of received BSSMAP UDT PAGING messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_UDT_UNKNOWN] = {"bssmap:rx:udt:err_unknown", "Number of received BSSMAP unknown UDT messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_DT1_CLEAR_CMD] = {"bssmap:rx:dt1:clear:cmd", "Number of received BSSMAP DT1 CLEAR CMD messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_DT1_CIPHER_MODE_CMD] = {"bssmap: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_RX_DT1_ASSIGMENT_RQST] = {"bssmap:rx:dt1:assignment:rqst", "Number of received BSSMAP DT1 ASSIGMENT RQST messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_DT1_LCLS_CONNECT_CTRL] = {"bssmap:rx:dt1:lcls_connect_ctrl:cmd", "Number of received BSSMAP DT1 LCLS CONNECT CTRL messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_DT1_HANDOVER_CMD] = {"bssmap:rx:dt1:handover:cmd", "Number of received BSSMAP DT1 HANDOVER CMD messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_DT1_CLASSMARK_RQST] = {"bssmap:rx:dt1:classmark:rqst", "Number of received BSSMAP DT1 CLASSMARK RQST messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_DT1_CONFUSION] = {"bssmap:rx:dt1:confusion", "Number of received BSSMAP DT1 CONFUSION messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_DT1_COMMON_ID] = {"bssmap:rx:dt1:common_id", "Number of received BSSMAP DT1 COMMON ID messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_DT1_UNKNOWN] = {"bssmap:rx:dt1:err_unknown", "Number of received BSSMAP unknown DT1 messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_DT1_DTAP] = {"bssmap:rx:dt1:dtap:good", "Number of received BSSMAP DTAP messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_DT1_DTAP_ERROR] = {"bssmap:rx:dt1:dtap:error", "Number of received BSSMAP DTAP messages with errors"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_REQUEST] = {"bssmap:rx:dt1:location:request", "Number of received BSSMAP Perform Location Request messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_ABORT] = {"bssmap:tx:dt1:location:abort", "Number of received BSSMAP Perform Location Abort messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Tx message counters (per message type)</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * The counters here follow the logic of the osmo_bsc_sigtran_send() function</span><br><span style="color: hsl(120, 100%, 40%);">+ * which receives DT1 messages from the upper layers and actually sends them to the MSC.</span><br><span style="color: hsl(120, 100%, 40%);">+ * These counters cover all messages passed to the function by the upper layers: */</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_BSS_MANAGEMENT] = {"bssmap:tx:type:bss_management", "Number of transmitted BSS MANAGEMENT messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DTAP] = {"bssmap:tx:type:dtap", "Number of transmitted DTAP messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_UNKNOWN] = {"bssmap:tx:type:err_unknown", "Number of transmitted messages with unknown type (an error in our code?)"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_SHORT] = {"bssmap:tx:type:err_short", "Number of transmitted messages which are too short (an error in our code?)"},</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The next counters are also counted in the osmo_bsc_sigtran_send() function and</span><br><span style="color: hsl(120, 100%, 40%);">+ * sum up to the exactly same number as the counters above but instead of message</span><br><span style="color: hsl(120, 100%, 40%);">+ * classes they split by the result of the sending attempt: */</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_ERR_CONN_NOT_READY] = {"bssmap:tx:result:err_conn_not_ready", "Number of BSSMAP messages we tried to send when the connection was not ready yet"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_ERR_SEND] = {"bssmap:tx:result:err_send", "Number of socket errors while sending BSSMAP messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_SUCCESS] = {"bssmap:tx:result:success", "Number of successfully sent BSSMAP messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Tx message counters (per specific message)</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Theoretically, the DT1 counters should sum up to the same number as the Tx counters</span><br><span style="color: hsl(120, 100%, 40%);">+ * above but since these counters are coming from the upper layers, there might be</span><br><span style="color: hsl(120, 100%, 40%);">+ * some difference if we forget some code path. */</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_UDT_RESET] = {"bssmap:tx:udt:reset:request", "Number of transmitted BSSMAP UDT RESET messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_UDT_RESET_ACK] = {"bssmap:tx:udt:reset:ack", "Number of transmitted BSSMAP UDT RESET ACK messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_CLEAR_RQST] = {"bssmap:tx:dt1:clear:rqst", "Number of transmitted BSSMAP DT1 CLEAR RQSTtx messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_CLEAR_COMPLETE] = {"bssmap:tx:dt1:clear:complete", "Number of transmitted BSSMAP DT1 CLEAR COMPLETE messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_FAILURE] = {"bssmap:tx:dt1:assigment:failure", "Number of transmitted BSSMAP DT1 ASSIGMENT FAILURE messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_COMPLETE] = {"bssmap:tx:dt1:assigment:complete", "Number of transmitted BSSMAP DT1 ASSIGMENT COMPLETE messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_SAPI_N_REJECT] = {"bssmap:tx:dt1:sapi_n:reject", "Number of transmitted BSSMAP DT1 SAPI N REJECT messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_CIPHER_COMPLETE] = {"bssmap:tx:dt1:cipher_mode:complete", "Number of transmitted BSSMAP DT1 CIPHER COMPLETE messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_CIPHER_REJECT] = {"bssmap:tx:dt1:cipher_mode:reject", "Number of transmitted BSSMAP DT1 CIPHER REJECT messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_CLASSMARK_UPDATE] = {"bssmap:tx:dt1:classmark:update", "Number of transmitted BSSMAP DT1 CLASSMARK UPDATE messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_LCLS_CONNECT_CTRL_ACK] = {"bssmap:tx:dt1:lcls_connect_ctrl:ack", "Number of transmitted BSSMAP DT1 LCLS CONNECT CTRL ACK messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_HANDOVER_REQUIRED] = {"bssmap:tx:dt1:handover:required", "Number of transmitted BSSMAP DT1 HANDOVER REQUIRED messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_HANDOVER_PERFORMED] = {"bssmap:tx:dt1:handover:performed", "Number of transmitted BSSMAP DT1 HANDOVER PERFORMED messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_HANDOVER_RQST_ACKNOWLEDGE] = {"bssmap:tx:dt1:handover:rqst_acknowledge", "Number of transmitted BSSMAP DT1 HANDOVER RQST ACKNOWLEDGE messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_HANDOVER_DETECT] = {"bssmap:tx:dt1:handover:detect", "Number of transmitted BSSMAP DT1 HANDOVER DETECT messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_HANDOVER_COMPLETE] = {"bssmap:tx:dt1:handover:complete", "Number of transmitted BSSMAP DT1 HANDOVER COMPLETE messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_HANDOVER_FAILURE] = {"bssmap:tx:dt1:handover:failure", "Number of transmitted BSSMAP DT1 HANDOVER FAILURE messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_DTAP] = {"bssmap:tx:dt1:dtap", "Number of transmitted BSSMAP DT1 DTAP messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_PERFORM_LOCATION_RESPONSE_SUCCESS] = {"bssmap:tx:dt1:location:response_success",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Number of transmitted BSSMAP Perform Location Response messages containing a location estimate"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_BSSMAP_TX_DT1_PERFORM_LOCATION_RESPONSE_FAILURE] = {"bssmap:tx:dt1:location:response_failure",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Number of transmitted BSSMAP Perform Location Response messages containing a failure cause"},</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Indicators for MSC pool usage */</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_MSCPOOL_SUBSCR_NEW] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "mscpool:subscr:new",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Complete Layer 3 requests assigned to this MSC by round-robin (no NRI was assigned yet).",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_MSCPOOL_SUBSCR_REATTACH] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "mscpool:subscr:reattach",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Complete Layer 3 requests assigned to this MSC by round-robin because the subscriber indicates a"</span><br><span style="color: hsl(120, 100%, 40%);">+ " NULL-NRI (previously assigned by another MSC).",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_MSCPOOL_SUBSCR_KNOWN] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "mscpool:subscr:known",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Complete Layer 3 requests directed to this MSC because the subscriber indicates an NRI of this MSC.",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_MSCPOOL_SUBSCR_PAGED] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "mscpool:subscr:paged",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Paging Response directed to this MSC because the subscriber was recently paged by this MSC.",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_MSCPOOL_SUBSCR_ATTACH_LOST] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "mscpool:subscr:attach_lost",</span><br><span style="color: hsl(120, 100%, 40%);">+ "A subscriber indicates an NRI value matching this MSC, but the MSC is not connected:"</span><br><span style="color: hsl(120, 100%, 40%);">+ " a re-attach to another MSC (if available) was forced, with possible service failure.",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_CTR_MSCPOOL_EMERG_FORWARDED] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "mscpool:emerg:forwarded",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Emergency call requests forwarded to this MSC.",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct rate_ctr_group_desc msc_ctrg_desc = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "msc",</span><br><span style="color: hsl(120, 100%, 40%);">+ "mobile switching center",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STATS_CLASS_GLOBAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ ARRAY_SIZE(msc_ctr_description),</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_ctr_description,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct osmo_stat_item_desc msc_stat_desc[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_STAT_MSC_LINKS_ACTIVE] = { "msc_links:active", "Number of active MSC links", "", 16, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ [MSC_STAT_MSC_LINKS_TOTAL] = { "msc_links:total", "Number of configured MSC links", "", 16, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct osmo_stat_item_group_desc msc_statg_desc = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .group_name_prefix = "msc",</span><br><span style="color: hsl(120, 100%, 40%);">+ .group_description = "mobile switching center",</span><br><span style="color: hsl(120, 100%, 40%);">+ .class_id = OSMO_STATS_CLASS_GLOBAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_items = ARRAY_SIZE(msc_stat_desc),</span><br><span style="color: hsl(120, 100%, 40%);">+ .item_desc = msc_stat_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span>diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>index afb633d..6943f1f 100644</span><br><span>--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -48,6 +48,7 @@</span><br><span> #include <osmocom/core/byteswap.h></span><br><span> #include <osmocom/bsc/lb.h></span><br><span> #include <osmocom/bsc/lcs_loc_req.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bsc_stats.h></span><br><span> </span><br><span> #define S(x) (1 << (x))</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/lcs_loc_req.c b/src/osmo-bsc/lcs_loc_req.c</span><br><span>index 7153ce6..8b76bc9 100644</span><br><span>--- a/src/osmo-bsc/lcs_loc_req.c</span><br><span>+++ b/src/osmo-bsc/lcs_loc_req.c</span><br><span>@@ -39,6 +39,7 @@</span><br><span> #include <osmocom/bsc/paging.h></span><br><span> #include <osmocom/bsc/bts_trx.h></span><br><span> #include <osmocom/bsc/bts.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bsc_stats.h></span><br><span> </span><br><span> enum lcs_loc_req_fsm_state {</span><br><span> LCS_LOC_REQ_ST_INIT,</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 a80ee64..49fd32d 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>@@ -30,6 +30,7 @@</span><br><span> #include <osmocom/bsc/osmo_bsc_sigtran.h></span><br><span> #include <osmocom/bsc/signal.h></span><br><span> #include <osmocom/bsc/bts.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bsc_stats.h></span><br><span> </span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/socket.h></span><br><span>@@ -45,120 +46,6 @@</span><br><span> #include <netinet/tcp.h></span><br><span> #include <unistd.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct rate_ctr_desc msc_ctr_description[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Rx message counters (per specific message) */</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_UDT_RESET_ACKNOWLEDGE] = {"bssmap:rx:udt:reset:ack", "Number of received BSSMAP UDT RESET ACKNOWLEDGE messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_UDT_RESET] = {"bssmap:rx:udt:reset:request", "Number of received BSSMAP UDT RESET messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_UDT_PAGING] = {"bssmap:rx:udt:paging", "Number of received BSSMAP UDT PAGING messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_UDT_UNKNOWN] = {"bssmap:rx:udt:err_unknown", "Number of received BSSMAP unknown UDT messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_DT1_CLEAR_CMD] = {"bssmap:rx:dt1:clear:cmd", "Number of received BSSMAP DT1 CLEAR CMD messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_DT1_CIPHER_MODE_CMD] = {"bssmap:rx:dt1:cipher_mode:cmd", "Number of received BSSMAP DT1 CIPHER MODE CMD messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_DT1_ASSIGMENT_RQST] = {"bssmap:rx:dt1:assignment:rqst", "Number of received BSSMAP DT1 ASSIGMENT RQST messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_DT1_LCLS_CONNECT_CTRL] = {"bssmap:rx:dt1:lcls_connect_ctrl:cmd", "Number of received BSSMAP DT1 LCLS CONNECT CTRL messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_DT1_HANDOVER_CMD] = {"bssmap:rx:dt1:handover:cmd", "Number of received BSSMAP DT1 HANDOVER CMD messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_DT1_CLASSMARK_RQST] = {"bssmap:rx:dt1:classmark:rqst", "Number of received BSSMAP DT1 CLASSMARK RQST messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_DT1_CONFUSION] = {"bssmap:rx:dt1:confusion", "Number of received BSSMAP DT1 CONFUSION messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_DT1_COMMON_ID] = {"bssmap:rx:dt1:common_id", "Number of received BSSMAP DT1 COMMON ID messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_DT1_UNKNOWN] = {"bssmap:rx:dt1:err_unknown", "Number of received BSSMAP unknown DT1 messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_DT1_DTAP] = {"bssmap:rx:dt1:dtap:good", "Number of received BSSMAP DTAP messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_DT1_DTAP_ERROR] = {"bssmap:rx:dt1:dtap:error", "Number of received BSSMAP DTAP messages with errors"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_REQUEST] = {"bssmap:rx:dt1:location:request", "Number of received BSSMAP Perform Location Request messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_ABORT] = {"bssmap:tx:dt1:location:abort", "Number of received BSSMAP Perform Location Abort messages"},</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Tx message counters (per message type)</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * The counters here follow the logic of the osmo_bsc_sigtran_send() function</span><br><span style="color: hsl(0, 100%, 40%);">- * which receives DT1 messages from the upper layers and actually sends them to the MSC.</span><br><span style="color: hsl(0, 100%, 40%);">- * These counters cover all messages passed to the function by the upper layers: */</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_BSS_MANAGEMENT] = {"bssmap:tx:type:bss_management", "Number of transmitted BSS MANAGEMENT messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DTAP] = {"bssmap:tx:type:dtap", "Number of transmitted DTAP messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_UNKNOWN] = {"bssmap:tx:type:err_unknown", "Number of transmitted messages with unknown type (an error in our code?)"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_SHORT] = {"bssmap:tx:type:err_short", "Number of transmitted messages which are too short (an error in our code?)"},</span><br><span style="color: hsl(0, 100%, 40%);">- /* The next counters are also counted in the osmo_bsc_sigtran_send() function and</span><br><span style="color: hsl(0, 100%, 40%);">- * sum up to the exactly same number as the counters above but instead of message</span><br><span style="color: hsl(0, 100%, 40%);">- * classes they split by the result of the sending attempt: */</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_ERR_CONN_NOT_READY] = {"bssmap:tx:result:err_conn_not_ready", "Number of BSSMAP messages we tried to send when the connection was not ready yet"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_ERR_SEND] = {"bssmap:tx:result:err_send", "Number of socket errors while sending BSSMAP messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_SUCCESS] = {"bssmap:tx:result:success", "Number of successfully sent BSSMAP messages"},</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Tx message counters (per specific message)</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Theoretically, the DT1 counters should sum up to the same number as the Tx counters</span><br><span style="color: hsl(0, 100%, 40%);">- * above but since these counters are coming from the upper layers, there might be</span><br><span style="color: hsl(0, 100%, 40%);">- * some difference if we forget some code path. */</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_UDT_RESET] = {"bssmap:tx:udt:reset:request", "Number of transmitted BSSMAP UDT RESET messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_UDT_RESET_ACK] = {"bssmap:tx:udt:reset:ack", "Number of transmitted BSSMAP UDT RESET ACK messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_CLEAR_RQST] = {"bssmap:tx:dt1:clear:rqst", "Number of transmitted BSSMAP DT1 CLEAR RQSTtx messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_CLEAR_COMPLETE] = {"bssmap:tx:dt1:clear:complete", "Number of transmitted BSSMAP DT1 CLEAR COMPLETE messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_FAILURE] = {"bssmap:tx:dt1:assigment:failure", "Number of transmitted BSSMAP DT1 ASSIGMENT FAILURE messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_COMPLETE] = {"bssmap:tx:dt1:assigment:complete", "Number of transmitted BSSMAP DT1 ASSIGMENT COMPLETE messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_SAPI_N_REJECT] = {"bssmap:tx:dt1:sapi_n:reject", "Number of transmitted BSSMAP DT1 SAPI N REJECT messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_CIPHER_COMPLETE] = {"bssmap:tx:dt1:cipher_mode:complete", "Number of transmitted BSSMAP DT1 CIPHER COMPLETE messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_CIPHER_REJECT] = {"bssmap:tx:dt1:cipher_mode:reject", "Number of transmitted BSSMAP DT1 CIPHER REJECT messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_CLASSMARK_UPDATE] = {"bssmap:tx:dt1:classmark:update", "Number of transmitted BSSMAP DT1 CLASSMARK UPDATE messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_LCLS_CONNECT_CTRL_ACK] = {"bssmap:tx:dt1:lcls_connect_ctrl:ack", "Number of transmitted BSSMAP DT1 LCLS CONNECT CTRL ACK messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_HANDOVER_REQUIRED] = {"bssmap:tx:dt1:handover:required", "Number of transmitted BSSMAP DT1 HANDOVER REQUIRED messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_HANDOVER_PERFORMED] = {"bssmap:tx:dt1:handover:performed", "Number of transmitted BSSMAP DT1 HANDOVER PERFORMED messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_HANDOVER_RQST_ACKNOWLEDGE] = {"bssmap:tx:dt1:handover:rqst_acknowledge", "Number of transmitted BSSMAP DT1 HANDOVER RQST ACKNOWLEDGE messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_HANDOVER_DETECT] = {"bssmap:tx:dt1:handover:detect", "Number of transmitted BSSMAP DT1 HANDOVER DETECT messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_HANDOVER_COMPLETE] = {"bssmap:tx:dt1:handover:complete", "Number of transmitted BSSMAP DT1 HANDOVER COMPLETE messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_HANDOVER_FAILURE] = {"bssmap:tx:dt1:handover:failure", "Number of transmitted BSSMAP DT1 HANDOVER FAILURE messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_DTAP] = {"bssmap:tx:dt1:dtap", "Number of transmitted BSSMAP DT1 DTAP messages"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_PERFORM_LOCATION_RESPONSE_SUCCESS] = {"bssmap:tx:dt1:location:response_success",</span><br><span style="color: hsl(0, 100%, 40%);">- "Number of transmitted BSSMAP Perform Location Response messages containing a location estimate"},</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_BSSMAP_TX_DT1_PERFORM_LOCATION_RESPONSE_FAILURE] = {"bssmap:tx:dt1:location:response_failure",</span><br><span style="color: hsl(0, 100%, 40%);">- "Number of transmitted BSSMAP Perform Location Response messages containing a failure cause"},</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Indicators for MSC pool usage */</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_MSCPOOL_SUBSCR_NEW] = {</span><br><span style="color: hsl(0, 100%, 40%);">- "mscpool:subscr:new",</span><br><span style="color: hsl(0, 100%, 40%);">- "Complete Layer 3 requests assigned to this MSC by round-robin (no NRI was assigned yet).",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_MSCPOOL_SUBSCR_REATTACH] = {</span><br><span style="color: hsl(0, 100%, 40%);">- "mscpool:subscr:reattach",</span><br><span style="color: hsl(0, 100%, 40%);">- "Complete Layer 3 requests assigned to this MSC by round-robin because the subscriber indicates a"</span><br><span style="color: hsl(0, 100%, 40%);">- " NULL-NRI (previously assigned by another MSC).",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_MSCPOOL_SUBSCR_KNOWN] = {</span><br><span style="color: hsl(0, 100%, 40%);">- "mscpool:subscr:known",</span><br><span style="color: hsl(0, 100%, 40%);">- "Complete Layer 3 requests directed to this MSC because the subscriber indicates an NRI of this MSC.",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_MSCPOOL_SUBSCR_PAGED] = {</span><br><span style="color: hsl(0, 100%, 40%);">- "mscpool:subscr:paged",</span><br><span style="color: hsl(0, 100%, 40%);">- "Paging Response directed to this MSC because the subscriber was recently paged by this MSC.",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_MSCPOOL_SUBSCR_ATTACH_LOST] = {</span><br><span style="color: hsl(0, 100%, 40%);">- "mscpool:subscr:attach_lost",</span><br><span style="color: hsl(0, 100%, 40%);">- "A subscriber indicates an NRI value matching this MSC, but the MSC is not connected:"</span><br><span style="color: hsl(0, 100%, 40%);">- " a re-attach to another MSC (if available) was forced, with possible service failure.",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_CTR_MSCPOOL_EMERG_FORWARDED] = {</span><br><span style="color: hsl(0, 100%, 40%);">- "mscpool:emerg:forwarded",</span><br><span style="color: hsl(0, 100%, 40%);">- "Emergency call requests forwarded to this MSC.",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct rate_ctr_group_desc msc_ctrg_desc = {</span><br><span style="color: hsl(0, 100%, 40%);">- "msc",</span><br><span style="color: hsl(0, 100%, 40%);">- "mobile switching center",</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STATS_CLASS_GLOBAL,</span><br><span style="color: hsl(0, 100%, 40%);">- ARRAY_SIZE(msc_ctr_description),</span><br><span style="color: hsl(0, 100%, 40%);">- msc_ctr_description,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct osmo_stat_item_desc msc_stat_desc[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_STAT_MSC_LINKS_ACTIVE] = { "msc_links:active", "Number of active MSC links", "", 16, 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- [MSC_STAT_MSC_LINKS_TOTAL] = { "msc_links:total", "Number of configured MSC links", "", 16, 0 },</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct osmo_stat_item_group_desc msc_statg_desc = {</span><br><span style="color: hsl(0, 100%, 40%);">- .group_name_prefix = "msc",</span><br><span style="color: hsl(0, 100%, 40%);">- .group_description = "mobile switching center",</span><br><span style="color: hsl(0, 100%, 40%);">- .class_id = OSMO_STATS_CLASS_GLOBAL,</span><br><span style="color: hsl(0, 100%, 40%);">- .num_items = ARRAY_SIZE(msc_stat_desc),</span><br><span style="color: hsl(0, 100%, 40%);">- .item_desc = msc_stat_desc,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int osmo_bsc_msc_init(struct bsc_msc_data *msc)</span><br><span> {</span><br><span> struct gsm_network *net = msc->network;</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>index d3c636d..8c0fb13 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>@@ -36,6 +36,7 @@</span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span> #include <osmocom/bsc/bts.h></span><br><span> #include <osmocom/bsc/paging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bsc_stats.h></span><br><span> #include <osmocom/mgcp_client/mgcp_common.h></span><br><span> </span><br><span> /* A pointer to a list with all involved MSCs</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25276">change 25276</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/+/25276"/><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: I03ab34f1c0511016da5b8c7db33d8d76db99f3af </div>
<div style="display:none"> Gerrit-Change-Number: 25276 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>