gprscdr: Update to 3GPP TS 32.298 V17.0.0

3 files changed, 253 insertions, 30 deletions

diff --git a/epan/dissectors/asn1/gprscdr/GPRSChargingDataTypes.asn b/epan/dissectors/asn1/gprscdr/GPRSChargingDataTypes.asn
index 36a12cbfca..ba203e9d7e 100644
--- a/epan/dissectors/asn1/gprscdr/GPRSChargingDataTypes.asn
+++ b/epan/dissectors/asn1/gprscdr/GPRSChargingDataTypes.asn
@@ -40,6 +40,7 @@ NodeID,
 PDPAddress,
 PLMN-Id,
 PositioningData,
+PSCellInformation,
 RATType,
 RecordingEntity,
 RecordType,
@@ -181,7 +182,9 @@ SGWRecord 	::= SET
 	servingPLMNRateControl		[61] ServingPLMNRateControl OPTIONAL,
 	pDPPDNTypeExtension			[62] PDPPDNTypeExtension OPTIONAL,
 	mOExceptionDataCounter		[63] MOExceptionDataCounter OPTIONAL,
-	listOfRANSecondaryRATUsageReports [64] SEQUENCE OF RANSecondaryRATUsageReport OPTIONAL
+	listOfRANSecondaryRATUsageReports [64] SEQUENCE OF RANSecondaryRATUsageReport OPTIONAL,
+	pSCellInformation			[65] PSCellInformation OPTIONAL
+
 }
 
 PGWRecord 	::= SET
diff --git a/epan/dissectors/asn1/gprscdr/GenericChargingDataTypes.asn b/epan/dissectors/asn1/gprscdr/GenericChargingDataTypes.asn
index 7559ee1e13..1c195c1ec2 100644
--- a/epan/dissectors/asn1/gprscdr/GenericChargingDataTypes.asn
+++ b/epan/dissectors/asn1/gprscdr/GenericChargingDataTypes.asn
@@ -39,6 +39,10 @@ FROM ACSE-1 {joint-iso-itu-t association-control (2) modules (0) apdus (0) versi
 --  Generic Data Types
 --
 
+-- 
+-- B
+-- 
+
 BCDDirectoryNumber		::= OCTET STRING
 --
 -- This type contains the binary coded decimal representation of
@@ -55,6 +59,10 @@ BCDDirectoryNumber		::= OCTET STRING
 -- redundant.
 --
 
+-- 
+-- C
+-- 
+
 CallDuration 			::= INTEGER
 --
 -- The call duration is counted in seconds. 
@@ -223,6 +231,7 @@ CauseForRecClosing	::= INTEGER
 -- 
 {
 	normalRelease					(0),
+	partialRecord					(1),
 	abnormalRelease					(4),
 	cAMELInitCallRelease			(5),
 	volumeLimit						(16),
@@ -282,6 +291,10 @@ CNIPMulticastDistribution		::= ENUMERATED
 	iP-MULTICAST				(1)
 }
 
+-- 
+-- D
+-- 
+
 DataVolumeOctets		::= INTEGER
 --
 -- The volume of data transferred in octets.
@@ -302,26 +315,52 @@ Diagnostics						::= CHOICE
 	itu-tQ767Cause							[2] INTEGER,
 	-- See Q.767 [309]
 	networkSpecificCause						[3] ManagementExtension,
-	-- To be defined by network operator	
+	-- To be defined by network operator
 	manufacturerSpecificCause				[4] ManagementExtension,
-	-- To be defined by manufacturer	
+	-- To be defined by manufacturer
+	-- May be used for CHF generated diagnostics
 	positionMethodFailureCause				[5] PositionMethodFailure-Diagnostic,
-	-- see TS 29.002 [214]
+	-- See TS 29.002 [214]
 	unauthorizedLCSClientCause				[6] UnauthorizedLCSClient-Diagnostic,
-	-- see TS 29.002 [214] 
+	-- See TS 29.002 [214] 
 	diameterResultCodeAndExperimentalResult	[7] INTEGER
-	-- See TS 29.338 [230], TS 29.337 [231], TS 29.128 [244]	
+	-- See TS 29.338 [230], TS 29.337 [231], TS 29.128 [244]
+-- May be used for Nchf received diagnostics
 }
 
 DiameterIdentity		::= OCTET STRING
 
+-- 
+-- E
+-- 
+
+Ecgi	::= SEQUENCE
+{
+	plmnId					[0] PLMN-Id,
+	eutraCellId			[1] EutraCellId,
+	nid						[2] Nid OPTIONAL
+}
+
 EnhancedDiagnostics					::= SEQUENCE
 {
 	rANNASCause						[0] SEQUENCE OF RANNASCause
 }
 
