NRPPa: upgrade dissector to v17.4.0

9 files changed, 51 insertions, 12 deletions

diff --git a/epan/dissectors/asn1/nrppa/NRPPA-CommonDataTypes.asn b/epan/dissectors/asn1/nrppa/NRPPA-CommonDataTypes.asn
index 9aa09df47c..1bd3259499 100644
--- a/epan/dissectors/asn1/nrppa/NRPPA-CommonDataTypes.asn
+++ b/epan/dissectors/asn1/nrppa/NRPPA-CommonDataTypes.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.455 V17.3.0 (2022-12)
+-- 3GPP TS 38.455 V17.4.0 (2023-03)
 -- 9.3.6	Common definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/nrppa/NRPPA-Constants.asn b/epan/dissectors/asn1/nrppa/NRPPA-Constants.asn
index e6bfa95da4..16541392ff 100644
--- a/epan/dissectors/asn1/nrppa/NRPPA-Constants.asn
+++ b/epan/dissectors/asn1/nrppa/NRPPA-Constants.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.455 V17.3.0 (2022-12)
+-- 3GPP TS 38.455 V17.4.0 (2023-03)
 -- 9.3.7	Constant definitions
 -- **************************************************************
 --
@@ -219,6 +219,7 @@ id-procedure-code-102-not-to-be-used							ProtocolIE-ID ::= 102
 id-procedure-code-103-not-to-be-used							ProtocolIE-ID ::= 103
 id-UETxTimingErrorMargin										ProtocolIE-ID ::= 104
 id-MeasurementPeriodicityNR-AoA									ProtocolIE-ID ::= 105
+id-SRSTransmissionStatus										ProtocolIE-ID ::= 106
 
 
 
diff --git a/epan/dissectors/asn1/nrppa/NRPPA-Containers.asn b/epan/dissectors/asn1/nrppa/NRPPA-Containers.asn
index 8fe0dff8d5..fbb2474200 100644
--- a/epan/dissectors/asn1/nrppa/NRPPA-Containers.asn
+++ b/epan/dissectors/asn1/nrppa/NRPPA-Containers.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.455 V17.3.0 (2022-12)
+-- 3GPP TS 38.455 V17.4.0 (2023-03)
 -- 9.3.8	Container definitions
 --
 -- **************************************************************
diff --git a/epan/dissectors/asn1/nrppa/NRPPA-IEs.asn b/epan/dissectors/asn1/nrppa/NRPPA-IEs.asn
index d618b2cb17..dda9b4d35b 100644
--- a/epan/dissectors/asn1/nrppa/NRPPA-IEs.asn
+++ b/epan/dissectors/asn1/nrppa/NRPPA-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.455 V17.3.0 (2022-12)
+-- 3GPP TS 38.455 V17.4.0 (2023-03)
 -- 9.3.5	Information Element definitions
 -- **************************************************************
 --
@@ -2344,6 +2344,8 @@ SRSInfo ::= SEQUENCE {
 	...
 }
 
