XnAP: dissect a few more fields

2 files changed, 46 insertions, 0 deletions

diff --git a/epan/dissectors/asn1/xnap/packet-xnap-template.c b/epan/dissectors/asn1/xnap/packet-xnap-template.c
index fd0a5b1597..70c84fa32e 100644
--- a/epan/dissectors/asn1/xnap/packet-xnap-template.c
+++ b/epan/dissectors/asn1/xnap/packet-xnap-template.c
@@ -65,6 +65,11 @@ static int hf_xnap_MeasurementsToActivate_M5 = -1;
 static int hf_xnap_MeasurementsToActivate_LoggingM1FromEventTriggered = -1;
 static int hf_xnap_MeasurementsToActivate_M6 = -1;
 static int hf_xnap_MeasurementsToActivate_M7 = -1;
+static int hf_xnap_ReportCharacteristics_PRBPeriodic = -1;
+static int hf_xnap_ReportCharacteristics_TNLCapacityIndPeriodic = -1;
+static int hf_xnap_ReportCharacteristics_CompositeAvailableCapacityPeriodic = -1;
+static int hf_xnap_ReportCharacteristics_NumberOfActiveUEs = -1;
+static int hf_xnap_ReportCharacteristics_Reserved = -1;
 #include "packet-xnap-hf.c"
 
 /* Initialize the subtree pointers */
@@ -94,6 +99,7 @@ static gint ett_xnap_TDDULDLConfigurationCommonNR = -1;
 static gint ett_xnap_UERLFReportContainerLTE = -1;
 static gint ett_xnap_UERLFReportContainerNR = -1;
 static gint ett_xnap_burstArrivalTime = -1;
+static gint ett_xnap_ReportCharacteristics = -1;
 #include "packet-xnap-ett.c"
 
 enum {
@@ -385,6 +391,26 @@ void proto_register_xnap(void) {
       { "M7", "xnap.MeasurementsToActivate.M7",
         FT_BOOLEAN, 8, TFS(&xnap_tfs_activate_do_not_activate), 0x01,
         NULL, HFILL }},
+    { &hf_xnap_ReportCharacteristics_PRBPeriodic,
+      { "PRBPeriodic", "xnap.ReportCharacteristics.PRBPeriodic",
+        FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x80000000,
+        NULL, HFILL }},
+    { &hf_xnap_ReportCharacteristics_TNLCapacityIndPeriodic,
+      { "TNLCapacityIndPeriodic", "xnap.ReportCharacteristics.TNLCapacityIndPeriodic",
+        FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x40000000,
+        NULL, HFILL }},
+    { &hf_xnap_ReportCharacteristics_CompositeAvailableCapacityPeriodic,
+      { "CompositeAvailableCapacityPeriodic", "xnap.ReportCharacteristics.CompositeAvailableCapacityPeriodic",
+        FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x20000000,
+        NULL, HFILL }},
+    { &hf_xnap_ReportCharacteristics_NumberOfActiveUEs,
+      { "NumberOfActiveUEs", "xnap.ReportCharacteristics.NumberOfActiveUEs",
+        FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x10000000,
+        NULL, HFILL }},
+    { &hf_xnap_ReportCharacteristics_Reserved,
+      { "Reserved", "xnap.ReportCharacteristics.Reserved",
+        FT_UINT32, BASE_HEX, NULL, 0x0fffffff,
+        NULL, HFILL }},
 #include "packet-xnap-hfarr.c"
   };
 
@@ -416,6 +442,7 @@ void proto_register_xnap(void) {
     &ett_xnap_UERLFReportContainerLTE,
     &ett_xnap_UERLFReportContainerNR,
     &ett_xnap_burstArrivalTime,
+    &ett_xnap_ReportCharacteristics,
 #include "packet-xnap-ettarr.c"
   };
 
diff --git a/epan/dissectors/asn1/xnap/xnap.cnf b/epan/dissectors/asn1/xnap/xnap.cnf
index 1a1cd17799..f45895b4e7 100644
--- a/epan/dissectors/asn1/xnap/xnap.cnf
+++ b/epan/dissectors/asn1/xnap/xnap.cnf
@@ -633,6 +633,25 @@ WLANName TYPE=FT_STRING DISPLAY = STR_UNICODE
     dissect_nr_rrc_ReferenceTime_r16_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
   }
 
+#.TYPE_ATTR
+TSCAssistanceInformation/periodicity DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_microseconds
+
+#.FN_BODY ReportCharacteristics VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+%(DEFAULT_BODY)s
+  if(parameter_tvb){
+    static int * const fields[] = {
+      &hf_xnap_ReportCharacteristics_PRBPeriodic,
+      &hf_xnap_ReportCharacteristics_TNLCapacityIndPeriodic,
+      &hf_xnap_ReportCharacteristics_CompositeAvailableCapacityPeriodic,
+      &hf_xnap_ReportCharacteristics_NumberOfActiveUEs,
+      &hf_xnap_ReportCharacteristics_Reserved,
+      NULL
+    };
+    proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_xnap_ReportCharacteristics);
+    proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 4, fields, ENC_BIG_ENDIAN);
+  }
+
 #.END
 
 #.FN_HDR HandoverRequest