+EutraCellId		::= UTF8String
+-- 
+-- See 3GPP TS 29.571 [249] for details
+-- 
+
+-- 
+-- G
+-- 
+
 GSNAddress	::= IPAddress
 
+-- 
+-- I
+-- 
+
 InvolvedParty ::= CHOICE 
 {
 	sIP-URI		[0] GraphicString, -- refer to rfc3261 [401]
@@ -362,12 +401,20 @@ IPBinV6AddressWithPrefixLength ::= SEQUENCE
 
 IPTextRepresentedAddress	::= CHOICE
 {	--
-	-- IP address in the familiar "dot" notation
+	-- IPv4 address are formatted in the "dotted decimal" notation according to IETF RFC 1166 [411].
+	-- IPv6 address are formatted according to clause 4 of IETF RFC 5952 [412]. The mixed IPv4 IPv6
+	-- notation according to clause 5 of IETF RFC 5952 [412] is not used.
+	-- IPv6 address prefix are formatted in the "/" notation and according to clause 4 of 
+	-- IETF RFC 5952 [412].
 	--
 	iPTextV4Address		[2] IA5String (SIZE(7..15)),
 	iPTextV6Address		[3] IA5String (SIZE(15..45))
 }
 
+-- 
+-- L
+-- 
+
 LCSCause				::= OCTET STRING (SIZE(1))
 --
 -- See LCS Cause Value, TS 49.031 [227]
@@ -410,6 +457,11 @@ LocationAreaCode		::= OCTET STRING (SIZE(2))
 -- See TS 24.008 [208]
 --
 
+-- 
+-- M
+-- 
+
+
 ManagementExtensions	::= SET OF ManagementExtension
 
 MBMS2G3GIndicator		::= ENUMERATED
@@ -500,6 +552,21 @@ MSTimeZone	::= OCTET STRING (SIZE (2))
 -- 1. Octet: Time Zone and 2. Octet: Daylight saving time, see TS 29.060 [215]
 --
 
+-- 
+-- N
+-- 
+
+Ncgi	::= SEQUENCE
+{
+	plmnId					[0] PLMN-Id,
+	nrCellId			[1] NrCellId,
+	nid						[2] Nid OPTIONAL
+}
+
+Nid		::= UTF8String--
+-- See 3GPP TS 29.571 [249] for details.
+-- 
+
 NodeID		::= IA5String (SIZE(1..20))
 
 NodeAddress ::= CHOICE 
@@ -508,6 +575,16 @@ NodeAddress ::= CHOICE
 	domainName	[1] GraphicString
 }
 
+NrCellId		::= UTF8String
+--
+-- See 3GPP TS 29.571 [249] for details.
+-- 
+
+
+-- 
+-- P
+-- 
+
 PDPAddressPrefixLength		::=INTEGER (1..64)
 --
 -- This is an integer indicating the length of the PDP/PDN IPv6 address prefix
@@ -539,6 +616,17 @@ PriorityType	::= ENUMERATED
 	high		(2)
 }
 
+PSCellInformation	::= SEQUENCE
+{
+	nRcgi					[0] Ncgi OPTIONAL,
+	ecgi					[1] Ecgi OPTIONAL 
+
+}
+
+-- 
+-- R
+-- 
+
 RANNASCause				::=	OCTET STRING
 -- This octet string is a 1:1 copy of the contents (i.e. starting with octet 5)
 -- of the "RAN/NAS Cause" information element specified in TS 29.274 [223].
@@ -643,7 +731,7 @@ RecordType 	::= INTEGER
 	iBCFRecord				(82),
 	tRFRecord				(89),
 	tFRecord				(90),
-	aTCFRecord				(91),
+aTCFRecord				(91),
 --
 --  Record values 71..75 are LCS specific. The contents are defined in TS 32.271 [31]
 --
@@ -746,6 +834,10 @@ RoutingAreaCode	::= OCTET STRING (SIZE(1))
 -- See TS 24.008 [208]	
 --
 
+-- 
+-- S
+-- 
+
 SCSASAddress		::= SET
 --
 -- 
@@ -807,7 +899,7 @@ SubscriberEquipmentType	::= ENUMERATED
 
 SubscriptionID	::= SET
 --
