X2AP: upgrade dissector to v16.5.0

9 files changed, 74 insertions, 14 deletions

diff --git a/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn b/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn
index 0c0d99f01f..e71b55d706 100644
--- a/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn
+++ b/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V16.4.0 (2021-01)
+-- 3GPP TS 36.423 V16.5.0 (2021-04)
 -- 9.3.6	Common definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/x2ap/X2AP-Constants.asn b/epan/dissectors/asn1/x2ap/X2AP-Constants.asn
index 736bea71f6..2a44894c33 100644
--- a/epan/dissectors/asn1/x2ap/X2AP-Constants.asn
+++ b/epan/dissectors/asn1/x2ap/X2AP-Constants.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V16.4.0 (2021-01)
+-- 3GPP TS 36.423 V16.5.0 (2021-04)
 -- 9.3.7	Constant definitions
 -- **************************************************************
 --
@@ -563,6 +563,7 @@ id-CellMeasurementResult-E-UTRA-ENDC-Item									ProtocolIE-ID ::= 402
 id-CellToReport-E-UTRA-ENDC													ProtocolIE-ID ::= 403
 id-CellToReport-E-UTRA-ENDC-Item											ProtocolIE-ID ::= 404
 id-TraceCollectionEntityURI													ProtocolIE-ID ::= 405
+id-SFN-Offset																ProtocolIE-ID ::= 406
 
 
 END
diff --git a/epan/dissectors/asn1/x2ap/X2AP-Containers.asn b/epan/dissectors/asn1/x2ap/X2AP-Containers.asn
index 10f7a0ecfe..1f3de1c524 100644
--- a/epan/dissectors/asn1/x2ap/X2AP-Containers.asn
+++ b/epan/dissectors/asn1/x2ap/X2AP-Containers.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V16.4.0 (2021-01)
+-- 3GPP TS 36.423 V16.5.0 (2021-04)
 -- 9.3.8	Container definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/x2ap/X2AP-IEs.asn b/epan/dissectors/asn1/x2ap/X2AP-IEs.asn
index 7f082eb9f4..39fd6c8359 100644
--- a/epan/dissectors/asn1/x2ap/X2AP-IEs.asn
+++ b/epan/dissectors/asn1/x2ap/X2AP-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V16.4.0 (2021-01)
+-- 3GPP TS 36.423 V16.5.0 (2021-04)
 -- 9.3.5	Information Element definitions
 -- **************************************************************
 --
@@ -85,6 +85,7 @@ IMPORTS
 	id-QoS-Mapping-Information,
 	id-IntendedTDD-DL-ULConfiguration-NR,
 	id-TraceCollectionEntityURI,
+	id-SFN-Offset,
 
 	maxnoofBearers,
 	maxCellineNB,
@@ -447,7 +448,9 @@ CauseRadioNetwork ::= ENUMERATED {
 	unknown-old-en-gNB-UE-X2AP-ID,
 	pDCP-Overload,
 	cho-cpc-resources-tobechanged,
-	ue-power-saving
+	ue-power-saving,
+	insufficient-ue-capabilities,
+	normal-release
 
 
 }
@@ -2557,7 +2560,8 @@ ServedCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	{ ID id-BandwidthReducedSI					CRITICALITY ignore	EXTENSION BandwidthReducedSI						PRESENCE optional}|
 	{ ID id-ProtectedEUTRAResourceIndication	CRITICALITY ignore	EXTENSION ProtectedEUTRAResourceIndication	PRESENCE optional}|
 	{ ID id-BPLMN-ID-Info-EUTRA					CRITICALITY ignore 	EXTENSION BPLMN-ID-Info-EUTRA						PRESENCE optional}|
-	{ ID id-NPRACHConfiguration					CRITICALITY ignore	EXTENSION	NPRACHConfiguration					PRESENCE optional},
+	{ ID id-NPRACHConfiguration					CRITICALITY ignore	EXTENSION	NPRACHConfiguration					PRESENCE optional}|
+	{ ID id-SFN-Offset							CRITICALITY ignore	EXTENSION SFN-Offset								PRESENCE optional},
 	...
 }
 
