X2AP: upgrade dissector to v17.3.0

8 files changed, 33 insertions, 12 deletions

diff --git a/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn b/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn
index 564b50898d..6124e67a61 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 V17.2.0 (2022-09)
+-- 3GPP TS 36.423 V17.3.0 (2022-12)
 -- 9.3.6	Common definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/x2ap/X2AP-Constants.asn b/epan/dissectors/asn1/x2ap/X2AP-Constants.asn
index 935fed4da9..0cd17019b5 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 V17.2.0 (2022-09)
+-- 3GPP TS 36.423 V17.3.0 (2022-12)
 -- 9.3.7	Constant definitions
 -- **************************************************************
 --
@@ -159,6 +159,7 @@ maxnoofCSIRSconfigurations					INTEGER ::= 96
 maxnoofCSIRSneighbourCells					INTEGER ::= 16
 maxnoofCSIRSneighbourCellsInMTC				INTEGER ::= 16
 maxnoofSensorName							INTEGER ::= 3
+maxnoofTargetSgNBsMinusOne					INTEGER ::= 7
 
 -- **************************************************************
 --
@@ -612,5 +613,6 @@ id-RAT-Restrictions															ProtocolIE-ID ::= 437
 id-SCGreconfigNotification													ProtocolIE-ID ::= 438
 id-MIMOPRBusageInformation													ProtocolIE-ID ::= 439
 id-SensorMeasurementConfiguration											ProtocolIE-ID ::= 440
+id-AdditionalListofForwardingGTPTunnelEndpoint								ProtocolIE-ID ::= 441
 
 END
diff --git a/epan/dissectors/asn1/x2ap/X2AP-Containers.asn b/epan/dissectors/asn1/x2ap/X2AP-Containers.asn
index 7d2dde8995..1d81ab714d 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 V17.2.0 (2022-09)
+-- 3GPP TS 36.423 V17.3.0 (2022-12)
 -- 9.3.8	Container definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/x2ap/X2AP-IEs.asn b/epan/dissectors/asn1/x2ap/X2AP-IEs.asn
index 792f820fd6..3d70292828 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 V17.2.0 (2022-09)
+-- 3GPP TS 36.423 V17.3.0 (2022-12)
 -- 9.3.5	Information Element definitions
 -- **************************************************************
 --
@@ -161,7 +161,8 @@ IMPORTS
 	maxnoofCSIRSneighbourCells,
 	maxnoofCSIRSneighbourCellsInMTC,
 	maxCellinengNB,
-	maxnoofSensorName
+	maxnoofSensorName,
+	maxnoofTargetSgNBsMinusOne
 
 
 FROM X2AP-Constants