--- used for ExternalIdentifier with SubscriptionIdType = END-User-NAI. See TS 23.003 [200]
+-- See TS 23.003 [200] and TS 29.571 [249]
 --
 {
 	subscriptionIDType	[0]	SubscriptionIDType,
@@ -823,9 +915,10 @@ SubscriptionIDType	::= ENUMERATED
 	eND-USER-PRIVATE		(4)
 
 --
--- eND-USER-IMSI can be used for 5G BRG or 5G CRG. 
--- eND-USER-NAI can be used to contain GLI or GCI for wireline access network scenarios
--- NAI format containing a GCI or GLI is specified in 28.15.5 and 28.15.6 of TS 23.003 [200]. 
+-- eND-USER-NAI can be used for externalIdentifier.
+-- eND-USER-IMSI can be used for 5G BRG or 5G CRG.
+-- eND-USER-NAI can be used for GLI or GCI for wireline access network scenarios
+-- NAI format for GCI and GLI is specified in 28.15.5 and 28.15.6 of TS 23.003 [200]. 
 --
 
 }
@@ -840,6 +933,10 @@ SystemType	::= ENUMERATED
 	gERAN				(2)
 }
 
+-- 
+-- T
+-- 
+
 ThreeGPPPSDataOffStatus		::= ENUMERATED
 {
 	active		    (0),
diff --git a/epan/dissectors/packet-gprscdr.c b/epan/dissectors/packet-gprscdr.c
index 689deec4ea..6635272dca 100644
--- a/epan/dissectors/packet-gprscdr.c
+++ b/epan/dissectors/packet-gprscdr.c
@@ -53,6 +53,9 @@ static int hf_gprscdr_manufacturerSpecificCause = -1;  /* ManagementExtension */
 static int hf_gprscdr_positionMethodFailureCause = -1;  /* PositionMethodFailure_Diagnostic */
 static int hf_gprscdr_unauthorizedLCSClientCause = -1;  /* UnauthorizedLCSClient_Diagnostic */
 static int hf_gprscdr_diameterResultCodeAndExperimentalResult = -1;  /* INTEGER */
+static int hf_gprscdr_plmnId = -1;                /* PLMN_Id */
+static int hf_gprscdr_eutraCellId = -1;           /* EutraCellId */
+static int hf_gprscdr_nid = -1;                   /* Nid */
 static int hf_gprscdr_rANNASCause = -1;           /* SEQUENCE_OF_RANNASCause */
 static int hf_gprscdr_rANNASCause_item = -1;      /* RANNASCause */
 static int hf_gprscdr_sIP_URI = -1;               /* GraphicString */
@@ -89,7 +92,10 @@ static int hf_gprscdr_mBMSGWAddress = -1;         /* GSNAddress */
 static int hf_gprscdr_cNIPMulticastDistribution = -1;  /* CNIPMulticastDistribution */
 static int hf_gprscdr_mBMSDataTransferStart = -1;  /* MBMSTime */
 static int hf_gprscdr_mBMSDataTransferStop = -1;  /* MBMSTime */
+static int hf_gprscdr_nrCellId = -1;              /* NrCellId */
 static int hf_gprscdr_iPAddress = -1;             /* IPAddress */
+static int hf_gprscdr_nRcgi = -1;                 /* Ncgi */
+static int hf_gprscdr_ecgi = -1;                  /* Ecgi */
 static int hf_gprscdr_sCSAddress = -1;            /* IPAddress */
 static int hf_gprscdr_sCSRealm = -1;              /* DiameterIdentity */
 static int hf_gprscdr_serviceSpecificData = -1;   /* GraphicString */
@@ -251,6 +257,7 @@ static int hf_gprscdr_pDPPDNTypeExtension = -1;   /* PDPPDNTypeExtension */
 static int hf_gprscdr_mOExceptionDataCounter = -1;  /* MOExceptionDataCounter */
 static int hf_gprscdr_listOfRANSecondaryRATUsageReports = -1;  /* SEQUENCE_OF_RANSecondaryRATUsageReport */
 static int hf_gprscdr_listOfRANSecondaryRATUsageReports_item = -1;  /* RANSecondaryRATUsageReport */
+static int hf_gprscdr_pSCellInformation = -1;     /* PSCellInformation */
 static int hf_gprscdr_p_GWAddress = -1;           /* GSNAddress */
 static int hf_gprscdr_userLocationInformation_07 = -1;  /* T_userLocationInformation_07 */
 static int hf_gprscdr_listOfServiceData_02 = -1;  /* SEQUENCE_OF_ChangeOfServiceCondition */
@@ -535,6 +542,7 @@ static int ett_gprscdr_userlocationinformation = -1;
 /*--- Included file: packet-gprscdr-ett.c ---*/
 #line 1 "./asn1/gprscdr/packet-gprscdr-ett.c"
 static gint ett_gprscdr_Diagnostics = -1;
+static gint ett_gprscdr_Ecgi = -1;
 static gint ett_gprscdr_EnhancedDiagnostics = -1;
 static gint ett_gprscdr_SEQUENCE_OF_RANNASCause = -1;
 static gint ett_gprscdr_InvolvedParty = -1;
@@ -548,7 +556,9 @@ static gint ett_gprscdr_LevelOfCAMELService = -1;
 static gint ett_gprscdr_LocationAreaAndCell = -1;
 static gint ett_gprscdr_ManagementExtensions = -1;
 static gint ett_gprscdr_MBMSInformation = -1;
+static gint ett_gprscdr_Ncgi = -1;
 static gint ett_gprscdr_PDPAddress = -1;
+static gint ett_gprscdr_PSCellInformation = -1;
 static gint ett_gprscdr_SCSASAddress = -1;
 static gint ett_gprscdr_ServiceSpecificInfo = -1;
 static gint ett_gprscdr_SubscriptionID = -1;
@@ -843,6 +853,7 @@ dissect_gprscdr_CellId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 static const value_string gprscdr_CauseForRecClosing_vals[] = {
   {   0, "normalRelease" },
+  {   1, "partialRecord" },
   {   4, "abnormalRelease" },
   {   5, "cAMELInitCallRelease" },
   {  16, "volumeLimit" },
@@ -1029,6 +1040,67 @@ dissect_gprscdr_DiameterIdentity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 
 
 static int
+dissect_gprscdr_PLMN_Id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 130 "./asn1/gprscdr/gprscdr.cnf"
+  tvbuff_t *parameter_tvb;
+  proto_tree *subtree;
+
+  offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
+                                       &parameter_tvb);
+
+
+  if (!parameter_tvb)
+    return offset;
+
+  subtree = proto_item_add_subtree(actx->created_item, ett_gprscdr_plmn_id);
+  dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, E212_NONE, TRUE);
+
+
+
+  return offset;
+}
+
+
+
+static int
+dissect_gprscdr_EutraCellId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_UTF8String,
+                                            actx, tree, tvb, offset, hf_index,
+                                            NULL);
+
+  return offset;
+}
+
+
+
+static int
+dissect_gprscdr_Nid(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_UTF8String,
+                                            actx, tree, tvb, offset, hf_index,
+                                            NULL);
+
+  return offset;
+}
+
+
+static const ber_sequence_t Ecgi_sequence[] = {
+  { &hf_gprscdr_plmnId      , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gprscdr_PLMN_Id },
+  { &hf_gprscdr_eutraCellId , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gprscdr_EutraCellId },
+  { &hf_gprscdr_nid         , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gprscdr_Nid },
+  { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_gprscdr_Ecgi(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+                                   Ecgi_sequence, hf_index, ett_gprscdr_Ecgi);
+
+  return offset;
+}
+
+
+
+static int
 dissect_gprscdr_RANNASCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        NULL);