@@ -2825,6 +2829,16 @@ SULInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+SFN-Offset ::= SEQUENCE {
+	sFN-Time-Offset					BIT STRING (SIZE(24)),
+	iE-Extensions		ProtocolExtensionContainer { {SFN-Offset-ExtIEs} } OPTIONAL,
+	...
+}
+
+SFN-Offset-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+		...
+}
+
 -- T
 
 TABasedMDT::= SEQUENCE {
diff --git a/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn b/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn
index 135bf6c871..5f71620579 100644
--- a/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn
+++ b/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V16.4.0 (2021-01)
+-- 3GPP TS 36.423 V16.5.0 (2021-04)
 -- 9.3.4	PDU Definitions
 -- **************************************************************
 --
@@ -230,7 +230,8 @@ IMPORTS
 	IABNodeIndication,
 	F1CTrafficContainer,
 	IntendedTDD-DL-ULConfiguration-NR,
-	UERadioCapability
+	UERadioCapability,
+	SFN-Offset
 
 
 
@@ -581,6 +582,7 @@ FROM X2AP-Containers
 	id-F1CTrafficContainer,
 	id-IntendedTDD-DL-ULConfiguration-NR,
 	id-UERadioCapability,
+	id-SFN-Offset,
 	maxCellineNB,
 	maxnoofBearers,
 	maxnoofPDCP-SN,
@@ -3909,7 +3911,8 @@ ServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	{ ID id-BPLMN-ID-Info-NR				CRITICALITY ignore 	EXTENSION BPLMN-ID-Info-NR				PRESENCE optional}|
 	{ ID id-SSB-PositionsInBurst			CRITICALITY ignore	EXTENSION SSB-PositionsInBurst	PRESENCE optional}|
 	{ ID id-NRCellPRACHConfig				CRITICALITY ignore	EXTENSION NRCellPRACHConfig		PRESENCE optional}|
-	{ ID id-CSI-RSTransmissionIndication	CRITICALITY ignore	EXTENSION CSI-RSTransmissionIndication		PRESENCE optional},
+	{ ID id-CSI-RSTransmissionIndication	CRITICALITY ignore	EXTENSION CSI-RSTransmissionIndication		PRESENCE optional}|
+	{ ID id-SFN-Offset						CRITICALITY ignore EXTENSION SFN-Offset								PRESENCE optional},
 	...
 }
 
diff --git a/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn b/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn
index 5956ef0c77..d4e9afc6d5 100644
--- a/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn
+++ b/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V16.4.0 (2021-01)
+-- 3GPP TS 36.423 V16.5.0 (2021-04)
 -- 9.3.3	Elementary Procedure Definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/x2ap/packet-x2ap-template.c b/epan/dissectors/asn1/x2ap/packet-x2ap-template.c
index 6d2b223459..7ba01ed51b 100644
--- a/epan/dissectors/asn1/x2ap/packet-x2ap-template.c
+++ b/epan/dissectors/asn1/x2ap/packet-x2ap-template.c
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Ref:
- * 3GPP TS 36.423 V16.4.0 (2021-01)
+ * 3GPP TS 36.423 V16.5.0 (2021-04)
  */
 
 #include "config.h"
diff --git a/epan/dissectors/asn1/x2ap/x2ap.cnf b/epan/dissectors/asn1/x2ap/x2ap.cnf
index e0ac0263a8..c79a610320 100644
--- a/epan/dissectors/asn1/x2ap/x2ap.cnf
+++ b/epan/dissectors/asn1/x2ap/x2ap.cnf
@@ -1543,6 +1543,7 @@ id-CellMeasurementResult-E-UTRA-ENDC-Item			ProtocolIE-ID
 id-CellToReport-E-UTRA-ENDC					ProtocolIE-ID
 id-CellToReport-E-UTRA-ENDC-Item				ProtocolIE-ID
 id-TraceCollectionEntityURI					ProtocolIE-ID
+id-SFN-Offset							ProtocolIE-ID
 
 #.REGISTER
 
@@ -1944,6 +1945,7 @@ NRCellPRACHConfig						N x2ap.extension id-NRCellPRACHConfig
 QoS-Mapping-Information						N x2ap.extension id-QoS-Mapping-Information
 IntendedTDD-DL-ULConfiguration-NR				N x2ap.extension id-IntendedTDD-DL-ULConfiguration-NR
 URI-Address							N x2ap.extension id-TraceCollectionEntityURI