@@ -279,6 +280,19 @@ CSI-RS-MTC-Neighbour-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+AdditionalListofForwardingGTPTunnelEndpoint ::= SEQUENCE (SIZE(1..maxnoofTargetSgNBsMinusOne)) OF AdditionalListofForwardingGTPTunnelEndpoint-Item
+
+AdditionalListofForwardingGTPTunnelEndpoint-Item ::= SEQUENCE {
+	uL-GTPtunnelEndpoint			GTPtunnelEndpoint													OPTIONAL,
+	dL-GTPtunnelEndpoint			GTPtunnelEndpoint													OPTIONAL,
+	iE-Extensions		ProtocolExtensionContainer { { AdditionalListofForwardingGTPTunnelEndpoint-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+AdditionalListofForwardingGTPTunnelEndpoint-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 AdditionLocationInformation ::= ENUMERATED {
 	includePSCell,
 	...
@@ -617,7 +631,7 @@ CPACcandidatePSCells-item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 CPCindicator ::= ENUMERATED {cpc-initiation, cpc-modification, cpc-cancel, ...}
 
 
-CPCdataforwarding ::= ENUMERATED {cpc-triggered, early-data-transmission-stop, ...}
+CPCdataforwarding ::= ENUMERATED {cpc-triggered, early-data-transmission-stop, ..., coordination-only}
 
 
 CPAinformation-REQ ::= SEQUENCE {
@@ -772,7 +786,7 @@ CPACinformation-REQD-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 CHO-DC-EarlyDataForwarding ::= ENUMERATED {stop, ...}
 
-CHO-DC-Indicator ::= ENUMERATED {true, ...}
+CHO-DC-Indicator ::= ENUMERATED {true, ..., coordination-only}
 
 CNTypeRestrictions ::= SEQUENCE (SIZE(1.. maxnoofEPLMNsPlusOne)) OF CNTypeRestrictionsItem
 
diff --git a/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn b/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn
index 4fee233a78..3b81b3ca06 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 V17.2.0 (2022-09)
+-- 3GPP TS 36.423 V17.3.0 (2022-12)
 -- 9.3.4	PDU Definitions
 -- **************************************************************
 --
@@ -261,7 +261,8 @@ IMPORTS
 	SecurityIndication,
 	SecurityResult,
 	TraceCollectionEntityIPAddress,
-	SCGreconfigNotification
+	SCGreconfigNotification,
+	AdditionalListofForwardingGTPTunnelEndpoint
 
 
 
@@ -643,6 +644,7 @@ FROM X2AP-Containers
 	id-SecurityIndication,
 	id-SecurityResult,
 	id-SCGreconfigNotification,
+	id-AdditionalListofForwardingGTPTunnelEndpoint,
 	maxCellineNB,
 	maxnoofBearers,
 	maxnoofPDCP-SN,
@@ -3907,6 +3909,7 @@ E-RABs-ToBeReleased-SgNBChaConf-Item-SgNBPDCPpresent ::= SEQUENCE {
 }
 
 E-RABs-ToBeReleased-SgNBChaConf-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-AdditionalListofForwardingGTPTunnelEndpoint				CRITICALITY ignore	EXTENSION AdditionalListofForwardingGTPTunnelEndpoint						PRESENCE optional },
 	...
 }
 
diff --git a/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn b/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn
index 36a2e03879..22378cc314 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 V17.2.0 (2022-09)
+-- 3GPP TS 36.423 V17.3.0 (2022-12)
 -- 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 9c58df4f8f..8df4e2aa94 100644
--- a/epan/dissectors/asn1/x2ap/packet-x2ap-template.c
+++ b/epan/dissectors/asn1/x2ap/packet-x2ap-template.c
@@ -3,7 +3,7 @@
  * X2 Application Protocol (X2AP);
  * 3GPP TS 36.423 packet dissection
  * Copyright 2007-2014, Anders Broman <anders.broman@ericsson.com>
- * Copyright 2016-2022, Pascal Quantin <pascal@wireshark.org>
+ * Copyright 2016-2023, Pascal Quantin <pascal@wireshark.org>
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Ref:
- * 3GPP TS 36.423 V17.2.0 (2022-09)
+ * 3GPP TS 36.423 V17.3.0 (2022-12)
  */
 
 #include "config.h"
diff --git a/epan/dissectors/asn1/x2ap/x2ap.cnf b/epan/dissectors/asn1/x2ap/x2ap.cnf
index 4e856b34c9..136cd16b4f 100644
--- a/epan/dissectors/asn1/x2ap/x2ap.cnf
+++ b/epan/dissectors/asn1/x2ap/x2ap.cnf
@@ -1652,6 +1652,7 @@ id-RAT-Restrictions						ProtocolIE-ID
 id-SCGreconfigNotification					ProtocolIE-ID
 id-MIMOPRBusageInformation					ProtocolIE-ID
 id-SensorMeasurementConfiguration				ProtocolIE-ID
+id-AdditionalListofForwardingGTPTunnelEndpoint			ProtocolIE-ID
 
 #.REGISTER
 
@@ -2088,6 +2089,7 @@ SecurityResult							N x2ap.extension id-SecurityResult
 RAT-Restrictions						N x2ap.extension id-RAT-Restrictions
 MIMOPRBusageInformation						N x2ap.extension id-MIMOPRBusageInformation
 SensorMeasurementConfiguration					N x2ap.extension id-SensorMeasurementConfiguration
+AdditionalListofForwardingGTPTunnelEndpoint			N x2ap.extension id-AdditionalListofForwardingGTPTunnelEndpoint
 
 # X2AP-PDU-Descriptions.asn  Interface Elementary Procedures
 #X2AP-ELEMENTARY-PROCEDURE