@@ -1584,6 +1656,33 @@ dissect_gprscdr_MSTimeZone(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 
 static int
+dissect_gprscdr_NrCellId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_UTF8String,
+                                            actx, tree, tvb, offset, hf_index,
+                                            NULL);
+
+  return offset;
+}
+
+
+static const ber_sequence_t Ncgi_sequence[] = {
+  { &hf_gprscdr_plmnId      , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gprscdr_PLMN_Id },
+  { &hf_gprscdr_nrCellId    , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gprscdr_NrCellId },
+  { &hf_gprscdr_nid         , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gprscdr_Nid },
+  { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_gprscdr_Ncgi(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+                                   Ncgi_sequence, hf_index, ett_gprscdr_Ncgi);
+
+  return offset;
+}
+
+
+
+static int
 dissect_gprscdr_NodeID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
                                             actx, tree, tvb, offset, hf_index,
@@ -1615,32 +1714,24 @@ dissect_gprscdr_PDPAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 
 static int
-dissect_gprscdr_PLMN_Id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 130 "./asn1/gprscdr/gprscdr.cnf"
-  tvbuff_t *parameter_tvb;
-  proto_tree *subtree;
-
+dissect_gprscdr_PositioningData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                       &parameter_tvb);
-
-
-  if (!parameter_tvb)
-    return offset;
-
-  subtree = proto_item_add_subtree(actx->created_item, ett_gprscdr_plmn_id);
-  dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, E212_NONE, TRUE);
-
-
+                                       NULL);
 
   return offset;
 }
 
 