+SFN-Offset							N x2ap.extension id-SFN-Offset
 
 # X2AP-PDU-Descriptions.asn  Interface Elementary Procedures
 #X2AP-ELEMENTARY-PROCEDURE
diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c
index 680651c771..c30347f289 100644
--- a/epan/dissectors/packet-x2ap.c
+++ b/epan/dissectors/packet-x2ap.c
@@ -20,7 +20,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Ref:
- * 3GPP TS 36.423 V16.4.0 (2021-01)
+ * 3GPP TS 36.423 V16.5.0 (2021-04)
  */
 
 #include "config.h"
@@ -586,7 +586,8 @@ typedef enum _ProtocolIE_ID_enum {
   id_CellMeasurementResult_E_UTRA_ENDC_Item = 402,
   id_CellToReport_E_UTRA_ENDC = 403,
   id_CellToReport_E_UTRA_ENDC_Item = 404,
-  id_TraceCollectionEntityURI = 405
+  id_TraceCollectionEntityURI = 405,
+  id_SFN_Offset = 406
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-x2ap-val.h ---*/
@@ -843,6 +844,7 @@ static int hf_x2ap_SubframeAssignment_PDU = -1;   /* SubframeAssignment */
 static int hf_x2ap_SgNBSecurityKey_PDU = -1;      /* SgNBSecurityKey */
 static int hf_x2ap_SgNBtoMeNBContainer_PDU = -1;  /* SgNBtoMeNBContainer */
 static int hf_x2ap_SCGConfigurationQuery_PDU = -1;  /* SCGConfigurationQuery */
+static int hf_x2ap_SFN_Offset_PDU = -1;           /* SFN_Offset */
 static int hf_x2ap_TAC_PDU = -1;                  /* TAC */
 static int hf_x2ap_TargetCellInNGRAN_PDU = -1;    /* TargetCellInNGRAN */
 static int hf_x2ap_TargetCellInUTRAN_PDU = -1;    /* TargetCellInUTRAN */
@@ -1533,6 +1535,7 @@ static int hf_x2ap_oneframe = -1;                 /* Oneframe */
 static int hf_x2ap_fourframes = -1;               /* Fourframes */
 static int hf_x2ap_sUL_ARFCN = -1;                /* INTEGER_0_3279165 */
 static int hf_x2ap_sUL_TxBW = -1;                 /* NR_TxBW */
+static int hf_x2ap_sFN_Time_Offset = -1;          /* BIT_STRING_SIZE_24 */
 static int hf_x2ap_tAListforMDT = -1;             /* TAListforMDT */
 static int hf_x2ap_tAIListforMDT = -1;            /* TAIListforMDT */
 static int hf_x2ap_TAIListforMDT_item = -1;       /* TAI_Item */
@@ -2125,6 +2128,7 @@ static gint ett_x2ap_SubbandCQIItem = -1;
 static gint ett_x2ap_SubframeAllocation = -1;
 static gint ett_x2ap_SULInformation = -1;
 static gint ett_x2ap_SupportedSULFreqBandItem = -1;
+static gint ett_x2ap_SFN_Offset = -1;
 static gint ett_x2ap_TABasedMDT = -1;
 static gint ett_x2ap_TAIBasedMDT = -1;
 static gint ett_x2ap_TAIListforMDT = -1;
@@ -3161,6 +3165,7 @@ static const value_string x2ap_ProtocolIE_ID_vals[] = {
   { id_CellToReport_E_UTRA_ENDC, "id-CellToReport-E-UTRA-ENDC" },
   { id_CellToReport_E_UTRA_ENDC_Item, "id-CellToReport-E-UTRA-ENDC-Item" },
   { id_TraceCollectionEntityURI, "id-TraceCollectionEntityURI" },
+  { id_SFN_Offset, "id-SFN-Offset" },
   { 0, NULL }
 };
 
@@ -4449,6 +4454,8 @@ static const value_string x2ap_CauseRadioNetwork_vals[] = {
   {  50, "pDCP-Overload" },
   {  51, "cho-cpc-resources-tobechanged" },
   {  52, "ue-power-saving" },
+  {  53, "insufficient-ue-capabilities" },
+  {  54, "normal-release" },
   { 0, NULL }
 };
 
@@ -4458,7 +4465,7 @@ static value_string_ext x2ap_CauseRadioNetwork_vals_ext = VALUE_STRING_EXT_INIT(
 static int
 dissect_x2ap_CauseRadioNetwork(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,
-                                     22, NULL, TRUE, 31, NULL);
+                                     22, NULL, TRUE, 33, NULL);
 
   return offset;
 }
