From aee1db9dc139e9ac4f4cd9c6eb8988ae50040adc Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Thu, 4 May 2023 15:09:32 +0200 Subject: ASCI: Add new rate counters to support VGCS/VBS messages Change-Id: I18e4ca3599e480de2d0f64cc1b6f4bb6ce8020d4 Related: OS#4852 --- include/osmocom/bsc/bsc_msc_data.h | 20 ++++++++++ src/osmo-bsc/osmo_bsc_msc.c | 80 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 47bdf123a..8454ccad4 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -71,6 +71,15 @@ enum { MSC_CTR_BSSMAP_RX_DT1_DTAP_ERROR, MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_REQUEST, MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_ABORT, + MSC_CTR_BSSMAP_RX_DT1_VGCS_VBS_SETUP, + MSC_CTR_BSSMAP_RX_DT1_VGCS_VBS_ASSIGN_RQST, + MSC_CTR_BSSMAP_RX_DT1_UPLINK_RQST_ACKNOWLEDGE, + MSC_CTR_BSSMAP_RX_DT1_UPLINK_REJECT_CMD, + MSC_CTR_BSSMAP_RX_DT1_UPLINK_RELEASE_CMD, + MSC_CTR_BSSMAP_RX_DT1_UPLINK_SEIZED_CMD, + MSC_CTR_BSSMAP_RX_DT1_VGCS_ADDL_INFO, + MSC_CTR_BSSMAP_RX_DT1_VGCS_SMS, + MSC_CTR_BSSMAP_RX_DT1_NOTIFICATION_DATA, /* Tx message counters (per connection type) */ MSC_CTR_BSSMAP_TX_BSS_MANAGEMENT, @@ -102,6 +111,17 @@ enum { MSC_CTR_BSSMAP_TX_DT1_DTAP, MSC_CTR_BSSMAP_TX_DT1_PERFORM_LOCATION_RESPONSE_SUCCESS, MSC_CTR_BSSMAP_TX_DT1_PERFORM_LOCATION_RESPONSE_FAILURE, + MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_SETUP_ACK, + MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_SETUP_REFUSE, + MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_ASSIGN_RESULT, + MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_ASSIGN_FAIL, + MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_QUEUING_INDICATION, + MSC_CTR_BSSMAP_TX_DT1_UPLINK_RQST, + MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_ASSIGNMENT_STATUS, + MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_AREA_CELL_INFO, + MSC_CTR_BSSMAP_TX_DT1_UPLINK_RQST_CONFIRMATION, + MSC_CTR_BSSMAP_TX_DT1_UPLINK_RELEASE_INDICATION, + MSC_CTR_BSSMAP_TX_DT1_UPLINK_APP_DATA, MSC_CTR_MSCPOOL_SUBSCR_NEW, MSC_CTR_MSCPOOL_SUBSCR_REATTACH, diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index 08a2466e3..2aeb5ca61 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -66,6 +66,42 @@ static const struct rate_ctr_desc msc_ctr_description[] = { [MSC_CTR_BSSMAP_RX_DT1_DTAP_ERROR] = {"bssmap:rx:dt1:dtap:error", "Number of received BSSMAP DTAP messages with errors"}, [MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_REQUEST] = {"bssmap:rx:dt1:location:request", "Number of received BSSMAP Perform Location Request messages"}, [MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_ABORT] = {"bssmap:tx:dt1:location:abort", "Number of received BSSMAP Perform Location Abort messages"}, + [MSC_CTR_BSSMAP_RX_DT1_VGCS_VBS_SETUP] = { + "bssmap:rx:dt1:vgcs_vbs_setup", + "Number of received BSSMAP DT1 VGCS/VBS SETUP messages" + }, + [MSC_CTR_BSSMAP_RX_DT1_VGCS_VBS_ASSIGN_RQST] = { + "bssmap:rx:dt1:vgcs_vbs_assignment:req", + "Number of received BSSMAP DT1 VGCS/VBS ASSIGNMENT messages" + }, + [MSC_CTR_BSSMAP_RX_DT1_UPLINK_RQST_ACKNOWLEDGE] = { + "bssmap:rx:dt1:uplink_rqst:ack", + "Number of received BSSMAP DT1 UPLINK REQUEST ACKNOWLEDGE messages" + }, + [MSC_CTR_BSSMAP_RX_DT1_UPLINK_REJECT_CMD] = { + "bssmap:rx:dt1:uplink_reject:cmd", + "Number of received BSSMAP DT1 UPLINK REJECT COMMAND messages" + }, + [MSC_CTR_BSSMAP_RX_DT1_UPLINK_RELEASE_CMD] = { + "bssmap:rx:dt1:uplink_release:cmd", + "Number of received BSSMAP DT1 UPLINK RELEASE COMMAND messages" + }, + [MSC_CTR_BSSMAP_RX_DT1_UPLINK_SEIZED_CMD] = { + "bssmap:rx:dt1:uplink_seized:cmd", + "Number of received BSSMAP DT1 UPLINK SEIZED COMMAND messages" + }, + [MSC_CTR_BSSMAP_RX_DT1_VGCS_ADDL_INFO] = { + "bssmap:rx:dt1:vgcs_addl_info", + "Number of received BSSMAP DT1 VGCS/VBS ASSITIONAL INFORMATION messages" + }, + [MSC_CTR_BSSMAP_RX_DT1_VGCS_SMS] = { + "bssmap:rx:dt1:vgcs_sms", + "Number of received BSSMAP DT1 VGCS SMS messages" + }, + [MSC_CTR_BSSMAP_RX_DT1_NOTIFICATION_DATA] = { + "bssmap:rx:dt1:notification_data", + "Number of received BSSMAP DT1 NOTIFICATION DATA messages" + }, /* Tx message counters (per message type) * @@ -110,6 +146,50 @@ static const struct rate_ctr_desc msc_ctr_description[] = { "Number of transmitted BSSMAP Perform Location Response messages containing a location estimate"}, [MSC_CTR_BSSMAP_TX_DT1_PERFORM_LOCATION_RESPONSE_FAILURE] = {"bssmap:tx:dt1:location:response_failure", "Number of transmitted BSSMAP Perform Location Response messages containing a failure cause"}, + [MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_SETUP_ACK] = { + "bssmap:tx:dt1:vgcs_vbs_setup:ack", + "Number of transmitted BSSMAP DT1 VGCS/VBS SETUP ACK messages" + }, + [MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_SETUP_REFUSE] = { + "bssmap:tx:dt1:vgcs_vbs_setup:refuse", + "Number of transmitted BSSMAP DT1 VGCS/VBS SETUP REFUSE messages" + }, + [MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_ASSIGN_RESULT] = { + "bssmap:tx:dt1:vgcs_vbs_assignment:res", + "Number of transmitted BSSMAP DT1 VGCS/VBS ASSIGNMENT RESULT messages" + }, + [MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_ASSIGN_FAIL] = { + "bssmap:tx:dt1:vgcs_vbs_assignment:fail", + "Number of transmitted BSSMAP DT1 VGCS/VBS ASSIGNMENT FAILURE messages" + }, + [MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_QUEUING_INDICATION] = { + "bssmap:tx:dt1:vgcs_vbs_queuing:ind", + "Number of transmitted BSSMAP DT1 VGCS/VBS QUEUING INDICATION messages" + }, + [MSC_CTR_BSSMAP_TX_DT1_UPLINK_RQST] = { + "bssmap:tx:dt1:uplink_rqst", + "Number of transmitted BSSMAP DT1 UPLINK REQUEST messages" + }, + [MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_ASSIGNMENT_STATUS] = { + "bssmap:tx:dt1:vgcs_vbs_assignment:status", + "Number of transmitted BSSMAP DT1 VGCS/VBS ASSIGNMENT STATUS messages" + }, + [MSC_CTR_BSSMAP_TX_DT1_VGCS_VBS_AREA_CELL_INFO] = { + "bssmap:tx:dt1:vgcs_vbs_area_cell:info", + "Number of transmitted BSSMAP DT1 VGCS/VBS AREA CELL INFO messages" + }, + [MSC_CTR_BSSMAP_TX_DT1_UPLINK_RQST_CONFIRMATION] = { + "bssmap:tx:dt1:uplink_rqst:cnf", + "Number of transmitted BSSMAP DT1 UPLINK REQUEST CONFIRMATION messages" + }, + [MSC_CTR_BSSMAP_TX_DT1_UPLINK_RELEASE_INDICATION] = { + "bssmap:tx:dt1:uplink_release:ind", + "Number of transmitted BSSMAP DT1 UPLINK RELEASE INDICATION messages" + }, + [MSC_CTR_BSSMAP_TX_DT1_UPLINK_APP_DATA] = { + "bssmap:tx:dt1:uplink_app_data", + "Number of transmitted BSSMAP DT1 UPLINK APPLICATION DATA messages" + }, /* Indicators for MSC pool usage */ [MSC_CTR_MSCPOOL_SUBSCR_NEW] = { -- cgit v1.2.3