+SRSTransmissionStatus ::= ENUMERATED {stopped, ...}
+
 PosSRSInfo ::= SEQUENCE {
 	posSRSResourceID		SRSPosResourceID,
 	...
diff --git a/epan/dissectors/asn1/nrppa/NRPPA-PDU-Contents.asn b/epan/dissectors/asn1/nrppa/NRPPA-PDU-Contents.asn
index 7be38f7029..e43a765883 100644
--- a/epan/dissectors/asn1/nrppa/NRPPA-PDU-Contents.asn
+++ b/epan/dissectors/asn1/nrppa/NRPPA-PDU-Contents.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.455 V17.3.0 (2022-12)
+-- 3GPP TS 38.455 V17.4.0 (2023-03)
 --9.3.4	PDU Definitions
 --
 -- **************************************************************
@@ -78,7 +78,8 @@ IMPORTS
 	PreconfigurationResult,
 	RequestType,
 	UE-TEG-ReportingPeriodicity,
-	MeasurementPeriodicityNR-AoA
+	MeasurementPeriodicityNR-AoA,
+	SRSTransmissionStatus
 
 
 FROM NRPPA-IEs
@@ -156,7 +157,8 @@ FROM NRPPA-Containers
 	id-PreconfigurationResult,
 	id-RequestType,
 	id-UE-TEG-ReportingPeriodicity,
-	id-MeasurementPeriodicityNR-AoA
+	id-MeasurementPeriodicityNR-AoA,
+	id-SRSTransmissionStatus
 
 
 
@@ -493,7 +495,8 @@ PositioningInformationUpdate ::= SEQUENCE {
 PositioningInformationUpdate-IEs NRPPA-PROTOCOL-IES ::= {
 	{ ID id-SRSConfiguration			CRITICALITY ignore	TYPE SRSConfiguration			PRESENCE optional}|
 	{ ID id-SFNInitialisationTime		CRITICALITY ignore	TYPE RelativeTime1900			PRESENCE optional}|
-	{ ID id-UETxTEGAssociationList		CRITICALITY ignore	TYPE UETxTEGAssociationList		PRESENCE optional},
+	{ ID id-UETxTEGAssociationList		CRITICALITY ignore	TYPE UETxTEGAssociationList		PRESENCE optional}|
+	{ ID id-SRSTransmissionStatus		CRITICALITY ignore	TYPE SRSTransmissionStatus	PRESENCE optional},
 	...
 }
 
diff --git a/epan/dissectors/asn1/nrppa/NRPPA-PDU-Descriptions.asn b/epan/dissectors/asn1/nrppa/NRPPA-PDU-Descriptions.asn
index 486f8bbbd6..ec0ea63c93 100644
--- a/epan/dissectors/asn1/nrppa/NRPPA-PDU-Descriptions.asn
+++ b/epan/dissectors/asn1/nrppa/NRPPA-PDU-Descriptions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.455 V17.3.0 (2022-12)
+-- 3GPP TS 38.455 V17.4.0 (2023-03)
 --
 -- ASN1START
 -- **************************************************************
diff --git a/epan/dissectors/asn1/nrppa/nrppa.cnf b/epan/dissectors/asn1/nrppa/nrppa.cnf
index 44f82d5178..5064df05a7 100644
--- a/epan/dissectors/asn1/nrppa/nrppa.cnf
+++ b/epan/dissectors/asn1/nrppa/nrppa.cnf
@@ -212,6 +212,7 @@ id-procedure-code-102-not-to-be-used          ProtocolIE-ID
 id-procedure-code-103-not-to-be-used          ProtocolIE-ID
 id-UETxTimingErrorMargin                      ProtocolIE-ID
 id-MeasurementPeriodicityNR-AoA               ProtocolIE-ID
+id-SRSTransmissionStatus                      ProtocolIE-ID
 
 #.REGISTER
 #NRPPA-PROTOCOL-IES
@@ -295,6 +296,7 @@ PreconfigurationResult                     N nrppa.ies id-PreconfigurationResult
 RequestType                                N nrppa.ies id-RequestType
 UE-TEG-ReportingPeriodicity                N nrppa.ies id-UE-TEG-ReportingPeriodicity
 MeasurementPeriodicityNR-AoA               N nrppa.ies id-MeasurementPeriodicityNR-AoA
+SRSTransmissionStatus                      N nrppa.ies id-SRSTransmissionStatus
 
 
 #NRPPA-PROTOCOL-EXTENSION
diff --git a/epan/dissectors/asn1/nrppa/packet-nrppa-template.c b/epan/dissectors/asn1/nrppa/packet-nrppa-template.c
index 1609c63534..44087784ec 100644
--- a/epan/dissectors/asn1/nrppa/packet-nrppa-template.c
+++ b/epan/dissectors/asn1/nrppa/packet-nrppa-template.c
@@ -8,7 +8,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * Ref 3GPP TS 38.455 V17.3.0 (2022-12)
+ * Ref 3GPP TS 38.455 V17.4.0 (2023-03)
  * http://www.3gpp.org
  */
 
diff --git a/epan/dissectors/packet-nrppa.c b/epan/dissectors/packet-nrppa.c
index 3446496f41..fc70116756 100644
--- a/epan/dissectors/packet-nrppa.c
+++ b/epan/dissectors/packet-nrppa.c
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * Ref 3GPP TS 38.455 V17.3.0 (2022-12)
+ * Ref 3GPP TS 38.455 V17.4.0 (2023-03)
  * http://www.3gpp.org
  */
 
@@ -96,6 +96,7 @@ static int hf_nrppa_SRSConfiguration_PDU = -1;    /* SRSConfiguration */
 static int hf_nrppa_SrsFrequency_PDU = -1;        /* SrsFrequency */
 static int hf_nrppa_SRSPortIndex_PDU = -1;        /* SRSPortIndex */
 static int hf_nrppa_SRSResourcetype_PDU = -1;     /* SRSResourcetype */
+static int hf_nrppa_SRSTransmissionStatus_PDU = -1;  /* SRSTransmissionStatus */
 static int hf_nrppa_SystemFrameNumber_PDU = -1;   /* SystemFrameNumber */
 static int hf_nrppa_TDD_Config_EUTRA_Item_PDU = -1;  /* TDD_Config_EUTRA_Item */
 static int hf_nrppa_TRPTEGInformation_PDU = -1;   /* TRPTEGInformation */
@@ -1297,7 +1298,8 @@ typedef enum _ProtocolIE_ID_enum {
   id_procedure_code_102_not_to_be_used = 102,
   id_procedure_code_103_not_to_be_used = 103,
   id_UETxTimingErrorMargin = 104,
-  id_MeasurementPeriodicityNR_AoA = 105
+  id_MeasurementPeriodicityNR_AoA = 105,
+  id_SRSTransmissionStatus = 106
 } ProtocolIE_ID_enum;
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
@@ -1519,6 +1521,7 @@ static const value_string nrppa_ProtocolIE_ID_vals[] = {
   { id_procedure_code_103_not_to_be_used, "id-procedure-code-103-not-to-be-used" },
   { id_UETxTimingErrorMargin, "id-UETxTimingErrorMargin" },
   { id_MeasurementPeriodicityNR_AoA, "id-MeasurementPeriodicityNR-AoA" },
+  { id_SRSTransmissionStatus, "id-SRSTransmissionStatus" },
   { 0, NULL }
 };
 
@@ -8826,6 +8829,21 @@ dissect_nrppa_SRSResourcetype(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
+static const value_string nrppa_SRSTransmissionStatus_vals[] = {
+  {   0, "stopped" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_nrppa_SRSTransmissionStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+                                     1, NULL, TRUE, 0, NULL);
+
+  return offset;
+}
+
+
 
 static int
 dissect_nrppa_SSID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -11206,6 +11224,14 @@ static int dissect_SRSResourcetype_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_SRSTransmissionStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_nrppa_SRSTransmissionStatus(tvb, offset, &asn1_ctx, tree, hf_nrppa_SRSTransmissionStatus_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_SystemFrameNumber_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -12035,6 +12061,10 @@ void proto_register_nrppa(void) {
       { "SRSResourcetype", "nrppa.SRSResourcetype_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_nrppa_SRSTransmissionStatus_PDU,
+      { "SRSTransmissionStatus", "nrppa.SRSTransmissionStatus",
+        FT_UINT32, BASE_DEC, VALS(nrppa_SRSTransmissionStatus_vals), 0,
+        NULL, HFILL }},
     { &hf_nrppa_SystemFrameNumber_PDU,
       { "SystemFrameNumber", "nrppa.SystemFrameNumber",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -15146,6 +15176,7 @@ proto_reg_handoff_nrppa(void)
   dissector_add_uint("nrppa.ies", id_RequestType, create_dissector_handle(dissect_RequestType_PDU, proto_nrppa));
   dissector_add_uint("nrppa.ies", id_UE_TEG_ReportingPeriodicity, create_dissector_handle(dissect_UE_TEG_ReportingPeriodicity_PDU, proto_nrppa));
   dissector_add_uint("nrppa.ies", id_MeasurementPeriodicityNR_AoA, create_dissector_handle(dissect_MeasurementPeriodicityNR_AoA_PDU, proto_nrppa));
+  dissector_add_uint("nrppa.ies", id_SRSTransmissionStatus, create_dissector_handle(dissect_SRSTransmissionStatus_PDU, proto_nrppa));
   dissector_add_uint("nrppa.extension", id_GeographicalCoordinates, create_dissector_handle(dissect_GeographicalCoordinates_PDU, proto_nrppa));
   dissector_add_uint("nrppa.extension", id_SRSSpatialRelation, create_dissector_handle(dissect_SpatialRelationInfo_PDU, proto_nrppa));
   dissector_add_uint("nrppa.extension", id_SRSSpatialRelationPerSRSResource, create_dissector_handle(dissect_SpatialRelationPerSRSResource_PDU, proto_nrppa));