+static const ber_sequence_t PSCellInformation_sequence[] = {
+  { &hf_gprscdr_nRcgi       , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gprscdr_Ncgi },
+  { &hf_gprscdr_ecgi        , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gprscdr_Ecgi },
+  { NULL, 0, 0, 0, NULL }
+};
 
 static int
-dissect_gprscdr_PositioningData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                       NULL);
+dissect_gprscdr_PSCellInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+                                   PSCellInformation_sequence, hf_index, ett_gprscdr_PSCellInformation);
 
   return offset;
 }
@@ -4222,6 +4313,7 @@ static const ber_sequence_t SGWRecord_set[] = {
   { &hf_gprscdr_pDPPDNTypeExtension, BER_CLASS_CON, 62, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gprscdr_PDPPDNTypeExtension },
   { &hf_gprscdr_mOExceptionDataCounter, BER_CLASS_CON, 63, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gprscdr_MOExceptionDataCounter },
   { &hf_gprscdr_listOfRANSecondaryRATUsageReports, BER_CLASS_CON, 64, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gprscdr_SEQUENCE_OF_RANSecondaryRATUsageReport },
+  { &hf_gprscdr_pSCellInformation, BER_CLASS_CON, 65, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gprscdr_PSCellInformation },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -5106,6 +5198,18 @@ proto_register_gprscdr(void)
       { "diameterResultCodeAndExperimentalResult", "gprscdr.diameterResultCodeAndExperimentalResult",
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
+    { &hf_gprscdr_plmnId,
+      { "plmnId", "gprscdr.plmnId",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "PLMN_Id", HFILL }},
+    { &hf_gprscdr_eutraCellId,
+      { "eutraCellId", "gprscdr.eutraCellId",
+        FT_STRING, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
+    { &hf_gprscdr_nid,
+      { "nid", "gprscdr.nid",
+        FT_STRING, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_gprscdr_rANNASCause,
       { "rANNASCause", "gprscdr.rANNASCause",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -5250,10 +5354,22 @@ proto_register_gprscdr(void)
       { "mBMSDataTransferStop", "gprscdr.mBMSDataTransferStop",
         FT_BYTES, BASE_NONE, NULL, 0,
         "MBMSTime", HFILL }},
+    { &hf_gprscdr_nrCellId,
+      { "nrCellId", "gprscdr.nrCellId",
+        FT_STRING, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_gprscdr_iPAddress,
       { "iPAddress", "gprscdr.iPAddress",
         FT_UINT32, BASE_DEC, VALS(gprscdr_IPAddress_vals), 0,
         NULL, HFILL }},
+    { &hf_gprscdr_nRcgi,
+      { "nRcgi", "gprscdr.nRcgi_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Ncgi", HFILL }},
+    { &hf_gprscdr_ecgi,
+      { "ecgi", "gprscdr.ecgi_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_gprscdr_sCSAddress,
       { "sCSAddress", "gprscdr.sCSAddress",
         FT_UINT32, BASE_DEC, VALS(gprscdr_IPAddress_vals), 0,
@@ -5898,6 +6014,10 @@ proto_register_gprscdr(void)
       { "RANSecondaryRATUsageReport", "gprscdr.RANSecondaryRATUsageReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_gprscdr_pSCellInformation,
+      { "pSCellInformation", "gprscdr.pSCellInformation_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_gprscdr_p_GWAddress,
       { "p-GWAddress", "gprscdr.p_GWAddress",
         FT_UINT32, BASE_DEC, VALS(gprscdr_IPAddress_vals), 0,
@@ -6988,6 +7108,7 @@ proto_register_gprscdr(void)
 /*--- Included file: packet-gprscdr-ettarr.c ---*/
 #line 1 "./asn1/gprscdr/packet-gprscdr-ettarr.c"
     &ett_gprscdr_Diagnostics,
+    &ett_gprscdr_Ecgi,
     &ett_gprscdr_EnhancedDiagnostics,
     &ett_gprscdr_SEQUENCE_OF_RANNASCause,
     &ett_gprscdr_InvolvedParty,
@@ -7001,7 +7122,9 @@ proto_register_gprscdr(void)
     &ett_gprscdr_LocationAreaAndCell,
     &ett_gprscdr_ManagementExtensions,
     &ett_gprscdr_MBMSInformation,
+    &ett_gprscdr_Ncgi,
     &ett_gprscdr_PDPAddress,
+    &ett_gprscdr_PSCellInformation,
     &ett_gprscdr_SCSASAddress,
     &ett_gprscdr_ServiceSpecificInfo,
     &ett_gprscdr_SubscriptionID,