@@ -11689,6 +11696,21 @@ dissect_x2ap_SCGConfigurationQuery(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
+static const per_sequence_t SFN_Offset_sequence[] = {
+  { &hf_x2ap_sFN_Time_Offset, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_x2ap_BIT_STRING_SIZE_24 },
+  { &hf_x2ap_iE_Extensions  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_x2ap_ProtocolExtensionContainer },
+  { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_SFN_Offset(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+                                   ett_x2ap_SFN_Offset, SFN_Offset_sequence);
+
+  return offset;
+}
+
+
 
 static int
 dissect_x2ap_TargetCellInNGRAN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -19632,6 +19654,14 @@ static int dissect_SCGConfigurationQuery_PDU(tvbuff_t *tvb _U_, packet_info *pin
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_SFN_Offset_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_x2ap_SFN_Offset(tvb, offset, &asn1_ctx, tree, hf_x2ap_SFN_Offset_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_TAC_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -22806,6 +22836,10 @@ void proto_register_x2ap(void) {
       { "SCGConfigurationQuery", "x2ap.SCGConfigurationQuery",
         FT_UINT32, BASE_DEC, VALS(x2ap_SCGConfigurationQuery_vals), 0,
         NULL, HFILL }},
+    { &hf_x2ap_SFN_Offset_PDU,
+      { "SFN-Offset", "x2ap.SFN_Offset_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_x2ap_TAC_PDU,
       { "TAC", "x2ap.TAC",
         FT_UINT16, BASE_DEC_HEX, NULL, 0,
@@ -25566,6 +25600,10 @@ void proto_register_x2ap(void) {
       { "sUL-TxBW", "x2ap.sUL_TxBW_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NR_TxBW", HFILL }},
+    { &hf_x2ap_sFN_Time_Offset,
+      { "sFN-Time-Offset", "x2ap.sFN_Time_Offset",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_24", HFILL }},
     { &hf_x2ap_tAListforMDT,
       { "tAListforMDT", "x2ap.tAListforMDT",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -27132,6 +27170,7 @@ void proto_register_x2ap(void) {
     &ett_x2ap_SubframeAllocation,
     &ett_x2ap_SULInformation,
     &ett_x2ap_SupportedSULFreqBandItem,
+    &ett_x2ap_SFN_Offset,
     &ett_x2ap_TABasedMDT,
     &ett_x2ap_TAIBasedMDT,
     &ett_x2ap_TAIListforMDT,
@@ -27947,6 +27986,7 @@ proto_reg_handoff_x2ap(void)
   dissector_add_uint("x2ap.extension", id_QoS_Mapping_Information, create_dissector_handle(dissect_QoS_Mapping_Information_PDU, proto_x2ap));
   dissector_add_uint("x2ap.extension", id_IntendedTDD_DL_ULConfiguration_NR, create_dissector_handle(dissect_IntendedTDD_DL_ULConfiguration_NR_PDU, proto_x2ap));
   dissector_add_uint("x2ap.extension", id_TraceCollectionEntityURI, create_dissector_handle(dissect_URI_Address_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.extension", id_SFN_Offset, create_dissector_handle(dissect_SFN_Offset_PDU, proto_x2ap));
   dissector_add_uint("x2ap.proc.imsg", id_handoverPreparation, create_dissector_handle(dissect_HandoverRequest_PDU, proto_x2ap));
   dissector_add_uint("x2ap.proc.sout", id_handoverPreparation, create_dissector_handle(dissect_HandoverRequestAcknowledge_PDU, proto_x2ap));
   dissector_add_uint("x2ap.proc.uout", id_handoverPreparation, create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_x2ap));