aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2018-06-25 15:34:41 -0700
committerPascal Quantin <pascal.quantin@gmail.com>2018-06-25 23:25:13 +0000
commitc6fc452c95eec93c17250dfbaf2db8c19a7aa90b (patch)
tree3f28116ac77b13e56973adeed73f64cc3da03e71
parent3a514caaf1e3b36eb284c3a566d489aba6df5392 (diff)
X2AP: upgrade dissector to v15.2.0
Change-Id: Ic85c1124456b841fefe54c92166add81599e4d85 Reviewed-on: https://code.wireshark.org/review/28437 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat
-rw-r--r--epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn6
-rw-r--r--epan/dissectors/asn1/x2ap/X2AP-Constants.asn103
-rw-r--r--epan/dissectors/asn1/x2ap/X2AP-Containers.asn18
-rw-r--r--epan/dissectors/asn1/x2ap/X2AP-IEs.asn258
-rw-r--r--epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn489
-rw-r--r--epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn74
-rw-r--r--epan/dissectors/asn1/x2ap/packet-x2ap-template.c8
-rw-r--r--epan/dissectors/asn1/x2ap/x2ap.cnf119
-rw-r--r--epan/dissectors/packet-x2ap.c2601
9 files changed, 3211 insertions, 465 deletions
diff --git a/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn b/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn
index c5b5c178c8..ad72c41b92 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 V15.1.0 (2018-03)
+-- 3GPP TS 36.423 V15.2.0 (2018-06)
-- 9.3.6 Common definitions
-- **************************************************************
--
@@ -7,10 +7,10 @@
-- **************************************************************
X2AP-CommonDataTypes {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) x2ap (2) version1 (1) x2ap-CommonDataTypes (3) }
-DEFINITIONS AUTOMATIC TAGS ::=
+DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
diff --git a/epan/dissectors/asn1/x2ap/X2AP-Constants.asn b/epan/dissectors/asn1/x2ap/X2AP-Constants.asn
index 0f6599e8c7..5df29e378d 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 V15.1.0 (2018-03)
+-- 3GPP TS 36.423 V15.2.0 (2018-06)
-- 9.3.7 Constant definitions
-- **************************************************************
--
@@ -7,10 +7,10 @@
-- **************************************************************
X2AP-Constants {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) x2ap (2) version1 (1) x2ap-Constants (4) }
-DEFINITIONS AUTOMATIC TAGS ::=
+DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
@@ -65,7 +65,10 @@ id-endcX2Setup ProcedureCode ::= 36
id-endcConfigurationUpdate ProcedureCode ::= 37
id-secondaryRATDataUsageReport ProcedureCode ::= 38
id-endcCellActivation ProcedureCode ::= 39
-
+id-endcPartialReset ProcedureCode ::= 40
+id-eUTRANRCellResourceCoordination ProcedureCode ::= 41
+id-SgNBActivityNotification ProcedureCode ::= 42
+id-endcX2Removal ProcedureCode ::= 43
-- **************************************************************
--
@@ -112,6 +115,10 @@ maxnooftimeperiods INTEGER ::= 2
maxnoofCellIDforQMC INTEGER ::= 32
maxnoofTAforQMC INTEGER ::= 8
maxnoofPLMNforQMC INTEGER ::= 16
+maxUEsinengNBDU INTEGER ::= 8192
+maxnoofProtectedResourcePatterns INTEGER ::= 16
+maxnoNRcellsSpectrumSharingWithE-UTRA INTEGER ::= 64
+maxnoofNrCellBands INTEGER ::= 32
-- **************************************************************
--
@@ -331,41 +338,41 @@ id-SgNBUEAggregateMaximumBitRate ProtocolIE-ID ::= 204
id-E-RABs-ToBeAdded-SgNBAddReqList ProtocolIE-ID ::= 205
id-MeNBtoSgNBContainer ProtocolIE-ID ::= 206
id-SgNB-UE-X2AP-ID ProtocolIE-ID ::= 207
-id-RequestedMCGSplitSRBs ProtocolIE-ID ::= 208
+id-RequestedSplitSRBs ProtocolIE-ID ::= 208
id-E-RABs-ToBeAdded-SgNBAddReq-Item ProtocolIE-ID ::= 209
id-E-RABs-Admitted-ToBeAdded-SgNBAddReqAckList ProtocolIE-ID ::= 210
-id-SgNBtoMeNBContainer ProtocolIE-ID ::= 211
-id-AdmittedMCGSplitSRBs ProtocolIE-ID ::= 212
-id-E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item ProtocolIE-ID ::= 213
-id-ResponseInformationSgNBReconfComp ProtocolIE-ID ::= 214
-id-UE-ContextInformation-SgNBModReq ProtocolIE-ID ::= 215
-id-E-RABs-ToBeAdded-SgNBModReq-Item ProtocolIE-ID ::= 216
-id-E-RABs-ToBeModified-SgNBModReq-Item ProtocolIE-ID ::= 217
-id-E-RABs-ToBeReleased-SgNBModReq-Item ProtocolIE-ID ::= 218
-id-E-RABs-Admitted-ToBeAdded-SgNBModAckList ProtocolIE-ID ::= 219
-id-E-RABs-Admitted-ToBeModified-SgNBModAckList ProtocolIE-ID ::= 220
-id-E-RABs-Admitted-ToBeReleased-SgNBModAckList ProtocolIE-ID ::= 221
-id-E-RABs-Admitted-ToBeAdded-SgNBModAck-Item ProtocolIE-ID ::= 222
-id-E-RABs-Admitted-ToBeModified-SgNBModAck-Item ProtocolIE-ID ::= 223
-id-E-RABs-Admitted-ToBeReleased-SgNBModAck-Item ProtocolIE-ID ::= 224
-id-E-RABs-ToBeReleased-SgNBModReqdList ProtocolIE-ID ::= 225
-id-E-RABs-ToBeModified-SgNBModReqdList ProtocolIE-ID ::= 226
+id-SgNBtoMeNBContainer ProtocolIE-ID ::= 211
+id-AdmittedSplitSRBs ProtocolIE-ID ::= 212
+id-E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item ProtocolIE-ID ::= 213
+id-ResponseInformationSgNBReconfComp ProtocolIE-ID ::= 214
+id-UE-ContextInformation-SgNBModReq ProtocolIE-ID ::= 215
+id-E-RABs-ToBeAdded-SgNBModReq-Item ProtocolIE-ID ::= 216
+id-E-RABs-ToBeModified-SgNBModReq-Item ProtocolIE-ID ::= 217
+id-E-RABs-ToBeReleased-SgNBModReq-Item ProtocolIE-ID ::= 218
+id-E-RABs-Admitted-ToBeAdded-SgNBModAckList ProtocolIE-ID ::= 219
+id-E-RABs-Admitted-ToBeModified-SgNBModAckList ProtocolIE-ID ::= 220
+id-E-RABs-Admitted-ToBeReleased-SgNBModAckList ProtocolIE-ID ::= 221
+id-E-RABs-Admitted-ToBeAdded-SgNBModAck-Item ProtocolIE-ID ::= 222
+id-E-RABs-Admitted-ToBeModified-SgNBModAck-Item ProtocolIE-ID ::= 223
+id-E-RABs-Admitted-ToBeReleased-SgNBModAck-Item ProtocolIE-ID ::= 224
+id-E-RABs-ToBeReleased-SgNBModReqdList ProtocolIE-ID ::= 225
+id-E-RABs-ToBeModified-SgNBModReqdList ProtocolIE-ID ::= 226
id-E-RABs-ToBeReleased-SgNBModReqd-Item ProtocolIE-ID ::= 227
id-E-RABs-ToBeModified-SgNBModReqd-Item ProtocolIE-ID ::= 228
-id-E-RABs-ToBeReleased-SgNBChaConfList ProtocolIE-ID ::= 229
-id-E-RABs-ToBeReleased-SgNBChaConf-Item ProtocolIE-ID ::= 230
-id-E-RABs-ToBeReleased-SgNBRelReqList ProtocolIE-ID ::= 231
-id-E-RABs-ToBeReleased-SgNBRelReq-Item ProtocolIE-ID ::= 232
-id-E-RABs-ToBeReleased-SgNBRelConfList ProtocolIE-ID ::= 233
-id-E-RABs-ToBeReleased-SgNBRelConf-Item ProtocolIE-ID ::= 234
-id-E-RABs-SubjectToSgNBCounterCheck-List ProtocolIE-ID ::= 235
-id-E-RABs-SubjectToSgNBCounterCheck-Item ProtocolIE-ID ::= 236
-id-RRCContainer ProtocolIE-ID ::= 237
-id-SRBType ProtocolIE-ID ::= 238
+id-E-RABs-ToBeReleased-SgNBChaConfList ProtocolIE-ID ::= 229
+id-E-RABs-ToBeReleased-SgNBChaConf-Item ProtocolIE-ID ::= 230
+id-E-RABs-ToBeReleased-SgNBRelReqList ProtocolIE-ID ::= 231
+id-E-RABs-ToBeReleased-SgNBRelReq-Item ProtocolIE-ID ::= 232
+id-E-RABs-ToBeReleased-SgNBRelConfList ProtocolIE-ID ::= 233
+id-E-RABs-ToBeReleased-SgNBRelConf-Item ProtocolIE-ID ::= 234
+id-E-RABs-SubjectToSgNBCounterCheck-List ProtocolIE-ID ::= 235
+id-E-RABs-SubjectToSgNBCounterCheck-Item ProtocolIE-ID ::= 236
+id-RRCContainer ProtocolIE-ID ::= 237
+id-SRBType ProtocolIE-ID ::= 238
id-Target-SgNB-ID ProtocolIE-ID ::= 239
id-HandoverRestrictionList ProtocolIE-ID ::= 240
id-SCGConfigurationQuery ProtocolIE-ID ::= 241
-id-MCGSplitSRB ProtocolIE-ID ::= 242
+id-SplitSRB ProtocolIE-ID ::= 242
id-UENRMeasurement ProtocolIE-ID ::= 243
id-InitiatingNodeType-EndcX2Setup ProtocolIE-ID ::= 244
id-InitiatingNodeType-EndcConfigUpdate ProtocolIE-ID ::= 245
@@ -378,7 +385,7 @@ id-CellAssistanceInformation ProtocolIE-ID ::= 251
id-Globalen-gNB-ID ProtocolIE-ID ::= 252
id-ServedNRcellsENDCX2ManagementList ProtocolIE-ID ::= 253
id-UE-ContextReferenceAtSgNB ProtocolIE-ID ::= 254
-id-SecondaryRATUsageReport ProtocolIE-ID ::= 255
+id-SecondaryRATUsageReport ProtocolIE-ID ::= 255
id-ActivationID ProtocolIE-ID ::= 256
id-MeNBResourceCoordinationInformation ProtocolIE-ID ::= 257
id-SgNBResourceCoordinationInformation ProtocolIE-ID ::= 258
@@ -393,5 +400,35 @@ id-SecondaryRATUsageReport-Item ProtocolIE-ID ::= 266
id-ServedNRCellsToActivate ProtocolIE-ID ::= 267
id-ActivatedNRCellList ProtocolIE-ID ::= 268
id-SelectedPLMN ProtocolIE-ID ::= 269
+id-UEs-ToBeReset ProtocolIE-ID ::= 270
+id-UEs-Admitted-ToBeReset ProtocolIE-ID ::= 271
+id-RRCConfigIndication ProtocolIE-ID ::= 272
+id-DownlinkPacketLossRate ProtocolIE-ID ::= 273
+id-UplinkPacketLossRate ProtocolIE-ID ::= 274
+id-SubscriberProfileIDforRFP ProtocolIE-ID ::= 275
+id-serviceType ProtocolIE-ID ::= 276
+id-AerialUEsubscriptionInformation ProtocolIE-ID ::= 277
+id-SGNB-Addition-Trigger-Ind ProtocolIE-ID ::= 278
+id-MeNBCell-ID ProtocolIE-ID ::= 279
+id-RequestedSplitSRBsrelease ProtocolIE-ID ::= 280
+id-AdmittedSplitSRBsrelease ProtocolIE-ID ::= 281
+id-NRS-NSSS-PowerOffset ProtocolIE-ID ::= 282
+id-NSSS-NumOccasionDifferentPrecoder ProtocolIE-ID ::= 283
+id-ProtectedEUTRAResourceIndication ProtocolIE-ID ::= 284
+id-InitiatingNodeType-EutranrCellResourceCoordination ProtocolIE-ID ::= 285
+id-RespondingNodeType-EutranrCellResourceCoordination ProtocolIE-ID ::= 286
+id-DataTrafficResourceIndication ProtocolIE-ID ::= 287
+id-SpectrumSharingGroupID ProtocolIE-ID ::= 288
+id-ListofEUTRACellsinEUTRACoordinationReq ProtocolIE-ID ::= 289
+id-ListofEUTRACellsinEUTRACoordinationResp ProtocolIE-ID ::= 290
+id-ListofEUTRACellsinNRCoordinationReq ProtocolIE-ID ::= 291
+id-ListofNRCellsinNRCoordinationReq ProtocolIE-ID ::= 292
+id-ListofNRCellsinNRCoordinationResp ProtocolIE-ID ::= 293
+id-E-RABs-AdmittedToBeModified-SgNBModConfList ProtocolIE-ID ::= 294
+id-E-RABs-AdmittedToBeModified-SgNBModConf-Item ProtocolIE-ID ::= 295
+id-UEContextLevelUserPlaneActivity ProtocolIE-ID ::= 296
+id-ERABActivityNotifyItemList ProtocolIE-ID ::= 297
+id-InitiatingNodeType-EndcX2Removal ProtocolIE-ID ::= 298
+id-RespondingNodeType-EndcX2Removal ProtocolIE-ID ::= 299
END
diff --git a/epan/dissectors/asn1/x2ap/X2AP-Containers.asn b/epan/dissectors/asn1/x2ap/X2AP-Containers.asn
index 21f3459965..958c96d453 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 V15.1.0 (2018-03)
+-- 3GPP TS 36.423 V15.2.0 (2018-06)
-- 9.3.8 Container definitions
-- **************************************************************
--
@@ -7,10 +7,10 @@
-- **************************************************************
X2AP-Containers {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) x2ap (2) version1 (1) x2ap-Containers (5) }
-DEFINITIONS AUTOMATIC TAGS ::=
+DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
@@ -27,7 +27,7 @@ IMPORTS
Criticality,
Presence,
PrivateIE-ID,
- ProtocolIE-ID
+ ProtocolIE-ID
FROM X2AP-CommonDataTypes;
-- **************************************************************
@@ -116,11 +116,11 @@ WITH SYNTAX {
--
-- **************************************************************
-ProtocolIE-Container {X2AP-PROTOCOL-IES : IEsSetParam} ::=
+ProtocolIE-Container {X2AP-PROTOCOL-IES : IEsSetParam} ::=
SEQUENCE (SIZE (0..maxProtocolIEs)) OF
ProtocolIE-Field {{IEsSetParam}}
-ProtocolIE-Single-Container {X2AP-PROTOCOL-IES : IEsSetParam} ::=
+ProtocolIE-Single-Container {X2AP-PROTOCOL-IES : IEsSetParam} ::=
ProtocolIE-Field {{IEsSetParam}}
ProtocolIE-Field {X2AP-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
@@ -135,7 +135,7 @@ ProtocolIE-Field {X2AP-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
--
-- **************************************************************
-ProtocolIE-ContainerPair {X2AP-PROTOCOL-IES-PAIR : IEsSetParam} ::=
+ProtocolIE-ContainerPair {X2AP-PROTOCOL-IES-PAIR : IEsSetParam} ::=
SEQUENCE (SIZE (0..maxProtocolIEs)) OF
ProtocolIE-FieldPair {{IEsSetParam}}
@@ -167,7 +167,7 @@ ProtocolIE-ContainerPairList {INTEGER : lowerBound, INTEGER : upperBound, X2AP-P
--
-- **************************************************************
-ProtocolExtensionContainer {X2AP-PROTOCOL-EXTENSION : ExtensionSetParam} ::=
+ProtocolExtensionContainer {X2AP-PROTOCOL-EXTENSION : ExtensionSetParam} ::=
SEQUENCE (SIZE (1..maxProtocolExtensions)) OF
ProtocolExtensionField {{ExtensionSetParam}}
@@ -183,7 +183,7 @@ ProtocolExtensionField {X2AP-PROTOCOL-EXTENSION : ExtensionSetParam} ::= SEQUENC
--
-- **************************************************************
-PrivateIE-Container {X2AP-PRIVATE-IES : IEsSetParam} ::=
+PrivateIE-Container {X2AP-PRIVATE-IES : IEsSetParam} ::=
SEQUENCE (SIZE (1..maxPrivateIEs)) OF
PrivateIE-Field {{IEsSetParam}}
diff --git a/epan/dissectors/asn1/x2ap/X2AP-IEs.asn b/epan/dissectors/asn1/x2ap/X2AP-IEs.asn
index a7b65ae330..c4bfba62d8 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 V15.1.0 (2018-03)
+-- 3GPP TS 36.423 V15.2.0 (2018-06)
-- 9.3.5 Information Element definitions
-- **************************************************************
--
@@ -58,6 +58,13 @@ IMPORTS
id-UEAppLayerMeasConfig,
id-DL-scheduling-PDCCH-CCE-usage,
id-UL-scheduling-PDCCH-CCE-usage,
+ id-DownlinkPacketLossRate,
+ id-UplinkPacketLossRate,
+ id-serviceType,
+ id-ProtectedEUTRAResourceIndication,
+ id-NRS-NSSS-PowerOffset,
+ id-NSSS-NumOccasionDifferentPrecoder,
+
maxnoofBearers,
maxCellineNB,
@@ -93,7 +100,11 @@ IMPORTS
maxnooftimeperiods,
maxnoofCellIDforQMC,
maxnoofTAforQMC,
- maxnoofPLMNforQMC
+ maxnoofPLMNforQMC,
+ maxUEsinengNBDU,
+ maxnoofProtectedResourcePatterns,
+ maxnoNRcellsSpectrumSharingWithE-UTRA,
+ maxnoofNrCellBands
FROM X2AP-Constants
@@ -199,6 +210,12 @@ AdditionalSpecialSubframePatternsExtension ::= ENUMERATED {
...
}
+AerialUEsubscriptionInformation ::= ENUMERATED {
+ allowed,
+ not-allowed,
+ ...
+}
+
AllocationAndRetentionPriority ::= SEQUENCE {
priorityLevel PriorityLevel,
pre-emptionCapability Pre-emptionCapability,
@@ -340,7 +357,8 @@ CauseRadioNetwork ::= ENUMERATED {
mCG-Mobility,
sCG-Mobility,
count-reaches-max-value,
- unknown-old-en-gNB-UE-X2AP-ID
+ unknown-old-en-gNB-UE-X2AP-ID,
+ pDCP-Overload
}
@@ -608,6 +626,16 @@ CyclicPrefixUL ::= ENUMERATED {
-- D
+
+DataTrafficResources ::= BIT STRING (SIZE(12..8800))
+
+DataTrafficResourceIndication ::= SEQUENCE {
+ activationSFN INTEGER (0..1023),
+ sharedResourceType SharedResourceType,
+ reservedSubframePattern ReservedSubframePattern OPTIONAL,
+...
+}
+
DeactivationIndication::= ENUMERATED {
deactivated,
...
@@ -635,6 +663,14 @@ DL-GBR-PRB-usage::= INTEGER (0..100)
DL-non-GBR-PRB-usage::= INTEGER (0..100)
+DLResourceBitmapULandDLSharing ::= DataTrafficResources
+
+DLResourcesULandDLSharing ::= CHOICE {
+unchanged NULL,
+ changed DLResourceBitmapULandDLSharing,
+ ...
+}
+
DL-scheduling-PDCCH-CCE-usage::= INTEGER (0..100)
DL-Total-PRB-usage::= INTEGER (0..100)
@@ -724,6 +760,19 @@ EN-DC-ResourceConfigurationExtIEs X2AP-PROTOCOL-EXTENSION ::= {
EPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMN-Identity
+ERABActivityNotifyItemList ::= SEQUENCE (SIZE (1..maxnoofBearers)) OF ERABActivityNotifyItem
+
+ERABActivityNotifyItem ::= SEQUENCE {
+ e-RAB-ID E-RAB-ID,
+ activityReport UserPlaneTrafficActivityReport,
+ iE-Extensions ProtocolExtensionContainer { {ERABActivityNotifyItem-ExtIEs} } OPTIONAL,
+ ...
+}
+
+ERABActivityNotifyItem-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
E-RAB-ID ::= INTEGER (0..15, ...)
E-RAB-Level-QoS-Parameters ::= SEQUENCE {
@@ -735,6 +784,9 @@ E-RAB-Level-QoS-Parameters ::= SEQUENCE {
}
E-RAB-Level-QoS-Parameters-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+-- Extended for introduction of downlink and uplink packet loss rate for enhanced Voice performance –
+ { ID id-DownlinkPacketLossRate CRITICALITY ignore EXTENSION Packet-LossRate PRESENCE optional}|
+ { ID id-UplinkPacketLossRate CRITICALITY ignore EXTENSION Packet-LossRate PRESENCE optional},
...
}
@@ -848,10 +900,12 @@ FDD-Info ::= SEQUENCE {
}
FDD-Info-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
- { ID id-UL-EARFCNExtension CRITICALITY reject EXTENSION EARFCNExtension PRESENCE optional}|
- { ID id-DL-EARFCNExtension CRITICALITY reject EXTENSION EARFCNExtension PRESENCE optional}|
+ { ID id-UL-EARFCNExtension CRITICALITY reject EXTENSION EARFCNExtension PRESENCE optional}|
+ { ID id-DL-EARFCNExtension CRITICALITY reject EXTENSION EARFCNExtension PRESENCE optional}|
{ ID id-OffsetOfNbiotChannelNumberToDL-EARFCN CRITICALITY reject EXTENSION OffsetOfNbiotChannelNumberToEARFCN PRESENCE optional}|
- { ID id-OffsetOfNbiotChannelNumberToUL-EARFCN CRITICALITY reject EXTENSION OffsetOfNbiotChannelNumberToEARFCN PRESENCE optional},
+ { ID id-OffsetOfNbiotChannelNumberToUL-EARFCN CRITICALITY reject EXTENSION OffsetOfNbiotChannelNumberToEARFCN PRESENCE optional}|
+ { ID id-NRS-NSSS-PowerOffset CRITICALITY ignore EXTENSION NRS-NSSS-PowerOffset PRESENCE optional}|
+ { ID id-NSSS-NumOccasionDifferentPrecoder CRITICALITY ignore EXTENSION NSSS-NumOccasionDifferentPrecoder PRESENCE optional},
...
}
@@ -906,6 +960,18 @@ FreqBandIndicatorPriority ::= ENUMERATED {
...
}
+
+FreqBandNrItem ::= SEQUENCE {
+ freqBandIndicatorNr INTEGER (1..1024,...),
+ supportedSULBandList SEQUENCE (SIZE(0..maxnoofNrCellBands)) OF SupportedSULFreqBandItem,
+ iE-Extensions ProtocolExtensionContainer { {FreqBandNrItem-ExtIEs} } OPTIONAL,
+ ...
+}
+
+FreqBandNrItem-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
-- G
GBR-QosInformation ::= SEQUENCE {
@@ -919,8 +985,8 @@ GBR-QosInformation ::= SEQUENCE {
GBR-QosInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-- Extension for maximum bitrate > 10Gbps --
- { ID id-extended-e-RAB-MaximumBitrateDL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
- { ID id-extended-e-RAB-MaximumBitrateUL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
+ { ID id-extended-e-RAB-MaximumBitrateDL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
+ { ID id-extended-e-RAB-MaximumBitrateUL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
{ ID id-extended-e-RAB-GuaranteedBitrateDL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
{ ID id-extended-e-RAB-GuaranteedBitrateUL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional},
...
@@ -1075,7 +1141,7 @@ LastVisitedEUTRANCellInformation ::= SEQUENCE {
LastVisitedEUTRANCellInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-- Extension for Rel-11 to support enhanced granularity for time UE stayed in cell --
{ ID id-Time-UE-StayedInCell-EnhancedGranularity CRITICALITY ignore EXTENSION Time-UE-StayedInCell-EnhancedGranularity PRESENCE optional}|
- { ID id-HO-cause CRITICALITY ignore EXTENSION Cause PRESENCE optional},
+ { ID id-HO-cause CRITICALITY ignore EXTENSION Cause PRESENCE optional},
...
}
@@ -1261,7 +1327,7 @@ MeasurementThresholdA2 ::= CHOICE {
MeNBResourceCoordinationInformation ::= SEQUENCE {
eUTRA-Cell-ID ECGI,
uLCoordinationInformation BIT STRING (SIZE(6..4400, ...)),
- dLCoordinationInformation BIT STRING (SIZE(6..4400, ...)),
+ dLCoordinationInformation BIT STRING (SIZE(6..4400, ...)) OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { MeNBResourceCoordinationInformationExtIEs} } OPTIONAL,
...
}
@@ -1320,17 +1386,17 @@ BandInfo-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
MeNBtoSgNBContainer ::= OCTET STRING
-MCGSplitSRBs ::= ENUMERATED {srb1, srb2, srb1and2, ...}
+SplitSRBs ::= ENUMERATED {srb1, srb2, srb1and2, ...}
-MCGSplitSRB ::= SEQUENCE {
+SplitSRB ::= SEQUENCE {
rrcContainer RRCContainer OPTIONAL,
srbType SRBType,
deliveryStatus DeliveryStatus OPTIONAL,
- iE-Extensions ProtocolExtensionContainer { {MCGSplitSRB-ExtIEs} } OPTIONAL,
+ iE-Extensions ProtocolExtensionContainer { {SplitSRB-ExtIEs} } OPTIONAL,
...
}
-MCGSplitSRB-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+SplitSRB-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
@@ -1369,7 +1435,19 @@ Number-of-Antennaports ::= ENUMERATED {
...
}
-NRARFCN ::= INTEGER (0..3266667) -- This IE may be refined.
+NRFreqInfo ::= SEQUENCE{
+ nRARFCN INTEGER (0.. 3279165),
+ nRARFCN-SUL INTEGER (0.. 3279165) OPTIONAL,
+ freqBandListNr SEQUENCE (SIZE(1..maxnoofNrCellBands)) OF FreqBandNrItem,
+ sULInformation SULInformation OPTIONAL,
+ iE-Extensions ProtocolExtensionContainer { {NRFreqInfo-ExtIEs} } OPTIONAL,
+
+ ...
+}
+
+NRFreqInfo-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
NRCellIdentifier ::= BIT STRING (SIZE (36))
@@ -1409,8 +1487,9 @@ NRNRB ::= ENUMERATED { nrb11, nrb18, nrb24, nrb25, nrb31, nrb32, nrb38, nrb51, n
NRSCS ::= ENUMERATED { scs15, scs30, scs60, scs120, ...}
+NRS-NSSS-PowerOffset ::= ENUMERATED { minusThree, zero, three, ...}
-Extended-TAC ::= OCTET STRING (SIZE (3))
+FiveGS-TAC ::= OCTET STRING (SIZE (3))
NRUESecurityCapabilities ::= SEQUENCE {
nRencryptionAlgorithms NRencryptionAlgorithms,
@@ -1423,6 +1502,8 @@ NRUESecurityCapabilities-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
+NSSS-NumOccasionDifferentPrecoder ::= ENUMERATED { two, four, eight, ...}
+
-- O
OffsetOfNbiotChannelNumberToEARFCN ::= ENUMERATED {
@@ -1454,6 +1535,8 @@ Oneframe ::= BIT STRING (SIZE (6))
-- P
+Packet-LossRate ::= INTEGER(0..1000)
+
PA-Values ::= ENUMERATED {
dB-6,
dB-4dot77,
@@ -1549,6 +1632,31 @@ ProSeUEtoNetworkRelaying ::= ENUMERATED {
...
}
+ProtectedEUTRAResourceIndication::= SEQUENCE {
+ activationSFN INTEGER (0..1023),
+ protectedResourceList ProtectedResourceList,
+ mBSFNControlRegionLength INTEGER (0..3) OPTIONAL,
+ pDCCHRegionLength INTEGER (1..3) OPTIONAL,
+ ...
+}
+
+
+ProtectedFootprintTimePattern ::= SEQUENCE {
+ protectedFootprintTimePeriodicity INTEGER (1..80, ...),
+ protectedFootprintStartTime INTEGER (1..20, ...),
+ ...
+}
+
+ProtectedResourceList ::= SEQUENCE (SIZE(1.. maxnoofProtectedResourcePatterns)) OF ProtectedResourceList-Item
+
+ProtectedResourceList-Item ::= SEQUENCE {
+ resourceType ResourceType,
+ intraPRBProtectedResourceFootprint BIT STRING (SIZE(84, ...)),
+ protectedFootprintFrequencyPattern BIT STRING (SIZE(6..110, ...)),
+ protectedFootprintTimePattern ProtectedFootprintTimePattern,
+ ...
+}
+
-- Q
QCI ::= INTEGER (0..255)
@@ -1651,6 +1759,20 @@ ReportingPeriodicityRSRPMR ::= ENUMERATED {
ReportIntervalMDT ::= ENUMERATED {ms120, ms240, ms480, ms640, ms1024, ms2048, ms5120, ms10240, min1, min6, min12, min30, min60}
+ReservedSubframePattern ::= SEQUENCE{
+ subframeType SubframeType,
+ reservedSubframePattern BIT STRING (SIZE(10..40)),
+ mBSFNControlRegionLength INTEGER (0..3),
+ ...
+}
+
+ResourceType ::= ENUMERATED {
+ downlinknonCRS,
+ cRS,
+ uplink,
+ ...
+}
+
ResumeID ::= CHOICE {
non-truncated BIT STRING(SIZE(40)),
truncated BIT STRING(SIZE(24)),
@@ -1682,6 +1804,12 @@ RNTP-Threshold ::= ENUMERATED {
...
}
+RRC-Config-Ind ::= ENUMERATED {
+ full-config,
+ delta-config,
+ ...
+}
+
RRC-Context ::= OCTET STRING
RRCConnReestabIndicator ::= ENUMERATED {
@@ -1781,21 +1909,28 @@ ServedCell-Information ::= SEQUENCE {
}
ServedCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
- { ID id-Number-of-Antennaports CRITICALITY ignore EXTENSION Number-of-Antennaports PRESENCE optional}|
- { ID id-PRACH-Configuration CRITICALITY ignore EXTENSION PRACH-Configuration PRESENCE optional}|
- { ID id-MBSFN-Subframe-Info CRITICALITY ignore EXTENSION MBSFN-Subframe-Infolist PRESENCE optional}|
- { ID id-CSG-Id CRITICALITY ignore EXTENSION CSG-Id PRESENCE optional}|
- { ID id-MBMS-Service-Area-List CRITICALITY ignore EXTENSION MBMS-Service-Area-Identity-List PRESENCE optional}|
- { ID id-MultibandInfoList CRITICALITY ignore EXTENSION MultibandInfoList PRESENCE optional}|
- { ID id-FreqBandIndicatorPriority CRITICALITY ignore EXTENSION FreqBandIndicatorPriority PRESENCE optional}|
- { ID id-BandwidthReducedSI CRITICALITY ignore EXTENSION BandwidthReducedSI PRESENCE optional},
+ { ID id-Number-of-Antennaports CRITICALITY ignore EXTENSION Number-of-Antennaports PRESENCE optional}|
+ { ID id-PRACH-Configuration CRITICALITY ignore EXTENSION PRACH-Configuration PRESENCE optional}|
+ { ID id-MBSFN-Subframe-Info CRITICALITY ignore EXTENSION MBSFN-Subframe-Infolist PRESENCE optional}|
+ { ID id-CSG-Id CRITICALITY ignore EXTENSION CSG-Id PRESENCE optional}|
+ { ID id-MBMS-Service-Area-List CRITICALITY ignore EXTENSION MBMS-Service-Area-Identity-List PRESENCE optional}|
+ { ID id-MultibandInfoList CRITICALITY ignore EXTENSION MultibandInfoList PRESENCE optional}|
+ { ID id-FreqBandIndicatorPriority CRITICALITY ignore EXTENSION FreqBandIndicatorPriority PRESENCE optional}|
+ { ID id-BandwidthReducedSI CRITICALITY ignore EXTENSION BandwidthReducedSI PRESENCE optional}|
+ { ID id-ProtectedEUTRAResourceIndication CRITICALITY ignore EXTENSION ProtectedEUTRAResourceIndication PRESENCE optional},
+ ...
+}
+
+ServiceType ::= ENUMERATED{
+ qMC-for-streaming-service,
+ qMC-for-MTSI-service,
...
}
SgNBResourceCoordinationInformation ::= SEQUENCE {
nR-CGI NRCGI,
uLCoordinationInformation BIT STRING (SIZE(6..4400, ...)),
- dLCoordinationInformation BIT STRING (SIZE(6..4400, ...)),
+ dLCoordinationInformation BIT STRING (SIZE(6..4400, ...)) OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { SgNBResourceCoordinationInformationExtIEs} } OPTIONAL,
...
}
@@ -1811,8 +1946,22 @@ SIPTOBearerDeactivationIndication ::= ENUMERATED {
...
}
+SharedResourceType ::= CHOICE{
+ uLOnlySharing ULOnlySharing,
+ uLandDLSharing ULandDLSharing,
+ ...
+}
+
ShortMAC-I ::= BIT STRING (SIZE(16))
+
+SGNB-Addition-Trigger-Ind ::= ENUMERATED {
+ sn-change,
+ inter-eNB-HO,
+ intra-eNB-HO,
+ ...
+}
+
SourceOfUEActivityBehaviourInformation ::= ENUMERATED {
subscription-information,
statistics,
@@ -1844,6 +1993,8 @@ SpecialSubframePatterns ::= ENUMERATED {
...
}
+SpectrumSharingGroupID ::= INTEGER (1..maxCellineNB)
+
SubbandCQI ::= SEQUENCE {
subbandCQICodeword0 SubbandCQICodeword0,
subbandCQICodeword1 SubbandCQICodeword1 OPTIONAL,
@@ -1915,6 +2066,8 @@ SubframeAssignment ::= ENUMERATED {
...
}
+SubframeType ::= ENUMERATED{mbsfn,nonmbsfn,...}
+
SgNBSecurityKey ::= BIT STRING (SIZE(256))
SgNBtoMeNBContainer ::= OCTET STRING
@@ -1923,12 +2076,22 @@ SRBType ::= ENUMERATED {srb1, srb2, ...}
SCGConfigurationQuery ::= ENUMERATED {true,...}
SULInformation ::= SEQUENCE {
- sUL-ARFCN NRARFCN,
+ sUL-ARFCN INTEGER (0.. 3279165),
sUL-TxBW NR-TxBW,
iE-Extensions ProtocolExtensionContainer { { SULInformation-ExtIEs } } OPTIONAL,
...
}
+
+SupportedSULFreqBandItem ::= SEQUENCE {
+ freqBandIndicatorNr INTEGER (1..1024,...),
+ ...
+}
+
+SupportedSULFreqBandItem-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
SULInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
@@ -2043,7 +2206,7 @@ traceCollectionEntityIPAddress TraceCollectionEntityIPAddress,
}
TraceActivation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
- { ID id-MDTConfiguration CRITICALITY ignore EXTENSION MDT-Configuration PRESENCE optional}|
+ { ID id-MDTConfiguration CRITICALITY ignore EXTENSION MDT-Configuration PRESENCE optional}|
{ ID id-UEAppLayerMeasConfig CRITICALITY ignore EXTENSION UEAppLayerMeasConfig PRESENCE optional},
...
}
@@ -2114,6 +2277,7 @@ UEAppLayerMeasConfig ::= SEQUENCE {
}
UEAppLayerMeasConfig-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ {ID id-serviceType CRITICALITY ignore EXTENSION ServiceType PRESENCE optional},
...
}
@@ -2162,6 +2326,26 @@ UE-Sidelink-Aggregate-MaximumBitRate-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
+UEsToBeResetList ::= SEQUENCE (SIZE (1.. maxUEsinengNBDU)) OF UEsToBeResetList-Item
+
+UEsToBeResetList-Item::= SEQUENCE {
+ meNB-ID UE-X2AP-ID,
+ meNB-ID-ext UE-X2AP-ID-Extension OPTIONAL,
+ sgNB-ID SgNB-UE-X2AP-ID OPTIONAL,
+ iE-Extensions ProtocolExtensionContainer { { UEsToBeResetList-Item-ExtIEs} } OPTIONAL,
+ ...
+}
+
+UEsToBeResetList-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+ULandDLSharing ::= SEQUENCE{
+ uLResourcesULandDLSharing ULResourcesULandDLSharing,
+ dLResourcesULandDLSharing DLResourcesULandDLSharing,
+ ...
+}
+
ULConfiguration::= SEQUENCE {
uL-PDCP UL-UE-Configuration,
iE-Extensions ProtocolExtensionContainer { { ULConfiguration-ExtIEs} } OPTIONAL,
@@ -2202,6 +2386,20 @@ UL-InterferenceOverloadIndication-Item ::= ENUMERATED {
UL-non-GBR-PRB-usage::= INTEGER (0..100)
+ULOnlySharing ::= SEQUENCE{
+ uLResourceBitmapULOnlySharing DataTrafficResources,
+ ...
+}
+
+ULResourceBitmapULandDLSharing ::= DataTrafficResources
+
+
+ULResourcesULandDLSharing ::= CHOICE {
+ unchanged NULL,
+ changed ULResourceBitmapULandDLSharing,
+ ...
+}
+
UL-scheduling-PDCCH-CCE-usage::= INTEGER (0..100)
UL-Total-PRB-usage::= INTEGER (0..100)
@@ -2233,11 +2431,13 @@ UsableABSInformationTDD-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
}
+UserPlaneTrafficActivityReport ::= ENUMERATED {inactive, re-activated, ...}
+
-- V
V2XServicesAuthorized ::= SEQUENCE {
- vehicleUE VehicleUE OPTIONAL,
-pedestrianUE PedestrianUE OPTIONAL,
+ vehicleUE VehicleUE OPTIONAL,
+pedestrianUE PedestrianUE OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {V2XServicesAuthorized-ExtIEs} } OPTIONAL,
...
}
diff --git a/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn b/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn
index fc3d638d0c..b987c82281 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 V15.1.0 (2018-03)
+-- 3GPP TS 36.423 V15.2.0 (2018-06)
-- 9.3.4 PDU Definitions
-- **************************************************************
--
@@ -30,6 +30,7 @@ IMPORTS
Correlation-ID,
COUNTvalue,
CellReportingIndicator,
+ AerialUEsubscriptionInformation,
CriticalityDiagnostics,
CRNTI,
CSGMembershipStatus,
@@ -83,6 +84,7 @@ IMPORTS
UE-HistoryInformationFromTheUE,
UE-S1AP-ID,
UESecurityCapabilities,
+ UEsToBeResetList,
UE-X2AP-ID,
UL-HighInterferenceIndicationInfo,
UL-InterferenceOverloadIndication,
@@ -127,17 +129,17 @@ IMPORTS
SgNBSecurityKey,
MeNBtoSgNBContainer,
SgNBtoMeNBContainer,
- MCGSplitSRBs,
+ SplitSRBs,
RRCContainer,
SRBType,
GlobalGNB-ID,
GNB-ID,
SCGConfigurationQuery,
- MCGSplitSRB,
+ SplitSRB,
UENRMeasurement,
EN-DC-ResourceConfiguration,
TAC,
- NRARFCN,
+ NRFreqInfo,
NRCGI,
NRPCI,
NRUESecurityCapabilities,
@@ -153,8 +155,16 @@ IMPORTS
RLCMode,
GBR-QosInformation,
DRB-ID,
- Extended-TAC,
- SULInformation
+ FiveGS-TAC,
+ SULInformation,
+ Packet-LossRate,
+ ResourceType,
+ DataTrafficResourceIndication,
+ SpectrumSharingGroupID,
+ RRC-Config-Ind,
+ SGNB-Addition-Trigger-Ind,
+ UserPlaneTrafficActivityReport,
+ ERABActivityNotifyItemList
FROM X2AP-IEs
@@ -183,6 +193,7 @@ FROM X2AP-Containers
id-CellToReport,
id-CellToReport-Item,
id-CompositeAvailableCapacityGroup,
+ id-AerialUEsubscriptionInformation,
id-CriticalityDiagnostics,
id-DeactivationIndication,
id-DynamicDLTransmissionInformation,
@@ -308,6 +319,8 @@ FROM X2AP-Containers
id-UE-ContextReferenceAtSeNB,
id-UE-ContextReferenceAtWT,
id-UE-ContextKeptIndicator,
+ id-UEs-ToBeReset,
+ id-UEs-Admitted-ToBeReset,
id-WT-UE-ContextKeptIndicator,
id-New-eNB-UE-X2AP-ID-Extension,
id-Old-eNB-UE-X2AP-ID-Extension,
@@ -332,11 +345,11 @@ FROM X2AP-Containers
id-E-RABs-ToBeAdded-SgNBAddReqList,
id-MeNBtoSgNBContainer,
id-SgNB-UE-X2AP-ID,
- id-RequestedMCGSplitSRBs,
+ id-RequestedSplitSRBs,
id-E-RABs-ToBeAdded-SgNBAddReq-Item,
id-E-RABs-Admitted-ToBeAdded-SgNBAddReqAckList,
id-SgNBtoMeNBContainer,
- id-AdmittedMCGSplitSRBs ,
+ id-AdmittedSplitSRBs ,
id-E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item,
id-ResponseInformationSgNBReconfComp,
id-UE-ContextInformation-SgNBModReq,
@@ -366,7 +379,7 @@ FROM X2AP-Containers
id-SRBType,
id-HandoverRestrictionList,
id-SCGConfigurationQuery,
- id-MCGSplitSRB,
+ id-SplitSRB,
id-UENRMeasurement,
id-InitiatingNodeType-EndcX2Setup,
id-InitiatingNodeType-EndcConfigUpdate,
@@ -392,6 +405,28 @@ FROM X2AP-Containers
id-SgNBResourceCoordinationInformation,
id-UEAppLayerMeasConfig,
id-SelectedPLMN,
+ id-SubscriberProfileIDforRFP,
+ id-InitiatingNodeType-EutranrCellResourceCoordination,
+ id-RespondingNodeType-EutranrCellResourceCoordination,
+ id-DataTrafficResourceIndication,
+ id-SpectrumSharingGroupID,
+ id-ListofEUTRACellsinEUTRACoordinationReq,
+ id-ListofEUTRACellsinEUTRACoordinationResp,
+ id-ListofEUTRACellsinNRCoordinationReq,
+ id-ListofNRCellsinNRCoordinationReq,
+ id-ListofNRCellsinNRCoordinationResp,
+ id-RRCConfigIndication,
+ id-SGNB-Addition-Trigger-Ind,
+ id-RequestedSplitSRBsrelease,
+ id-AdmittedSplitSRBsrelease,
+ id-E-RABs-AdmittedToBeModified-SgNBModConfList,
+ id-E-RABs-AdmittedToBeModified-SgNBModConf-Item,
+ id-UEContextLevelUserPlaneActivity,
+ id-ERABActivityNotifyItemList,
+ id-MeNBCell-ID,
+ id-InitiatingNodeType-EndcX2Removal,
+ id-RespondingNodeType-EndcX2Removal,
+
maxCellineNB,
maxnoofBearers,
@@ -403,7 +438,11 @@ FROM X2AP-Containers
maxCellinengNB,
maxnoofCellIDforQMC,
maxnoofTAforQMC,
- maxnoofPLMNforQMC
+ maxnoofPLMNforQMC,
+ maxnoofProtectedResourcePatterns,
+ maxnoNRcellsSpectrumSharingWithE-UTRA,
+ maxnoofNrCellBands
+
FROM X2AP-Constants;
-- **************************************************************
@@ -418,26 +457,27 @@ HandoverRequest ::= SEQUENCE {
}
HandoverRequest-IEs X2AP-PROTOCOL-IES ::= {
- { ID id-Old-eNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory}|
- { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
- { ID id-TargetCell-ID CRITICALITY reject TYPE ECGI PRESENCE mandatory}|
- { ID id-GUMMEI-ID CRITICALITY reject TYPE GUMMEI PRESENCE mandatory}|
- { ID id-UE-ContextInformation CRITICALITY reject TYPE UE-ContextInformation PRESENCE mandatory}|
- { ID id-UE-HistoryInformation CRITICALITY ignore TYPE UE-HistoryInformation PRESENCE mandatory}|
- { ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE optional}|
- { ID id-SRVCCOperationPossible CRITICALITY ignore TYPE SRVCCOperationPossible PRESENCE optional}|
- { ID id-CSGMembershipStatus CRITICALITY reject TYPE CSGMembershipStatus PRESENCE optional}|
- { ID id-MobilityInformation CRITICALITY ignore TYPE MobilityInformation PRESENCE optional}|
- { ID id-Masked-IMEISV CRITICALITY ignore TYPE Masked-IMEISV PRESENCE optional}|
- { ID id-UE-HistoryInformationFromTheUE CRITICALITY ignore TYPE UE-HistoryInformationFromTheUE PRESENCE optional}|
- { ID id-ExpectedUEBehaviour CRITICALITY ignore TYPE ExpectedUEBehaviour PRESENCE optional}|
- { ID id-ProSeAuthorized CRITICALITY ignore TYPE ProSeAuthorized PRESENCE optional}|
- { ID id-UE-ContextReferenceAtSeNB CRITICALITY ignore TYPE UE-ContextReferenceAtSeNB PRESENCE optional}|
- { ID id-Old-eNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}|
- { ID id-V2XServicesAuthorized CRITICALITY ignore TYPE V2XServicesAuthorized PRESENCE optional}|
- { ID id-UE-ContextReferenceAtWT CRITICALITY ignore TYPE UE-ContextReferenceAtWT PRESENCE optional}|
- { ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
- { ID id-UE-ContextReferenceAtSgNB CRITICALITY ignore TYPE UE-ContextReferenceAtSgNB PRESENCE optional},
+ { ID id-Old-eNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory}|
+ { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
+ { ID id-TargetCell-ID CRITICALITY reject TYPE ECGI PRESENCE mandatory}|
+ { ID id-GUMMEI-ID CRITICALITY reject TYPE GUMMEI PRESENCE mandatory}|
+ { ID id-UE-ContextInformation CRITICALITY reject TYPE UE-ContextInformation PRESENCE mandatory}|
+ { ID id-UE-HistoryInformation CRITICALITY ignore TYPE UE-HistoryInformation PRESENCE mandatory}|
+ { ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE optional}|
+ { ID id-SRVCCOperationPossible CRITICALITY ignore TYPE SRVCCOperationPossible PRESENCE optional}|
+ { ID id-CSGMembershipStatus CRITICALITY reject TYPE CSGMembershipStatus PRESENCE optional}|
+ { ID id-MobilityInformation CRITICALITY ignore TYPE MobilityInformation PRESENCE optional}|
+ { ID id-Masked-IMEISV CRITICALITY ignore TYPE Masked-IMEISV PRESENCE optional}|
+ { ID id-UE-HistoryInformationFromTheUE CRITICALITY ignore TYPE UE-HistoryInformationFromTheUE PRESENCE optional}|
+ { ID id-ExpectedUEBehaviour CRITICALITY ignore TYPE ExpectedUEBehaviour PRESENCE optional}|
+ { ID id-ProSeAuthorized CRITICALITY ignore TYPE ProSeAuthorized PRESENCE optional}|
+ { ID id-UE-ContextReferenceAtSeNB CRITICALITY ignore TYPE UE-ContextReferenceAtSeNB PRESENCE optional}|
+ { ID id-Old-eNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}|
+ { ID id-V2XServicesAuthorized CRITICALITY ignore TYPE V2XServicesAuthorized PRESENCE optional}|
+ { ID id-UE-ContextReferenceAtWT CRITICALITY ignore TYPE UE-ContextReferenceAtWT PRESENCE optional}|
+ { ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}|
+ { ID id-UE-ContextReferenceAtSgNB CRITICALITY ignore TYPE UE-ContextReferenceAtSgNB PRESENCE optional}|
+ { ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional},
...
}
@@ -456,8 +496,8 @@ UE-ContextInformation ::= SEQUENCE {
}
UE-ContextInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-{ ID id-ManagementBasedMDTallowed CRITICALITY ignore EXTENSION ManagementBasedMDTallowed PRESENCE optional }|
-{ ID id-ManagementBasedMDTPLMNList CRITICALITY ignore EXTENSION MDTPLMNList PRESENCE optional }|
+{ ID id-ManagementBasedMDTallowed CRITICALITY ignore EXTENSION ManagementBasedMDTallowed PRESENCE optional }|
+{ ID id-ManagementBasedMDTPLMNList CRITICALITY ignore EXTENSION MDTPLMNList PRESENCE optional }|
{ ID id-UESidelinkAggregateMaximumBitRate CRITICALITY ignore EXTENSION UESidelinkAggregateMaximumBitRate PRESENCE optional},
...
}
@@ -2167,7 +2207,9 @@ RetrieveUEContextRequest-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-SeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}|
{ ID id-resumeID CRITICALITY reject TYPE ResumeID PRESENCE mandatory}|
{ ID id-ShortMAC-I CRITICALITY reject TYPE ShortMAC-I PRESENCE mandatory}|
- { ID id-NewEUTRANCellIdentifier CRITICALITY reject TYPE EUTRANCellIdentifier PRESENCE mandatory},
+ { ID id-NewEUTRANCellIdentifier CRITICALITY reject TYPE EUTRANCellIdentifier PRESENCE mandatory}|
+ {ID id-FailureCellCRNTI CRITICALITY reject TYPE CRNTI PRESENCE optional}|
+ {ID id-FailureCellPCI CRITICALITY reject TYPE PCI PRESENCE optional},
...
}
@@ -2195,7 +2237,8 @@ RetrieveUEContextResponse-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-ExpectedUEBehaviour CRITICALITY ignore TYPE ExpectedUEBehaviour PRESENCE optional}|
{ ID id-ProSeAuthorized CRITICALITY ignore TYPE ProSeAuthorized PRESENCE optional}|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}|
- { ID id-V2XServicesAuthorized CRITICALITY ignore TYPE V2XServicesAuthorized PRESENCE optional},
+ { ID id-V2XServicesAuthorized CRITICALITY ignore TYPE V2XServicesAuthorized PRESENCE optional}|
+ { ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional},
...
}
@@ -2282,8 +2325,11 @@ SgNBAdditionRequest-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-SgNB-UE-X2AP-ID CRITICALITY reject TYPE SgNB-UE-X2AP-ID PRESENCE optional}|
{ ID id-ExpectedUEBehaviour CRITICALITY ignore TYPE ExpectedUEBehaviour PRESENCE optional}|
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}|
- { ID id-RequestedMCGSplitSRBs CRITICALITY reject TYPE MCGSplitSRBs PRESENCE optional}|
- { ID id-MeNBResourceCoordinationInformation CRITICALITY ignore TYPE MeNBResourceCoordinationInformation PRESENCE optional},
+ { ID id-RequestedSplitSRBs CRITICALITY reject TYPE SplitSRBs PRESENCE optional}|
+ { ID id-MeNBResourceCoordinationInformation CRITICALITY ignore TYPE MeNBResourceCoordinationInformation PRESENCE optional}|
+ { ID id-SGNB-Addition-Trigger-Ind CRITICALITY reject TYPE SGNB-Addition-Trigger-Ind PRESENCE optional}|
+ { ID id-SubscriberProfileIDforRFP CRITICALITY ignore TYPE SubscriberProfileIDforRFP PRESENCE optional}|
+ { ID id-MeNBCell-ID CRITICALITY reject TYPE ECGI PRESENCE mandatory},
...
}
@@ -2329,7 +2375,8 @@ E-RABs-ToBeAdded-SgNBAddReq-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION :
E-RABs-ToBeAdded-SgNBAddReq-Item-SgNBPDCPnotpresent ::= SEQUENCE {
requested-SCG-E-RAB-Level-QoS-Parameters E-RAB-Level-QoS-Parameters,
- meNB-UL-GTP-TEIDatPDCP GTPtunnelEndpoint,
+ meNB-UL-GTP-TEIDatPDCP GTPtunnelEndpoint,
+ secondary-meNB-UL-GTP-TEIDatPDCP GTPtunnelEndpoint OPTIONAL,
rlc-Mode RLCMode,
uL-Configuration ULConfiguration OPTIONAL,
-- This IE shall be present if MCG resource and SCG resources IEs in the the EN-DC Resource Configuration IE are set to “present” --
@@ -2360,8 +2407,9 @@ SgNBAdditionRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-SgNBtoMeNBContainer CRITICALITY reject TYPE SgNBtoMeNBContainer PRESENCE mandatory}|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}|
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}|
- { ID id-AdmittedMCGSplitSRBs CRITICALITY reject TYPE MCGSplitSRBs PRESENCE optional}|
- { ID id-SgNBResourceCoordinationInformation CRITICALITY ignore TYPE SgNBResourceCoordinationInformation PRESENCE optional},
+ { ID id-AdmittedSplitSRBs CRITICALITY reject TYPE SplitSRBs PRESENCE optional}|
+ { ID id-SgNBResourceCoordinationInformation CRITICALITY ignore TYPE SgNBResourceCoordinationInformation PRESENCE optional}|
+ { ID id-RRCConfigIndication CRITICALITY reject TYPE RRC-Config-Ind PRESENCE optional},
...
}
@@ -2396,7 +2444,7 @@ E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item-SgNBPDCPpresent ::= SEQUENCE {
dL-Forwarding-GTPtunnelEndpoint GTPtunnelEndpoint OPTIONAL,
uL-Forwarding-GTPtunnelEndpoint GTPtunnelEndpoint OPTIONAL,
mCG-E-RAB-Level-QoS-Parameters E-RAB-Level-QoS-Parameters OPTIONAL,
--- This IE shall be present if MCG resource and SCG resource IEs in the the EN-DC Resource Configuration IE are set to “present” --
+-- This IE shall be present if MCG resource and SCG resource IEs in the the EN-DC Resource Configuration IE are set to “present” and the GBR QoS Information IE is present in the Requested MCG E-RAB Level QoS Parameters IE --
uL-Configuration ULConfiguration OPTIONAL,
-- This IE shall be present if MCG resource and SCG resources IEs in the the EN-DC Resource Configuration IE are set to “present” --
iE-Extensions ProtocolExtensionContainer { {E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item-SgNBPDCPpresentExtIEs} } OPTIONAL,
@@ -2408,8 +2456,9 @@ E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL
}
E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item-SgNBPDCPnotpresent ::= SEQUENCE {
- sgNB-DL-GTP-TEIDatSCG GTPtunnelEndpoint,
- iE-Extensions ProtocolExtensionContainer { {E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item-SgNBPDCPnotpresentExtIEs} } OPTIONAL,
+ sgNB-DL-GTP-TEIDatSCG GTPtunnelEndpoint,
+ secondary-sgNB-DL-GTP-TEIDatSCG GTPtunnelEndpoint OPTIONAL,
+ iE-Extensions ProtocolExtensionContainer { {E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item-SgNBPDCPnotpresentExtIEs} } OPTIONAL,
...
}
@@ -2507,7 +2556,9 @@ SgNBModificationRequest-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-UE-ContextInformation-SgNBModReq CRITICALITY reject TYPE UE-ContextInformation-SgNBModReq PRESENCE optional}|
{ ID id-MeNBtoSgNBContainer CRITICALITY ignore TYPE MeNBtoSgNBContainer PRESENCE optional}|
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}|
- { ID id-MeNBResourceCoordinationInformation CRITICALITY ignore TYPE MeNBResourceCoordinationInformation PRESENCE optional},
+ { ID id-MeNBResourceCoordinationInformation CRITICALITY ignore TYPE MeNBResourceCoordinationInformation PRESENCE optional}|
+ { ID id-RequestedSplitSRBs CRITICALITY ignore TYPE SplitSRBs PRESENCE optional}|
+ { ID id-RequestedSplitSRBsrelease CRITICALITY ignore TYPE SplitSRBs PRESENCE optional},
...
}
@@ -2523,6 +2574,7 @@ UE-ContextInformation-SgNBModReq ::= SEQUENCE {
}
UE-ContextInformationSgNBModReqExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ { ID id-SubscriberProfileIDforRFP CRITICALITY ignore EXTENSION SubscriberProfileIDforRFP PRESENCE optional},
...
}
@@ -2568,7 +2620,8 @@ E-RABs-ToBeAdded-SgNBModReq-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION :
E-RABs-ToBeAdded-SgNBModReq-Item-SgNBPDCPnotpresent ::= SEQUENCE {
requested-SCG-E-RAB-Level-QoS-Parameters E-RAB-Level-QoS-Parameters,
- meNB-UL-GTP-TEIDatPDCP GTPtunnelEndpoint,
+ meNB-UL-GTP-TEIDatPDCP GTPtunnelEndpoint,
+ secondary-meNB-UL-GTP-TEIDatPDCP GTPtunnelEndpoint OPTIONAL,
rlc-Mode RLCMode,
uL-Configuration ULConfiguration OPTIONAL,
-- This IE shall be present if MCG resource and SCG resources IEs in the the EN-DC Resource Configuration IE are set to “present” --
@@ -2696,7 +2749,9 @@ SgNBModificationRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-SgNBtoMeNBContainer CRITICALITY ignore TYPE SgNBtoMeNBContainer PRESENCE optional}|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}|
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY ignore TYPE UE-X2AP-ID-Extension PRESENCE optional}|
- { ID id-SgNBResourceCoordinationInformation CRITICALITY ignore TYPE SgNBResourceCoordinationInformation PRESENCE optional},
+ { ID id-SgNBResourceCoordinationInformation CRITICALITY ignore TYPE SgNBResourceCoordinationInformation PRESENCE optional}|
+ { ID id-AdmittedSplitSRBs CRITICALITY ignore TYPE SplitSRBs PRESENCE optional}|
+ { ID id-AdmittedSplitSRBsrelease CRITICALITY ignore TYPE SplitSRBs PRESENCE optional},
...
}
@@ -2731,7 +2786,7 @@ E-RABs-Admitted-ToBeAdded-SgNBModAck-Item-SgNBPDCPpresent ::= SEQUENCE {
dL-Forwarding-GTPtunnelEndpoint GTPtunnelEndpoint OPTIONAL,
uL-Forwarding-GTPtunnelEndpoint GTPtunnelEndpoint OPTIONAL,
mCG-E-RAB-Level-QoS-Parameters E-RAB-Level-QoS-Parameters OPTIONAL,
--- This IE shall be present if MCG resource and SCG resource IEs in the the EN-DC Resource Configuration IE are set to “present” --
+-- This IE shall be present if MCG resource and SCG resource IEs in the the EN-DC Resource Configuration IE are set to “present” and the GBR QoS Information IE is present in the Requested MCG E-RAB Level QoS Parameters IE --
uL-Configuration ULConfiguration OPTIONAL,
-- This IE shall be present if MCG resource and SCG resources IEs in the the EN-DC Resource Configuration IE are set to “present” --
iE-Extensions ProtocolExtensionContainer { {E-RABs-Admitted-ToBeAdded-SgNBModAck-Item-SgNBPDCPpresentExtIEs} } OPTIONAL,
@@ -2744,6 +2799,7 @@ E-RABs-Admitted-ToBeAdded-SgNBModAck-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EX
E-RABs-Admitted-ToBeAdded-SgNBModAck-Item-SgNBPDCPnotpresent ::= SEQUENCE {
sgNB-DL-GTP-TEIDatSCG GTPtunnelEndpoint,
+ secondary-sgNB-DL-GTP-TEIDatSCG GTPtunnelEndpoint OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {E-RABs-Admitted-ToBeAdded-SgNBModAck-Item-SgNBPDCPnotpresentExtIEs} } OPTIONAL,
...
}
@@ -2778,6 +2834,7 @@ E-RABs-Admitted-ToBeModified-SgNBModAck-Item-SgNBPDCPpresent ::= SEQUENCE {
s1-DL-GTPtunnelEndpoint GTPtunnelEndpoint OPTIONAL,
sgNB-UL-GTP-TEIDatPDCP GTPtunnelEndpoint OPTIONAL,
mCG-E-RAB-Level-QoS-Parameters E-RAB-Level-QoS-Parameters OPTIONAL,
+ uL-Configuration ULConfiguration OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {E-RABs-Admitted-ToBeModified-SgNBModAck-Item-SgNBPDCPpresentExtIEs} } OPTIONAL,
...
}
@@ -2927,6 +2984,8 @@ E-RABs-ToBeModified-SgNBModReqd-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
E-RABs-ToBeModified-SgNBModReqd-Item-SgNBPDCPpresent ::= SEQUENCE {
requested-MCG-E-RAB-Level-QoS-Parameters E-RAB-Level-QoS-Parameters OPTIONAL,
uL-Configuration ULConfiguration OPTIONAL,
+ sgNB-UL-GTP-TEIDatPDCP GTPtunnelEndpoint OPTIONAL,
+ s1-DL-GTP-TEIDatSgNB GTPtunnelEndpoint OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {E-RABs-ToBeModified-SgNBModReqd-Item-SgNBPDCPpresentExtIEs} } OPTIONAL,
...
}
@@ -2936,7 +2995,8 @@ E-RABs-ToBeModified-SgNBModReqd-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSI
}
E-RABs-ToBeModified-SgNBModReqd-Item-SgNBPDCPnotpresent ::= SEQUENCE {
- sgNB-DL-GTP-TEIDatSCG GTPtunnelEndpoint OPTIONAL,
+ sgNB-DL-GTP-TEIDatSCG GTPtunnelEndpoint OPTIONAL,
+ secondary-sgNB-DL-GTP-TEIDatSCG GTPtunnelEndpoint OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {E-RABs-ToBeModified-SgNBModReqd-Item-SgNBPDCPnotpresentExtIEs} } OPTIONAL,
...
}
@@ -2958,12 +3018,56 @@ SgNBModificationConfirm ::= SEQUENCE {
}
SgNBModificationConfirm-IEs X2AP-PROTOCOL-IES ::= {
- { ID id-MeNB-UE-X2AP-ID CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}|
- { ID id-SgNB-UE-X2AP-ID CRITICALITY ignore TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}|
- { ID id-MeNBtoSgNBContainer CRITICALITY ignore TYPE MeNBtoSgNBContainer PRESENCE optional}|
- { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}|
- { ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY ignore TYPE UE-X2AP-ID-Extension PRESENCE optional}|
- { ID id-MeNBResourceCoordinationInformation CRITICALITY ignore TYPE MeNBResourceCoordinationInformation PRESENCE optional},
+ { ID id-MeNB-UE-X2AP-ID CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}|
+ { ID id-SgNB-UE-X2AP-ID CRITICALITY ignore TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}|
+ { ID id-E-RABs-AdmittedToBeModified-SgNBModConfList CRITICALITY ignore TYPE E-RABs-AdmittedToBeModified-SgNBModConfList PRESENCE optional}|
+ { ID id-MeNBtoSgNBContainer CRITICALITY ignore TYPE MeNBtoSgNBContainer PRESENCE optional}|
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}|
+ { ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY ignore TYPE UE-X2AP-ID-Extension PRESENCE optional}|
+ { ID id-MeNBResourceCoordinationInformation CRITICALITY ignore TYPE MeNBResourceCoordinationInformation PRESENCE optional},
+ ...
+}
+
+E-RABs-AdmittedToBeModified-SgNBModConfList ::= SEQUENCE (SIZE (1..maxnoofBearers)) OF ProtocolIE-Single-Container
+ { {E-RABs-AdmittedToBeModified-SgNBModConf-ItemIEs} }
+
+E-RABs-AdmittedToBeModified-SgNBModConf-ItemIEs X2AP-PROTOCOL-IES ::= {
+{ ID id-E-RABs-AdmittedToBeModified-SgNBModConf-Item CRITICALITY ignore TYPE E-RABs-AdmittedToBeModified-SgNBModConf-Item PRESENCE mandatory },
+ ...
+}
+
+E-RABs-AdmittedToBeModified-SgNBModConf-Item ::= SEQUENCE {
+ e-RAB-ID E-RAB-ID,
+ en-DC-ResourceConfiguration EN-DC-ResourceConfiguration,
+ resource-configuration CHOICE {
+ sgNBPDCPpresent E-RABs-AdmittedToBeModified-SgNBModConf-Item-SgNBPDCPpresent,
+ sgNBPDCPnotpresent E-RABs-AdmittedToBeModified-SgNBModConf-Item-SgNBPDCPnotpresent,
+ ...
+ },
+ iE-Extensions ProtocolExtensionContainer { {E-RABs-AdmittedToBeModified-SgNBModConf-ItemExtIEs} } OPTIONAL,
+ ...
+}
+
+E-RABs-AdmittedToBeModified-SgNBModConf-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+E-RABs-AdmittedToBeModified-SgNBModConf-Item-SgNBPDCPpresent ::= SEQUENCE {
+ iE-Extensions ProtocolExtensionContainer { {E-RABs-AdmittedToBeModified-SgNBModConf-Item-SgNBPDCPpresentExtIEs} } OPTIONAL,
+ ...
+}
+
+E-RABs-AdmittedToBeModified-SgNBModConf-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+E-RABs-AdmittedToBeModified-SgNBModConf-Item-SgNBPDCPnotpresent ::= SEQUENCE {
+ secondary-meNB-UL-GTP-TEIDatPDCP GTPtunnelEndpoint OPTIONAL,
+ iE-Extensions ProtocolExtensionContainer { {E-RABs-AdmittedToBeModified-SgNBModConf-Item-SgNBPDCPnotpresentExtIEs} } OPTIONAL,
+ ...
+}
+
+E-RABs-AdmittedToBeModified-SgNBModConf-Item-SgNBPDCPnotpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
@@ -3309,10 +3413,10 @@ RRCTransfer ::= SEQUENCE {
}
RRCTransfer-IEs X2AP-PROTOCOL-IES ::= {
- { ID id-MeNB-UE-X2AP-ID CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}|
- { ID id-SgNB-UE-X2AP-ID CRITICALITY ignore TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}|
- { ID id-MCGSplitSRB CRITICALITY ignore TYPE MCGSplitSRB PRESENCE optional}|
- { ID id-UENRMeasurement CRITICALITY ignore TYPE UENRMeasurement PRESENCE optional}|
+ { ID id-MeNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory}|
+ { ID id-SgNB-UE-X2AP-ID CRITICALITY reject TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}|
+ { ID id-SplitSRB CRITICALITY reject TYPE SplitSRB PRESENCE optional}|
+ { ID id-UENRMeasurement CRITICALITY reject TYPE UENRMeasurement PRESENCE optional}|
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional},
...
}
@@ -3332,7 +3436,8 @@ SgNBChangeRefuse-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-MeNB-UE-X2AP-ID CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}|
{ ID id-SgNB-UE-X2AP-ID CRITICALITY ignore TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
- { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional},
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}|
+ { ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional},
...
}
@@ -3395,7 +3500,8 @@ En-gNBServedCells-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
ServedNRCell-Information ::= SEQUENCE {
nrpCI NRPCI,
nrCellID NRCGI,
- eXtended-TAC Extended-TAC,
+ fiveGS-TAC FiveGS-TAC,
+ configured-TAC TAC OPTIONAL,
broadcastPLMNs BroadcastPLMNs-Item,
nrModeInfo CHOICE {
fdd FDD-InfoServedNRCell-Information,
@@ -3403,7 +3509,6 @@ ServedNRCell-Information ::= SEQUENCE {
...
},
measurementTimingConfiguration OCTET STRING,
- sULInformation SULInformation OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { ServedNRCell-Information-ExtIEs} } OPTIONAL,
...
}
@@ -3413,8 +3518,8 @@ ServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
}
FDD-InfoServedNRCell-Information ::= SEQUENCE {
- ul-NR-ARFCN NRARFCN,
- dl-NR-ARFCN NRARFCN,
+ ul-NRFreqInfo NRFreqInfo,
+ dl-NRFreqInfo NRFreqInfo,
ul-NR-TxBW NR-TxBW,
dl-NR-TxBW NR-TxBW,
iE-Extensions ProtocolExtensionContainer { { FDD-InfoServedNRCell-Information-ExtIEs } } OPTIONAL,
@@ -3425,10 +3530,19 @@ FDD-InfoServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
+FDD-InfoNeighbourServedNRCell-Information ::= SEQUENCE {
+ ul-NRFreqInfo NRFreqInfo,
+ dl-NRFreqInfo NRFreqInfo,
+ iE-Extensions ProtocolExtensionContainer { { FDD-InfoNeighbourServedNRCell-Information-ExtIEs } } OPTIONAL,
+ ...
+}
+FDD-InfoNeighbourServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
TDD-InfoServedNRCell-Information ::= SEQUENCE {
- nR-ARFCN NRARFCN,
+ nRFreqInfo NRFreqInfo,
nR-TxBW NR-TxBW,
iE-Extensions ProtocolExtensionContainer { { TDD-InfoServedNRCell-Information-ExtIEs } } OPTIONAL,
...
@@ -3438,11 +3552,28 @@ TDD-InfoServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
+TDD-InfoNeighbourServedNRCell-Information ::= SEQUENCE {
+ nRFreqInfo NRFreqInfo,
+ iE-Extensions ProtocolExtensionContainer { { TDD-InfoNeighbourServedNRCell-Information-ExtIEs } } OPTIONAL,
+ ...
+}
+
+TDD-InfoNeighbourServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
NRNeighbour-Information ::= SEQUENCE (SIZE (1.. maxofNRNeighbours))OF SEQUENCE {
nrpCI NRPCI,
nrCellID NRCGI,
- nrARFCN NRARFCN,
- eXtended-TAC Extended-TAC,
+ nrFreqInfo NRFreqInfo,
+ fiveGS-TAC FiveGS-TAC,
+ configured-TAC TAC OPTIONAL,
+ measurementTimingConfiguration OCTET STRING,
+ nRNeighbourModeInfo CHOICE {
+ fdd FDD-InfoNeighbourServedNRCell-Information,
+ tdd TDD-InfoNeighbourServedNRCell-Information,
+ ...
+ },
iE-Extensions ProtocolExtensionContainer { { NRNeighbour-Information-ExtIEs} } OPTIONAL,
...
}
@@ -3460,6 +3591,11 @@ CellAssistanceInformation ::= CHOICE {
Limited-list ::= SEQUENCE (SIZE (1..maxCellinengNB)) OF SEQUENCE {
nrCellID NRCGI,
+ iE-Extensions ProtocolExtensionContainer { {Limited-list-ExtIEs} } OPTIONAL,
+ ...
+}
+
+Limited-list-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
@@ -3574,7 +3710,7 @@ ServedNRCellsToModify-Item::= SEQUENCE {
servedNRCellInformation ServedNRCell-Information,
nrNeighbourInformation NRNeighbour-Information OPTIONAL,
nrDeactivationIndication DeactivationIndication OPTIONAL,
- iE-Extensions ProtocolExtensionContainer { { ServedNRCellsToModify-Item-ExtIEs} } OPTIONAL,
+ iE-Extensions ProtocolExtensionContainer { { ServedNRCellsToModify-Item-ExtIEs} } OPTIONAL,
...
}
@@ -3602,13 +3738,18 @@ ENDCConfigurationUpdateAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
RespondingNodeType-EndcConfigUpdate::= CHOICE {
+ respond-eNB ProtocolIE-Container {{ENB-ENDCConfigUpdateAckIEs}},
respond-en-gNB ProtocolIE-Container {{En-gNB-ENDCConfigUpdateAckIEs}},
...
}
+ENB-ENDCConfigUpdateAckIEs X2AP-PROTOCOL-IES ::= {
+ ...
+}
+
En-gNB-ENDCConfigUpdateAckIEs X2AP-PROTOCOL-IES ::= {
- { ID id-ServedNRcellsENDCX2ManagementList CRITICALITY reject TYPE ServedNRcellsENDCX2ManagementList PRESENCE mandatory},
+ { ID id-ServedNRcellsENDCX2ManagementList CRITICALITY reject TYPE ServedNRcellsENDCX2ManagementList PRESENCE optional},
...
}
@@ -3727,5 +3868,219 @@ SecondaryRATDataUsageReport-IEs X2AP-PROTOCOL-IES ::= {
...
}
+SgNBActivityNotification ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container {{SgNBActivityNotification-IEs}},
+ ...
+}
+
+SgNBActivityNotification-IEs X2AP-PROTOCOL-IES ::= {
+ { ID id-MeNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory}|
+ { ID id-SgNB-UE-X2AP-ID CRITICALITY reject TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}|
+ { ID id-UEContextLevelUserPlaneActivity CRITICALITY reject TYPE UserPlaneTrafficActivityReport PRESENCE mandatory}|
+ { ID id-ERABActivityNotifyItemList CRITICALITY reject TYPE ERABActivityNotifyItemList PRESENCE mandatory}|
+ { ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional},
+ ...
+}
+
+-- **************************************************************
+--
+-- EN-DC PARTIAL RESET REQUIRED
+--
+-- **************************************************************
+
+ENDCPartialResetRequired ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container {{ENDCPartialResetRequired-IEs}},
+ ...
+}
+
+ENDCPartialResetRequired-IEs X2AP-PROTOCOL-IES ::= {
+ { ID id-UEs-ToBeReset CRITICALITY reject TYPE UEsToBeResetList PRESENCE mandatory}|
+ { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory },
+ ...
+}
+
+-- **************************************************************
+--
+-- EN-DC PARTIAL RESET CONFIRM
+--
+-- **************************************************************
+
+ENDCPartialResetConfirm ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container {{ENDCPartialResetConfirm-IEs}},
+ ...
+}
+
+ENDCPartialResetConfirm-IEs X2AP-PROTOCOL-IES ::= {
+ { ID id-UEs-Admitted-ToBeReset CRITICALITY reject TYPE UEsToBeResetList PRESENCE mandatory},
+ ...
+}
+
+-- **************************************************************
+--
+-- E-UTRA - NR CELL RESOURCE COORDINATION REQUEST
+--
+-- **************************************************************
+
+EUTRANRCellResourceCoordinationRequest ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container {{EUTRANRCellResourceCoordinationRequest-IEs}},
+ ...
+}
+
+EUTRANRCellResourceCoordinationRequest-IEs X2AP-PROTOCOL-IES ::= {
+ { ID id-InitiatingNodeType-EutranrCellResourceCoordination CRITICALITY reject TYPE InitiatingNodeType-EutranrCellResourceCoordination PRESENCE mandatory},
+ ...
+}
+
+InitiatingNodeType-EutranrCellResourceCoordination ::= CHOICE {
+ initiate-eNB ProtocolIE-Container {{ENB-EUTRA-NRCellResourceCoordinationReqIEs}},
+ initiate-en-gNB ProtocolIE-Container {{En-gNB-EUTRA-NRCellResourceCoordinationReqIEs}},
+ ...
+}
+
+
+ENB-EUTRA-NRCellResourceCoordinationReqIEs X2AP-PROTOCOL-IES ::= {
+ { ID id-DataTrafficResourceIndication CRITICALITY reject TYPE DataTrafficResourceIndication PRESENCE mandatory}|
+ { ID id-SpectrumSharingGroupID CRITICALITY reject TYPE SpectrumSharingGroupID PRESENCE mandatory}|
+ { ID id-ListofEUTRACellsinEUTRACoordinationReq CRITICALITY reject TYPE ListofEUTRACellsinEUTRACoordinationReq PRESENCE mandatory },
+ ...
+}
+
+
+En-gNB-EUTRA-NRCellResourceCoordinationReqIEs X2AP-PROTOCOL-IES ::= {
+ { ID id-DataTrafficResourceIndication CRITICALITY reject TYPE DataTrafficResourceIndication PRESENCE mandatory}|
+ { ID id-ListofEUTRACellsinNRCoordinationReq CRITICALITY reject TYPE ListofEUTRACellsinNRCoordinationReq PRESENCE mandatory }|
+ { ID id-SpectrumSharingGroupID CRITICALITY reject TYPE SpectrumSharingGroupID PRESENCE mandatory}|
+ { ID id-ListofNRCellsinNRCoordinationReq CRITICALITY reject TYPE ListofNRCellsinNRCoordinationReq PRESENCE mandatory },
+ ...
+}
+
+
+ListofEUTRACellsinEUTRACoordinationReq ::= SEQUENCE (SIZE (0..maxCellineNB)) OF ECGI
+ListofEUTRACellsinNRCoordinationReq ::= SEQUENCE (SIZE (1..maxCellineNB)) OF ECGI
+ListofNRCellsinNRCoordinationReq ::= SEQUENCE (SIZE (0..maxnoNRcellsSpectrumSharingWithE-UTRA)) OF NRCGI
+
+-- **************************************************************
+--
+-- E-UTRA - NR CELL RESOURCE COORDINATION RESPONSE
+--
+-- **************************************************************
+
+EUTRANRCellResourceCoordinationResponse ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container {{EUTRANRCellResourceCoordinationResponse-IEs}},
+ ...
+}
+
+EUTRANRCellResourceCoordinationResponse-IEs X2AP-PROTOCOL-IES ::= {
+ { ID id-RespondingNodeType-EutranrCellResourceCoordination CRITICALITY reject TYPE RespondingNodeType-EutranrCellResourceCoordination PRESENCE mandatory},
+ ...
+}
+
+RespondingNodeType-EutranrCellResourceCoordination ::= CHOICE {
+ respond-eNB ProtocolIE-Container {{ENB-EUTRA-NRCellResourceCoordinationReqAckIEs}},
+ respond-en-gNB ProtocolIE-Container {{En-gNB-EUTRA-NRCellResourceCoordinationReqAckIEs}},
+ ...
+}
+
+
+ENB-EUTRA-NRCellResourceCoordinationReqAckIEs X2AP-PROTOCOL-IES ::= {
+ { ID id-DataTrafficResourceIndication CRITICALITY reject TYPE DataTrafficResourceIndication PRESENCE mandatory}|
+ { ID id-SpectrumSharingGroupID CRITICALITY reject TYPE SpectrumSharingGroupID PRESENCE mandatory}|
+ { ID id-ListofEUTRACellsinEUTRACoordinationResp CRITICALITY reject TYPE ListofEUTRACellsinEUTRACoordinationResp PRESENCE mandatory },
+ ...
+}
+
+
+En-gNB-EUTRA-NRCellResourceCoordinationReqAckIEs X2AP-PROTOCOL-IES ::= {
+ { ID id-DataTrafficResourceIndication CRITICALITY reject TYPE DataTrafficResourceIndication PRESENCE mandatory}|
+ { ID id-SpectrumSharingGroupID CRITICALITY reject TYPE SpectrumSharingGroupID PRESENCE mandatory}|
+ { ID id-ListofNRCellsinNRCoordinationResp CRITICALITY reject TYPE ListofNRCellsinNRCoordinationResp PRESENCE mandatory },
+
+
+ ...
+}
+
+ListofEUTRACellsinEUTRACoordinationResp ::= SEQUENCE (SIZE (1..maxCellineNB)) OF ECGI
+ListofNRCellsinNRCoordinationResp ::= SEQUENCE (SIZE (1..maxnoNRcellsSpectrumSharingWithE-UTRA)) OF NRCGI
+
+-- **************************************************************
+--
+-- EN-DC X2 REMOVAL REQUEST
+--
+-- **************************************************************
+
+ENDCX2RemovalRequest ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container {{ENDCX2RemovalRequest-IEs}},
+ ...
+}
+
+ENDCX2RemovalRequest-IEs X2AP-PROTOCOL-IES ::= {
+ { ID id-InitiatingNodeType-EndcX2Removal CRITICALITY reject TYPE InitiatingNodeType-EndcX2Removal PRESENCE mandatory},
+ ...
+}
+
+InitiatingNodeType-EndcX2Removal ::= CHOICE {
+ init-eNB ProtocolIE-Container {{ENB-ENDCX2RemovalReqIEs}},
+ init-en-gNB ProtocolIE-Container {{En-gNB-ENDCX2RemovalReqIEs}},
+ ...
+}
+
+ENB-ENDCX2RemovalReqIEs X2AP-PROTOCOL-IES ::= {
+ { ID id-GlobalENB-ID CRITICALITY reject TYPE GlobalENB-ID PRESENCE mandatory},
+ ...
+}
+
+En-gNB-ENDCX2RemovalReqIEs X2AP-PROTOCOL-IES ::= {
+ { ID id-Globalen-gNB-ID CRITICALITY reject TYPE GlobalGNB-ID PRESENCE mandatory},
+ ...
+}
+
+-- **************************************************************
+--
+-- EN-DC X2 REMOVAL RESPONSE
+--
+-- **************************************************************
+
+ENDCX2RemovalResponse ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container {{ENDCX2RemovalResponse-IEs}},
+ ...
+}
+
+ENDCX2RemovalResponse-IEs X2AP-PROTOCOL-IES ::= {
+ { ID id-RespondingNodeType-EndcX2Removal CRITICALITY reject TYPE RespondingNodeType-EndcX2Removal PRESENCE mandatory},
+ ...
+}
+
+RespondingNodeType-EndcX2Removal ::= CHOICE {
+ respond-eNB ProtocolIE-Container {{ENB-ENDCX2RemovalReqAckIEs}},
+ respond-en-gNB ProtocolIE-Container {{En-gNB-ENDCX2RemovalReqAckIEs}},
+ ...
+}
+
+ENB-ENDCX2RemovalReqAckIEs X2AP-PROTOCOL-IES ::= {
+ { ID id-GlobalENB-ID CRITICALITY reject TYPE GlobalENB-ID PRESENCE mandatory},
+ ...
+}
+
+En-gNB-ENDCX2RemovalReqAckIEs X2AP-PROTOCOL-IES ::= {
+ { ID id-Globalen-gNB-ID CRITICALITY reject TYPE GlobalGNB-ID PRESENCE mandatory},
+ ...
+}
+
+-- **************************************************************
+--
+-- EN-DC X2 REMOVAL FAILURE
+--
+-- **************************************************************
+
+ENDCX2RemovalFailure ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container {{ENDCX2RemovalFailure-IEs}},
+ ...
+}
+
+ENDCX2RemovalFailure-IEs X2AP-PROTOCOL-IES ::= {
+ { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory} |
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
+ ...
+}
END
diff --git a/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn b/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn
index 2210d2bde7..0efcb2b507 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 V15.1.0 (2018-03)
+-- 3GPP TS 36.423 V15.2.0 (2018-06)
-- 9.3.3 Elementary Procedure Definitions
-- **************************************************************
--
@@ -7,10 +7,10 @@
-- **************************************************************
X2AP-PDU-Descriptions {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) x2ap (2) version1 (1) x2ap-PDU-Descriptions (0) }
-DEFINITIONS AUTOMATIC TAGS ::=
+DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
@@ -45,7 +45,7 @@ FROM X2AP-CommonDataTypes
ResourceStatusFailure,
ResourceStatusRequest,
ResourceStatusResponse,
- ResourceStatusUpdate,
+ ResourceStatusUpdate,
RLFIndication,
SNStatusTransfer,
UEContextRelease,
@@ -106,23 +106,32 @@ FROM X2AP-CommonDataTypes
SecondaryRATDataUsageReport,
ENDCCellActivationRequest,
ENDCCellActivationResponse,
- ENDCCellActivationFailure
+ ENDCCellActivationFailure,
+ ENDCPartialResetRequired,
+ ENDCPartialResetConfirm,
+ EUTRANRCellResourceCoordinationRequest,
+ EUTRANRCellResourceCoordinationResponse,
+ SgNBActivityNotification,
+ ENDCX2RemovalRequest,
+ ENDCX2RemovalResponse,
+ ENDCX2RemovalFailure
+
FROM X2AP-PDU-Contents
id-cellActivation,
id-eNBConfigurationUpdate,
id-errorIndication,
- id-handoverCancel,
+ id-handoverCancel,
id-handoverReport,
id-handoverPreparation,
-
+
id-loadIndication,
id-privateMessage,
id-reset,
-
+
id-resourceStatusReporting,
- id-resourceStatusReportingInitiation,
+ id-resourceStatusReportingInitiation,
id-rLFIndication,
id-snStatusTransfer,
id-uEContextRelease,
@@ -151,7 +160,12 @@ FROM X2AP-PDU-Contents
id-endcX2Setup,
id-endcConfigurationUpdate,
id-secondaryRATDataUsageReport,
- id-endcCellActivation
+ id-endcCellActivation,
+ id-endcPartialReset,
+ id-eUTRANRCellResourceCoordination,
+ id-SgNBActivityNotification,
+ id-endcX2Removal
+
FROM X2AP-Constants;
@@ -241,7 +255,10 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-1 X2AP-ELEMENTARY-PROCEDURE ::= {
sgNBChange |
endcX2Setup |
endcConfigurationUpdate |
- endcCellActivation ,
+ endcCellActivation |
+ endcPartialReset |
+ eUTRANRCellResourceCoordination |
+ endcX2Removal ,
...
}
@@ -263,7 +280,9 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-2 X2AP-ELEMENTARY-PROCEDURE ::= {
sgNBReconfigurationCompletion |
sgNBCounterCheck |
rRCTransfer |
- secondaryRATDataUsageReport ,
+ secondaryRATDataUsageReport |
+ sgNBActivityNotification
+,
...
}
@@ -488,7 +507,7 @@ sgNBinitiatedSgNBModification X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SgNBModificationRequired
SUCCESSFUL OUTCOME SgNBModificationConfirm
UNSUCCESSFUL OUTCOME SgNBModificationRefuse
- PROCEDURE CODE id-sgNBinitiatedSgNBModification
+ PROCEDURE CODE id-sgNBinitiatedSgNBModification
CRITICALITY reject
}
@@ -558,4 +577,33 @@ endcCellActivation X2AP-ELEMENTARY-PROCEDURE ::= {
CRITICALITY reject
}
+endcPartialReset X2AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE ENDCPartialResetRequired
+ SUCCESSFUL OUTCOME ENDCPartialResetConfirm
+ PROCEDURE CODE id-endcPartialReset
+ CRITICALITY reject
+}
+
+eUTRANRCellResourceCoordination X2AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE EUTRANRCellResourceCoordinationRequest
+ SUCCESSFUL OUTCOME EUTRANRCellResourceCoordinationResponse
+ PROCEDURE CODE id-eUTRANRCellResourceCoordination
+ CRITICALITY reject
+}
+
+sgNBActivityNotification X2AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE SgNBActivityNotification
+ PROCEDURE CODE id-SgNBActivityNotification
+ CRITICALITY reject
+}
+
+
+endcX2Removal X2AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE ENDCX2RemovalRequest
+ SUCCESSFUL OUTCOME ENDCX2RemovalResponse
+ UNSUCCESSFUL OUTCOME ENDCX2RemovalFailure
+ PROCEDURE CODE id-endcX2Removal
+ CRITICALITY reject
+}
+
END
diff --git a/epan/dissectors/asn1/x2ap/packet-x2ap-template.c b/epan/dissectors/asn1/x2ap/packet-x2ap-template.c
index 46da4f5474..f7d57b06c9 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 V15.1.0 (2018-03)
+ * 3GPP TS 36.423 V15.2.0 (2018-06)
*/
#include "config.h"
@@ -226,6 +226,12 @@ x2ap_Threshold_RSRQ_fmt(gchar *s, guint32 v)
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%u)", ((float)v/2)-20, v);
}
+static void
+x2ap_Packet_LossRate_fmt(gchar *s, guint32 v)
+{
+ g_snprintf(s, ITEM_LABEL_LENGTH, "%.1f %% (%u)", (float)v/10, v);
+}
+
static struct x2ap_private_data*
x2ap_get_private_data(packet_info *pinfo)
{
diff --git a/epan/dissectors/asn1/x2ap/x2ap.cnf b/epan/dissectors/asn1/x2ap/x2ap.cnf
index 0b6a04beba..3061593b84 100644
--- a/epan/dissectors/asn1/x2ap/x2ap.cnf
+++ b/epan/dissectors/asn1/x2ap/x2ap.cnf
@@ -268,7 +268,7 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_SgNBtoMeNBContainer);
dissect_nr_rrc_CG_ConfigInfo_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
-#.FN_HDR MCGSplitSRB/rrcContainer
+#.FN_HDR SplitSRB/rrcContainer
struct x2ap_private_data *x2ap_data = x2ap_get_private_data(actx->pinfo);
x2ap_data->rrc_container_type = RRC_CONTAINER_TYPE_PDCP_C_PDU;
@@ -585,6 +585,18 @@ E-RABUsageReport-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&un
dissect_nr_rrc_MeasurementTimingConfiguration_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
+#.TYPE_ATTR
+Packet-LossRate DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(x2ap_Packet_LossRate_fmt)
+
+#.FN_FTR ProtectedEUTRAResourceIndication/mBSFNControlRegionLength
+ proto_item_append_text(actx->created_item, " REs");
+
+#.FN_FTR ProtectedEUTRAResourceIndication/pDCCHRegionLength
+ proto_item_append_text(actx->created_item, " REs");
+
+#.FN_FTR ReservedSubframePattern/mBSFNControlRegionLength
+ proto_item_append_text(actx->created_item, " REs");
+
#.END
#.FN_HDR HandoverRequest
@@ -749,6 +761,22 @@ E-RABUsageReport-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&un
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCCellActivationResponse");
#.FN_HDR ENDCCellActivationFailure
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCCellActivationFailure");
+#.FN_HDR ENDCPartialResetRequired
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCPartialResetRequired");
+#.FN_HDR ENDCPartialResetConfirm
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCPartialResetConfirm");
+#.FN_HDR EUTRANRCellResourceCoordinationRequest
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "EUTRANRCellResourceCoordinationRequest");
+#.FN_HDR EUTRANRCellResourceCoordinationResponse
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "EUTRANRCellResourceCoordinationResponse");
+#.FN_HDR SgNBActivityNotification
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBActivityNotification");
+#.FN_HDR ENDCX2RemovalRequest
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2RemovalRequest");
+#.FN_HDR ENDCX2RemovalResponse
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2RemovalResponse");
+#.FN_HDR ENDCX2RemovalFailure
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2RemovalFailure");
#.ASSIGN_VALUE_TO_TYPE # X2AP does not have constants assigned to types, they are pure INTEGER
# ProcedureCode
@@ -793,6 +821,10 @@ id-endcX2Setup ProcedureCode
id-endcConfigurationUpdate ProcedureCode
id-secondaryRATDataUsageReport ProcedureCode
id-endcCellActivation ProcedureCode
+id-endcPartialReset ProcedureCode
+id-eUTRANRCellResourceCoordination ProcedureCode
+id-SgNBActivityNotification ProcedureCode
+id-endcX2Removal ProcedureCode
# ProtocolIE-ID
@@ -995,11 +1027,11 @@ id-SgNBUEAggregateMaximumBitRate ProtocolIE-ID
id-E-RABs-ToBeAdded-SgNBAddReqList ProtocolIE-ID
id-MeNBtoSgNBContainer ProtocolIE-ID
id-SgNB-UE-X2AP-ID ProtocolIE-ID
-id-RequestedMCGSplitSRBs ProtocolIE-ID
+id-RequestedSplitSRBs ProtocolIE-ID
id-E-RABs-ToBeAdded-SgNBAddReq-Item ProtocolIE-ID
id-E-RABs-Admitted-ToBeAdded-SgNBAddReqAckList ProtocolIE-ID
id-SgNBtoMeNBContainer ProtocolIE-ID
-id-AdmittedMCGSplitSRBs ProtocolIE-ID
+id-AdmittedSplitSRBs ProtocolIE-ID
id-E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item ProtocolIE-ID
id-ResponseInformationSgNBReconfComp ProtocolIE-ID
id-UE-ContextInformation-SgNBModReq ProtocolIE-ID
@@ -1029,7 +1061,7 @@ id-SRBType ProtocolIE-ID
id-Target-SgNB-ID ProtocolIE-ID
id-HandoverRestrictionList ProtocolIE-ID
id-SCGConfigurationQuery ProtocolIE-ID
-id-MCGSplitSRB ProtocolIE-ID
+id-SplitSRB ProtocolIE-ID
id-UENRMeasurement ProtocolIE-ID
id-InitiatingNodeType-EndcX2Setup ProtocolIE-ID
id-InitiatingNodeType-EndcConfigUpdate ProtocolIE-ID
@@ -1057,6 +1089,36 @@ id-SecondaryRATUsageReport-Item ProtocolIE-ID
id-ServedNRCellsToActivate ProtocolIE-ID
id-ActivatedNRCellList ProtocolIE-ID
id-SelectedPLMN ProtocolIE-ID
+id-UEs-ToBeReset ProtocolIE-ID
+id-UEs-Admitted-ToBeReset ProtocolIE-ID
+id-RRCConfigIndication ProtocolIE-ID
+id-DownlinkPacketLossRate ProtocolIE-ID
+id-UplinkPacketLossRate ProtocolIE-ID
+id-SubscriberProfileIDforRFP ProtocolIE-ID
+id-serviceType ProtocolIE-ID
+id-AerialUEsubscriptionInformation ProtocolIE-ID
+id-SGNB-Addition-Trigger-Ind ProtocolIE-ID
+id-MeNBCell-ID ProtocolIE-ID
+id-RequestedSplitSRBsrelease ProtocolIE-ID
+id-AdmittedSplitSRBsrelease ProtocolIE-ID
+id-NRS-NSSS-PowerOffset ProtocolIE-ID
+id-NSSS-NumOccasionDifferentPrecoder ProtocolIE-ID
+id-ProtectedEUTRAResourceIndication ProtocolIE-ID
+id-InitiatingNodeType-EutranrCellResourceCoordination ProtocolIE-ID
+id-RespondingNodeType-EutranrCellResourceCoordination ProtocolIE-ID
+id-DataTrafficResourceIndication ProtocolIE-ID
+id-SpectrumSharingGroupID ProtocolIE-ID
+id-ListofEUTRACellsinEUTRACoordinationReq ProtocolIE-ID
+id-ListofEUTRACellsinEUTRACoordinationResp ProtocolIE-ID
+id-ListofEUTRACellsinNRCoordinationReq ProtocolIE-ID
+id-ListofNRCellsinNRCoordinationReq ProtocolIE-ID
+id-ListofNRCellsinNRCoordinationResp ProtocolIE-ID
+id-E-RABs-AdmittedToBeModified-SgNBModConfList ProtocolIE-ID
+id-E-RABs-AdmittedToBeModified-SgNBModConf-Item ProtocolIE-ID
+id-UEContextLevelUserPlaneActivity ProtocolIE-ID
+id-ERABActivityNotifyItemList ProtocolIE-ID
+id-InitiatingNodeType-EndcX2Removal ProtocolIE-ID
+id-RespondingNodeType-EndcX2Removal ProtocolIE-ID
#.REGISTER
@@ -1195,11 +1257,11 @@ UEAggregateMaximumBitRate N x2ap.ies id-SgNBUEAggregateMaximumBitRate
E-RABs-ToBeAdded-SgNBAddReqList N x2ap.ies id-E-RABs-ToBeAdded-SgNBAddReqList
MeNBtoSgNBContainer N x2ap.ies id-MeNBtoSgNBContainer
SgNB-UE-X2AP-ID N x2ap.ies id-SgNB-UE-X2AP-ID
-MCGSplitSRBs N x2ap.ies id-RequestedMCGSplitSRBs
+SplitSRBs N x2ap.ies id-RequestedSplitSRBs
E-RABs-ToBeAdded-SgNBAddReq-Item N x2ap.ies id-E-RABs-ToBeAdded-SgNBAddReq-Item
E-RABs-Admitted-ToBeAdded-SgNBAddReqAckList N x2ap.ies id-E-RABs-Admitted-ToBeAdded-SgNBAddReqAckList
SgNBtoMeNBContainer N x2ap.ies id-SgNBtoMeNBContainer
-MCGSplitSRBs N x2ap.ies id-AdmittedMCGSplitSRBs
+SplitSRBs N x2ap.ies id-AdmittedSplitSRBs
E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item N x2ap.ies id-E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item
ResponseInformationSgNBReconfComp N x2ap.ies id-ResponseInformationSgNBReconfComp
UE-ContextInformation-SgNBModReq N x2ap.ies id-UE-ContextInformation-SgNBModReq
@@ -1227,7 +1289,7 @@ E-RABs-SubjectToSgNBCounterCheck-Item N x2ap.ies id-E-RABs-SubjectToSgNBCount
GNB-ID N x2ap.ies id-Target-SgNB-ID
HandoverRestrictionList N x2ap.ies id-HandoverRestrictionList
SCGConfigurationQuery N x2ap.ies id-SCGConfigurationQuery
-MCGSplitSRB N x2ap.ies id-MCGSplitSRB
+SplitSRB N x2ap.ies id-SplitSRB
UENRMeasurement N x2ap.ies id-UENRMeasurement
InitiatingNodeType-EndcX2Setup N x2ap.ies id-InitiatingNodeType-EndcX2Setup
InitiatingNodeType-EndcConfigUpdate N x2ap.ies id-InitiatingNodeType-EndcConfigUpdate
@@ -1254,6 +1316,30 @@ SecondaryRATUsageReport-Item N x2ap.ies id-SecondaryRATUsageReport-Item
ServedNRCellsToActivate N x2ap.ies id-ServedNRCellsToActivate
ActivatedNRCellList N x2ap.ies id-ActivatedNRCellList
PLMN-Identity N x2ap.ies id-SelectedPLMN
+UEsToBeResetList N x2ap.ies id-UEs-ToBeReset
+UEsToBeResetList N x2ap.ies id-UEs-Admitted-ToBeReset
+RRC-Config-Ind N x2ap.ies id-RRCConfigIndication
+SubscriberProfileIDforRFP N x2ap.ies id-SubscriberProfileIDforRFP
+AerialUEsubscriptionInformation N x2ap.ies id-AerialUEsubscriptionInformation
+SGNB-Addition-Trigger-Ind N x2ap.ies id-SGNB-Addition-Trigger-Ind
+ECGI N x2ap.ies id-MeNBCell-ID
+SplitSRBs N x2ap.ies id-RequestedSplitSRBsrelease
+SplitSRBs N x2ap.ies id-AdmittedSplitSRBsrelease
+InitiatingNodeType-EutranrCellResourceCoordination N x2ap.ies id-InitiatingNodeType-EutranrCellResourceCoordination
+RespondingNodeType-EutranrCellResourceCoordination N x2ap.ies id-RespondingNodeType-EutranrCellResourceCoordination
+DataTrafficResourceIndication N x2ap.ies id-DataTrafficResourceIndication
+SpectrumSharingGroupID N x2ap.ies id-SpectrumSharingGroupID
+ListofEUTRACellsinEUTRACoordinationReq N x2ap.ies id-ListofEUTRACellsinEUTRACoordinationReq
+ListofEUTRACellsinEUTRACoordinationResp N x2ap.ies id-ListofEUTRACellsinEUTRACoordinationResp
+ListofEUTRACellsinNRCoordinationReq N x2ap.ies id-ListofEUTRACellsinNRCoordinationReq
+ListofNRCellsinNRCoordinationReq N x2ap.ies id-ListofNRCellsinNRCoordinationReq
+ListofNRCellsinNRCoordinationResp N x2ap.ies id-ListofNRCellsinNRCoordinationResp
+E-RABs-AdmittedToBeModified-SgNBModConfList N x2ap.ies id-E-RABs-AdmittedToBeModified-SgNBModConfList
+E-RABs-AdmittedToBeModified-SgNBModConf-Item N x2ap.ies id-E-RABs-AdmittedToBeModified-SgNBModConf-Item
+UserPlaneTrafficActivityReport N x2ap.ies id-UEContextLevelUserPlaneActivity
+ERABActivityNotifyItemList N x2ap.ies id-ERABActivityNotifyItemList
+InitiatingNodeType-EndcX2Removal N x2ap.ies id-InitiatingNodeType-EndcX2Removal
+RespondingNodeType-EndcX2Removal N x2ap.ies id-RespondingNodeType-EndcX2Removal
#X2AP-PROTOCOL-EXTENSION
Number-of-Antennaports N x2ap.extension id-Number-of-Antennaports
@@ -1320,6 +1406,13 @@ ExtendedBitRate N x2ap.extension id-extended-e-RAB-GuaranteedBitrateUL
ExtendedBitRate N x2ap.extension id-extended-uEaggregateMaximumBitRateDownlink
ExtendedBitRate N x2ap.extension id-extended-uEaggregateMaximumBitRateUplink
NRrestriction N x2ap.extension id-NRrestriction
+Packet-LossRate N x2ap.extension id-DownlinkPacketLossRate
+Packet-LossRate N x2ap.extension id-UplinkPacketLossRate
+SubscriberProfileIDforRFP N x2ap.extension id-SubscriberProfileIDforRFP
+ServiceType N x2ap.extension id-serviceType
+NRS-NSSS-PowerOffset N x2ap.extension id-NRS-NSSS-PowerOffset
+NSSS-NumOccasionDifferentPrecoder N x2ap.extension id-NSSS-NumOccasionDifferentPrecoder
+ProtectedEUTRAResourceIndication N x2ap.extension id-ProtectedEUTRAResourceIndication
# X2AP-PDU-Descriptions.asn Interface Elementary Procedures
#X2AP-ELEMENTARY-PROCEDURE
@@ -1443,4 +1536,16 @@ SecondaryRATDataUsageReport N x2ap.proc.imsg id-secondaryRATDataUsageReport
ENDCCellActivationRequest N x2ap.proc.imsg id-endcCellActivation
ENDCCellActivationResponse N x2ap.proc.sout id-endcCellActivation
ENDCCellActivationFailure N x2ap.proc.uout id-endcCellActivation
+
+ENDCPartialResetRequired N x2ap.proc.imsg id-endcPartialReset
+ENDCPartialResetConfirm N x2ap.proc.sout id-endcPartialReset
+
+EUTRANRCellResourceCoordinationRequest N x2ap.proc.imsg id-eUTRANRCellResourceCoordination
+EUTRANRCellResourceCoordinationResponse N x2ap.proc.sout id-eUTRANRCellResourceCoordination
+
+SgNBActivityNotification N x2ap.proc.imsg id-SgNBActivityNotification
+
+ENDCX2RemovalRequest N x2ap.proc.imsg id-endcX2Removal
+ENDCX2RemovalResponse N x2ap.proc.sout id-endcX2Removal
+ENDCX2RemovalFailure N x2ap.proc.uout id-endcX2Removal
#.END
diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c
index a2c1db4172..f024b8a9fa 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 V15.1.0 (2018-03)
+ * 3GPP TS 36.423 V15.2.0 (2018-06)
*/
#include "config.h"
@@ -97,6 +97,10 @@ void proto_register_x2ap(void);
#define maxnoofCellIDforQMC 32
#define maxnoofTAforQMC 8
#define maxnoofPLMNforQMC 16
+#define maxUEsinengNBDU 8192
+#define maxnoofProtectedResourcePatterns 16
+#define maxnoNRcellsSpectrumSharingWithE_UTRA 64
+#define maxnoofNrCellBands 32
typedef enum _ProcedureCode_enum {
id_handoverPreparation = 0,
@@ -138,7 +142,11 @@ typedef enum _ProcedureCode_enum {
id_endcX2Setup = 36,
id_endcConfigurationUpdate = 37,
id_secondaryRATDataUsageReport = 38,
- id_endcCellActivation = 39
+ id_endcCellActivation = 39,
+ id_endcPartialReset = 40,
+ id_eUTRANRCellResourceCoordination = 41,
+ id_SgNBActivityNotification = 42,
+ id_endcX2Removal = 43
} ProcedureCode_enum;
typedef enum _ProtocolIE_ID_enum {
@@ -350,11 +358,11 @@ typedef enum _ProtocolIE_ID_enum {
id_E_RABs_ToBeAdded_SgNBAddReqList = 205,
id_MeNBtoSgNBContainer = 206,
id_SgNB_UE_X2AP_ID = 207,
- id_RequestedMCGSplitSRBs = 208,
+ id_RequestedSplitSRBs = 208,
id_E_RABs_ToBeAdded_SgNBAddReq_Item = 209,
id_E_RABs_Admitted_ToBeAdded_SgNBAddReqAckList = 210,
id_SgNBtoMeNBContainer = 211,
- id_AdmittedMCGSplitSRBs = 212,
+ id_AdmittedSplitSRBs = 212,
id_E_RABs_Admitted_ToBeAdded_SgNBAddReqAck_Item = 213,
id_ResponseInformationSgNBReconfComp = 214,
id_UE_ContextInformation_SgNBModReq = 215,
@@ -384,7 +392,7 @@ typedef enum _ProtocolIE_ID_enum {
id_Target_SgNB_ID = 239,
id_HandoverRestrictionList = 240,
id_SCGConfigurationQuery = 241,
- id_MCGSplitSRB = 242,
+ id_SplitSRB = 242,
id_UENRMeasurement = 243,
id_InitiatingNodeType_EndcX2Setup = 244,
id_InitiatingNodeType_EndcConfigUpdate = 245,
@@ -411,7 +419,37 @@ typedef enum _ProtocolIE_ID_enum {
id_SecondaryRATUsageReport_Item = 266,
id_ServedNRCellsToActivate = 267,
id_ActivatedNRCellList = 268,
- id_SelectedPLMN = 269
+ id_SelectedPLMN = 269,
+ id_UEs_ToBeReset = 270,
+ id_UEs_Admitted_ToBeReset = 271,
+ id_RRCConfigIndication = 272,
+ id_DownlinkPacketLossRate = 273,
+ id_UplinkPacketLossRate = 274,
+ id_SubscriberProfileIDforRFP = 275,
+ id_serviceType = 276,
+ id_AerialUEsubscriptionInformation = 277,
+ id_SGNB_Addition_Trigger_Ind = 278,
+ id_MeNBCell_ID = 279,
+ id_RequestedSplitSRBsrelease = 280,
+ id_AdmittedSplitSRBsrelease = 281,
+ id_NRS_NSSS_PowerOffset = 282,
+ id_NSSS_NumOccasionDifferentPrecoder = 283,
+ id_ProtectedEUTRAResourceIndication = 284,
+ id_InitiatingNodeType_EutranrCellResourceCoordination = 285,
+ id_RespondingNodeType_EutranrCellResourceCoordination = 286,
+ id_DataTrafficResourceIndication = 287,
+ id_SpectrumSharingGroupID = 288,
+ id_ListofEUTRACellsinEUTRACoordinationReq = 289,
+ id_ListofEUTRACellsinEUTRACoordinationResp = 290,
+ id_ListofEUTRACellsinNRCoordinationReq = 291,
+ id_ListofNRCellsinNRCoordinationReq = 292,
+ id_ListofNRCellsinNRCoordinationResp = 293,
+ id_E_RABs_AdmittedToBeModified_SgNBModConfList = 294,
+ id_E_RABs_AdmittedToBeModified_SgNBModConf_Item = 295,
+ id_UEContextLevelUserPlaneActivity = 296,
+ id_ERABActivityNotifyItemList = 297,
+ id_InitiatingNodeType_EndcX2Removal = 298,
+ id_RespondingNodeType_EndcX2Removal = 299
} ProtocolIE_ID_enum;
typedef enum _TriggeringMessage_enum {
@@ -494,6 +532,7 @@ static int hf_x2ap_ABS_Status_PDU = -1; /* ABS_Status */
static int hf_x2ap_ActivationID_PDU = -1; /* ActivationID */
static int hf_x2ap_AdditionalSpecialSubframe_Info_PDU = -1; /* AdditionalSpecialSubframe_Info */
static int hf_x2ap_AdditionalSpecialSubframeExtension_Info_PDU = -1; /* AdditionalSpecialSubframeExtension_Info */
+static int hf_x2ap_AerialUEsubscriptionInformation_PDU = -1; /* AerialUEsubscriptionInformation */
static int hf_x2ap_BandwidthReducedSI_PDU = -1; /* BandwidthReducedSI */
static int hf_x2ap_BearerType_PDU = -1; /* BearerType */
static int hf_x2ap_Cause_PDU = -1; /* Cause */
@@ -509,12 +548,14 @@ static int hf_x2ap_CRNTI_PDU = -1; /* CRNTI */
static int hf_x2ap_CSGMembershipStatus_PDU = -1; /* CSGMembershipStatus */
static int hf_x2ap_CSG_Id_PDU = -1; /* CSG_Id */
static int hf_x2ap_CSIReportList_PDU = -1; /* CSIReportList */
+static int hf_x2ap_DataTrafficResourceIndication_PDU = -1; /* DataTrafficResourceIndication */
static int hf_x2ap_DeactivationIndication_PDU = -1; /* DeactivationIndication */
static int hf_x2ap_DL_scheduling_PDCCH_CCE_usage_PDU = -1; /* DL_scheduling_PDCCH_CCE_usage */
static int hf_x2ap_DynamicDLTransmissionInformation_PDU = -1; /* DynamicDLTransmissionInformation */
static int hf_x2ap_EARFCNExtension_PDU = -1; /* EARFCNExtension */
static int hf_x2ap_ECGI_PDU = -1; /* ECGI */
static int hf_x2ap_EnhancedRNTP_PDU = -1; /* EnhancedRNTP */
+static int hf_x2ap_ERABActivityNotifyItemList_PDU = -1; /* ERABActivityNotifyItemList */
static int hf_x2ap_E_RAB_List_PDU = -1; /* E_RAB_List */
static int hf_x2ap_E_RAB_Item_PDU = -1; /* E_RAB_Item */
static int hf_x2ap_E_RABUsageReport_Item_PDU = -1; /* E_RABUsageReport_Item */
@@ -553,19 +594,23 @@ static int hf_x2ap_MobilityParametersModificationRange_PDU = -1; /* MobilityPar
static int hf_x2ap_MobilityParametersInformation_PDU = -1; /* MobilityParametersInformation */
static int hf_x2ap_MultibandInfoList_PDU = -1; /* MultibandInfoList */
static int hf_x2ap_MeNBtoSgNBContainer_PDU = -1; /* MeNBtoSgNBContainer */
-static int hf_x2ap_MCGSplitSRBs_PDU = -1; /* MCGSplitSRBs */
-static int hf_x2ap_MCGSplitSRB_PDU = -1; /* MCGSplitSRB */
+static int hf_x2ap_SplitSRBs_PDU = -1; /* SplitSRBs */
+static int hf_x2ap_SplitSRB_PDU = -1; /* SplitSRB */
static int hf_x2ap_UENRMeasurement_PDU = -1; /* UENRMeasurement */
static int hf_x2ap_Number_of_Antennaports_PDU = -1; /* Number_of_Antennaports */
static int hf_x2ap_NRrestriction_PDU = -1; /* NRrestriction */
+static int hf_x2ap_NRS_NSSS_PowerOffset_PDU = -1; /* NRS_NSSS_PowerOffset */
static int hf_x2ap_NRUESecurityCapabilities_PDU = -1; /* NRUESecurityCapabilities */
+static int hf_x2ap_NSSS_NumOccasionDifferentPrecoder_PDU = -1; /* NSSS_NumOccasionDifferentPrecoder */
static int hf_x2ap_OffsetOfNbiotChannelNumberToEARFCN_PDU = -1; /* OffsetOfNbiotChannelNumberToEARFCN */
+static int hf_x2ap_Packet_LossRate_PDU = -1; /* Packet_LossRate */
static int hf_x2ap_PDCPChangeIndication_PDU = -1; /* PDCPChangeIndication */
static int hf_x2ap_PCI_PDU = -1; /* PCI */
static int hf_x2ap_PLMN_Identity_PDU = -1; /* PLMN_Identity */
static int hf_x2ap_PRACH_Configuration_PDU = -1; /* PRACH_Configuration */
static int hf_x2ap_ProSeAuthorized_PDU = -1; /* ProSeAuthorized */
static int hf_x2ap_ProSeUEtoNetworkRelaying_PDU = -1; /* ProSeUEtoNetworkRelaying */
+static int hf_x2ap_ProtectedEUTRAResourceIndication_PDU = -1; /* ProtectedEUTRAResourceIndication */
static int hf_x2ap_ReceiveStatusOfULPDCPSDUsExtended_PDU = -1; /* ReceiveStatusOfULPDCPSDUsExtended */
static int hf_x2ap_ReceiveStatusOfULPDCPSDUsPDCP_SNlength18_PDU = -1; /* ReceiveStatusOfULPDCPSDUsPDCP_SNlength18 */
static int hf_x2ap_Registration_Request_PDU = -1; /* Registration_Request */
@@ -573,6 +618,7 @@ static int hf_x2ap_ReportCharacteristics_PDU = -1; /* ReportCharacteristics */
static int hf_x2ap_ReportingPeriodicityCSIR_PDU = -1; /* ReportingPeriodicityCSIR */
static int hf_x2ap_ReportingPeriodicityRSRPMR_PDU = -1; /* ReportingPeriodicityRSRPMR */
static int hf_x2ap_ResumeID_PDU = -1; /* ResumeID */
+static int hf_x2ap_RRC_Config_Ind_PDU = -1; /* RRC_Config_Ind */
static int hf_x2ap_RRCConnReestabIndicator_PDU = -1; /* RRCConnReestabIndicator */
static int hf_x2ap_RRCConnSetupIndicator_PDU = -1; /* RRCConnSetupIndicator */
static int hf_x2ap_RSRPMRList_PDU = -1; /* RSRPMRList */
@@ -582,11 +628,15 @@ static int hf_x2ap_SecondaryRATUsageReport_Item_PDU = -1; /* SecondaryRATUsageR
static int hf_x2ap_SeNBSecurityKey_PDU = -1; /* SeNBSecurityKey */
static int hf_x2ap_SeNBtoMeNBContainer_PDU = -1; /* SeNBtoMeNBContainer */
static int hf_x2ap_ServedCells_PDU = -1; /* ServedCells */
+static int hf_x2ap_ServiceType_PDU = -1; /* ServiceType */
static int hf_x2ap_x2ap_SgNBResourceCoordinationInformation_PDU = -1; /* SgNBResourceCoordinationInformation */
static int hf_x2ap_SgNB_UE_X2AP_ID_PDU = -1; /* SgNB_UE_X2AP_ID */
static int hf_x2ap_SIPTOBearerDeactivationIndication_PDU = -1; /* SIPTOBearerDeactivationIndication */
static int hf_x2ap_ShortMAC_I_PDU = -1; /* ShortMAC_I */
+static int hf_x2ap_SGNB_Addition_Trigger_Ind_PDU = -1; /* SGNB_Addition_Trigger_Ind */
+static int hf_x2ap_SpectrumSharingGroupID_PDU = -1; /* SpectrumSharingGroupID */
static int hf_x2ap_SRVCCOperationPossible_PDU = -1; /* SRVCCOperationPossible */
+static int hf_x2ap_SubscriberProfileIDforRFP_PDU = -1; /* SubscriberProfileIDforRFP */
static int hf_x2ap_SubframeAssignment_PDU = -1; /* SubframeAssignment */
static int hf_x2ap_SgNBSecurityKey_PDU = -1; /* SgNBSecurityKey */
static int hf_x2ap_SgNBtoMeNBContainer_PDU = -1; /* SgNBtoMeNBContainer */
@@ -611,7 +661,9 @@ static int hf_x2ap_UE_RLF_Report_Container_PDU = -1; /* UE_RLF_Report_Container
static int hf_x2ap_UE_RLF_Report_Container_for_extended_bands_PDU = -1; /* UE_RLF_Report_Container_for_extended_bands */
static int hf_x2ap_UESecurityCapabilities_PDU = -1; /* UESecurityCapabilities */
static int hf_x2ap_UESidelinkAggregateMaximumBitRate_PDU = -1; /* UESidelinkAggregateMaximumBitRate */
+static int hf_x2ap_UEsToBeResetList_PDU = -1; /* UEsToBeResetList */
static int hf_x2ap_UL_scheduling_PDCCH_CCE_usage_PDU = -1; /* UL_scheduling_PDCCH_CCE_usage */
+static int hf_x2ap_UserPlaneTrafficActivityReport_PDU = -1; /* UserPlaneTrafficActivityReport */
static int hf_x2ap_V2XServicesAuthorized_PDU = -1; /* V2XServicesAuthorized */
static int hf_x2ap_X2BenefitValue_PDU = -1; /* X2BenefitValue */
static int hf_x2ap_HandoverRequest_PDU = -1; /* HandoverRequest */
@@ -747,6 +799,8 @@ static int hf_x2ap_E_RABs_ToBeReleased_SgNBModReqd_Item_PDU = -1; /* E_RABs_ToB
static int hf_x2ap_E_RABs_ToBeModified_SgNBModReqdList_PDU = -1; /* E_RABs_ToBeModified_SgNBModReqdList */
static int hf_x2ap_E_RABs_ToBeModified_SgNBModReqd_Item_PDU = -1; /* E_RABs_ToBeModified_SgNBModReqd_Item */
static int hf_x2ap_SgNBModificationConfirm_PDU = -1; /* SgNBModificationConfirm */
+static int hf_x2ap_E_RABs_AdmittedToBeModified_SgNBModConfList_PDU = -1; /* E_RABs_AdmittedToBeModified_SgNBModConfList */
+static int hf_x2ap_E_RABs_AdmittedToBeModified_SgNBModConf_Item_PDU = -1; /* E_RABs_AdmittedToBeModified_SgNBModConf_Item */
static int hf_x2ap_SgNBModificationRefuse_PDU = -1; /* SgNBModificationRefuse */
static int hf_x2ap_SgNBReleaseRequest_PDU = -1; /* SgNBReleaseRequest */
static int hf_x2ap_E_RABs_ToBeReleased_SgNBRelReqList_PDU = -1; /* E_RABs_ToBeReleased_SgNBRelReqList */
@@ -789,6 +843,23 @@ static int hf_x2ap_ENDCCellActivationResponse_PDU = -1; /* ENDCCellActivationRe
static int hf_x2ap_ActivatedNRCellList_PDU = -1; /* ActivatedNRCellList */
static int hf_x2ap_ENDCCellActivationFailure_PDU = -1; /* ENDCCellActivationFailure */
static int hf_x2ap_SecondaryRATDataUsageReport_PDU = -1; /* SecondaryRATDataUsageReport */
+static int hf_x2ap_SgNBActivityNotification_PDU = -1; /* SgNBActivityNotification */
+static int hf_x2ap_ENDCPartialResetRequired_PDU = -1; /* ENDCPartialResetRequired */
+static int hf_x2ap_ENDCPartialResetConfirm_PDU = -1; /* ENDCPartialResetConfirm */
+static int hf_x2ap_EUTRANRCellResourceCoordinationRequest_PDU = -1; /* EUTRANRCellResourceCoordinationRequest */
+static int hf_x2ap_InitiatingNodeType_EutranrCellResourceCoordination_PDU = -1; /* InitiatingNodeType_EutranrCellResourceCoordination */
+static int hf_x2ap_ListofEUTRACellsinEUTRACoordinationReq_PDU = -1; /* ListofEUTRACellsinEUTRACoordinationReq */
+static int hf_x2ap_ListofEUTRACellsinNRCoordinationReq_PDU = -1; /* ListofEUTRACellsinNRCoordinationReq */
+static int hf_x2ap_ListofNRCellsinNRCoordinationReq_PDU = -1; /* ListofNRCellsinNRCoordinationReq */
+static int hf_x2ap_EUTRANRCellResourceCoordinationResponse_PDU = -1; /* EUTRANRCellResourceCoordinationResponse */
+static int hf_x2ap_RespondingNodeType_EutranrCellResourceCoordination_PDU = -1; /* RespondingNodeType_EutranrCellResourceCoordination */
+static int hf_x2ap_ListofEUTRACellsinEUTRACoordinationResp_PDU = -1; /* ListofEUTRACellsinEUTRACoordinationResp */
+static int hf_x2ap_ListofNRCellsinNRCoordinationResp_PDU = -1; /* ListofNRCellsinNRCoordinationResp */
+static int hf_x2ap_ENDCX2RemovalRequest_PDU = -1; /* ENDCX2RemovalRequest */
+static int hf_x2ap_InitiatingNodeType_EndcX2Removal_PDU = -1; /* InitiatingNodeType_EndcX2Removal */
+static int hf_x2ap_ENDCX2RemovalResponse_PDU = -1; /* ENDCX2RemovalResponse */
+static int hf_x2ap_RespondingNodeType_EndcX2Removal_PDU = -1; /* RespondingNodeType_EndcX2Removal */
+static int hf_x2ap_ENDCX2RemovalFailure_PDU = -1; /* ENDCX2RemovalFailure */
static int hf_x2ap_X2AP_PDU_PDU = -1; /* X2AP_PDU */
static int hf_x2ap_local = -1; /* INTEGER_0_maxPrivateIEs */
static int hf_x2ap_global = -1; /* OBJECT_IDENTIFIER */
@@ -887,7 +958,12 @@ static int hf_x2ap_rI = -1; /* INTEGER_1_8_ */
static int hf_x2ap_widebandCQI = -1; /* WidebandCQI */
static int hf_x2ap_subbandSize = -1; /* SubbandSize */
static int hf_x2ap_subbandCQIList = -1; /* SubbandCQIList */
+static int hf_x2ap_activationSFN = -1; /* INTEGER_0_1023 */
+static int hf_x2ap_sharedResourceType = -1; /* SharedResourceType */
+static int hf_x2ap_reservedSubframePattern = -1; /* ReservedSubframePattern */
static int hf_x2ap_highestSuccessDeliveredPDCPSN = -1; /* INTEGER_0_4095 */
+static int hf_x2ap_unchanged = -1; /* NULL */
+static int hf_x2ap_changed = -1; /* DLResourceBitmapULandDLSharing */
static int hf_x2ap_naics_active = -1; /* DynamicNAICSInformation */
static int hf_x2ap_naics_inactive = -1; /* NULL */
static int hf_x2ap_transmissionModes = -1; /* T_transmissionModes */
@@ -907,11 +983,13 @@ static int hf_x2ap_pDCPatSgNB = -1; /* T_pDCPatSgNB */
static int hf_x2ap_mCGresources = -1; /* T_mCGresources */
static int hf_x2ap_sCGresources = -1; /* T_sCGresources */
static int hf_x2ap_EPLMNs_item = -1; /* PLMN_Identity */
+static int hf_x2ap_ERABActivityNotifyItemList_item = -1; /* ERABActivityNotifyItem */
+static int hf_x2ap_e_RAB_ID = -1; /* E_RAB_ID */
+static int hf_x2ap_activityReport = -1; /* UserPlaneTrafficActivityReport */
static int hf_x2ap_qCI = -1; /* QCI */
static int hf_x2ap_allocationAndRetentionPriority = -1; /* AllocationAndRetentionPriority */
static int hf_x2ap_gbrQosInformation = -1; /* GBR_QosInformation */
static int hf_x2ap_E_RAB_List_item = -1; /* ProtocolIE_Single_Container */
-static int hf_x2ap_e_RAB_ID = -1; /* E_RAB_ID */
static int hf_x2ap_cause = -1; /* Cause */
static int hf_x2ap_E_RABUsageReportList_item = -1; /* ProtocolIE_Single_Container */
static int hf_x2ap_startTimeStamp = -1; /* T_startTimeStamp */
@@ -937,6 +1015,9 @@ static int hf_x2ap_ForbiddenTACs_item = -1; /* TAC */
static int hf_x2ap_ForbiddenLAs_item = -1; /* ForbiddenLAs_Item */
static int hf_x2ap_forbiddenLACs = -1; /* ForbiddenLACs */
static int hf_x2ap_ForbiddenLACs_item = -1; /* LAC */
+static int hf_x2ap_freqBandIndicatorNr = -1; /* INTEGER_1_1024_ */
+static int hf_x2ap_supportedSULBandList = -1; /* SEQUENCE_SIZE_0_maxnoofNrCellBands_OF_SupportedSULFreqBandItem */
+static int hf_x2ap_supportedSULBandList_item = -1; /* SupportedSULFreqBandItem */
static int hf_x2ap_e_RAB_MaximumBitrateDL = -1; /* BitRate */
static int hf_x2ap_e_RAB_MaximumBitrateUL = -1; /* BitRate */
static int hf_x2ap_e_RAB_GuaranteedBitrateDL = -1; /* BitRate */
@@ -1008,6 +1089,11 @@ static int hf_x2ap_uENRMeasurements = -1; /* T_uENRMeasurements */
static int hf_x2ap_Neighbour_Information_item = -1; /* Neighbour_Information_item */
static int hf_x2ap_pCI = -1; /* PCI */
static int hf_x2ap_eARFCN = -1; /* EARFCN */
+static int hf_x2ap_nRARFCN = -1; /* INTEGER_0_3279165 */
+static int hf_x2ap_nRARFCN_SUL = -1; /* INTEGER_0_3279165 */
+static int hf_x2ap_freqBandListNr = -1; /* SEQUENCE_SIZE_1_maxnoofNrCellBands_OF_FreqBandNrItem */
+static int hf_x2ap_freqBandListNr_item = -1; /* FreqBandNrItem */
+static int hf_x2ap_sULInformation = -1; /* SULInformation */
static int hf_x2ap_nRcellIdentifier = -1; /* NRCellIdentifier */
static int hf_x2ap_nRSCS = -1; /* NRSCS */
static int hf_x2ap_nRNRB = -1; /* NRNRB */
@@ -1022,6 +1108,16 @@ static int hf_x2ap_plmnListforQMC = -1; /* PLMNListforQMC */
static int hf_x2ap_PLMNListforQMC_item = -1; /* PLMN_Identity */
static int hf_x2ap_proSeDirectDiscovery = -1; /* ProSeDirectDiscovery */
static int hf_x2ap_proSeDirectCommunication = -1; /* ProSeDirectCommunication */
+static int hf_x2ap_protectedResourceList = -1; /* ProtectedResourceList */
+static int hf_x2ap_mBSFNControlRegionLength = -1; /* T_mBSFNControlRegionLength */
+static int hf_x2ap_pDCCHRegionLength = -1; /* T_pDCCHRegionLength */
+static int hf_x2ap_protectedFootprintTimePeriodicity = -1; /* INTEGER_1_80_ */
+static int hf_x2ap_protectedFootprintStartTime = -1; /* INTEGER_1_20_ */
+static int hf_x2ap_ProtectedResourceList_item = -1; /* ProtectedResourceList_Item */
+static int hf_x2ap_resourceType = -1; /* ResourceType */
+static int hf_x2ap_intraPRBProtectedResourceFootprint = -1; /* BIT_STRING_SIZE_84_ */
+static int hf_x2ap_protectedFootprintFrequencyPattern = -1; /* BIT_STRING_SIZE_6_110_ */
+static int hf_x2ap_protectedFootprintTimePattern = -1; /* ProtectedFootprintTimePattern */
static int hf_x2ap_dL_GBR_PRB_usage = -1; /* DL_GBR_PRB_usage */
static int hf_x2ap_uL_GBR_PRB_usage = -1; /* UL_GBR_PRB_usage */
static int hf_x2ap_dL_non_GBR_PRB_usage = -1; /* DL_non_GBR_PRB_usage */
@@ -1034,6 +1130,9 @@ static int hf_x2ap_numberOfCellSpecificAntennaPorts_02 = -1; /* T_numberOfCellS
static int hf_x2ap_p_B = -1; /* INTEGER_0_3_ */
static int hf_x2ap_pDCCH_InterferenceImpact = -1; /* INTEGER_0_4_ */
static int hf_x2ap_ReplacingCellsList_item = -1; /* ReplacingCellsList_Item */
+static int hf_x2ap_subframeType = -1; /* SubframeType */
+static int hf_x2ap_reservedSubframePattern_01 = -1; /* BIT_STRING_SIZE_10_40 */
+static int hf_x2ap_mBSFNControlRegionLength_01 = -1; /* T_mBSFNControlRegionLength_01 */
static int hf_x2ap_non_truncated = -1; /* BIT_STRING_SIZE_40 */
static int hf_x2ap_truncated = -1; /* BIT_STRING_SIZE_24 */
static int hf_x2ap_RSRPMeasurementResult_item = -1; /* RSRPMeasurementResult_item */
@@ -1054,6 +1153,8 @@ static int hf_x2ap_tAC = -1; /* TAC */
static int hf_x2ap_broadcastPLMNs = -1; /* BroadcastPLMNs_Item */
static int hf_x2ap_eUTRA_Mode_Info = -1; /* EUTRA_Mode_Info */
static int hf_x2ap_nR_CGI = -1; /* NRCGI */
+static int hf_x2ap_uLOnlySharing = -1; /* ULOnlySharing */
+static int hf_x2ap_uLandDLSharing = -1; /* ULandDLSharing */
static int hf_x2ap_specialSubframePatterns = -1; /* SpecialSubframePatterns */
static int hf_x2ap_subbandCQICodeword0 = -1; /* SubbandCQICodeword0 */
static int hf_x2ap_subbandCQICodeword1 = -1; /* SubbandCQICodeword1 */
@@ -1066,7 +1167,7 @@ static int hf_x2ap_subbandCQI = -1; /* SubbandCQI */
static int hf_x2ap_subbandIndex = -1; /* INTEGER_0_27_ */
static int hf_x2ap_oneframe = -1; /* Oneframe */
static int hf_x2ap_fourframes = -1; /* Fourframes */
-static int hf_x2ap_sUL_ARFCN = -1; /* NRARFCN */
+static int hf_x2ap_sUL_ARFCN = -1; /* INTEGER_0_3279165 */
static int hf_x2ap_sUL_TxBW = -1; /* NR_TxBW */
static int hf_x2ap_tAListforMDT = -1; /* TAListforMDT */
static int hf_x2ap_tAIListforMDT = -1; /* TAIListforMDT */
@@ -1092,11 +1193,19 @@ static int hf_x2ap_UE_HistoryInformation_item = -1; /* LastVisitedCell_Item */
static int hf_x2ap_encryptionAlgorithms = -1; /* EncryptionAlgorithms */
static int hf_x2ap_integrityProtectionAlgorithms = -1; /* IntegrityProtectionAlgorithms */
static int hf_x2ap_uESidelinkAggregateMaximumBitRate = -1; /* BitRate */
+static int hf_x2ap_UEsToBeResetList_item = -1; /* UEsToBeResetList_Item */
+static int hf_x2ap_meNB_ID = -1; /* UE_X2AP_ID */
+static int hf_x2ap_meNB_ID_ext = -1; /* UE_X2AP_ID_Extension */
+static int hf_x2ap_sgNB_ID = -1; /* SgNB_UE_X2AP_ID */
+static int hf_x2ap_uLResourcesULandDLSharing = -1; /* ULResourcesULandDLSharing */
+static int hf_x2ap_dLResourcesULandDLSharing = -1; /* DLResourcesULandDLSharing */
static int hf_x2ap_uL_PDCP = -1; /* UL_UE_Configuration */
static int hf_x2ap_UL_HighInterferenceIndicationInfo_item = -1; /* UL_HighInterferenceIndicationInfo_Item */
static int hf_x2ap_target_Cell_ID = -1; /* ECGI */
static int hf_x2ap_ul_interferenceindication = -1; /* UL_HighInterferenceIndication */
static int hf_x2ap_UL_InterferenceOverloadIndication_item = -1; /* UL_InterferenceOverloadIndication_Item */
+static int hf_x2ap_uLResourceBitmapULOnlySharing = -1; /* DataTrafficResources */
+static int hf_x2ap_changed_01 = -1; /* ULResourceBitmapULandDLSharing */
static int hf_x2ap_fdd_01 = -1; /* UsableABSInformationFDD */
static int hf_x2ap_tdd_01 = -1; /* UsableABSInformationTDD */
static int hf_x2ap_usable_abs_pattern_info = -1; /* BIT_STRING_SIZE_40 */
@@ -1225,6 +1334,7 @@ static int hf_x2ap_max_MCG_admit_E_RAB_Level_QoS_Parameters = -1; /* GBR_QosInf
static int hf_x2ap_meNB_DL_GTP_TEIDatMCG = -1; /* GTPtunnelEndpoint */
static int hf_x2ap_requested_SCG_E_RAB_Level_QoS_Parameters = -1; /* E_RAB_Level_QoS_Parameters */
static int hf_x2ap_meNB_UL_GTP_TEIDatPDCP = -1; /* GTPtunnelEndpoint */
+static int hf_x2ap_secondary_meNB_UL_GTP_TEIDatPDCP = -1; /* GTPtunnelEndpoint */
static int hf_x2ap_rlc_Mode = -1; /* RLCMode */
static int hf_x2ap_uL_Configuration = -1; /* ULConfiguration */
static int hf_x2ap_E_RABs_Admitted_ToBeAdded_SgNBAddReqAckList_item = -1; /* ProtocolIE_Single_Container */
@@ -1234,6 +1344,7 @@ static int hf_x2ap_sgNBPDCPnotpresent_01 = -1; /* E_RABs_Admitted_ToBeAdded_S
static int hf_x2ap_sgNB_UL_GTP_TEIDatPDCP = -1; /* GTPtunnelEndpoint */
static int hf_x2ap_mCG_E_RAB_Level_QoS_Parameters = -1; /* E_RAB_Level_QoS_Parameters */
static int hf_x2ap_sgNB_DL_GTP_TEIDatSCG = -1; /* GTPtunnelEndpoint */
+static int hf_x2ap_secondary_sgNB_DL_GTP_TEIDatSCG = -1; /* GTPtunnelEndpoint */
static int hf_x2ap_success_SgNBReconfComp = -1; /* ResponseInformationSgNBReconfComp_SuccessItem */
static int hf_x2ap_reject_by_MeNB_SgNBReconfComp = -1; /* ResponseInformationSgNBReconfComp_RejectByMeNBItem */
static int hf_x2ap_meNBtoSgNBContainer = -1; /* MeNBtoSgNBContainer */
@@ -1276,19 +1387,24 @@ static int hf_x2ap_resource_configuration_08 = -1; /* T_resource_configuration_
static int hf_x2ap_sgNBPDCPpresent_08 = -1; /* E_RABs_ToBeModified_SgNBModReqd_Item_SgNBPDCPpresent */
static int hf_x2ap_sgNBPDCPnotpresent_08 = -1; /* E_RABs_ToBeModified_SgNBModReqd_Item_SgNBPDCPnotpresent */
static int hf_x2ap_requested_MCG_E_RAB_Level_QoS_Parameters = -1; /* E_RAB_Level_QoS_Parameters */
-static int hf_x2ap_E_RABs_ToBeReleased_SgNBRelReqList_item = -1; /* ProtocolIE_Single_Container */
+static int hf_x2ap_s1_DL_GTP_TEIDatSgNB = -1; /* GTPtunnelEndpoint */
+static int hf_x2ap_E_RABs_AdmittedToBeModified_SgNBModConfList_item = -1; /* ProtocolIE_Single_Container */
static int hf_x2ap_resource_configuration_09 = -1; /* T_resource_configuration_09 */
-static int hf_x2ap_sgNBPDCPpresent_09 = -1; /* E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPpresent */
-static int hf_x2ap_sgNBPDCPnotpresent_09 = -1; /* E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPnotpresent */
-static int hf_x2ap_E_RABs_ToBeReleased_SgNBRelConfList_item = -1; /* ProtocolIE_Single_Container */
+static int hf_x2ap_sgNBPDCPpresent_09 = -1; /* E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPpresent */
+static int hf_x2ap_sgNBPDCPnotpresent_09 = -1; /* E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPnotpresent */
+static int hf_x2ap_E_RABs_ToBeReleased_SgNBRelReqList_item = -1; /* ProtocolIE_Single_Container */
static int hf_x2ap_resource_configuration_10 = -1; /* T_resource_configuration_10 */
-static int hf_x2ap_sgNBPDCPpresent_10 = -1; /* E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPpresent */
-static int hf_x2ap_sgNBPDCPnotpresent_10 = -1; /* E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPnotpresent */
+static int hf_x2ap_sgNBPDCPpresent_10 = -1; /* E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPpresent */
+static int hf_x2ap_sgNBPDCPnotpresent_10 = -1; /* E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPnotpresent */
+static int hf_x2ap_E_RABs_ToBeReleased_SgNBRelConfList_item = -1; /* ProtocolIE_Single_Container */
+static int hf_x2ap_resource_configuration_11 = -1; /* T_resource_configuration_11 */
+static int hf_x2ap_sgNBPDCPpresent_11 = -1; /* E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPpresent */
+static int hf_x2ap_sgNBPDCPnotpresent_11 = -1; /* E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPnotpresent */
static int hf_x2ap_E_RABs_SubjectToSgNBCounterCheck_List_item = -1; /* ProtocolIE_Single_Container */
static int hf_x2ap_E_RABs_ToBeReleased_SgNBChaConfList_item = -1; /* ProtocolIE_Single_Container */
-static int hf_x2ap_resource_configuration_11 = -1; /* T_resource_configuration_11 */
-static int hf_x2ap_sgNBPDCPpresent_11 = -1; /* E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPpresent */
-static int hf_x2ap_sgNBPDCPnotpresent_11 = -1; /* E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPnotpresent */
+static int hf_x2ap_resource_configuration_12 = -1; /* T_resource_configuration_12 */
+static int hf_x2ap_sgNBPDCPpresent_12 = -1; /* E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPpresent */
+static int hf_x2ap_sgNBPDCPnotpresent_12 = -1; /* E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPnotpresent */
static int hf_x2ap_init_eNB = -1; /* ProtocolIE_Container */
static int hf_x2ap_init_en_gNB = -1; /* ProtocolIE_Container */
static int hf_x2ap_ServedEUTRAcellsENDCX2ManagementList_item = -1; /* ServedEUTRAcellsENDCX2ManagementList_item */
@@ -1299,20 +1415,24 @@ static int hf_x2ap_servedNRCellInfo = -1; /* ServedNRCell_Information */
static int hf_x2ap_nRNeighbourInfo = -1; /* NRNeighbour_Information */
static int hf_x2ap_nrpCI = -1; /* NRPCI */
static int hf_x2ap_nrCellID = -1; /* NRCGI */
-static int hf_x2ap_eXtended_TAC = -1; /* Extended_TAC */
+static int hf_x2ap_fiveGS_TAC = -1; /* FiveGS_TAC */
+static int hf_x2ap_configured_TAC = -1; /* TAC */
static int hf_x2ap_nrModeInfo = -1; /* T_nrModeInfo */
static int hf_x2ap_fdd_02 = -1; /* FDD_InfoServedNRCell_Information */
static int hf_x2ap_tdd_02 = -1; /* TDD_InfoServedNRCell_Information */
static int hf_x2ap_measurementTimingConfiguration = -1; /* T_measurementTimingConfiguration */
-static int hf_x2ap_sULInformation = -1; /* SULInformation */
-static int hf_x2ap_ul_NR_ARFCN = -1; /* NRARFCN */
-static int hf_x2ap_dl_NR_ARFCN = -1; /* NRARFCN */
+static int hf_x2ap_ul_NRFreqInfo = -1; /* NRFreqInfo */
+static int hf_x2ap_dl_NRFreqInfo = -1; /* NRFreqInfo */
static int hf_x2ap_ul_NR_TxBW = -1; /* NR_TxBW */
static int hf_x2ap_dl_NR_TxBW = -1; /* NR_TxBW */
-static int hf_x2ap_nR_ARFCN = -1; /* NRARFCN */
+static int hf_x2ap_nRFreqInfo = -1; /* NRFreqInfo */
static int hf_x2ap_nR_TxBW = -1; /* NR_TxBW */
static int hf_x2ap_NRNeighbour_Information_item = -1; /* NRNeighbour_Information_item */
-static int hf_x2ap_nrARFCN = -1; /* NRARFCN */
+static int hf_x2ap_nrFreqInfo = -1; /* NRFreqInfo */
+static int hf_x2ap_measurementTimingConfiguration_01 = -1; /* OCTET_STRING */
+static int hf_x2ap_nRNeighbourModeInfo = -1; /* T_nRNeighbourModeInfo */
+static int hf_x2ap_fdd_03 = -1; /* FDD_InfoNeighbourServedNRCell_Information */
+static int hf_x2ap_tdd_03 = -1; /* TDD_InfoNeighbourServedNRCell_Information */
static int hf_x2ap_limited_list = -1; /* Limited_list */
static int hf_x2ap_full_list = -1; /* T_full_list */
static int hf_x2ap_Limited_list_item = -1; /* Limited_list_item */
@@ -1329,6 +1449,13 @@ static int hf_x2ap_nrDeactivationIndication = -1; /* DeactivationIndication */
static int hf_x2ap_ServedNRcellsToDeleteENDCConfUpdList_item = -1; /* NRCGI */
static int hf_x2ap_ServedNRCellsToActivate_item = -1; /* ServedNRCellsToActivate_Item */
static int hf_x2ap_ActivatedNRCellList_item = -1; /* ActivatedNRCellList_Item */
+static int hf_x2ap_initiate_eNB = -1; /* ProtocolIE_Container */
+static int hf_x2ap_initiate_en_gNB = -1; /* ProtocolIE_Container */
+static int hf_x2ap_ListofEUTRACellsinEUTRACoordinationReq_item = -1; /* ECGI */
+static int hf_x2ap_ListofEUTRACellsinNRCoordinationReq_item = -1; /* ECGI */
+static int hf_x2ap_ListofNRCellsinNRCoordinationReq_item = -1; /* NRCGI */
+static int hf_x2ap_ListofEUTRACellsinEUTRACoordinationResp_item = -1; /* ECGI */
+static int hf_x2ap_ListofNRCellsinNRCoordinationResp_item = -1; /* NRCGI */
static int hf_x2ap_initiatingMessage = -1; /* InitiatingMessage */
static int hf_x2ap_successfulOutcome = -1; /* SuccessfulOutcome */
static int hf_x2ap_unsuccessfulOutcome = -1; /* UnsuccessfulOutcome */
@@ -1418,7 +1545,9 @@ static gint ett_x2ap_CSIReportPerCSIProcess = -1;
static gint ett_x2ap_CSIReportPerCSIProcess_item = -1;
static gint ett_x2ap_CSIReportPerCSIProcessItem = -1;
static gint ett_x2ap_CSIReportPerCSIProcessItem_item = -1;
+static gint ett_x2ap_DataTrafficResourceIndication = -1;
static gint ett_x2ap_DeliveryStatus = -1;
+static gint ett_x2ap_DLResourcesULandDLSharing = -1;
static gint ett_x2ap_DynamicDLTransmissionInformation = -1;
static gint ett_x2ap_DynamicNAICSInformation = -1;
static gint ett_x2ap_SEQUENCE_SIZE_0_maxnoofPA_OF_PA_Values = -1;
@@ -1428,6 +1557,8 @@ static gint ett_x2ap_EnhancedRNTPStartTime = -1;
static gint ett_x2ap_ENB_ID = -1;
static gint ett_x2ap_EN_DC_ResourceConfiguration = -1;
static gint ett_x2ap_EPLMNs = -1;
+static gint ett_x2ap_ERABActivityNotifyItemList = -1;
+static gint ett_x2ap_ERABActivityNotifyItem = -1;
static gint ett_x2ap_E_RAB_Level_QoS_Parameters = -1;
static gint ett_x2ap_E_RAB_List = -1;
static gint ett_x2ap_E_RAB_Item = -1;
@@ -1444,6 +1575,8 @@ static gint ett_x2ap_ForbiddenTACs = -1;
static gint ett_x2ap_ForbiddenLAs = -1;
static gint ett_x2ap_ForbiddenLAs_Item = -1;
static gint ett_x2ap_ForbiddenLACs = -1;
+static gint ett_x2ap_FreqBandNrItem = -1;
+static gint ett_x2ap_SEQUENCE_SIZE_0_maxnoofNrCellBands_OF_SupportedSULFreqBandItem = -1;
static gint ett_x2ap_GBR_QosInformation = -1;
static gint ett_x2ap_GlobalENB_ID = -1;
static gint ett_x2ap_GlobalGNB_ID = -1;
@@ -1476,10 +1609,12 @@ static gint ett_x2ap_MobilityParametersModificationRange = -1;
static gint ett_x2ap_MobilityParametersInformation = -1;
static gint ett_x2ap_MultibandInfoList = -1;
static gint ett_x2ap_BandInfo = -1;
-static gint ett_x2ap_MCGSplitSRB = -1;
+static gint ett_x2ap_SplitSRB = -1;
static gint ett_x2ap_UENRMeasurement = -1;
static gint ett_x2ap_Neighbour_Information = -1;
static gint ett_x2ap_Neighbour_Information_item = -1;
+static gint ett_x2ap_NRFreqInfo = -1;
+static gint ett_x2ap_SEQUENCE_SIZE_1_maxnoofNrCellBands_OF_FreqBandNrItem = -1;
static gint ett_x2ap_NRCGI = -1;
static gint ett_x2ap_NR_TxBW = -1;
static gint ett_x2ap_NRUESecurityCapabilities = -1;
@@ -1487,10 +1622,15 @@ static gint ett_x2ap_PRACH_Configuration = -1;
static gint ett_x2ap_PLMNAreaBasedQMC = -1;
static gint ett_x2ap_PLMNListforQMC = -1;
static gint ett_x2ap_ProSeAuthorized = -1;
+static gint ett_x2ap_ProtectedEUTRAResourceIndication = -1;
+static gint ett_x2ap_ProtectedFootprintTimePattern = -1;
+static gint ett_x2ap_ProtectedResourceList = -1;
+static gint ett_x2ap_ProtectedResourceList_Item = -1;
static gint ett_x2ap_RadioResourceStatus = -1;
static gint ett_x2ap_RelativeNarrowbandTxPower = -1;
static gint ett_x2ap_ReplacingCellsList = -1;
static gint ett_x2ap_ReplacingCellsList_Item = -1;
+static gint ett_x2ap_ReservedSubframePattern = -1;
static gint ett_x2ap_ResumeID = -1;
static gint ett_x2ap_RSRPMeasurementResult = -1;
static gint ett_x2ap_RSRPMeasurementResult_item = -1;
@@ -1503,6 +1643,7 @@ static gint ett_x2ap_ServedCells = -1;
static gint ett_x2ap_ServedCells_item = -1;
static gint ett_x2ap_ServedCell_Information = -1;
static gint ett_x2ap_SgNBResourceCoordinationInformation = -1;
+static gint ett_x2ap_SharedResourceType = -1;
static gint ett_x2ap_SpecialSubframe_Info = -1;
static gint ett_x2ap_SubbandCQI = -1;
static gint ett_x2ap_SubbandCQICodeword0 = -1;
@@ -1511,6 +1652,7 @@ static gint ett_x2ap_SubbandCQIList = -1;
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_TABasedMDT = -1;
static gint ett_x2ap_TAIBasedMDT = -1;
static gint ett_x2ap_TAIListforMDT = -1;
@@ -1528,10 +1670,15 @@ static gint ett_x2ap_UEAppLayerMeasConfig = -1;
static gint ett_x2ap_UE_HistoryInformation = -1;
static gint ett_x2ap_UESecurityCapabilities = -1;
static gint ett_x2ap_UESidelinkAggregateMaximumBitRate = -1;
+static gint ett_x2ap_UEsToBeResetList = -1;
+static gint ett_x2ap_UEsToBeResetList_Item = -1;
+static gint ett_x2ap_ULandDLSharing = -1;
static gint ett_x2ap_ULConfiguration = -1;
static gint ett_x2ap_UL_HighInterferenceIndicationInfo = -1;
static gint ett_x2ap_UL_HighInterferenceIndicationInfo_Item = -1;
static gint ett_x2ap_UL_InterferenceOverloadIndication = -1;
+static gint ett_x2ap_ULOnlySharing = -1;
+static gint ett_x2ap_ULResourcesULandDLSharing = -1;
static gint ett_x2ap_UsableABSInformation = -1;
static gint ett_x2ap_UsableABSInformationFDD = -1;
static gint ett_x2ap_UsableABSInformationTDD = -1;
@@ -1732,11 +1879,16 @@ static gint ett_x2ap_T_resource_configuration_08 = -1;
static gint ett_x2ap_E_RABs_ToBeModified_SgNBModReqd_Item_SgNBPDCPpresent = -1;
static gint ett_x2ap_E_RABs_ToBeModified_SgNBModReqd_Item_SgNBPDCPnotpresent = -1;
static gint ett_x2ap_SgNBModificationConfirm = -1;
+static gint ett_x2ap_E_RABs_AdmittedToBeModified_SgNBModConfList = -1;
+static gint ett_x2ap_E_RABs_AdmittedToBeModified_SgNBModConf_Item = -1;
+static gint ett_x2ap_T_resource_configuration_09 = -1;
+static gint ett_x2ap_E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPpresent = -1;
+static gint ett_x2ap_E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPnotpresent = -1;
static gint ett_x2ap_SgNBModificationRefuse = -1;
static gint ett_x2ap_SgNBReleaseRequest = -1;
static gint ett_x2ap_E_RABs_ToBeReleased_SgNBRelReqList = -1;
static gint ett_x2ap_E_RABs_ToBeReleased_SgNBRelReq_Item = -1;
-static gint ett_x2ap_T_resource_configuration_09 = -1;
+static gint ett_x2ap_T_resource_configuration_10 = -1;
static gint ett_x2ap_E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPpresent = -1;
static gint ett_x2ap_E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPnotpresent = -1;
static gint ett_x2ap_SgNBReleaseRequestAcknowledge = -1;
@@ -1745,7 +1897,7 @@ static gint ett_x2ap_SgNBReleaseRequired = -1;
static gint ett_x2ap_SgNBReleaseConfirm = -1;
static gint ett_x2ap_E_RABs_ToBeReleased_SgNBRelConfList = -1;
static gint ett_x2ap_E_RABs_ToBeReleased_SgNBRelConf_Item = -1;
-static gint ett_x2ap_T_resource_configuration_10 = -1;
+static gint ett_x2ap_T_resource_configuration_11 = -1;
static gint ett_x2ap_E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPpresent = -1;
static gint ett_x2ap_E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPnotpresent = -1;
static gint ett_x2ap_SgNBCounterCheckRequest = -1;
@@ -1755,7 +1907,7 @@ static gint ett_x2ap_SgNBChangeRequired = -1;
static gint ett_x2ap_SgNBChangeConfirm = -1;
static gint ett_x2ap_E_RABs_ToBeReleased_SgNBChaConfList = -1;
static gint ett_x2ap_E_RABs_ToBeReleased_SgNBChaConf_Item = -1;
-static gint ett_x2ap_T_resource_configuration_11 = -1;
+static gint ett_x2ap_T_resource_configuration_12 = -1;
static gint ett_x2ap_E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPpresent = -1;
static gint ett_x2ap_E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPnotpresent = -1;
static gint ett_x2ap_RRCTransfer = -1;
@@ -1769,9 +1921,12 @@ static gint ett_x2ap_ServedNRcellsENDCX2ManagementList_item = -1;
static gint ett_x2ap_ServedNRCell_Information = -1;
static gint ett_x2ap_T_nrModeInfo = -1;
static gint ett_x2ap_FDD_InfoServedNRCell_Information = -1;
+static gint ett_x2ap_FDD_InfoNeighbourServedNRCell_Information = -1;
static gint ett_x2ap_TDD_InfoServedNRCell_Information = -1;
+static gint ett_x2ap_TDD_InfoNeighbourServedNRCell_Information = -1;
static gint ett_x2ap_NRNeighbour_Information = -1;
static gint ett_x2ap_NRNeighbour_Information_item = -1;
+static gint ett_x2ap_T_nRNeighbourModeInfo = -1;
static gint ett_x2ap_CellAssistanceInformation = -1;
static gint ett_x2ap_Limited_list = -1;
static gint ett_x2ap_Limited_list_item = -1;
@@ -1797,6 +1952,23 @@ static gint ett_x2ap_ActivatedNRCellList = -1;
static gint ett_x2ap_ActivatedNRCellList_Item = -1;
static gint ett_x2ap_ENDCCellActivationFailure = -1;
static gint ett_x2ap_SecondaryRATDataUsageReport = -1;
+static gint ett_x2ap_SgNBActivityNotification = -1;
+static gint ett_x2ap_ENDCPartialResetRequired = -1;
+static gint ett_x2ap_ENDCPartialResetConfirm = -1;
+static gint ett_x2ap_EUTRANRCellResourceCoordinationRequest = -1;
+static gint ett_x2ap_InitiatingNodeType_EutranrCellResourceCoordination = -1;
+static gint ett_x2ap_ListofEUTRACellsinEUTRACoordinationReq = -1;
+static gint ett_x2ap_ListofEUTRACellsinNRCoordinationReq = -1;
+static gint ett_x2ap_ListofNRCellsinNRCoordinationReq = -1;
+static gint ett_x2ap_EUTRANRCellResourceCoordinationResponse = -1;
+static gint ett_x2ap_RespondingNodeType_EutranrCellResourceCoordination = -1;
+static gint ett_x2ap_ListofEUTRACellsinEUTRACoordinationResp = -1;
+static gint ett_x2ap_ListofNRCellsinNRCoordinationResp = -1;
+static gint ett_x2ap_ENDCX2RemovalRequest = -1;
+static gint ett_x2ap_InitiatingNodeType_EndcX2Removal = -1;
+static gint ett_x2ap_ENDCX2RemovalResponse = -1;
+static gint ett_x2ap_RespondingNodeType_EndcX2Removal = -1;
+static gint ett_x2ap_ENDCX2RemovalFailure = -1;
static gint ett_x2ap_X2AP_PDU = -1;
static gint ett_x2ap_InitiatingMessage = -1;
static gint ett_x2ap_SuccessfulOutcome = -1;
@@ -1889,6 +2061,12 @@ x2ap_Threshold_RSRQ_fmt(gchar *s, guint32 v)
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%u)", ((float)v/2)-20, v);
}
+static void
+x2ap_Packet_LossRate_fmt(gchar *s, guint32 v)
+{
+ g_snprintf(s, ITEM_LABEL_LENGTH, "%.1f %% (%u)", (float)v/10, v);
+}
+
static struct x2ap_private_data*
x2ap_get_private_data(packet_info *pinfo)
{
@@ -2003,6 +2181,10 @@ static const value_string x2ap_ProcedureCode_vals[] = {
{ id_endcConfigurationUpdate, "id-endcConfigurationUpdate" },
{ id_secondaryRATDataUsageReport, "id-secondaryRATDataUsageReport" },
{ id_endcCellActivation, "id-endcCellActivation" },
+ { id_endcPartialReset, "id-endcPartialReset" },
+ { id_eUTRANRCellResourceCoordination, "id-eUTRANRCellResourceCoordination" },
+ { id_SgNBActivityNotification, "id-SgNBActivityNotification" },
+ { id_endcX2Removal, "id-endcX2Removal" },
{ 0, NULL }
};
@@ -2232,11 +2414,11 @@ static const value_string x2ap_ProtocolIE_ID_vals[] = {
{ id_E_RABs_ToBeAdded_SgNBAddReqList, "id-E-RABs-ToBeAdded-SgNBAddReqList" },
{ id_MeNBtoSgNBContainer, "id-MeNBtoSgNBContainer" },
{ id_SgNB_UE_X2AP_ID, "id-SgNB-UE-X2AP-ID" },
- { id_RequestedMCGSplitSRBs, "id-RequestedMCGSplitSRBs" },
+ { id_RequestedSplitSRBs, "id-RequestedSplitSRBs" },
{ id_E_RABs_ToBeAdded_SgNBAddReq_Item, "id-E-RABs-ToBeAdded-SgNBAddReq-Item" },
{ id_E_RABs_Admitted_ToBeAdded_SgNBAddReqAckList, "id-E-RABs-Admitted-ToBeAdded-SgNBAddReqAckList" },
{ id_SgNBtoMeNBContainer, "id-SgNBtoMeNBContainer" },
- { id_AdmittedMCGSplitSRBs, "id-AdmittedMCGSplitSRBs" },
+ { id_AdmittedSplitSRBs, "id-AdmittedSplitSRBs" },
{ id_E_RABs_Admitted_ToBeAdded_SgNBAddReqAck_Item, "id-E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item" },
{ id_ResponseInformationSgNBReconfComp, "id-ResponseInformationSgNBReconfComp" },
{ id_UE_ContextInformation_SgNBModReq, "id-UE-ContextInformation-SgNBModReq" },
@@ -2266,7 +2448,7 @@ static const value_string x2ap_ProtocolIE_ID_vals[] = {
{ id_Target_SgNB_ID, "id-Target-SgNB-ID" },
{ id_HandoverRestrictionList, "id-HandoverRestrictionList" },
{ id_SCGConfigurationQuery, "id-SCGConfigurationQuery" },
- { id_MCGSplitSRB, "id-MCGSplitSRB" },
+ { id_SplitSRB, "id-SplitSRB" },
{ id_UENRMeasurement, "id-UENRMeasurement" },
{ id_InitiatingNodeType_EndcX2Setup, "id-InitiatingNodeType-EndcX2Setup" },
{ id_InitiatingNodeType_EndcConfigUpdate, "id-InitiatingNodeType-EndcConfigUpdate" },
@@ -2294,6 +2476,36 @@ static const value_string x2ap_ProtocolIE_ID_vals[] = {
{ id_ServedNRCellsToActivate, "id-ServedNRCellsToActivate" },
{ id_ActivatedNRCellList, "id-ActivatedNRCellList" },
{ id_SelectedPLMN, "id-SelectedPLMN" },
+ { id_UEs_ToBeReset, "id-UEs-ToBeReset" },
+ { id_UEs_Admitted_ToBeReset, "id-UEs-Admitted-ToBeReset" },
+ { id_RRCConfigIndication, "id-RRCConfigIndication" },
+ { id_DownlinkPacketLossRate, "id-DownlinkPacketLossRate" },
+ { id_UplinkPacketLossRate, "id-UplinkPacketLossRate" },
+ { id_SubscriberProfileIDforRFP, "id-SubscriberProfileIDforRFP" },
+ { id_serviceType, "id-serviceType" },
+ { id_AerialUEsubscriptionInformation, "id-AerialUEsubscriptionInformation" },
+ { id_SGNB_Addition_Trigger_Ind, "id-SGNB-Addition-Trigger-Ind" },
+ { id_MeNBCell_ID, "id-MeNBCell-ID" },
+ { id_RequestedSplitSRBsrelease, "id-RequestedSplitSRBsrelease" },
+ { id_AdmittedSplitSRBsrelease, "id-AdmittedSplitSRBsrelease" },
+ { id_NRS_NSSS_PowerOffset, "id-NRS-NSSS-PowerOffset" },
+ { id_NSSS_NumOccasionDifferentPrecoder, "id-NSSS-NumOccasionDifferentPrecoder" },
+ { id_ProtectedEUTRAResourceIndication, "id-ProtectedEUTRAResourceIndication" },
+ { id_InitiatingNodeType_EutranrCellResourceCoordination, "id-InitiatingNodeType-EutranrCellResourceCoordination" },
+ { id_RespondingNodeType_EutranrCellResourceCoordination, "id-RespondingNodeType-EutranrCellResourceCoordination" },
+ { id_DataTrafficResourceIndication, "id-DataTrafficResourceIndication" },
+ { id_SpectrumSharingGroupID, "id-SpectrumSharingGroupID" },
+ { id_ListofEUTRACellsinEUTRACoordinationReq, "id-ListofEUTRACellsinEUTRACoordinationReq" },
+ { id_ListofEUTRACellsinEUTRACoordinationResp, "id-ListofEUTRACellsinEUTRACoordinationResp" },
+ { id_ListofEUTRACellsinNRCoordinationReq, "id-ListofEUTRACellsinNRCoordinationReq" },
+ { id_ListofNRCellsinNRCoordinationReq, "id-ListofNRCellsinNRCoordinationReq" },
+ { id_ListofNRCellsinNRCoordinationResp, "id-ListofNRCellsinNRCoordinationResp" },
+ { id_E_RABs_AdmittedToBeModified_SgNBModConfList, "id-E-RABs-AdmittedToBeModified-SgNBModConfList" },
+ { id_E_RABs_AdmittedToBeModified_SgNBModConf_Item, "id-E-RABs-AdmittedToBeModified-SgNBModConf-Item" },
+ { id_UEContextLevelUserPlaneActivity, "id-UEContextLevelUserPlaneActivity" },
+ { id_ERABActivityNotifyItemList, "id-ERABActivityNotifyItemList" },
+ { id_InitiatingNodeType_EndcX2Removal, "id-InitiatingNodeType-EndcX2Removal" },
+ { id_RespondingNodeType_EndcX2Removal, "id-RespondingNodeType-EndcX2Removal" },
{ 0, NULL }
};
@@ -2779,6 +2991,22 @@ dissect_x2ap_AdditionalSpecialSubframeExtension_Info(tvbuff_t *tvb _U_, int offs
}
+static const value_string x2ap_AerialUEsubscriptionInformation_vals[] = {
+ { 0, "allowed" },
+ { 1, "not-allowed" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_AerialUEsubscriptionInformation(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,
+ 2, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
static const value_string x2ap_PriorityLevel_vals[] = {
{ 0, "spare" },
{ 1, "highest" },
@@ -3348,6 +3576,7 @@ static const value_string x2ap_CauseRadioNetwork_vals[] = {
{ 47, "sCG-Mobility" },
{ 48, "count-reaches-max-value" },
{ 49, "unknown-old-en-gNB-UE-X2AP-ID" },
+ { 50, "pDCP-Overload" },
{ 0, NULL }
};
@@ -3357,7 +3586,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, 28, NULL);
+ 22, NULL, TRUE, 29, NULL);
return offset;
}
@@ -4294,6 +4523,211 @@ dissect_x2ap_CSIReportList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
}
+
+static int
+dissect_x2ap_DataTrafficResources(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
+ 12, 8800, FALSE, NULL, NULL);
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_INTEGER_0_1023(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 0U, 1023U, NULL, FALSE);
+
+ return offset;
+}
+
+
+static const per_sequence_t ULOnlySharing_sequence[] = {
+ { &hf_x2ap_uLResourceBitmapULOnlySharing, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_DataTrafficResources },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_ULOnlySharing(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_ULOnlySharing, ULOnlySharing_sequence);
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_ULResourceBitmapULandDLSharing(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_x2ap_DataTrafficResources(tvb, offset, actx, tree, hf_index);
+
+ return offset;
+}
+
+
+static const value_string x2ap_ULResourcesULandDLSharing_vals[] = {
+ { 0, "unchanged" },
+ { 1, "changed" },
+ { 0, NULL }
+};
+
+static const per_choice_t ULResourcesULandDLSharing_choice[] = {
+ { 0, &hf_x2ap_unchanged , ASN1_EXTENSION_ROOT , dissect_x2ap_NULL },
+ { 1, &hf_x2ap_changed_01 , ASN1_EXTENSION_ROOT , dissect_x2ap_ULResourceBitmapULandDLSharing },
+ { 0, NULL, 0, NULL }
+};
+
+static int
+dissect_x2ap_ULResourcesULandDLSharing(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_ULResourcesULandDLSharing, ULResourcesULandDLSharing_choice,
+ NULL);
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_DLResourceBitmapULandDLSharing(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_x2ap_DataTrafficResources(tvb, offset, actx, tree, hf_index);
+
+ return offset;
+}
+
+
+static const value_string x2ap_DLResourcesULandDLSharing_vals[] = {
+ { 0, "unchanged" },
+ { 1, "changed" },
+ { 0, NULL }
+};
+
+static const per_choice_t DLResourcesULandDLSharing_choice[] = {
+ { 0, &hf_x2ap_unchanged , ASN1_EXTENSION_ROOT , dissect_x2ap_NULL },
+ { 1, &hf_x2ap_changed , ASN1_EXTENSION_ROOT , dissect_x2ap_DLResourceBitmapULandDLSharing },
+ { 0, NULL, 0, NULL }
+};
+
+static int
+dissect_x2ap_DLResourcesULandDLSharing(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_DLResourcesULandDLSharing, DLResourcesULandDLSharing_choice,
+ NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t ULandDLSharing_sequence[] = {
+ { &hf_x2ap_uLResourcesULandDLSharing, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ULResourcesULandDLSharing },
+ { &hf_x2ap_dLResourcesULandDLSharing, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_DLResourcesULandDLSharing },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_ULandDLSharing(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_ULandDLSharing, ULandDLSharing_sequence);
+
+ return offset;
+}
+
+
+static const value_string x2ap_SharedResourceType_vals[] = {
+ { 0, "uLOnlySharing" },
+ { 1, "uLandDLSharing" },
+ { 0, NULL }
+};
+
+static const per_choice_t SharedResourceType_choice[] = {
+ { 0, &hf_x2ap_uLOnlySharing , ASN1_EXTENSION_ROOT , dissect_x2ap_ULOnlySharing },
+ { 1, &hf_x2ap_uLandDLSharing , ASN1_EXTENSION_ROOT , dissect_x2ap_ULandDLSharing },
+ { 0, NULL, 0, NULL }
+};
+
+static int
+dissect_x2ap_SharedResourceType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_SharedResourceType, SharedResourceType_choice,
+ NULL);
+
+ return offset;
+}
+
+
+static const value_string x2ap_SubframeType_vals[] = {
+ { 0, "mbsfn" },
+ { 1, "nonmbsfn" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_SubframeType(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,
+ 2, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_BIT_STRING_SIZE_10_40(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
+ 10, 40, FALSE, NULL, NULL);
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_T_mBSFNControlRegionLength_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 0U, 3U, NULL, FALSE);
+
+#line 598 "./asn1/x2ap/x2ap.cnf"
+ proto_item_append_text(actx->created_item, " REs");
+
+
+ return offset;
+}
+
+
+static const per_sequence_t ReservedSubframePattern_sequence[] = {
+ { &hf_x2ap_subframeType , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_SubframeType },
+ { &hf_x2ap_reservedSubframePattern_01, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BIT_STRING_SIZE_10_40 },
+ { &hf_x2ap_mBSFNControlRegionLength_01, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_T_mBSFNControlRegionLength_01 },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_ReservedSubframePattern(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_ReservedSubframePattern, ReservedSubframePattern_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t DataTrafficResourceIndication_sequence[] = {
+ { &hf_x2ap_activationSFN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_INTEGER_0_1023 },
+ { &hf_x2ap_sharedResourceType, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_SharedResourceType },
+ { &hf_x2ap_reservedSubframePattern, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ReservedSubframePattern },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_DataTrafficResourceIndication(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_DataTrafficResourceIndication, DataTrafficResourceIndication_sequence);
+
+ return offset;
+}
+
+
static const value_string x2ap_DeactivationIndication_vals[] = {
{ 0, "deactivated" },
{ 0, NULL }
@@ -4788,6 +5222,52 @@ dissect_x2ap_E_RAB_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
}
+static const value_string x2ap_UserPlaneTrafficActivityReport_vals[] = {
+ { 0, "inactive" },
+ { 1, "re-activated" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_UserPlaneTrafficActivityReport(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,
+ 2, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t ERABActivityNotifyItem_sequence[] = {
+ { &hf_x2ap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_ID },
+ { &hf_x2ap_activityReport , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UserPlaneTrafficActivityReport },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_ERABActivityNotifyItem(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_ERABActivityNotifyItem, ERABActivityNotifyItem_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t ERABActivityNotifyItemList_sequence_of[1] = {
+ { &hf_x2ap_ERABActivityNotifyItemList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ERABActivityNotifyItem },
+};
+
+static int
+dissect_x2ap_ERABActivityNotifyItemList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_ERABActivityNotifyItemList, ERABActivityNotifyItemList_sequence_of,
+ 1, maxnoofBearers, FALSE);
+
+ return offset;
+}
+
+
static int
dissect_x2ap_QCI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -5443,6 +5923,60 @@ dissect_x2ap_FreqBandIndicatorPriority(tvbuff_t *tvb _U_, int offset _U_, asn1_c
}
+
+static int
+dissect_x2ap_INTEGER_1_1024_(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 1U, 1024U, NULL, TRUE);
+
+ return offset;
+}
+
+
+static const per_sequence_t SupportedSULFreqBandItem_sequence[] = {
+ { &hf_x2ap_freqBandIndicatorNr, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_INTEGER_1_1024_ },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_SupportedSULFreqBandItem(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_SupportedSULFreqBandItem, SupportedSULFreqBandItem_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t SEQUENCE_SIZE_0_maxnoofNrCellBands_OF_SupportedSULFreqBandItem_sequence_of[1] = {
+ { &hf_x2ap_supportedSULBandList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_SupportedSULFreqBandItem },
+};
+
+static int
+dissect_x2ap_SEQUENCE_SIZE_0_maxnoofNrCellBands_OF_SupportedSULFreqBandItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_SEQUENCE_SIZE_0_maxnoofNrCellBands_OF_SupportedSULFreqBandItem, SEQUENCE_SIZE_0_maxnoofNrCellBands_OF_SupportedSULFreqBandItem_sequence_of,
+ 0, maxnoofNrCellBands, FALSE);
+
+ return offset;
+}
+
+
+static const per_sequence_t FreqBandNrItem_sequence[] = {
+ { &hf_x2ap_freqBandIndicatorNr, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_INTEGER_1_1024_ },
+ { &hf_x2ap_supportedSULBandList, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_SEQUENCE_SIZE_0_maxnoofNrCellBands_OF_SupportedSULFreqBandItem },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_FreqBandNrItem(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_FreqBandNrItem, FreqBandNrItem_sequence);
+
+ return offset;
+}
+
+
static const per_sequence_t GlobalENB_ID_sequence[] = {
{ &hf_x2ap_pLMN_Identity , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity },
{ &hf_x2ap_eNB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ENB_ID },
@@ -6417,7 +6951,7 @@ dissect_x2ap_Measurement_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
static const per_sequence_t MeNBResourceCoordinationInformation_sequence[] = {
{ &hf_x2ap_eUTRA_Cell_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI },
{ &hf_x2ap_uLCoordinationInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BIT_STRING_SIZE_6_4400_ },
- { &hf_x2ap_dLCoordinationInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BIT_STRING_SIZE_6_4400_ },
+ { &hf_x2ap_dLCoordinationInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_BIT_STRING_SIZE_6_4400_ },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -6664,7 +7198,7 @@ dissect_x2ap_MeNBtoSgNBContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
}
-static const value_string x2ap_MCGSplitSRBs_vals[] = {
+static const value_string x2ap_SplitSRBs_vals[] = {
{ 0, "srb1" },
{ 1, "srb2" },
{ 2, "srb1and2" },
@@ -6673,7 +7207,7 @@ static const value_string x2ap_MCGSplitSRBs_vals[] = {
static int
-dissect_x2ap_MCGSplitSRBs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_x2ap_SplitSRBs(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,
3, NULL, TRUE, 0, NULL);
@@ -6735,7 +7269,7 @@ dissect_x2ap_SRBType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
}
-static const per_sequence_t MCGSplitSRB_sequence[] = {
+static const per_sequence_t SplitSRB_sequence[] = {
{ &hf_x2ap_rrcContainer , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_T_rrcContainer },
{ &hf_x2ap_srbType , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_SRBType },
{ &hf_x2ap_deliveryStatus , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_DeliveryStatus },
@@ -6744,9 +7278,9 @@ static const per_sequence_t MCGSplitSRB_sequence[] = {
};
static int
-dissect_x2ap_MCGSplitSRB(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_x2ap_SplitSRB(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_MCGSplitSRB, MCGSplitSRB_sequence);
+ ett_x2ap_SplitSRB, SplitSRB_sequence);
return offset;
}
@@ -6842,9 +7376,136 @@ dissect_x2ap_Number_of_Antennaports(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
static int
-dissect_x2ap_NRARFCN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_x2ap_INTEGER_0_3279165(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
- 0U, 3266667U, NULL, FALSE);
+ 0U, 3279165U, NULL, FALSE);
+
+ return offset;
+}
+
+
+static const per_sequence_t SEQUENCE_SIZE_1_maxnoofNrCellBands_OF_FreqBandNrItem_sequence_of[1] = {
+ { &hf_x2ap_freqBandListNr_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_FreqBandNrItem },
+};
+
+static int
+dissect_x2ap_SEQUENCE_SIZE_1_maxnoofNrCellBands_OF_FreqBandNrItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_SEQUENCE_SIZE_1_maxnoofNrCellBands_OF_FreqBandNrItem, SEQUENCE_SIZE_1_maxnoofNrCellBands_OF_FreqBandNrItem_sequence_of,
+ 1, maxnoofNrCellBands, FALSE);
+
+ return offset;
+}
+
+
+static const value_string x2ap_NRSCS_vals[] = {
+ { 0, "scs15" },
+ { 1, "scs30" },
+ { 2, "scs60" },
+ { 3, "scs120" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_NRSCS(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,
+ 4, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
+static const value_string x2ap_NRNRB_vals[] = {
+ { 0, "nrb11" },
+ { 1, "nrb18" },
+ { 2, "nrb24" },
+ { 3, "nrb25" },
+ { 4, "nrb31" },
+ { 5, "nrb32" },
+ { 6, "nrb38" },
+ { 7, "nrb51" },
+ { 8, "nrb52" },
+ { 9, "nrb65" },
+ { 10, "nrb66" },
+ { 11, "nrb78" },
+ { 12, "nrb79" },
+ { 13, "nrb93" },
+ { 14, "nrb106" },
+ { 15, "nrb107" },
+ { 16, "nrb121" },
+ { 17, "nrb132" },
+ { 18, "nrb133" },
+ { 19, "nrb135" },
+ { 20, "nrb160" },
+ { 21, "nrb162" },
+ { 22, "nrb189" },
+ { 23, "nrb216" },
+ { 24, "nrb217" },
+ { 25, "nrb245" },
+ { 26, "nrb264" },
+ { 27, "nrb270" },
+ { 28, "nrb273" },
+ { 0, NULL }
+};
+
+static value_string_ext x2ap_NRNRB_vals_ext = VALUE_STRING_EXT_INIT(x2ap_NRNRB_vals);
+
+
+static int
+dissect_x2ap_NRNRB(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,
+ 29, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t NR_TxBW_sequence[] = {
+ { &hf_x2ap_nRSCS , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRSCS },
+ { &hf_x2ap_nRNRB , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRNRB },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_NR_TxBW(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_NR_TxBW, NR_TxBW_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t SULInformation_sequence[] = {
+ { &hf_x2ap_sUL_ARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_INTEGER_0_3279165 },
+ { &hf_x2ap_sUL_TxBW , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NR_TxBW },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_SULInformation(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_SULInformation, SULInformation_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t NRFreqInfo_sequence[] = {
+ { &hf_x2ap_nRARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_INTEGER_0_3279165 },
+ { &hf_x2ap_nRARFCN_SUL , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_INTEGER_0_3279165 },
+ { &hf_x2ap_freqBandListNr , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_SEQUENCE_SIZE_1_maxnoofNrCellBands_OF_FreqBandNrItem },
+ { &hf_x2ap_sULInformation , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_SULInformation },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_NRFreqInfo(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_NRFreqInfo, NRFreqInfo_sequence);
return offset;
}
@@ -6953,106 +7614,61 @@ dissect_x2ap_NRintegrityProtectionAlgorithms(tvbuff_t *tvb _U_, int offset _U_,
}
-static const value_string x2ap_NRSCS_vals[] = {
- { 0, "scs15" },
- { 1, "scs30" },
- { 2, "scs60" },
- { 3, "scs120" },
+static const value_string x2ap_NRS_NSSS_PowerOffset_vals[] = {
+ { 0, "minusThree" },
+ { 1, "zero" },
+ { 2, "three" },
{ 0, NULL }
};
static int
-dissect_x2ap_NRSCS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_x2ap_NRS_NSSS_PowerOffset(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,
- 4, NULL, TRUE, 0, NULL);
+ 3, NULL, TRUE, 0, NULL);
return offset;
}
-static const value_string x2ap_NRNRB_vals[] = {
- { 0, "nrb11" },
- { 1, "nrb18" },
- { 2, "nrb24" },
- { 3, "nrb25" },
- { 4, "nrb31" },
- { 5, "nrb32" },
- { 6, "nrb38" },
- { 7, "nrb51" },
- { 8, "nrb52" },
- { 9, "nrb65" },
- { 10, "nrb66" },
- { 11, "nrb78" },
- { 12, "nrb79" },
- { 13, "nrb93" },
- { 14, "nrb106" },
- { 15, "nrb107" },
- { 16, "nrb121" },
- { 17, "nrb132" },
- { 18, "nrb133" },
- { 19, "nrb135" },
- { 20, "nrb160" },
- { 21, "nrb162" },
- { 22, "nrb189" },
- { 23, "nrb216" },
- { 24, "nrb217" },
- { 25, "nrb245" },
- { 26, "nrb264" },
- { 27, "nrb270" },
- { 28, "nrb273" },
- { 0, NULL }
-};
-
-static value_string_ext x2ap_NRNRB_vals_ext = VALUE_STRING_EXT_INIT(x2ap_NRNRB_vals);
-
static int
-dissect_x2ap_NRNRB(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,
- 29, NULL, TRUE, 0, NULL);
+dissect_x2ap_FiveGS_TAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+ 3, 3, FALSE, NULL);
return offset;
}
-static const per_sequence_t NR_TxBW_sequence[] = {
- { &hf_x2ap_nRSCS , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRSCS },
- { &hf_x2ap_nRNRB , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRNRB },
+static const per_sequence_t NRUESecurityCapabilities_sequence[] = {
+ { &hf_x2ap_nRencryptionAlgorithms, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRencryptionAlgorithms },
+ { &hf_x2ap_nRintegrityProtectionAlgorithms, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRintegrityProtectionAlgorithms },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
static int
-dissect_x2ap_NR_TxBW(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_x2ap_NRUESecurityCapabilities(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_NR_TxBW, NR_TxBW_sequence);
-
- return offset;
-}
-
-
-
-static int
-dissect_x2ap_Extended_TAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
- 3, 3, FALSE, NULL);
+ ett_x2ap_NRUESecurityCapabilities, NRUESecurityCapabilities_sequence);
return offset;
}
-static const per_sequence_t NRUESecurityCapabilities_sequence[] = {
- { &hf_x2ap_nRencryptionAlgorithms, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRencryptionAlgorithms },
- { &hf_x2ap_nRintegrityProtectionAlgorithms, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRintegrityProtectionAlgorithms },
- { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
- { NULL, 0, 0, NULL }
+static const value_string x2ap_NSSS_NumOccasionDifferentPrecoder_vals[] = {
+ { 0, "two" },
+ { 1, "four" },
+ { 2, "eight" },
+ { 0, NULL }
};
+
static int
-dissect_x2ap_NRUESecurityCapabilities(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_NRUESecurityCapabilities, NRUESecurityCapabilities_sequence);
+dissect_x2ap_NSSS_NumOccasionDifferentPrecoder(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,
+ 3, NULL, TRUE, 0, NULL);
return offset;
}
@@ -7095,6 +7711,16 @@ dissect_x2ap_OffsetOfNbiotChannelNumberToEARFCN(tvbuff_t *tvb _U_, int offset _U
}
+
+static int
+dissect_x2ap_Packet_LossRate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 0U, 1000U, NULL, FALSE);
+
+ return offset;
+}
+
+
static const value_string x2ap_PDCPChangeIndication_vals[] = {
{ 0, "s-KgNB-update-required" },
{ 1, "pDCP-data-recovery-required" },
@@ -7261,6 +7887,154 @@ dissect_x2ap_ProSeUEtoNetworkRelaying(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
}
+static const value_string x2ap_ResourceType_vals[] = {
+ { 0, "downlinknonCRS" },
+ { 1, "cRS" },
+ { 2, "uplink" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_ResourceType(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,
+ 3, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_BIT_STRING_SIZE_84_(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
+ 84, 84, TRUE, NULL, NULL);
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_BIT_STRING_SIZE_6_110_(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
+ 6, 110, TRUE, NULL, NULL);
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_INTEGER_1_80_(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 1U, 80U, NULL, TRUE);
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_INTEGER_1_20_(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 1U, 20U, NULL, TRUE);
+
+ return offset;
+}
+
+
+static const per_sequence_t ProtectedFootprintTimePattern_sequence[] = {
+ { &hf_x2ap_protectedFootprintTimePeriodicity, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_INTEGER_1_80_ },
+ { &hf_x2ap_protectedFootprintStartTime, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_INTEGER_1_20_ },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_ProtectedFootprintTimePattern(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_ProtectedFootprintTimePattern, ProtectedFootprintTimePattern_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t ProtectedResourceList_Item_sequence[] = {
+ { &hf_x2ap_resourceType , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ResourceType },
+ { &hf_x2ap_intraPRBProtectedResourceFootprint, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BIT_STRING_SIZE_84_ },
+ { &hf_x2ap_protectedFootprintFrequencyPattern, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BIT_STRING_SIZE_6_110_ },
+ { &hf_x2ap_protectedFootprintTimePattern, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtectedFootprintTimePattern },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_ProtectedResourceList_Item(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_ProtectedResourceList_Item, ProtectedResourceList_Item_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t ProtectedResourceList_sequence_of[1] = {
+ { &hf_x2ap_ProtectedResourceList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtectedResourceList_Item },
+};
+
+static int
+dissect_x2ap_ProtectedResourceList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_ProtectedResourceList, ProtectedResourceList_sequence_of,
+ 1, maxnoofProtectedResourcePatterns, FALSE);
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_T_mBSFNControlRegionLength(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 0U, 3U, NULL, FALSE);
+
+#line 592 "./asn1/x2ap/x2ap.cnf"
+ proto_item_append_text(actx->created_item, " REs");
+
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_T_pDCCHRegionLength(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 1U, 3U, NULL, FALSE);
+
+#line 595 "./asn1/x2ap/x2ap.cnf"
+ proto_item_append_text(actx->created_item, " REs");
+
+
+ return offset;
+}
+
+
+static const per_sequence_t ProtectedEUTRAResourceIndication_sequence[] = {
+ { &hf_x2ap_activationSFN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_INTEGER_0_1023 },
+ { &hf_x2ap_protectedResourceList, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtectedResourceList },
+ { &hf_x2ap_mBSFNControlRegionLength, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_T_mBSFNControlRegionLength },
+ { &hf_x2ap_pDCCHRegionLength, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_T_pDCCHRegionLength },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_ProtectedEUTRAResourceIndication(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_ProtectedEUTRAResourceIndication, ProtectedEUTRAResourceIndication_sequence);
+
+ return offset;
+}
+
+
static int
dissect_x2ap_UL_GBR_PRB_usage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -7359,16 +8133,6 @@ dissect_x2ap_Registration_Request(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
}
-
-static int
-dissect_x2ap_BIT_STRING_SIZE_6_110_(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
- 6, 110, TRUE, NULL, NULL);
-
- return offset;
-}
-
-
static const value_string x2ap_T_numberOfCellSpecificAntennaPorts_02_vals[] = {
{ 0, "one" },
{ 1, "two" },
@@ -7530,6 +8294,22 @@ dissect_x2ap_RLCMode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
}
+static const value_string x2ap_RRC_Config_Ind_vals[] = {
+ { 0, "full-config" },
+ { 1, "delta-config" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_RRC_Config_Ind(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,
+ 2, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
static int
dissect_x2ap_RRC_Context(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -7815,10 +8595,26 @@ dissect_x2ap_ServedCells(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
}
+static const value_string x2ap_ServiceType_vals[] = {
+ { 0, "qMC-for-streaming-service" },
+ { 1, "qMC-for-MTSI-service" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_ServiceType(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,
+ 2, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
static const per_sequence_t SgNBResourceCoordinationInformation_sequence[] = {
{ &hf_x2ap_nR_CGI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRCGI },
{ &hf_x2ap_uLCoordinationInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BIT_STRING_SIZE_6_4400_ },
- { &hf_x2ap_dLCoordinationInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BIT_STRING_SIZE_6_4400_ },
+ { &hf_x2ap_dLCoordinationInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_BIT_STRING_SIZE_6_4400_ },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -7867,6 +8663,33 @@ dissect_x2ap_ShortMAC_I(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
}
+static const value_string x2ap_SGNB_Addition_Trigger_Ind_vals[] = {
+ { 0, "sn-change" },
+ { 1, "inter-eNB-HO" },
+ { 2, "intra-eNB-HO" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_SGNB_Addition_Trigger_Ind(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,
+ 3, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_SpectrumSharingGroupID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+ 1U, maxCellineNB, NULL, FALSE);
+
+ return offset;
+}
+
+
static const value_string x2ap_SRVCCOperationPossible_vals[] = {
{ 0, "possible" },
{ 0, NULL }
@@ -7937,22 +8760,6 @@ dissect_x2ap_SCGConfigurationQuery(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
}
-static const per_sequence_t SULInformation_sequence[] = {
- { &hf_x2ap_sUL_ARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRARFCN },
- { &hf_x2ap_sUL_TxBW , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NR_TxBW },
- { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
- { NULL, 0, 0, NULL }
-};
-
-static int
-dissect_x2ap_SULInformation(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_SULInformation, SULInformation_sequence);
-
- return offset;
-}
-
-
static int
dissect_x2ap_TargetCellInUTRAN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -8295,6 +9102,37 @@ dissect_x2ap_UESidelinkAggregateMaximumBitRate(tvbuff_t *tvb _U_, int offset _U_
}
+static const per_sequence_t UEsToBeResetList_Item_sequence[] = {
+ { &hf_x2ap_meNB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UE_X2AP_ID },
+ { &hf_x2ap_meNB_ID_ext , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_UE_X2AP_ID_Extension },
+ { &hf_x2ap_sgNB_ID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_SgNB_UE_X2AP_ID },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_UEsToBeResetList_Item(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_UEsToBeResetList_Item, UEsToBeResetList_Item_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t UEsToBeResetList_sequence_of[1] = {
+ { &hf_x2ap_UEsToBeResetList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_UEsToBeResetList_Item },
+};
+
+static int
+dissect_x2ap_UEsToBeResetList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_UEsToBeResetList, UEsToBeResetList_sequence_of,
+ 1, maxUEsinengNBDU, FALSE);
+
+ return offset;
+}
+
+
static const value_string x2ap_UL_UE_Configuration_vals[] = {
{ 0, "no-data" },
{ 1, "shared" },
@@ -8499,7 +9337,7 @@ static const per_sequence_t HandoverRequest_sequence[] = {
static int
dissect_x2ap_HandoverRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 591 "./asn1/x2ap/x2ap.cnf"
+#line 603 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8630,7 +9468,7 @@ static const per_sequence_t HandoverRequestAcknowledge_sequence[] = {
static int
dissect_x2ap_HandoverRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 593 "./asn1/x2ap/x2ap.cnf"
+#line 605 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequestAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8678,7 +9516,7 @@ static const per_sequence_t HandoverPreparationFailure_sequence[] = {
static int
dissect_x2ap_HandoverPreparationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 595 "./asn1/x2ap/x2ap.cnf"
+#line 607 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverPreparationFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8695,7 +9533,7 @@ static const per_sequence_t HandoverReport_sequence[] = {
static int
dissect_x2ap_HandoverReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 633 "./asn1/x2ap/x2ap.cnf"
+#line 645 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverReport");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8712,7 +9550,7 @@ static const per_sequence_t SNStatusTransfer_sequence[] = {
static int
dissect_x2ap_SNStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 597 "./asn1/x2ap/x2ap.cnf"
+#line 609 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNStatusTransfer");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8761,7 +9599,7 @@ static const per_sequence_t UEContextRelease_sequence[] = {
static int
dissect_x2ap_UEContextRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 599 "./asn1/x2ap/x2ap.cnf"
+#line 611 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextRelease");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8778,7 +9616,7 @@ static const per_sequence_t HandoverCancel_sequence[] = {
static int
dissect_x2ap_HandoverCancel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 601 "./asn1/x2ap/x2ap.cnf"
+#line 613 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverCancel");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8795,7 +9633,7 @@ static const per_sequence_t ErrorIndication_sequence[] = {
static int
dissect_x2ap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 603 "./asn1/x2ap/x2ap.cnf"
+#line 615 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ErrorIndication");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8812,7 +9650,7 @@ static const per_sequence_t ResetRequest_sequence[] = {
static int
dissect_x2ap_ResetRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 605 "./asn1/x2ap/x2ap.cnf"
+#line 617 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResetRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8829,7 +9667,7 @@ static const per_sequence_t ResetResponse_sequence[] = {
static int
dissect_x2ap_ResetResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 607 "./asn1/x2ap/x2ap.cnf"
+#line 619 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResetResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8846,7 +9684,7 @@ static const per_sequence_t X2SetupRequest_sequence[] = {
static int
dissect_x2ap_X2SetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 609 "./asn1/x2ap/x2ap.cnf"
+#line 621 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2SetupRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8863,7 +9701,7 @@ static const per_sequence_t X2SetupResponse_sequence[] = {
static int
dissect_x2ap_X2SetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 611 "./asn1/x2ap/x2ap.cnf"
+#line 623 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2SetupResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8880,7 +9718,7 @@ static const per_sequence_t X2SetupFailure_sequence[] = {
static int
dissect_x2ap_X2SetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 613 "./asn1/x2ap/x2ap.cnf"
+#line 625 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2SetupFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8897,7 +9735,7 @@ static const per_sequence_t LoadInformation_sequence[] = {
static int
dissect_x2ap_LoadInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 615 "./asn1/x2ap/x2ap.cnf"
+#line 627 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "LoadInformation");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8946,7 +9784,7 @@ static const per_sequence_t ENBConfigurationUpdate_sequence[] = {
static int
dissect_x2ap_ENBConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 617 "./asn1/x2ap/x2ap.cnf"
+#line 629 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENBConfigurationUpdate");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9008,7 +9846,7 @@ static const per_sequence_t ENBConfigurationUpdateAcknowledge_sequence[] = {
static int
dissect_x2ap_ENBConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 619 "./asn1/x2ap/x2ap.cnf"
+#line 631 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENBConfigurationUpdateAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9025,7 +9863,7 @@ static const per_sequence_t ENBConfigurationUpdateFailure_sequence[] = {
static int
dissect_x2ap_ENBConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 621 "./asn1/x2ap/x2ap.cnf"
+#line 633 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENBConfigurationUpdateFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9042,7 +9880,7 @@ static const per_sequence_t ResourceStatusRequest_sequence[] = {
static int
dissect_x2ap_ResourceStatusRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 623 "./asn1/x2ap/x2ap.cnf"
+#line 635 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResourceStatusRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9121,7 +9959,7 @@ static const per_sequence_t ResourceStatusResponse_sequence[] = {
static int
dissect_x2ap_ResourceStatusResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 625 "./asn1/x2ap/x2ap.cnf"
+#line 637 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResourceStatusResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9229,7 +10067,7 @@ static const per_sequence_t ResourceStatusFailure_sequence[] = {
static int
dissect_x2ap_ResourceStatusFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 627 "./asn1/x2ap/x2ap.cnf"
+#line 639 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResourceStatusFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9276,7 +10114,7 @@ static const per_sequence_t ResourceStatusUpdate_sequence[] = {
static int
dissect_x2ap_ResourceStatusUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 629 "./asn1/x2ap/x2ap.cnf"
+#line 641 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResourceStatusUpdate");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9325,7 +10163,7 @@ static const per_sequence_t PrivateMessage_sequence[] = {
static int
dissect_x2ap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 631 "./asn1/x2ap/x2ap.cnf"
+#line 643 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PrivateMessage");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9342,7 +10180,7 @@ static const per_sequence_t MobilityChangeRequest_sequence[] = {
static int
dissect_x2ap_MobilityChangeRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 637 "./asn1/x2ap/x2ap.cnf"
+#line 649 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MobilityChangeRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9359,7 +10197,7 @@ static const per_sequence_t MobilityChangeAcknowledge_sequence[] = {
static int
dissect_x2ap_MobilityChangeAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 639 "./asn1/x2ap/x2ap.cnf"
+#line 651 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MobilityChangeAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9376,7 +10214,7 @@ static const per_sequence_t MobilityChangeFailure_sequence[] = {
static int
dissect_x2ap_MobilityChangeFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 641 "./asn1/x2ap/x2ap.cnf"
+#line 653 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MobilityChangeFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9393,7 +10231,7 @@ static const per_sequence_t RLFIndication_sequence[] = {
static int
dissect_x2ap_RLFIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 635 "./asn1/x2ap/x2ap.cnf"
+#line 647 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RLFIndication");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9410,7 +10248,7 @@ static const per_sequence_t CellActivationRequest_sequence[] = {
static int
dissect_x2ap_CellActivationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 643 "./asn1/x2ap/x2ap.cnf"
+#line 655 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellActivationRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9456,7 +10294,7 @@ static const per_sequence_t CellActivationResponse_sequence[] = {
static int
dissect_x2ap_CellActivationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 645 "./asn1/x2ap/x2ap.cnf"
+#line 657 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellActivationResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9502,7 +10340,7 @@ static const per_sequence_t CellActivationFailure_sequence[] = {
static int
dissect_x2ap_CellActivationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 647 "./asn1/x2ap/x2ap.cnf"
+#line 659 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellActivationFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9519,7 +10357,7 @@ static const per_sequence_t X2Release_sequence[] = {
static int
dissect_x2ap_X2Release(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 649 "./asn1/x2ap/x2ap.cnf"
+#line 661 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2Release");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9536,7 +10374,7 @@ static const per_sequence_t X2APMessageTransfer_sequence[] = {
static int
dissect_x2ap_X2APMessageTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 651 "./asn1/x2ap/x2ap.cnf"
+#line 663 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2APMessageTransfer");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9588,7 +10426,7 @@ static const per_sequence_t SeNBAdditionRequest_sequence[] = {
static int
dissect_x2ap_SeNBAdditionRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 659 "./asn1/x2ap/x2ap.cnf"
+#line 671 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBAdditionRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9676,7 +10514,7 @@ static const per_sequence_t SeNBAdditionRequestAcknowledge_sequence[] = {
static int
dissect_x2ap_SeNBAdditionRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 661 "./asn1/x2ap/x2ap.cnf"
+#line 673 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBAdditionRequestAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9763,7 +10601,7 @@ static const per_sequence_t SeNBAdditionRequestReject_sequence[] = {
static int
dissect_x2ap_SeNBAdditionRequestReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 663 "./asn1/x2ap/x2ap.cnf"
+#line 675 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBAdditionRequestReject");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9780,7 +10618,7 @@ static const per_sequence_t SeNBReconfigurationComplete_sequence[] = {
static int
dissect_x2ap_SeNBReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 665 "./asn1/x2ap/x2ap.cnf"
+#line 677 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBReconfigurationComplete");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9850,7 +10688,7 @@ static const per_sequence_t SeNBModificationRequest_sequence[] = {
static int
dissect_x2ap_SeNBModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 667 "./asn1/x2ap/x2ap.cnf"
+#line 679 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBModificationRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10097,7 +10935,7 @@ static const per_sequence_t SeNBModificationRequestAcknowledge_sequence[] = {
static int
dissect_x2ap_SeNBModificationRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 669 "./asn1/x2ap/x2ap.cnf"
+#line 681 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBModificationRequestAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10318,7 +11156,7 @@ static const per_sequence_t SeNBModificationRequestReject_sequence[] = {
static int
dissect_x2ap_SeNBModificationRequestReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 671 "./asn1/x2ap/x2ap.cnf"
+#line 683 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBModificationRequestReject");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10335,7 +11173,7 @@ static const per_sequence_t SeNBModificationRequired_sequence[] = {
static int
dissect_x2ap_SeNBModificationRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 673 "./asn1/x2ap/x2ap.cnf"
+#line 685 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBModificationRequired");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10382,7 +11220,7 @@ static const per_sequence_t SeNBModificationConfirm_sequence[] = {
static int
dissect_x2ap_SeNBModificationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 675 "./asn1/x2ap/x2ap.cnf"
+#line 687 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBModificationConfirm");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10399,7 +11237,7 @@ static const per_sequence_t SeNBModificationRefuse_sequence[] = {
static int
dissect_x2ap_SeNBModificationRefuse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 677 "./asn1/x2ap/x2ap.cnf"
+#line 689 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBModificationRefuse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10416,7 +11254,7 @@ static const per_sequence_t SeNBReleaseRequest_sequence[] = {
static int
dissect_x2ap_SeNBReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 679 "./asn1/x2ap/x2ap.cnf"
+#line 691 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBReleaseRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10502,7 +11340,7 @@ static const per_sequence_t SeNBReleaseRequired_sequence[] = {
static int
dissect_x2ap_SeNBReleaseRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 681 "./asn1/x2ap/x2ap.cnf"
+#line 693 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBReleaseRequired");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10519,7 +11357,7 @@ static const per_sequence_t SeNBReleaseConfirm_sequence[] = {
static int
dissect_x2ap_SeNBReleaseConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 683 "./asn1/x2ap/x2ap.cnf"
+#line 695 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBReleaseConfirm");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10605,7 +11443,7 @@ static const per_sequence_t SeNBCounterCheckRequest_sequence[] = {
static int
dissect_x2ap_SeNBCounterCheckRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 685 "./asn1/x2ap/x2ap.cnf"
+#line 697 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SeNBCounterCheckRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10663,7 +11501,7 @@ static const per_sequence_t X2RemovalRequest_sequence[] = {
static int
dissect_x2ap_X2RemovalRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 653 "./asn1/x2ap/x2ap.cnf"
+#line 665 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2RemovalRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10680,7 +11518,7 @@ static const per_sequence_t X2RemovalResponse_sequence[] = {
static int
dissect_x2ap_X2RemovalResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 655 "./asn1/x2ap/x2ap.cnf"
+#line 667 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2RemovalResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10697,7 +11535,7 @@ static const per_sequence_t X2RemovalFailure_sequence[] = {
static int
dissect_x2ap_X2RemovalFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 657 "./asn1/x2ap/x2ap.cnf"
+#line 669 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "X2RemovalFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10714,7 +11552,7 @@ static const per_sequence_t RetrieveUEContextRequest_sequence[] = {
static int
dissect_x2ap_RetrieveUEContextRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 687 "./asn1/x2ap/x2ap.cnf"
+#line 699 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RetrieveUEContextRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10731,7 +11569,7 @@ static const per_sequence_t RetrieveUEContextResponse_sequence[] = {
static int
dissect_x2ap_RetrieveUEContextResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 689 "./asn1/x2ap/x2ap.cnf"
+#line 701 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RetrieveUEContextResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10804,7 +11642,7 @@ static const per_sequence_t RetrieveUEContextFailure_sequence[] = {
static int
dissect_x2ap_RetrieveUEContextFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 691 "./asn1/x2ap/x2ap.cnf"
+#line 703 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RetrieveUEContextFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10821,7 +11659,7 @@ static const per_sequence_t SgNBAdditionRequest_sequence[] = {
static int
dissect_x2ap_SgNBAdditionRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 693 "./asn1/x2ap/x2ap.cnf"
+#line 705 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBAdditionRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10867,6 +11705,7 @@ dissect_x2ap_E_RABs_ToBeAdded_SgNBAddReq_Item_SgNBPDCPpresent(tvbuff_t *tvb _U_,
static const per_sequence_t E_RABs_ToBeAdded_SgNBAddReq_Item_SgNBPDCPnotpresent_sequence[] = {
{ &hf_x2ap_requested_SCG_E_RAB_Level_QoS_Parameters, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_Level_QoS_Parameters },
{ &hf_x2ap_meNB_UL_GTP_TEIDatPDCP, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_GTPtunnelEndpoint },
+ { &hf_x2ap_secondary_meNB_UL_GTP_TEIDatPDCP, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint },
{ &hf_x2ap_rlc_Mode , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_RLCMode },
{ &hf_x2ap_uL_Configuration, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ULConfiguration },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
@@ -10929,7 +11768,7 @@ static const per_sequence_t SgNBAdditionRequestAcknowledge_sequence[] = {
static int
dissect_x2ap_SgNBAdditionRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 695 "./asn1/x2ap/x2ap.cnf"
+#line 707 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBAdditionRequestAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10976,6 +11815,7 @@ dissect_x2ap_E_RABs_Admitted_ToBeAdded_SgNBAddReqAck_Item_SgNBPDCPpresent(tvbuff
static const per_sequence_t E_RABs_Admitted_ToBeAdded_SgNBAddReqAck_Item_SgNBPDCPnotpresent_sequence[] = {
{ &hf_x2ap_sgNB_DL_GTP_TEIDatSCG, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_GTPtunnelEndpoint },
+ { &hf_x2ap_secondary_sgNB_DL_GTP_TEIDatSCG, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -11035,7 +11875,7 @@ static const per_sequence_t SgNBAdditionRequestReject_sequence[] = {
static int
dissect_x2ap_SgNBAdditionRequestReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 697 "./asn1/x2ap/x2ap.cnf"
+#line 709 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBAdditionRequestReject");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11052,7 +11892,7 @@ static const per_sequence_t SgNBReconfigurationComplete_sequence[] = {
static int
dissect_x2ap_SgNBReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 699 "./asn1/x2ap/x2ap.cnf"
+#line 711 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBReconfigurationComplete");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11121,7 +11961,7 @@ static const per_sequence_t SgNBModificationRequest_sequence[] = {
static int
dissect_x2ap_SgNBModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 701 "./asn1/x2ap/x2ap.cnf"
+#line 713 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBModificationRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11215,6 +12055,7 @@ dissect_x2ap_E_RABs_ToBeAdded_SgNBModReq_Item_SgNBPDCPpresent(tvbuff_t *tvb _U_,
static const per_sequence_t E_RABs_ToBeAdded_SgNBModReq_Item_SgNBPDCPnotpresent_sequence[] = {
{ &hf_x2ap_requested_SCG_E_RAB_Level_QoS_Parameters, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_Level_QoS_Parameters },
{ &hf_x2ap_meNB_UL_GTP_TEIDatPDCP, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_GTPtunnelEndpoint },
+ { &hf_x2ap_secondary_meNB_UL_GTP_TEIDatPDCP, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint },
{ &hf_x2ap_rlc_Mode , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_RLCMode },
{ &hf_x2ap_uL_Configuration, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ULConfiguration },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
@@ -11420,7 +12261,7 @@ static const per_sequence_t SgNBModificationRequestAcknowledge_sequence[] = {
static int
dissect_x2ap_SgNBModificationRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 703 "./asn1/x2ap/x2ap.cnf"
+#line 715 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBModificationRequestAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11467,6 +12308,7 @@ dissect_x2ap_E_RABs_Admitted_ToBeAdded_SgNBModAck_Item_SgNBPDCPpresent(tvbuff_t
static const per_sequence_t E_RABs_Admitted_ToBeAdded_SgNBModAck_Item_SgNBPDCPnotpresent_sequence[] = {
{ &hf_x2ap_sgNB_DL_GTP_TEIDatSCG, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_GTPtunnelEndpoint },
+ { &hf_x2ap_secondary_sgNB_DL_GTP_TEIDatSCG, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -11537,6 +12379,7 @@ static const per_sequence_t E_RABs_Admitted_ToBeModified_SgNBModAck_Item_SgNBPDC
{ &hf_x2ap_s1_DL_GTPtunnelEndpoint, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint },
{ &hf_x2ap_sgNB_UL_GTP_TEIDatPDCP, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint },
{ &hf_x2ap_mCG_E_RAB_Level_QoS_Parameters, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_E_RAB_Level_QoS_Parameters },
+ { &hf_x2ap_uL_Configuration, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ULConfiguration },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -11692,7 +12535,7 @@ static const per_sequence_t SgNBModificationRequestReject_sequence[] = {
static int
dissect_x2ap_SgNBModificationRequestReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 705 "./asn1/x2ap/x2ap.cnf"
+#line 717 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBModificationRequestReject");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11709,7 +12552,7 @@ static const per_sequence_t SgNBModificationRequired_sequence[] = {
static int
dissect_x2ap_SgNBModificationRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 707 "./asn1/x2ap/x2ap.cnf"
+#line 719 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBModificationRequired");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11766,6 +12609,8 @@ dissect_x2ap_E_RABs_ToBeModified_SgNBModReqdList(tvbuff_t *tvb _U_, int offset _
static const per_sequence_t E_RABs_ToBeModified_SgNBModReqd_Item_SgNBPDCPpresent_sequence[] = {
{ &hf_x2ap_requested_MCG_E_RAB_Level_QoS_Parameters, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_E_RAB_Level_QoS_Parameters },
{ &hf_x2ap_uL_Configuration, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ULConfiguration },
+ { &hf_x2ap_sgNB_UL_GTP_TEIDatPDCP, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint },
+ { &hf_x2ap_s1_DL_GTP_TEIDatSgNB, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -11781,6 +12626,7 @@ dissect_x2ap_E_RABs_ToBeModified_SgNBModReqd_Item_SgNBPDCPpresent(tvbuff_t *tvb
static const per_sequence_t E_RABs_ToBeModified_SgNBModReqd_Item_SgNBPDCPnotpresent_sequence[] = {
{ &hf_x2ap_sgNB_DL_GTP_TEIDatSCG, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint },
+ { &hf_x2ap_secondary_sgNB_DL_GTP_TEIDatSCG, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -11840,7 +12686,7 @@ static const per_sequence_t SgNBModificationConfirm_sequence[] = {
static int
dissect_x2ap_SgNBModificationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 709 "./asn1/x2ap/x2ap.cnf"
+#line 721 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBModificationConfirm");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11850,6 +12696,88 @@ dissect_x2ap_SgNBModificationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
}
+static const per_sequence_t E_RABs_AdmittedToBeModified_SgNBModConfList_sequence_of[1] = {
+ { &hf_x2ap_E_RABs_AdmittedToBeModified_SgNBModConfList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container },
+};
+
+static int
+dissect_x2ap_E_RABs_AdmittedToBeModified_SgNBModConfList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_E_RABs_AdmittedToBeModified_SgNBModConfList, E_RABs_AdmittedToBeModified_SgNBModConfList_sequence_of,
+ 1, maxnoofBearers, FALSE);
+
+ return offset;
+}
+
+
+static const per_sequence_t E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPpresent_sequence[] = {
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPpresent(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_E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPpresent, E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPpresent_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPnotpresent_sequence[] = {
+ { &hf_x2ap_secondary_meNB_UL_GTP_TEIDatPDCP, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPnotpresent(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_E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPnotpresent, E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPnotpresent_sequence);
+
+ return offset;
+}
+
+
+static const value_string x2ap_T_resource_configuration_09_vals[] = {
+ { 0, "sgNBPDCPpresent" },
+ { 1, "sgNBPDCPnotpresent" },
+ { 0, NULL }
+};
+
+static const per_choice_t T_resource_configuration_09_choice[] = {
+ { 0, &hf_x2ap_sgNBPDCPpresent_09, ASN1_EXTENSION_ROOT , dissect_x2ap_E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPpresent },
+ { 1, &hf_x2ap_sgNBPDCPnotpresent_09, ASN1_EXTENSION_ROOT , dissect_x2ap_E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPnotpresent },
+ { 0, NULL, 0, NULL }
+};
+
+static int
+dissect_x2ap_T_resource_configuration_09(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_T_resource_configuration_09, T_resource_configuration_09_choice,
+ NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t E_RABs_AdmittedToBeModified_SgNBModConf_Item_sequence[] = {
+ { &hf_x2ap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_ID },
+ { &hf_x2ap_en_DC_ResourceConfiguration, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EN_DC_ResourceConfiguration },
+ { &hf_x2ap_resource_configuration_09, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_T_resource_configuration_09 },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_E_RABs_AdmittedToBeModified_SgNBModConf_Item(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_E_RABs_AdmittedToBeModified_SgNBModConf_Item, E_RABs_AdmittedToBeModified_SgNBModConf_Item_sequence);
+
+ return offset;
+}
+
+
static const per_sequence_t SgNBModificationRefuse_sequence[] = {
{ &hf_x2ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Container },
{ NULL, 0, 0, NULL }
@@ -11857,7 +12785,7 @@ static const per_sequence_t SgNBModificationRefuse_sequence[] = {
static int
dissect_x2ap_SgNBModificationRefuse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 711 "./asn1/x2ap/x2ap.cnf"
+#line 723 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBModificationRefuse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11874,7 +12802,7 @@ static const per_sequence_t SgNBReleaseRequest_sequence[] = {
static int
dissect_x2ap_SgNBReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 713 "./asn1/x2ap/x2ap.cnf"
+#line 725 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBReleaseRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11928,22 +12856,22 @@ dissect_x2ap_E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPnotpresent(tvbuff_t *tv
}
-static const value_string x2ap_T_resource_configuration_09_vals[] = {
+static const value_string x2ap_T_resource_configuration_10_vals[] = {
{ 0, "sgNBPDCPpresent" },
{ 1, "sgNBPDCPnotpresent" },
{ 0, NULL }
};
-static const per_choice_t T_resource_configuration_09_choice[] = {
- { 0, &hf_x2ap_sgNBPDCPpresent_09, ASN1_EXTENSION_ROOT , dissect_x2ap_E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPpresent },
- { 1, &hf_x2ap_sgNBPDCPnotpresent_09, ASN1_EXTENSION_ROOT , dissect_x2ap_E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPnotpresent },
+static const per_choice_t T_resource_configuration_10_choice[] = {
+ { 0, &hf_x2ap_sgNBPDCPpresent_10, ASN1_EXTENSION_ROOT , dissect_x2ap_E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPpresent },
+ { 1, &hf_x2ap_sgNBPDCPnotpresent_10, ASN1_EXTENSION_ROOT , dissect_x2ap_E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPnotpresent },
{ 0, NULL, 0, NULL }
};
static int
-dissect_x2ap_T_resource_configuration_09(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_x2ap_T_resource_configuration_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
- ett_x2ap_T_resource_configuration_09, T_resource_configuration_09_choice,
+ ett_x2ap_T_resource_configuration_10, T_resource_configuration_10_choice,
NULL);
return offset;
@@ -11953,7 +12881,7 @@ dissect_x2ap_T_resource_configuration_09(tvbuff_t *tvb _U_, int offset _U_, asn1
static const per_sequence_t E_RABs_ToBeReleased_SgNBRelReq_Item_sequence[] = {
{ &hf_x2ap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_ID },
{ &hf_x2ap_en_DC_ResourceConfiguration, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EN_DC_ResourceConfiguration },
- { &hf_x2ap_resource_configuration_09, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_T_resource_configuration_09 },
+ { &hf_x2ap_resource_configuration_10, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_T_resource_configuration_10 },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -11974,7 +12902,7 @@ static const per_sequence_t SgNBReleaseRequestAcknowledge_sequence[] = {
static int
dissect_x2ap_SgNBReleaseRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 715 "./asn1/x2ap/x2ap.cnf"
+#line 727 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBReleaseRequestAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11991,7 +12919,7 @@ static const per_sequence_t SgNBReleaseRequestReject_sequence[] = {
static int
dissect_x2ap_SgNBReleaseRequestReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 717 "./asn1/x2ap/x2ap.cnf"
+#line 729 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBReleaseRequestReject");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12008,7 +12936,7 @@ static const per_sequence_t SgNBReleaseRequired_sequence[] = {
static int
dissect_x2ap_SgNBReleaseRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 719 "./asn1/x2ap/x2ap.cnf"
+#line 731 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBReleaseRequired");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12025,7 +12953,7 @@ static const per_sequence_t SgNBReleaseConfirm_sequence[] = {
static int
dissect_x2ap_SgNBReleaseConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 721 "./asn1/x2ap/x2ap.cnf"
+#line 733 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBReleaseConfirm");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12079,22 +13007,22 @@ dissect_x2ap_E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPnotpresent(tvbuff_t *t
}
-static const value_string x2ap_T_resource_configuration_10_vals[] = {
+static const value_string x2ap_T_resource_configuration_11_vals[] = {
{ 0, "sgNBPDCPpresent" },
{ 1, "sgNBPDCPnotpresent" },
{ 0, NULL }
};
-static const per_choice_t T_resource_configuration_10_choice[] = {
- { 0, &hf_x2ap_sgNBPDCPpresent_10, ASN1_EXTENSION_ROOT , dissect_x2ap_E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPpresent },
- { 1, &hf_x2ap_sgNBPDCPnotpresent_10, ASN1_EXTENSION_ROOT , dissect_x2ap_E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPnotpresent },
+static const per_choice_t T_resource_configuration_11_choice[] = {
+ { 0, &hf_x2ap_sgNBPDCPpresent_11, ASN1_EXTENSION_ROOT , dissect_x2ap_E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPpresent },
+ { 1, &hf_x2ap_sgNBPDCPnotpresent_11, ASN1_EXTENSION_ROOT , dissect_x2ap_E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPnotpresent },
{ 0, NULL, 0, NULL }
};
static int
-dissect_x2ap_T_resource_configuration_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_x2ap_T_resource_configuration_11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
- ett_x2ap_T_resource_configuration_10, T_resource_configuration_10_choice,
+ ett_x2ap_T_resource_configuration_11, T_resource_configuration_11_choice,
NULL);
return offset;
@@ -12104,7 +13032,7 @@ dissect_x2ap_T_resource_configuration_10(tvbuff_t *tvb _U_, int offset _U_, asn1
static const per_sequence_t E_RABs_ToBeReleased_SgNBRelConf_Item_sequence[] = {
{ &hf_x2ap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_ID },
{ &hf_x2ap_en_DC_ResourceConfiguration, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EN_DC_ResourceConfiguration },
- { &hf_x2ap_resource_configuration_10, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_T_resource_configuration_10 },
+ { &hf_x2ap_resource_configuration_11, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_T_resource_configuration_11 },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -12125,7 +13053,7 @@ static const per_sequence_t SgNBCounterCheckRequest_sequence[] = {
static int
dissect_x2ap_SgNBCounterCheckRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 723 "./asn1/x2ap/x2ap.cnf"
+#line 735 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBCounterCheckRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12173,7 +13101,7 @@ static const per_sequence_t SgNBChangeRequired_sequence[] = {
static int
dissect_x2ap_SgNBChangeRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 725 "./asn1/x2ap/x2ap.cnf"
+#line 737 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBChangeRequired");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12190,7 +13118,7 @@ static const per_sequence_t SgNBChangeConfirm_sequence[] = {
static int
dissect_x2ap_SgNBChangeConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 727 "./asn1/x2ap/x2ap.cnf"
+#line 739 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBChangeConfirm");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12244,22 +13172,22 @@ dissect_x2ap_E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPnotpresent(tvbuff_t *t
}
-static const value_string x2ap_T_resource_configuration_11_vals[] = {
+static const value_string x2ap_T_resource_configuration_12_vals[] = {
{ 0, "sgNBPDCPpresent" },
{ 1, "sgNBPDCPnotpresent" },
{ 0, NULL }
};
-static const per_choice_t T_resource_configuration_11_choice[] = {
- { 0, &hf_x2ap_sgNBPDCPpresent_11, ASN1_EXTENSION_ROOT , dissect_x2ap_E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPpresent },
- { 1, &hf_x2ap_sgNBPDCPnotpresent_11, ASN1_EXTENSION_ROOT , dissect_x2ap_E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPnotpresent },
+static const per_choice_t T_resource_configuration_12_choice[] = {
+ { 0, &hf_x2ap_sgNBPDCPpresent_12, ASN1_EXTENSION_ROOT , dissect_x2ap_E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPpresent },
+ { 1, &hf_x2ap_sgNBPDCPnotpresent_12, ASN1_EXTENSION_ROOT , dissect_x2ap_E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPnotpresent },
{ 0, NULL, 0, NULL }
};
static int
-dissect_x2ap_T_resource_configuration_11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_x2ap_T_resource_configuration_12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
- ett_x2ap_T_resource_configuration_11, T_resource_configuration_11_choice,
+ ett_x2ap_T_resource_configuration_12, T_resource_configuration_12_choice,
NULL);
return offset;
@@ -12269,7 +13197,7 @@ dissect_x2ap_T_resource_configuration_11(tvbuff_t *tvb _U_, int offset _U_, asn1
static const per_sequence_t E_RABs_ToBeReleased_SgNBChaConf_Item_sequence[] = {
{ &hf_x2ap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_ID },
{ &hf_x2ap_en_DC_ResourceConfiguration, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EN_DC_ResourceConfiguration },
- { &hf_x2ap_resource_configuration_11, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_T_resource_configuration_11 },
+ { &hf_x2ap_resource_configuration_12, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_T_resource_configuration_12 },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -12290,7 +13218,7 @@ static const per_sequence_t RRCTransfer_sequence[] = {
static int
dissect_x2ap_RRCTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 731 "./asn1/x2ap/x2ap.cnf"
+#line 743 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRCTransfer");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12307,7 +13235,7 @@ static const per_sequence_t SgNBChangeRefuse_sequence[] = {
static int
dissect_x2ap_SgNBChangeRefuse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 729 "./asn1/x2ap/x2ap.cnf"
+#line 741 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBChangeRefuse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12324,7 +13252,7 @@ static const per_sequence_t ENDCX2SetupRequest_sequence[] = {
static int
dissect_x2ap_ENDCX2SetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 733 "./asn1/x2ap/x2ap.cnf"
+#line 745 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2SetupRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12356,11 +13284,77 @@ dissect_x2ap_InitiatingNodeType_EndcX2Setup(tvbuff_t *tvb _U_, int offset _U_, a
}
+
+static int
+dissect_x2ap_OCTET_STRING(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+ NO_BOUND, NO_BOUND, FALSE, NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t FDD_InfoNeighbourServedNRCell_Information_sequence[] = {
+ { &hf_x2ap_ul_NRFreqInfo , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRFreqInfo },
+ { &hf_x2ap_dl_NRFreqInfo , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRFreqInfo },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_FDD_InfoNeighbourServedNRCell_Information(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_FDD_InfoNeighbourServedNRCell_Information, FDD_InfoNeighbourServedNRCell_Information_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t TDD_InfoNeighbourServedNRCell_Information_sequence[] = {
+ { &hf_x2ap_nRFreqInfo , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRFreqInfo },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_TDD_InfoNeighbourServedNRCell_Information(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_TDD_InfoNeighbourServedNRCell_Information, TDD_InfoNeighbourServedNRCell_Information_sequence);
+
+ return offset;
+}
+
+
+static const value_string x2ap_T_nRNeighbourModeInfo_vals[] = {
+ { 0, "fdd" },
+ { 1, "tdd" },
+ { 0, NULL }
+};
+
+static const per_choice_t T_nRNeighbourModeInfo_choice[] = {
+ { 0, &hf_x2ap_fdd_03 , ASN1_EXTENSION_ROOT , dissect_x2ap_FDD_InfoNeighbourServedNRCell_Information },
+ { 1, &hf_x2ap_tdd_03 , ASN1_EXTENSION_ROOT , dissect_x2ap_TDD_InfoNeighbourServedNRCell_Information },
+ { 0, NULL, 0, NULL }
+};
+
+static int
+dissect_x2ap_T_nRNeighbourModeInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_T_nRNeighbourModeInfo, T_nRNeighbourModeInfo_choice,
+ NULL);
+
+ return offset;
+}
+
+
static const per_sequence_t NRNeighbour_Information_item_sequence[] = {
{ &hf_x2ap_nrpCI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRPCI },
{ &hf_x2ap_nrCellID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRCGI },
- { &hf_x2ap_nrARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRARFCN },
- { &hf_x2ap_eXtended_TAC , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Extended_TAC },
+ { &hf_x2ap_nrFreqInfo , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRFreqInfo },
+ { &hf_x2ap_fiveGS_TAC , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_FiveGS_TAC },
+ { &hf_x2ap_configured_TAC , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_TAC },
+ { &hf_x2ap_measurementTimingConfiguration_01, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_OCTET_STRING },
+ { &hf_x2ap_nRNeighbourModeInfo, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_T_nRNeighbourModeInfo },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -12419,8 +13413,8 @@ dissect_x2ap_ServedEUTRAcellsENDCX2ManagementList(tvbuff_t *tvb _U_, int offset
static const per_sequence_t FDD_InfoServedNRCell_Information_sequence[] = {
- { &hf_x2ap_ul_NR_ARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRARFCN },
- { &hf_x2ap_dl_NR_ARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRARFCN },
+ { &hf_x2ap_ul_NRFreqInfo , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRFreqInfo },
+ { &hf_x2ap_dl_NRFreqInfo , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRFreqInfo },
{ &hf_x2ap_ul_NR_TxBW , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NR_TxBW },
{ &hf_x2ap_dl_NR_TxBW , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NR_TxBW },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
@@ -12437,7 +13431,7 @@ dissect_x2ap_FDD_InfoServedNRCell_Information(tvbuff_t *tvb _U_, int offset _U_,
static const per_sequence_t TDD_InfoServedNRCell_Information_sequence[] = {
- { &hf_x2ap_nR_ARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRARFCN },
+ { &hf_x2ap_nRFreqInfo , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRFreqInfo },
{ &hf_x2ap_nR_TxBW , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NR_TxBW },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
@@ -12496,11 +13490,11 @@ dissect_x2ap_T_measurementTimingConfiguration(tvbuff_t *tvb _U_, int offset _U_,
static const per_sequence_t ServedNRCell_Information_sequence[] = {
{ &hf_x2ap_nrpCI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRPCI },
{ &hf_x2ap_nrCellID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRCGI },
- { &hf_x2ap_eXtended_TAC , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Extended_TAC },
+ { &hf_x2ap_fiveGS_TAC , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_FiveGS_TAC },
+ { &hf_x2ap_configured_TAC , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_TAC },
{ &hf_x2ap_broadcastPLMNs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BroadcastPLMNs_Item },
{ &hf_x2ap_nrModeInfo , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_T_nrModeInfo },
{ &hf_x2ap_measurementTimingConfiguration, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_T_measurementTimingConfiguration },
- { &hf_x2ap_sULInformation , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_SULInformation },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -12546,6 +13540,7 @@ dissect_x2ap_ServedNRcellsENDCX2ManagementList(tvbuff_t *tvb _U_, int offset _U_
static const per_sequence_t Limited_list_item_sequence[] = {
{ &hf_x2ap_nrCellID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NRCGI },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -12616,7 +13611,7 @@ static const per_sequence_t ENDCX2SetupResponse_sequence[] = {
static int
dissect_x2ap_ENDCX2SetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 735 "./asn1/x2ap/x2ap.cnf"
+#line 747 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2SetupResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12655,7 +13650,7 @@ static const per_sequence_t ENDCX2SetupFailure_sequence[] = {
static int
dissect_x2ap_ENDCX2SetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 737 "./asn1/x2ap/x2ap.cnf"
+#line 749 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2SetupFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12672,7 +13667,7 @@ static const per_sequence_t ENDCConfigurationUpdate_sequence[] = {
static int
dissect_x2ap_ENDCConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 739 "./asn1/x2ap/x2ap.cnf"
+#line 751 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCConfigurationUpdate");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12802,7 +13797,7 @@ static const per_sequence_t ENDCConfigurationUpdateAcknowledge_sequence[] = {
static int
dissect_x2ap_ENDCConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 741 "./asn1/x2ap/x2ap.cnf"
+#line 753 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCConfigurationUpdateAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12813,12 +13808,14 @@ dissect_x2ap_ENDCConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U
static const value_string x2ap_RespondingNodeType_EndcConfigUpdate_vals[] = {
- { 0, "respond-en-gNB" },
+ { 0, "respond-eNB" },
+ { 1, "respond-en-gNB" },
{ 0, NULL }
};
static const per_choice_t RespondingNodeType_EndcConfigUpdate_choice[] = {
- { 0, &hf_x2ap_respond_en_gNB , ASN1_EXTENSION_ROOT , dissect_x2ap_ProtocolIE_Container },
+ { 0, &hf_x2ap_respond_eNB , ASN1_EXTENSION_ROOT , dissect_x2ap_ProtocolIE_Container },
+ { 1, &hf_x2ap_respond_en_gNB , ASN1_EXTENSION_ROOT , dissect_x2ap_ProtocolIE_Container },
{ 0, NULL, 0, NULL }
};
@@ -12839,7 +13836,7 @@ static const per_sequence_t ENDCConfigurationUpdateFailure_sequence[] = {
static int
dissect_x2ap_ENDCConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 743 "./asn1/x2ap/x2ap.cnf"
+#line 755 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCConfigurationUpdateFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12856,7 +13853,7 @@ static const per_sequence_t ENDCCellActivationRequest_sequence[] = {
static int
dissect_x2ap_ENDCCellActivationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 747 "./asn1/x2ap/x2ap.cnf"
+#line 759 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCCellActivationRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12902,7 +13899,7 @@ static const per_sequence_t ENDCCellActivationResponse_sequence[] = {
static int
dissect_x2ap_ENDCCellActivationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 749 "./asn1/x2ap/x2ap.cnf"
+#line 761 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCCellActivationResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12948,10 +13945,9 @@ static const per_sequence_t ENDCCellActivationFailure_sequence[] = {
static int
dissect_x2ap_ENDCCellActivationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 751 "./asn1/x2ap/x2ap.cnf"
+#line 763 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCCellActivationFailure");
-
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_x2ap_ENDCCellActivationFailure, ENDCCellActivationFailure_sequence);
@@ -12966,7 +13962,7 @@ static const per_sequence_t SecondaryRATDataUsageReport_sequence[] = {
static int
dissect_x2ap_SecondaryRATDataUsageReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 745 "./asn1/x2ap/x2ap.cnf"
+#line 757 "./asn1/x2ap/x2ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SecondaryRATDataUsageReport");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -12976,6 +13972,301 @@ dissect_x2ap_SecondaryRATDataUsageReport(tvbuff_t *tvb _U_, int offset _U_, asn1
}
+static const per_sequence_t SgNBActivityNotification_sequence[] = {
+ { &hf_x2ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_SgNBActivityNotification(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 773 "./asn1/x2ap/x2ap.cnf"
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SgNBActivityNotification");
+
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_SgNBActivityNotification, SgNBActivityNotification_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t ENDCPartialResetRequired_sequence[] = {
+ { &hf_x2ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_ENDCPartialResetRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 765 "./asn1/x2ap/x2ap.cnf"
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCPartialResetRequired");
+
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_ENDCPartialResetRequired, ENDCPartialResetRequired_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t ENDCPartialResetConfirm_sequence[] = {
+ { &hf_x2ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_ENDCPartialResetConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 767 "./asn1/x2ap/x2ap.cnf"
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCPartialResetConfirm");
+
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_ENDCPartialResetConfirm, ENDCPartialResetConfirm_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t EUTRANRCellResourceCoordinationRequest_sequence[] = {
+ { &hf_x2ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_EUTRANRCellResourceCoordinationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 769 "./asn1/x2ap/x2ap.cnf"
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "EUTRANRCellResourceCoordinationRequest");
+
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_EUTRANRCellResourceCoordinationRequest, EUTRANRCellResourceCoordinationRequest_sequence);
+
+ return offset;
+}
+
+
+static const value_string x2ap_InitiatingNodeType_EutranrCellResourceCoordination_vals[] = {
+ { 0, "initiate-eNB" },
+ { 1, "initiate-en-gNB" },
+ { 0, NULL }
+};
+
+static const per_choice_t InitiatingNodeType_EutranrCellResourceCoordination_choice[] = {
+ { 0, &hf_x2ap_initiate_eNB , ASN1_EXTENSION_ROOT , dissect_x2ap_ProtocolIE_Container },
+ { 1, &hf_x2ap_initiate_en_gNB, ASN1_EXTENSION_ROOT , dissect_x2ap_ProtocolIE_Container },
+ { 0, NULL, 0, NULL }
+};
+
+static int
+dissect_x2ap_InitiatingNodeType_EutranrCellResourceCoordination(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_InitiatingNodeType_EutranrCellResourceCoordination, InitiatingNodeType_EutranrCellResourceCoordination_choice,
+ NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t ListofEUTRACellsinEUTRACoordinationReq_sequence_of[1] = {
+ { &hf_x2ap_ListofEUTRACellsinEUTRACoordinationReq_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI },
+};
+
+static int
+dissect_x2ap_ListofEUTRACellsinEUTRACoordinationReq(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_ListofEUTRACellsinEUTRACoordinationReq, ListofEUTRACellsinEUTRACoordinationReq_sequence_of,
+ 0, maxCellineNB, FALSE);
+
+ return offset;
+}
+
+
+static const per_sequence_t ListofEUTRACellsinNRCoordinationReq_sequence_of[1] = {
+ { &hf_x2ap_ListofEUTRACellsinNRCoordinationReq_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI },
+};
+
+static int
+dissect_x2ap_ListofEUTRACellsinNRCoordinationReq(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_ListofEUTRACellsinNRCoordinationReq, ListofEUTRACellsinNRCoordinationReq_sequence_of,
+ 1, maxCellineNB, FALSE);
+
+ return offset;
+}
+
+
+static const per_sequence_t ListofNRCellsinNRCoordinationReq_sequence_of[1] = {
+ { &hf_x2ap_ListofNRCellsinNRCoordinationReq_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_NRCGI },
+};
+
+static int
+dissect_x2ap_ListofNRCellsinNRCoordinationReq(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_ListofNRCellsinNRCoordinationReq, ListofNRCellsinNRCoordinationReq_sequence_of,
+ 0, maxnoNRcellsSpectrumSharingWithE_UTRA, FALSE);
+
+ return offset;
+}
+
+
+static const per_sequence_t EUTRANRCellResourceCoordinationResponse_sequence[] = {
+ { &hf_x2ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_EUTRANRCellResourceCoordinationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 771 "./asn1/x2ap/x2ap.cnf"
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "EUTRANRCellResourceCoordinationResponse");
+
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_EUTRANRCellResourceCoordinationResponse, EUTRANRCellResourceCoordinationResponse_sequence);
+
+ return offset;
+}
+
+
+static const value_string x2ap_RespondingNodeType_EutranrCellResourceCoordination_vals[] = {
+ { 0, "respond-eNB" },
+ { 1, "respond-en-gNB" },
+ { 0, NULL }
+};
+
+static const per_choice_t RespondingNodeType_EutranrCellResourceCoordination_choice[] = {
+ { 0, &hf_x2ap_respond_eNB , ASN1_EXTENSION_ROOT , dissect_x2ap_ProtocolIE_Container },
+ { 1, &hf_x2ap_respond_en_gNB , ASN1_EXTENSION_ROOT , dissect_x2ap_ProtocolIE_Container },
+ { 0, NULL, 0, NULL }
+};
+
+static int
+dissect_x2ap_RespondingNodeType_EutranrCellResourceCoordination(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_RespondingNodeType_EutranrCellResourceCoordination, RespondingNodeType_EutranrCellResourceCoordination_choice,
+ NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t ListofEUTRACellsinEUTRACoordinationResp_sequence_of[1] = {
+ { &hf_x2ap_ListofEUTRACellsinEUTRACoordinationResp_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI },
+};
+
+static int
+dissect_x2ap_ListofEUTRACellsinEUTRACoordinationResp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_ListofEUTRACellsinEUTRACoordinationResp, ListofEUTRACellsinEUTRACoordinationResp_sequence_of,
+ 1, maxCellineNB, FALSE);
+
+ return offset;
+}
+
+
+static const per_sequence_t ListofNRCellsinNRCoordinationResp_sequence_of[1] = {
+ { &hf_x2ap_ListofNRCellsinNRCoordinationResp_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_NRCGI },
+};
+
+static int
+dissect_x2ap_ListofNRCellsinNRCoordinationResp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_ListofNRCellsinNRCoordinationResp, ListofNRCellsinNRCoordinationResp_sequence_of,
+ 1, maxnoNRcellsSpectrumSharingWithE_UTRA, FALSE);
+
+ return offset;
+}
+
+
+static const per_sequence_t ENDCX2RemovalRequest_sequence[] = {
+ { &hf_x2ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_ENDCX2RemovalRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 775 "./asn1/x2ap/x2ap.cnf"
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2RemovalRequest");
+
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_ENDCX2RemovalRequest, ENDCX2RemovalRequest_sequence);
+
+ return offset;
+}
+
+
+static const value_string x2ap_InitiatingNodeType_EndcX2Removal_vals[] = {
+ { 0, "init-eNB" },
+ { 1, "init-en-gNB" },
+ { 0, NULL }
+};
+
+static const per_choice_t InitiatingNodeType_EndcX2Removal_choice[] = {
+ { 0, &hf_x2ap_init_eNB , ASN1_EXTENSION_ROOT , dissect_x2ap_ProtocolIE_Container },
+ { 1, &hf_x2ap_init_en_gNB , ASN1_EXTENSION_ROOT , dissect_x2ap_ProtocolIE_Container },
+ { 0, NULL, 0, NULL }
+};
+
+static int
+dissect_x2ap_InitiatingNodeType_EndcX2Removal(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_InitiatingNodeType_EndcX2Removal, InitiatingNodeType_EndcX2Removal_choice,
+ NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t ENDCX2RemovalResponse_sequence[] = {
+ { &hf_x2ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_ENDCX2RemovalResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 777 "./asn1/x2ap/x2ap.cnf"
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2RemovalResponse");
+
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_ENDCX2RemovalResponse, ENDCX2RemovalResponse_sequence);
+
+ return offset;
+}
+
+
+static const value_string x2ap_RespondingNodeType_EndcX2Removal_vals[] = {
+ { 0, "respond-eNB" },
+ { 1, "respond-en-gNB" },
+ { 0, NULL }
+};
+
+static const per_choice_t RespondingNodeType_EndcX2Removal_choice[] = {
+ { 0, &hf_x2ap_respond_eNB , ASN1_EXTENSION_ROOT , dissect_x2ap_ProtocolIE_Container },
+ { 1, &hf_x2ap_respond_en_gNB , ASN1_EXTENSION_ROOT , dissect_x2ap_ProtocolIE_Container },
+ { 0, NULL, 0, NULL }
+};
+
+static int
+dissect_x2ap_RespondingNodeType_EndcX2Removal(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_RespondingNodeType_EndcX2Removal, RespondingNodeType_EndcX2Removal_choice,
+ NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t ENDCX2RemovalFailure_sequence[] = {
+ { &hf_x2ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_ENDCX2RemovalFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 779 "./asn1/x2ap/x2ap.cnf"
+ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2RemovalFailure");
+
+
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_ENDCX2RemovalFailure, ENDCX2RemovalFailure_sequence);
+
+ return offset;
+}
+
+
static int
dissect_x2ap_InitiatingMessage_value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -13116,6 +14407,14 @@ static int dissect_AdditionalSpecialSubframeExtension_Info_PDU(tvbuff_t *tvb _U_
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_AerialUEsubscriptionInformation_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_AerialUEsubscriptionInformation(tvb, offset, &asn1_ctx, tree, hf_x2ap_AerialUEsubscriptionInformation_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_BandwidthReducedSI_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -13236,6 +14535,14 @@ static int dissect_CSIReportList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_DataTrafficResourceIndication_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_DataTrafficResourceIndication(tvb, offset, &asn1_ctx, tree, hf_x2ap_DataTrafficResourceIndication_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_DeactivationIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -13284,6 +14591,14 @@ static int dissect_EnhancedRNTP_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_ERABActivityNotifyItemList_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_ERABActivityNotifyItemList(tvb, offset, &asn1_ctx, tree, hf_x2ap_ERABActivityNotifyItemList_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_E_RAB_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -13588,19 +14903,19 @@ static int dissect_MeNBtoSgNBContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_MCGSplitSRBs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+static int dissect_SplitSRBs_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_MCGSplitSRBs(tvb, offset, &asn1_ctx, tree, hf_x2ap_MCGSplitSRBs_PDU);
+ offset = dissect_x2ap_SplitSRBs(tvb, offset, &asn1_ctx, tree, hf_x2ap_SplitSRBs_PDU);
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_MCGSplitSRB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+static int dissect_SplitSRB_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_MCGSplitSRB(tvb, offset, &asn1_ctx, tree, hf_x2ap_MCGSplitSRB_PDU);
+ offset = dissect_x2ap_SplitSRB(tvb, offset, &asn1_ctx, tree, hf_x2ap_SplitSRB_PDU);
offset += 7; offset >>= 3;
return offset;
}
@@ -13628,6 +14943,14 @@ static int dissect_NRrestriction_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_NRS_NSSS_PowerOffset_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_NRS_NSSS_PowerOffset(tvb, offset, &asn1_ctx, tree, hf_x2ap_NRS_NSSS_PowerOffset_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_NRUESecurityCapabilities_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -13636,6 +14959,14 @@ static int dissect_NRUESecurityCapabilities_PDU(tvbuff_t *tvb _U_, packet_info *
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_NSSS_NumOccasionDifferentPrecoder_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_NSSS_NumOccasionDifferentPrecoder(tvb, offset, &asn1_ctx, tree, hf_x2ap_NSSS_NumOccasionDifferentPrecoder_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_OffsetOfNbiotChannelNumberToEARFCN_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -13644,6 +14975,14 @@ static int dissect_OffsetOfNbiotChannelNumberToEARFCN_PDU(tvbuff_t *tvb _U_, pac
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_Packet_LossRate_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_Packet_LossRate(tvb, offset, &asn1_ctx, tree, hf_x2ap_Packet_LossRate_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_PDCPChangeIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -13692,6 +15031,14 @@ static int dissect_ProSeUEtoNetworkRelaying_PDU(tvbuff_t *tvb _U_, packet_info *
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_ProtectedEUTRAResourceIndication_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_ProtectedEUTRAResourceIndication(tvb, offset, &asn1_ctx, tree, hf_x2ap_ProtectedEUTRAResourceIndication_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_ReceiveStatusOfULPDCPSDUsExtended_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -13748,6 +15095,14 @@ static int dissect_ResumeID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_RRC_Config_Ind_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_RRC_Config_Ind(tvb, offset, &asn1_ctx, tree, hf_x2ap_RRC_Config_Ind_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_RRCConnReestabIndicator_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -13820,6 +15175,14 @@ static int dissect_ServedCells_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_ServiceType_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_ServiceType(tvb, offset, &asn1_ctx, tree, hf_x2ap_ServiceType_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
int dissect_x2ap_SgNBResourceCoordinationInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -13852,6 +15215,22 @@ static int dissect_ShortMAC_I_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_SGNB_Addition_Trigger_Ind_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_SGNB_Addition_Trigger_Ind(tvb, offset, &asn1_ctx, tree, hf_x2ap_SGNB_Addition_Trigger_Ind_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_SpectrumSharingGroupID_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_SpectrumSharingGroupID(tvb, offset, &asn1_ctx, tree, hf_x2ap_SpectrumSharingGroupID_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_SRVCCOperationPossible_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -13860,6 +15239,14 @@ static int dissect_SRVCCOperationPossible_PDU(tvbuff_t *tvb _U_, packet_info *pi
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_SubscriberProfileIDforRFP_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_SubscriberProfileIDforRFP(tvb, offset, &asn1_ctx, tree, hf_x2ap_SubscriberProfileIDforRFP_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_SubframeAssignment_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -14052,6 +15439,14 @@ static int dissect_UESidelinkAggregateMaximumBitRate_PDU(tvbuff_t *tvb _U_, pack
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_UEsToBeResetList_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_UEsToBeResetList(tvb, offset, &asn1_ctx, tree, hf_x2ap_UEsToBeResetList_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_UL_scheduling_PDCCH_CCE_usage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -14060,6 +15455,14 @@ static int dissect_UL_scheduling_PDCCH_CCE_usage_PDU(tvbuff_t *tvb _U_, packet_i
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_UserPlaneTrafficActivityReport_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_UserPlaneTrafficActivityReport(tvb, offset, &asn1_ctx, tree, hf_x2ap_UserPlaneTrafficActivityReport_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_V2XServicesAuthorized_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -15140,6 +16543,22 @@ static int dissect_SgNBModificationConfirm_PDU(tvbuff_t *tvb _U_, packet_info *p
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_E_RABs_AdmittedToBeModified_SgNBModConfList_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_E_RABs_AdmittedToBeModified_SgNBModConfList(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RABs_AdmittedToBeModified_SgNBModConfList_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_E_RABs_AdmittedToBeModified_SgNBModConf_Item_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_E_RABs_AdmittedToBeModified_SgNBModConf_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RABs_AdmittedToBeModified_SgNBModConf_Item_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_SgNBModificationRefuse_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -15476,6 +16895,142 @@ static int dissect_SecondaryRATDataUsageReport_PDU(tvbuff_t *tvb _U_, packet_inf
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_SgNBActivityNotification_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_SgNBActivityNotification(tvb, offset, &asn1_ctx, tree, hf_x2ap_SgNBActivityNotification_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_ENDCPartialResetRequired_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_ENDCPartialResetRequired(tvb, offset, &asn1_ctx, tree, hf_x2ap_ENDCPartialResetRequired_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_ENDCPartialResetConfirm_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_ENDCPartialResetConfirm(tvb, offset, &asn1_ctx, tree, hf_x2ap_ENDCPartialResetConfirm_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_EUTRANRCellResourceCoordinationRequest_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_EUTRANRCellResourceCoordinationRequest(tvb, offset, &asn1_ctx, tree, hf_x2ap_EUTRANRCellResourceCoordinationRequest_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_InitiatingNodeType_EutranrCellResourceCoordination_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_InitiatingNodeType_EutranrCellResourceCoordination(tvb, offset, &asn1_ctx, tree, hf_x2ap_InitiatingNodeType_EutranrCellResourceCoordination_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_ListofEUTRACellsinEUTRACoordinationReq_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_ListofEUTRACellsinEUTRACoordinationReq(tvb, offset, &asn1_ctx, tree, hf_x2ap_ListofEUTRACellsinEUTRACoordinationReq_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_ListofEUTRACellsinNRCoordinationReq_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_ListofEUTRACellsinNRCoordinationReq(tvb, offset, &asn1_ctx, tree, hf_x2ap_ListofEUTRACellsinNRCoordinationReq_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_ListofNRCellsinNRCoordinationReq_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_ListofNRCellsinNRCoordinationReq(tvb, offset, &asn1_ctx, tree, hf_x2ap_ListofNRCellsinNRCoordinationReq_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_EUTRANRCellResourceCoordinationResponse_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_EUTRANRCellResourceCoordinationResponse(tvb, offset, &asn1_ctx, tree, hf_x2ap_EUTRANRCellResourceCoordinationResponse_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_RespondingNodeType_EutranrCellResourceCoordination_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_RespondingNodeType_EutranrCellResourceCoordination(tvb, offset, &asn1_ctx, tree, hf_x2ap_RespondingNodeType_EutranrCellResourceCoordination_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_ListofEUTRACellsinEUTRACoordinationResp_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_ListofEUTRACellsinEUTRACoordinationResp(tvb, offset, &asn1_ctx, tree, hf_x2ap_ListofEUTRACellsinEUTRACoordinationResp_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_ListofNRCellsinNRCoordinationResp_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_ListofNRCellsinNRCoordinationResp(tvb, offset, &asn1_ctx, tree, hf_x2ap_ListofNRCellsinNRCoordinationResp_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_ENDCX2RemovalRequest_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_ENDCX2RemovalRequest(tvb, offset, &asn1_ctx, tree, hf_x2ap_ENDCX2RemovalRequest_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_InitiatingNodeType_EndcX2Removal_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_InitiatingNodeType_EndcX2Removal(tvb, offset, &asn1_ctx, tree, hf_x2ap_InitiatingNodeType_EndcX2Removal_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_ENDCX2RemovalResponse_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_ENDCX2RemovalResponse(tvb, offset, &asn1_ctx, tree, hf_x2ap_ENDCX2RemovalResponse_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_RespondingNodeType_EndcX2Removal_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_RespondingNodeType_EndcX2Removal(tvb, offset, &asn1_ctx, tree, hf_x2ap_RespondingNodeType_EndcX2Removal_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_ENDCX2RemovalFailure_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_ENDCX2RemovalFailure(tvb, offset, &asn1_ctx, tree, hf_x2ap_ENDCX2RemovalFailure_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -15487,7 +17042,7 @@ static int dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
/*--- End of included file: packet-x2ap-fn.c ---*/
-#line 241 "./asn1/x2ap/packet-x2ap-template.c"
+#line 247 "./asn1/x2ap/packet-x2ap-template.c"
static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
@@ -15815,6 +17370,10 @@ void proto_register_x2ap(void) {
{ "AdditionalSpecialSubframeExtension-Info", "x2ap.AdditionalSpecialSubframeExtension_Info_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_AerialUEsubscriptionInformation_PDU,
+ { "AerialUEsubscriptionInformation", "x2ap.AerialUEsubscriptionInformation",
+ FT_UINT32, BASE_DEC, VALS(x2ap_AerialUEsubscriptionInformation_vals), 0,
+ NULL, HFILL }},
{ &hf_x2ap_BandwidthReducedSI_PDU,
{ "BandwidthReducedSI", "x2ap.BandwidthReducedSI",
FT_UINT32, BASE_DEC, VALS(x2ap_BandwidthReducedSI_vals), 0,
@@ -15875,6 +17434,10 @@ void proto_register_x2ap(void) {
{ "CSIReportList", "x2ap.CSIReportList",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_DataTrafficResourceIndication_PDU,
+ { "DataTrafficResourceIndication", "x2ap.DataTrafficResourceIndication_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_DeactivationIndication_PDU,
{ "DeactivationIndication", "x2ap.DeactivationIndication",
FT_UINT32, BASE_DEC, VALS(x2ap_DeactivationIndication_vals), 0,
@@ -15899,6 +17462,10 @@ void proto_register_x2ap(void) {
{ "EnhancedRNTP", "x2ap.EnhancedRNTP_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_ERABActivityNotifyItemList_PDU,
+ { "ERABActivityNotifyItemList", "x2ap.ERABActivityNotifyItemList",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_E_RAB_List_PDU,
{ "E-RAB-List", "x2ap.E_RAB_List",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -16051,12 +17618,12 @@ void proto_register_x2ap(void) {
{ "MeNBtoSgNBContainer", "x2ap.MeNBtoSgNBContainer",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
- { &hf_x2ap_MCGSplitSRBs_PDU,
- { "MCGSplitSRBs", "x2ap.MCGSplitSRBs",
- FT_UINT32, BASE_DEC, VALS(x2ap_MCGSplitSRBs_vals), 0,
+ { &hf_x2ap_SplitSRBs_PDU,
+ { "SplitSRBs", "x2ap.SplitSRBs",
+ FT_UINT32, BASE_DEC, VALS(x2ap_SplitSRBs_vals), 0,
NULL, HFILL }},
- { &hf_x2ap_MCGSplitSRB_PDU,
- { "MCGSplitSRB", "x2ap.MCGSplitSRB_element",
+ { &hf_x2ap_SplitSRB_PDU,
+ { "SplitSRB", "x2ap.SplitSRB_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_x2ap_UENRMeasurement_PDU,
@@ -16071,14 +17638,26 @@ void proto_register_x2ap(void) {
{ "NRrestriction", "x2ap.NRrestriction",
FT_UINT32, BASE_DEC, VALS(x2ap_NRrestriction_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_NRS_NSSS_PowerOffset_PDU,
+ { "NRS-NSSS-PowerOffset", "x2ap.NRS_NSSS_PowerOffset",
+ FT_UINT32, BASE_DEC, VALS(x2ap_NRS_NSSS_PowerOffset_vals), 0,
+ NULL, HFILL }},
{ &hf_x2ap_NRUESecurityCapabilities_PDU,
{ "NRUESecurityCapabilities", "x2ap.NRUESecurityCapabilities_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_NSSS_NumOccasionDifferentPrecoder_PDU,
+ { "NSSS-NumOccasionDifferentPrecoder", "x2ap.NSSS_NumOccasionDifferentPrecoder",
+ FT_UINT32, BASE_DEC, VALS(x2ap_NSSS_NumOccasionDifferentPrecoder_vals), 0,
+ NULL, HFILL }},
{ &hf_x2ap_OffsetOfNbiotChannelNumberToEARFCN_PDU,
{ "OffsetOfNbiotChannelNumberToEARFCN", "x2ap.OffsetOfNbiotChannelNumberToEARFCN",
FT_UINT32, BASE_DEC|BASE_EXT_STRING, &x2ap_OffsetOfNbiotChannelNumberToEARFCN_vals_ext, 0,
NULL, HFILL }},
+ { &hf_x2ap_Packet_LossRate_PDU,
+ { "Packet-LossRate", "x2ap.Packet_LossRate",
+ FT_UINT32, BASE_CUSTOM, CF_FUNC(x2ap_Packet_LossRate_fmt), 0,
+ NULL, HFILL }},
{ &hf_x2ap_PDCPChangeIndication_PDU,
{ "PDCPChangeIndication", "x2ap.PDCPChangeIndication",
FT_UINT32, BASE_DEC, VALS(x2ap_PDCPChangeIndication_vals), 0,
@@ -16103,6 +17682,10 @@ void proto_register_x2ap(void) {
{ "ProSeUEtoNetworkRelaying", "x2ap.ProSeUEtoNetworkRelaying",
FT_UINT32, BASE_DEC, VALS(x2ap_ProSeUEtoNetworkRelaying_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_ProtectedEUTRAResourceIndication_PDU,
+ { "ProtectedEUTRAResourceIndication", "x2ap.ProtectedEUTRAResourceIndication_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_ReceiveStatusOfULPDCPSDUsExtended_PDU,
{ "ReceiveStatusOfULPDCPSDUsExtended", "x2ap.ReceiveStatusOfULPDCPSDUsExtended",
FT_BYTES, BASE_NONE, NULL, 0,
@@ -16131,6 +17714,10 @@ void proto_register_x2ap(void) {
{ "ResumeID", "x2ap.ResumeID",
FT_UINT32, BASE_DEC, VALS(x2ap_ResumeID_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_RRC_Config_Ind_PDU,
+ { "RRC-Config-Ind", "x2ap.RRC_Config_Ind",
+ FT_UINT32, BASE_DEC, VALS(x2ap_RRC_Config_Ind_vals), 0,
+ NULL, HFILL }},
{ &hf_x2ap_RRCConnReestabIndicator_PDU,
{ "RRCConnReestabIndicator", "x2ap.RRCConnReestabIndicator",
FT_UINT32, BASE_DEC, VALS(x2ap_RRCConnReestabIndicator_vals), 0,
@@ -16167,6 +17754,10 @@ void proto_register_x2ap(void) {
{ "ServedCells", "x2ap.ServedCells",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_ServiceType_PDU,
+ { "ServiceType", "x2ap.ServiceType",
+ FT_UINT32, BASE_DEC, VALS(x2ap_ServiceType_vals), 0,
+ NULL, HFILL }},
{ &hf_x2ap_x2ap_SgNBResourceCoordinationInformation_PDU,
{ "SgNBResourceCoordinationInformation", "x2ap.SgNBResourceCoordinationInformation_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -16183,10 +17774,22 @@ void proto_register_x2ap(void) {
{ "ShortMAC-I", "x2ap.ShortMAC_I",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_SGNB_Addition_Trigger_Ind_PDU,
+ { "SGNB-Addition-Trigger-Ind", "x2ap.SGNB_Addition_Trigger_Ind",
+ FT_UINT32, BASE_DEC, VALS(x2ap_SGNB_Addition_Trigger_Ind_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_SpectrumSharingGroupID_PDU,
+ { "SpectrumSharingGroupID", "x2ap.SpectrumSharingGroupID",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_SRVCCOperationPossible_PDU,
{ "SRVCCOperationPossible", "x2ap.SRVCCOperationPossible",
FT_UINT32, BASE_DEC, VALS(x2ap_SRVCCOperationPossible_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_SubscriberProfileIDforRFP_PDU,
+ { "SubscriberProfileIDforRFP", "x2ap.SubscriberProfileIDforRFP",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_SubframeAssignment_PDU,
{ "SubframeAssignment", "x2ap.SubframeAssignment",
FT_UINT32, BASE_DEC, VALS(x2ap_SubframeAssignment_vals), 0,
@@ -16283,10 +17886,18 @@ void proto_register_x2ap(void) {
{ "UESidelinkAggregateMaximumBitRate", "x2ap.UESidelinkAggregateMaximumBitRate_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_UEsToBeResetList_PDU,
+ { "UEsToBeResetList", "x2ap.UEsToBeResetList",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_UL_scheduling_PDCCH_CCE_usage_PDU,
{ "UL-scheduling-PDCCH-CCE-usage", "x2ap.UL_scheduling_PDCCH_CCE_usage",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_UserPlaneTrafficActivityReport_PDU,
+ { "UserPlaneTrafficActivityReport", "x2ap.UserPlaneTrafficActivityReport",
+ FT_UINT32, BASE_DEC, VALS(x2ap_UserPlaneTrafficActivityReport_vals), 0,
+ NULL, HFILL }},
{ &hf_x2ap_V2XServicesAuthorized_PDU,
{ "V2XServicesAuthorized", "x2ap.V2XServicesAuthorized_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -16827,6 +18438,14 @@ void proto_register_x2ap(void) {
{ "SgNBModificationConfirm", "x2ap.SgNBModificationConfirm_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_E_RABs_AdmittedToBeModified_SgNBModConfList_PDU,
+ { "E-RABs-AdmittedToBeModified-SgNBModConfList", "x2ap.E_RABs_AdmittedToBeModified_SgNBModConfList",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_E_RABs_AdmittedToBeModified_SgNBModConf_Item_PDU,
+ { "E-RABs-AdmittedToBeModified-SgNBModConf-Item", "x2ap.E_RABs_AdmittedToBeModified_SgNBModConf_Item_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_SgNBModificationRefuse_PDU,
{ "SgNBModificationRefuse", "x2ap.SgNBModificationRefuse_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -16995,6 +18614,74 @@ void proto_register_x2ap(void) {
{ "SecondaryRATDataUsageReport", "x2ap.SecondaryRATDataUsageReport_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_SgNBActivityNotification_PDU,
+ { "SgNBActivityNotification", "x2ap.SgNBActivityNotification_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_ENDCPartialResetRequired_PDU,
+ { "ENDCPartialResetRequired", "x2ap.ENDCPartialResetRequired_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_ENDCPartialResetConfirm_PDU,
+ { "ENDCPartialResetConfirm", "x2ap.ENDCPartialResetConfirm_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_EUTRANRCellResourceCoordinationRequest_PDU,
+ { "EUTRANRCellResourceCoordinationRequest", "x2ap.EUTRANRCellResourceCoordinationRequest_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_InitiatingNodeType_EutranrCellResourceCoordination_PDU,
+ { "InitiatingNodeType-EutranrCellResourceCoordination", "x2ap.InitiatingNodeType_EutranrCellResourceCoordination",
+ FT_UINT32, BASE_DEC, VALS(x2ap_InitiatingNodeType_EutranrCellResourceCoordination_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_ListofEUTRACellsinEUTRACoordinationReq_PDU,
+ { "ListofEUTRACellsinEUTRACoordinationReq", "x2ap.ListofEUTRACellsinEUTRACoordinationReq",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_ListofEUTRACellsinNRCoordinationReq_PDU,
+ { "ListofEUTRACellsinNRCoordinationReq", "x2ap.ListofEUTRACellsinNRCoordinationReq",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_ListofNRCellsinNRCoordinationReq_PDU,
+ { "ListofNRCellsinNRCoordinationReq", "x2ap.ListofNRCellsinNRCoordinationReq",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_EUTRANRCellResourceCoordinationResponse_PDU,
+ { "EUTRANRCellResourceCoordinationResponse", "x2ap.EUTRANRCellResourceCoordinationResponse_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_RespondingNodeType_EutranrCellResourceCoordination_PDU,
+ { "RespondingNodeType-EutranrCellResourceCoordination", "x2ap.RespondingNodeType_EutranrCellResourceCoordination",
+ FT_UINT32, BASE_DEC, VALS(x2ap_RespondingNodeType_EutranrCellResourceCoordination_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_ListofEUTRACellsinEUTRACoordinationResp_PDU,
+ { "ListofEUTRACellsinEUTRACoordinationResp", "x2ap.ListofEUTRACellsinEUTRACoordinationResp",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_ListofNRCellsinNRCoordinationResp_PDU,
+ { "ListofNRCellsinNRCoordinationResp", "x2ap.ListofNRCellsinNRCoordinationResp",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_ENDCX2RemovalRequest_PDU,
+ { "ENDCX2RemovalRequest", "x2ap.ENDCX2RemovalRequest_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_InitiatingNodeType_EndcX2Removal_PDU,
+ { "InitiatingNodeType-EndcX2Removal", "x2ap.InitiatingNodeType_EndcX2Removal",
+ FT_UINT32, BASE_DEC, VALS(x2ap_InitiatingNodeType_EndcX2Removal_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_ENDCX2RemovalResponse_PDU,
+ { "ENDCX2RemovalResponse", "x2ap.ENDCX2RemovalResponse_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_RespondingNodeType_EndcX2Removal_PDU,
+ { "RespondingNodeType-EndcX2Removal", "x2ap.RespondingNodeType_EndcX2Removal",
+ FT_UINT32, BASE_DEC, VALS(x2ap_RespondingNodeType_EndcX2Removal_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_ENDCX2RemovalFailure_PDU,
+ { "ENDCX2RemovalFailure", "x2ap.ENDCX2RemovalFailure_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_X2AP_PDU_PDU,
{ "X2AP-PDU", "x2ap.X2AP_PDU",
FT_UINT32, BASE_DEC, VALS(x2ap_X2AP_PDU_vals), 0,
@@ -17387,10 +19074,30 @@ void proto_register_x2ap(void) {
{ "subbandCQIList", "x2ap.subbandCQIList",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_activationSFN,
+ { "activationSFN", "x2ap.activationSFN",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "INTEGER_0_1023", HFILL }},
+ { &hf_x2ap_sharedResourceType,
+ { "sharedResourceType", "x2ap.sharedResourceType",
+ FT_UINT32, BASE_DEC, VALS(x2ap_SharedResourceType_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_reservedSubframePattern,
+ { "reservedSubframePattern", "x2ap.reservedSubframePattern_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_highestSuccessDeliveredPDCPSN,
{ "highestSuccessDeliveredPDCPSN", "x2ap.highestSuccessDeliveredPDCPSN",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_0_4095", HFILL }},
+ { &hf_x2ap_unchanged,
+ { "unchanged", "x2ap.unchanged_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_changed,
+ { "changed", "x2ap.changed",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "DLResourceBitmapULandDLSharing", HFILL }},
{ &hf_x2ap_naics_active,
{ "naics-active", "x2ap.naics_active_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -17467,6 +19174,18 @@ void proto_register_x2ap(void) {
{ "PLMN-Identity", "x2ap.PLMN_Identity",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_ERABActivityNotifyItemList_item,
+ { "ERABActivityNotifyItem", "x2ap.ERABActivityNotifyItem_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_e_RAB_ID,
+ { "e-RAB-ID", "x2ap.e_RAB_ID",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_activityReport,
+ { "activityReport", "x2ap.activityReport",
+ FT_UINT32, BASE_DEC, VALS(x2ap_UserPlaneTrafficActivityReport_vals), 0,
+ "UserPlaneTrafficActivityReport", HFILL }},
{ &hf_x2ap_qCI,
{ "qCI", "x2ap.qCI",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -17483,10 +19202,6 @@ void proto_register_x2ap(void) {
{ "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
- { &hf_x2ap_e_RAB_ID,
- { "e-RAB-ID", "x2ap.e_RAB_ID",
- FT_UINT32, BASE_DEC, NULL, 0,
- NULL, HFILL }},
{ &hf_x2ap_cause,
{ "cause", "x2ap.cause",
FT_UINT32, BASE_DEC, VALS(x2ap_Cause_vals), 0,
@@ -17587,6 +19302,18 @@ void proto_register_x2ap(void) {
{ "LAC", "x2ap.LAC",
FT_UINT16, BASE_DEC_HEX, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_freqBandIndicatorNr,
+ { "freqBandIndicatorNr", "x2ap.freqBandIndicatorNr",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "INTEGER_1_1024_", HFILL }},
+ { &hf_x2ap_supportedSULBandList,
+ { "supportedSULBandList", "x2ap.supportedSULBandList",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "SEQUENCE_SIZE_0_maxnoofNrCellBands_OF_SupportedSULFreqBandItem", HFILL }},
+ { &hf_x2ap_supportedSULBandList_item,
+ { "SupportedSULFreqBandItem", "x2ap.SupportedSULFreqBandItem_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_e_RAB_MaximumBitrateDL,
{ "e-RAB-MaximumBitrateDL", "x2ap.e_RAB_MaximumBitrateDL",
FT_UINT64, BASE_DEC|BASE_UNIT_STRING, &units_bit_sec, 0,
@@ -17871,6 +19598,26 @@ void proto_register_x2ap(void) {
{ "eARFCN", "x2ap.eARFCN",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_nRARFCN,
+ { "nRARFCN", "x2ap.nRARFCN",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "INTEGER_0_3279165", HFILL }},
+ { &hf_x2ap_nRARFCN_SUL,
+ { "nRARFCN-SUL", "x2ap.nRARFCN_SUL",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "INTEGER_0_3279165", HFILL }},
+ { &hf_x2ap_freqBandListNr,
+ { "freqBandListNr", "x2ap.freqBandListNr",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "SEQUENCE_SIZE_1_maxnoofNrCellBands_OF_FreqBandNrItem", HFILL }},
+ { &hf_x2ap_freqBandListNr_item,
+ { "FreqBandNrItem", "x2ap.FreqBandNrItem_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_sULInformation,
+ { "sULInformation", "x2ap.sULInformation_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_nRcellIdentifier,
{ "nRcellIdentifier", "x2ap.nRcellIdentifier",
FT_BYTES, BASE_NONE, NULL, 0,
@@ -17927,6 +19674,46 @@ void proto_register_x2ap(void) {
{ "proSeDirectCommunication", "x2ap.proSeDirectCommunication",
FT_UINT32, BASE_DEC, VALS(x2ap_ProSeDirectCommunication_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_protectedResourceList,
+ { "protectedResourceList", "x2ap.protectedResourceList",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_mBSFNControlRegionLength,
+ { "mBSFNControlRegionLength", "x2ap.mBSFNControlRegionLength",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_pDCCHRegionLength,
+ { "pDCCHRegionLength", "x2ap.pDCCHRegionLength",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_protectedFootprintTimePeriodicity,
+ { "protectedFootprintTimePeriodicity", "x2ap.protectedFootprintTimePeriodicity",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "INTEGER_1_80_", HFILL }},
+ { &hf_x2ap_protectedFootprintStartTime,
+ { "protectedFootprintStartTime", "x2ap.protectedFootprintStartTime",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "INTEGER_1_20_", HFILL }},
+ { &hf_x2ap_ProtectedResourceList_item,
+ { "ProtectedResourceList-Item", "x2ap.ProtectedResourceList_Item_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_resourceType,
+ { "resourceType", "x2ap.resourceType",
+ FT_UINT32, BASE_DEC, VALS(x2ap_ResourceType_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_intraPRBProtectedResourceFootprint,
+ { "intraPRBProtectedResourceFootprint", "x2ap.intraPRBProtectedResourceFootprint",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "BIT_STRING_SIZE_84_", HFILL }},
+ { &hf_x2ap_protectedFootprintFrequencyPattern,
+ { "protectedFootprintFrequencyPattern", "x2ap.protectedFootprintFrequencyPattern",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "BIT_STRING_SIZE_6_110_", HFILL }},
+ { &hf_x2ap_protectedFootprintTimePattern,
+ { "protectedFootprintTimePattern", "x2ap.protectedFootprintTimePattern_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_dL_GBR_PRB_usage,
{ "dL-GBR-PRB-usage", "x2ap.dL_GBR_PRB_usage",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -17975,6 +19762,18 @@ void proto_register_x2ap(void) {
{ "ReplacingCellsList-Item", "x2ap.ReplacingCellsList_Item_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_subframeType,
+ { "subframeType", "x2ap.subframeType",
+ FT_UINT32, BASE_DEC, VALS(x2ap_SubframeType_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_reservedSubframePattern_01,
+ { "reservedSubframePattern", "x2ap.reservedSubframePattern",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "BIT_STRING_SIZE_10_40", HFILL }},
+ { &hf_x2ap_mBSFNControlRegionLength_01,
+ { "mBSFNControlRegionLength", "x2ap.mBSFNControlRegionLength",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "T_mBSFNControlRegionLength_01", HFILL }},
{ &hf_x2ap_non_truncated,
{ "non-truncated", "x2ap.non_truncated",
FT_BYTES, BASE_NONE, NULL, 0,
@@ -18055,6 +19854,14 @@ void proto_register_x2ap(void) {
{ "nR-CGI", "x2ap.nR_CGI_element",
FT_NONE, BASE_NONE, NULL, 0,
"NRCGI", HFILL }},
+ { &hf_x2ap_uLOnlySharing,
+ { "uLOnlySharing", "x2ap.uLOnlySharing_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_uLandDLSharing,
+ { "uLandDLSharing", "x2ap.uLandDLSharing_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_specialSubframePatterns,
{ "specialSubframePatterns", "x2ap.specialSubframePatterns",
FT_UINT32, BASE_DEC, VALS(x2ap_SpecialSubframePatterns_vals), 0,
@@ -18106,7 +19913,7 @@ void proto_register_x2ap(void) {
{ &hf_x2ap_sUL_ARFCN,
{ "sUL-ARFCN", "x2ap.sUL_ARFCN",
FT_UINT32, BASE_DEC, NULL, 0,
- "NRARFCN", HFILL }},
+ "INTEGER_0_3279165", HFILL }},
{ &hf_x2ap_sUL_TxBW,
{ "sUL-TxBW", "x2ap.sUL_TxBW_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -18207,6 +20014,30 @@ void proto_register_x2ap(void) {
{ "uESidelinkAggregateMaximumBitRate", "x2ap.uESidelinkAggregateMaximumBitRate",
FT_UINT64, BASE_DEC|BASE_UNIT_STRING, &units_bit_sec, 0,
"BitRate", HFILL }},
+ { &hf_x2ap_UEsToBeResetList_item,
+ { "UEsToBeResetList-Item", "x2ap.UEsToBeResetList_Item_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_meNB_ID,
+ { "meNB-ID", "x2ap.meNB_ID",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "UE_X2AP_ID", HFILL }},
+ { &hf_x2ap_meNB_ID_ext,
+ { "meNB-ID-ext", "x2ap.meNB_ID_ext",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "UE_X2AP_ID_Extension", HFILL }},
+ { &hf_x2ap_sgNB_ID,
+ { "sgNB-ID", "x2ap.sgNB_ID",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "SgNB_UE_X2AP_ID", HFILL }},
+ { &hf_x2ap_uLResourcesULandDLSharing,
+ { "uLResourcesULandDLSharing", "x2ap.uLResourcesULandDLSharing",
+ FT_UINT32, BASE_DEC, VALS(x2ap_ULResourcesULandDLSharing_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_dLResourcesULandDLSharing,
+ { "dLResourcesULandDLSharing", "x2ap.dLResourcesULandDLSharing",
+ FT_UINT32, BASE_DEC, VALS(x2ap_DLResourcesULandDLSharing_vals), 0,
+ NULL, HFILL }},
{ &hf_x2ap_uL_PDCP,
{ "uL-PDCP", "x2ap.uL_PDCP",
FT_UINT32, BASE_DEC, VALS(x2ap_UL_UE_Configuration_vals), 0,
@@ -18227,6 +20058,14 @@ void proto_register_x2ap(void) {
{ "UL-InterferenceOverloadIndication-Item", "x2ap.UL_InterferenceOverloadIndication_Item",
FT_UINT32, BASE_DEC, VALS(x2ap_UL_InterferenceOverloadIndication_Item_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_uLResourceBitmapULOnlySharing,
+ { "uLResourceBitmapULOnlySharing", "x2ap.uLResourceBitmapULOnlySharing",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "DataTrafficResources", HFILL }},
+ { &hf_x2ap_changed_01,
+ { "changed", "x2ap.changed",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "ULResourceBitmapULandDLSharing", HFILL }},
{ &hf_x2ap_fdd_01,
{ "fdd", "x2ap.fdd_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -18739,6 +20578,10 @@ void proto_register_x2ap(void) {
{ "meNB-UL-GTP-TEIDatPDCP", "x2ap.meNB_UL_GTP_TEIDatPDCP_element",
FT_NONE, BASE_NONE, NULL, 0,
"GTPtunnelEndpoint", HFILL }},
+ { &hf_x2ap_secondary_meNB_UL_GTP_TEIDatPDCP,
+ { "secondary-meNB-UL-GTP-TEIDatPDCP", "x2ap.secondary_meNB_UL_GTP_TEIDatPDCP_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "GTPtunnelEndpoint", HFILL }},
{ &hf_x2ap_rlc_Mode,
{ "rlc-Mode", "x2ap.rlc_Mode",
FT_UINT32, BASE_DEC, VALS(x2ap_RLCMode_vals), 0,
@@ -18775,6 +20618,10 @@ void proto_register_x2ap(void) {
{ "sgNB-DL-GTP-TEIDatSCG", "x2ap.sgNB_DL_GTP_TEIDatSCG_element",
FT_NONE, BASE_NONE, NULL, 0,
"GTPtunnelEndpoint", HFILL }},
+ { &hf_x2ap_secondary_sgNB_DL_GTP_TEIDatSCG,
+ { "secondary-sgNB-DL-GTP-TEIDatSCG", "x2ap.secondary_sgNB_DL_GTP_TEIDatSCG_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "GTPtunnelEndpoint", HFILL }},
{ &hf_x2ap_success_SgNBReconfComp,
{ "success-SgNBReconfComp", "x2ap.success_SgNBReconfComp_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -18943,7 +20790,11 @@ void proto_register_x2ap(void) {
{ "requested-MCG-E-RAB-Level-QoS-Parameters", "x2ap.requested_MCG_E_RAB_Level_QoS_Parameters_element",
FT_NONE, BASE_NONE, NULL, 0,
"E_RAB_Level_QoS_Parameters", HFILL }},
- { &hf_x2ap_E_RABs_ToBeReleased_SgNBRelReqList_item,
+ { &hf_x2ap_s1_DL_GTP_TEIDatSgNB,
+ { "s1-DL-GTP-TEIDatSgNB", "x2ap.s1_DL_GTP_TEIDatSgNB_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "GTPtunnelEndpoint", HFILL }},
+ { &hf_x2ap_E_RABs_AdmittedToBeModified_SgNBModConfList_item,
{ "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
@@ -18954,12 +20805,12 @@ void proto_register_x2ap(void) {
{ &hf_x2ap_sgNBPDCPpresent_09,
{ "sgNBPDCPpresent", "x2ap.sgNBPDCPpresent_element",
FT_NONE, BASE_NONE, NULL, 0,
- "E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPpresent", HFILL }},
+ "E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPpresent", HFILL }},
{ &hf_x2ap_sgNBPDCPnotpresent_09,
{ "sgNBPDCPnotpresent", "x2ap.sgNBPDCPnotpresent_element",
FT_NONE, BASE_NONE, NULL, 0,
- "E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPnotpresent", HFILL }},
- { &hf_x2ap_E_RABs_ToBeReleased_SgNBRelConfList_item,
+ "E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPnotpresent", HFILL }},
+ { &hf_x2ap_E_RABs_ToBeReleased_SgNBRelReqList_item,
{ "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
@@ -18970,10 +20821,26 @@ void proto_register_x2ap(void) {
{ &hf_x2ap_sgNBPDCPpresent_10,
{ "sgNBPDCPpresent", "x2ap.sgNBPDCPpresent_element",
FT_NONE, BASE_NONE, NULL, 0,
- "E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPpresent", HFILL }},
+ "E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPpresent", HFILL }},
{ &hf_x2ap_sgNBPDCPnotpresent_10,
{ "sgNBPDCPnotpresent", "x2ap.sgNBPDCPnotpresent_element",
FT_NONE, BASE_NONE, NULL, 0,
+ "E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPnotpresent", HFILL }},
+ { &hf_x2ap_E_RABs_ToBeReleased_SgNBRelConfList_item,
+ { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_resource_configuration_11,
+ { "resource-configuration", "x2ap.resource_configuration",
+ FT_UINT32, BASE_DEC, VALS(x2ap_T_resource_configuration_11_vals), 0,
+ "T_resource_configuration_11", HFILL }},
+ { &hf_x2ap_sgNBPDCPpresent_11,
+ { "sgNBPDCPpresent", "x2ap.sgNBPDCPpresent_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPpresent", HFILL }},
+ { &hf_x2ap_sgNBPDCPnotpresent_11,
+ { "sgNBPDCPnotpresent", "x2ap.sgNBPDCPnotpresent_element",
+ FT_NONE, BASE_NONE, NULL, 0,
"E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPnotpresent", HFILL }},
{ &hf_x2ap_E_RABs_SubjectToSgNBCounterCheck_List_item,
{ "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
@@ -18983,15 +20850,15 @@ void proto_register_x2ap(void) {
{ "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
- { &hf_x2ap_resource_configuration_11,
+ { &hf_x2ap_resource_configuration_12,
{ "resource-configuration", "x2ap.resource_configuration",
- FT_UINT32, BASE_DEC, VALS(x2ap_T_resource_configuration_11_vals), 0,
- "T_resource_configuration_11", HFILL }},
- { &hf_x2ap_sgNBPDCPpresent_11,
+ FT_UINT32, BASE_DEC, VALS(x2ap_T_resource_configuration_12_vals), 0,
+ "T_resource_configuration_12", HFILL }},
+ { &hf_x2ap_sgNBPDCPpresent_12,
{ "sgNBPDCPpresent", "x2ap.sgNBPDCPpresent_element",
FT_NONE, BASE_NONE, NULL, 0,
"E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPpresent", HFILL }},
- { &hf_x2ap_sgNBPDCPnotpresent_11,
+ { &hf_x2ap_sgNBPDCPnotpresent_12,
{ "sgNBPDCPnotpresent", "x2ap.sgNBPDCPnotpresent_element",
FT_NONE, BASE_NONE, NULL, 0,
"E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPnotpresent", HFILL }},
@@ -19035,10 +20902,14 @@ void proto_register_x2ap(void) {
{ "nrCellID", "x2ap.nrCellID_element",
FT_NONE, BASE_NONE, NULL, 0,
"NRCGI", HFILL }},
- { &hf_x2ap_eXtended_TAC,
- { "eXtended-TAC", "x2ap.eXtended_TAC",
+ { &hf_x2ap_fiveGS_TAC,
+ { "fiveGS-TAC", "x2ap.fiveGS_TAC",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_configured_TAC,
+ { "configured-TAC", "x2ap.configured_TAC",
+ FT_UINT16, BASE_DEC_HEX, NULL, 0,
+ "TAC", HFILL }},
{ &hf_x2ap_nrModeInfo,
{ "nrModeInfo", "x2ap.nrModeInfo",
FT_UINT32, BASE_DEC, VALS(x2ap_T_nrModeInfo_vals), 0,
@@ -19055,18 +20926,14 @@ void proto_register_x2ap(void) {
{ "measurementTimingConfiguration", "x2ap.measurementTimingConfiguration",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
- { &hf_x2ap_sULInformation,
- { "sULInformation", "x2ap.sULInformation_element",
+ { &hf_x2ap_ul_NRFreqInfo,
+ { "ul-NRFreqInfo", "x2ap.ul_NRFreqInfo_element",
FT_NONE, BASE_NONE, NULL, 0,
- NULL, HFILL }},
- { &hf_x2ap_ul_NR_ARFCN,
- { "ul-NR-ARFCN", "x2ap.ul_NR_ARFCN",
- FT_UINT32, BASE_DEC, NULL, 0,
- "NRARFCN", HFILL }},
- { &hf_x2ap_dl_NR_ARFCN,
- { "dl-NR-ARFCN", "x2ap.dl_NR_ARFCN",
- FT_UINT32, BASE_DEC, NULL, 0,
- "NRARFCN", HFILL }},
+ "NRFreqInfo", HFILL }},
+ { &hf_x2ap_dl_NRFreqInfo,
+ { "dl-NRFreqInfo", "x2ap.dl_NRFreqInfo_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "NRFreqInfo", HFILL }},
{ &hf_x2ap_ul_NR_TxBW,
{ "ul-NR-TxBW", "x2ap.ul_NR_TxBW_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -19075,10 +20942,10 @@ void proto_register_x2ap(void) {
{ "dl-NR-TxBW", "x2ap.dl_NR_TxBW_element",
FT_NONE, BASE_NONE, NULL, 0,
"NR_TxBW", HFILL }},
- { &hf_x2ap_nR_ARFCN,
- { "nR-ARFCN", "x2ap.nR_ARFCN",
- FT_UINT32, BASE_DEC, NULL, 0,
- "NRARFCN", HFILL }},
+ { &hf_x2ap_nRFreqInfo,
+ { "nRFreqInfo", "x2ap.nRFreqInfo_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_nR_TxBW,
{ "nR-TxBW", "x2ap.nR_TxBW_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -19087,10 +20954,26 @@ void proto_register_x2ap(void) {
{ "NRNeighbour-Information item", "x2ap.NRNeighbour_Information_item_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
- { &hf_x2ap_nrARFCN,
- { "nrARFCN", "x2ap.nrARFCN",
- FT_UINT32, BASE_DEC, NULL, 0,
+ { &hf_x2ap_nrFreqInfo,
+ { "nrFreqInfo", "x2ap.nrFreqInfo_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_measurementTimingConfiguration_01,
+ { "measurementTimingConfiguration", "x2ap.measurementTimingConfiguration",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "OCTET_STRING", HFILL }},
+ { &hf_x2ap_nRNeighbourModeInfo,
+ { "nRNeighbourModeInfo", "x2ap.nRNeighbourModeInfo",
+ FT_UINT32, BASE_DEC, VALS(x2ap_T_nRNeighbourModeInfo_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_fdd_03,
+ { "fdd", "x2ap.fdd_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "FDD_InfoNeighbourServedNRCell_Information", HFILL }},
+ { &hf_x2ap_tdd_03,
+ { "tdd", "x2ap.tdd_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "TDD_InfoNeighbourServedNRCell_Information", HFILL }},
{ &hf_x2ap_limited_list,
{ "limited-list", "x2ap.limited_list",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -19155,6 +21038,34 @@ void proto_register_x2ap(void) {
{ "ActivatedNRCellList-Item", "x2ap.ActivatedNRCellList_Item_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_initiate_eNB,
+ { "initiate-eNB", "x2ap.initiate_eNB",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "ProtocolIE_Container", HFILL }},
+ { &hf_x2ap_initiate_en_gNB,
+ { "initiate-en-gNB", "x2ap.initiate_en_gNB",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "ProtocolIE_Container", HFILL }},
+ { &hf_x2ap_ListofEUTRACellsinEUTRACoordinationReq_item,
+ { "ECGI", "x2ap.ECGI_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_ListofEUTRACellsinNRCoordinationReq_item,
+ { "ECGI", "x2ap.ECGI_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_ListofNRCellsinNRCoordinationReq_item,
+ { "NRCGI", "x2ap.NRCGI_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_ListofEUTRACellsinEUTRACoordinationResp_item,
+ { "ECGI", "x2ap.ECGI_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_ListofNRCellsinNRCoordinationResp_item,
+ { "NRCGI", "x2ap.NRCGI_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_initiatingMessage,
{ "initiatingMessage", "x2ap.initiatingMessage_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -19181,7 +21092,7 @@ void proto_register_x2ap(void) {
"UnsuccessfulOutcome_value", HFILL }},
/*--- End of included file: packet-x2ap-hfarr.c ---*/
-#line 546 "./asn1/x2ap/packet-x2ap-template.c"
+#line 552 "./asn1/x2ap/packet-x2ap-template.c"
};
/* List of subtrees */
@@ -19264,7 +21175,9 @@ void proto_register_x2ap(void) {
&ett_x2ap_CSIReportPerCSIProcess_item,
&ett_x2ap_CSIReportPerCSIProcessItem,
&ett_x2ap_CSIReportPerCSIProcessItem_item,
+ &ett_x2ap_DataTrafficResourceIndication,
&ett_x2ap_DeliveryStatus,
+ &ett_x2ap_DLResourcesULandDLSharing,
&ett_x2ap_DynamicDLTransmissionInformation,
&ett_x2ap_DynamicNAICSInformation,
&ett_x2ap_SEQUENCE_SIZE_0_maxnoofPA_OF_PA_Values,
@@ -19274,6 +21187,8 @@ void proto_register_x2ap(void) {
&ett_x2ap_ENB_ID,
&ett_x2ap_EN_DC_ResourceConfiguration,
&ett_x2ap_EPLMNs,
+ &ett_x2ap_ERABActivityNotifyItemList,
+ &ett_x2ap_ERABActivityNotifyItem,
&ett_x2ap_E_RAB_Level_QoS_Parameters,
&ett_x2ap_E_RAB_List,
&ett_x2ap_E_RAB_Item,
@@ -19290,6 +21205,8 @@ void proto_register_x2ap(void) {
&ett_x2ap_ForbiddenLAs,
&ett_x2ap_ForbiddenLAs_Item,
&ett_x2ap_ForbiddenLACs,
+ &ett_x2ap_FreqBandNrItem,
+ &ett_x2ap_SEQUENCE_SIZE_0_maxnoofNrCellBands_OF_SupportedSULFreqBandItem,
&ett_x2ap_GBR_QosInformation,
&ett_x2ap_GlobalENB_ID,
&ett_x2ap_GlobalGNB_ID,
@@ -19322,10 +21239,12 @@ void proto_register_x2ap(void) {
&ett_x2ap_MobilityParametersInformation,
&ett_x2ap_MultibandInfoList,
&ett_x2ap_BandInfo,
- &ett_x2ap_MCGSplitSRB,
+ &ett_x2ap_SplitSRB,
&ett_x2ap_UENRMeasurement,
&ett_x2ap_Neighbour_Information,
&ett_x2ap_Neighbour_Information_item,
+ &ett_x2ap_NRFreqInfo,
+ &ett_x2ap_SEQUENCE_SIZE_1_maxnoofNrCellBands_OF_FreqBandNrItem,
&ett_x2ap_NRCGI,
&ett_x2ap_NR_TxBW,
&ett_x2ap_NRUESecurityCapabilities,
@@ -19333,10 +21252,15 @@ void proto_register_x2ap(void) {
&ett_x2ap_PLMNAreaBasedQMC,
&ett_x2ap_PLMNListforQMC,
&ett_x2ap_ProSeAuthorized,
+ &ett_x2ap_ProtectedEUTRAResourceIndication,
+ &ett_x2ap_ProtectedFootprintTimePattern,
+ &ett_x2ap_ProtectedResourceList,
+ &ett_x2ap_ProtectedResourceList_Item,
&ett_x2ap_RadioResourceStatus,
&ett_x2ap_RelativeNarrowbandTxPower,
&ett_x2ap_ReplacingCellsList,
&ett_x2ap_ReplacingCellsList_Item,
+ &ett_x2ap_ReservedSubframePattern,
&ett_x2ap_ResumeID,
&ett_x2ap_RSRPMeasurementResult,
&ett_x2ap_RSRPMeasurementResult_item,
@@ -19349,6 +21273,7 @@ void proto_register_x2ap(void) {
&ett_x2ap_ServedCells_item,
&ett_x2ap_ServedCell_Information,
&ett_x2ap_SgNBResourceCoordinationInformation,
+ &ett_x2ap_SharedResourceType,
&ett_x2ap_SpecialSubframe_Info,
&ett_x2ap_SubbandCQI,
&ett_x2ap_SubbandCQICodeword0,
@@ -19357,6 +21282,7 @@ void proto_register_x2ap(void) {
&ett_x2ap_SubbandCQIItem,
&ett_x2ap_SubframeAllocation,
&ett_x2ap_SULInformation,
+ &ett_x2ap_SupportedSULFreqBandItem,
&ett_x2ap_TABasedMDT,
&ett_x2ap_TAIBasedMDT,
&ett_x2ap_TAIListforMDT,
@@ -19374,10 +21300,15 @@ void proto_register_x2ap(void) {
&ett_x2ap_UE_HistoryInformation,
&ett_x2ap_UESecurityCapabilities,
&ett_x2ap_UESidelinkAggregateMaximumBitRate,
+ &ett_x2ap_UEsToBeResetList,
+ &ett_x2ap_UEsToBeResetList_Item,
+ &ett_x2ap_ULandDLSharing,
&ett_x2ap_ULConfiguration,
&ett_x2ap_UL_HighInterferenceIndicationInfo,
&ett_x2ap_UL_HighInterferenceIndicationInfo_Item,
&ett_x2ap_UL_InterferenceOverloadIndication,
+ &ett_x2ap_ULOnlySharing,
+ &ett_x2ap_ULResourcesULandDLSharing,
&ett_x2ap_UsableABSInformation,
&ett_x2ap_UsableABSInformationFDD,
&ett_x2ap_UsableABSInformationTDD,
@@ -19578,11 +21509,16 @@ void proto_register_x2ap(void) {
&ett_x2ap_E_RABs_ToBeModified_SgNBModReqd_Item_SgNBPDCPpresent,
&ett_x2ap_E_RABs_ToBeModified_SgNBModReqd_Item_SgNBPDCPnotpresent,
&ett_x2ap_SgNBModificationConfirm,
+ &ett_x2ap_E_RABs_AdmittedToBeModified_SgNBModConfList,
+ &ett_x2ap_E_RABs_AdmittedToBeModified_SgNBModConf_Item,
+ &ett_x2ap_T_resource_configuration_09,
+ &ett_x2ap_E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPpresent,
+ &ett_x2ap_E_RABs_AdmittedToBeModified_SgNBModConf_Item_SgNBPDCPnotpresent,
&ett_x2ap_SgNBModificationRefuse,
&ett_x2ap_SgNBReleaseRequest,
&ett_x2ap_E_RABs_ToBeReleased_SgNBRelReqList,
&ett_x2ap_E_RABs_ToBeReleased_SgNBRelReq_Item,
- &ett_x2ap_T_resource_configuration_09,
+ &ett_x2ap_T_resource_configuration_10,
&ett_x2ap_E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPpresent,
&ett_x2ap_E_RABs_ToBeReleased_SgNBRelReq_Item_SgNBPDCPnotpresent,
&ett_x2ap_SgNBReleaseRequestAcknowledge,
@@ -19591,7 +21527,7 @@ void proto_register_x2ap(void) {
&ett_x2ap_SgNBReleaseConfirm,
&ett_x2ap_E_RABs_ToBeReleased_SgNBRelConfList,
&ett_x2ap_E_RABs_ToBeReleased_SgNBRelConf_Item,
- &ett_x2ap_T_resource_configuration_10,
+ &ett_x2ap_T_resource_configuration_11,
&ett_x2ap_E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPpresent,
&ett_x2ap_E_RABs_ToBeReleased_SgNBRelConf_Item_SgNBPDCPnotpresent,
&ett_x2ap_SgNBCounterCheckRequest,
@@ -19601,7 +21537,7 @@ void proto_register_x2ap(void) {
&ett_x2ap_SgNBChangeConfirm,
&ett_x2ap_E_RABs_ToBeReleased_SgNBChaConfList,
&ett_x2ap_E_RABs_ToBeReleased_SgNBChaConf_Item,
- &ett_x2ap_T_resource_configuration_11,
+ &ett_x2ap_T_resource_configuration_12,
&ett_x2ap_E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPpresent,
&ett_x2ap_E_RABs_ToBeReleased_SgNBChaConf_Item_SgNBPDCPnotpresent,
&ett_x2ap_RRCTransfer,
@@ -19615,9 +21551,12 @@ void proto_register_x2ap(void) {
&ett_x2ap_ServedNRCell_Information,
&ett_x2ap_T_nrModeInfo,
&ett_x2ap_FDD_InfoServedNRCell_Information,
+ &ett_x2ap_FDD_InfoNeighbourServedNRCell_Information,
&ett_x2ap_TDD_InfoServedNRCell_Information,
+ &ett_x2ap_TDD_InfoNeighbourServedNRCell_Information,
&ett_x2ap_NRNeighbour_Information,
&ett_x2ap_NRNeighbour_Information_item,
+ &ett_x2ap_T_nRNeighbourModeInfo,
&ett_x2ap_CellAssistanceInformation,
&ett_x2ap_Limited_list,
&ett_x2ap_Limited_list_item,
@@ -19643,13 +21582,30 @@ void proto_register_x2ap(void) {
&ett_x2ap_ActivatedNRCellList_Item,
&ett_x2ap_ENDCCellActivationFailure,
&ett_x2ap_SecondaryRATDataUsageReport,
+ &ett_x2ap_SgNBActivityNotification,
+ &ett_x2ap_ENDCPartialResetRequired,
+ &ett_x2ap_ENDCPartialResetConfirm,
+ &ett_x2ap_EUTRANRCellResourceCoordinationRequest,
+ &ett_x2ap_InitiatingNodeType_EutranrCellResourceCoordination,
+ &ett_x2ap_ListofEUTRACellsinEUTRACoordinationReq,
+ &ett_x2ap_ListofEUTRACellsinNRCoordinationReq,
+ &ett_x2ap_ListofNRCellsinNRCoordinationReq,
+ &ett_x2ap_EUTRANRCellResourceCoordinationResponse,
+ &ett_x2ap_RespondingNodeType_EutranrCellResourceCoordination,
+ &ett_x2ap_ListofEUTRACellsinEUTRACoordinationResp,
+ &ett_x2ap_ListofNRCellsinNRCoordinationResp,
+ &ett_x2ap_ENDCX2RemovalRequest,
+ &ett_x2ap_InitiatingNodeType_EndcX2Removal,
+ &ett_x2ap_ENDCX2RemovalResponse,
+ &ett_x2ap_RespondingNodeType_EndcX2Removal,
+ &ett_x2ap_ENDCX2RemovalFailure,
&ett_x2ap_X2AP_PDU,
&ett_x2ap_InitiatingMessage,
&ett_x2ap_SuccessfulOutcome,
&ett_x2ap_UnsuccessfulOutcome,
/*--- End of included file: packet-x2ap-ettarr.c ---*/
-#line 578 "./asn1/x2ap/packet-x2ap-template.c"
+#line 584 "./asn1/x2ap/packet-x2ap-template.c"
};
module_t *x2ap_module;
@@ -19831,11 +21787,11 @@ proto_reg_handoff_x2ap(void)
dissector_add_uint("x2ap.ies", id_E_RABs_ToBeAdded_SgNBAddReqList, create_dissector_handle(dissect_E_RABs_ToBeAdded_SgNBAddReqList_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_MeNBtoSgNBContainer, create_dissector_handle(dissect_MeNBtoSgNBContainer_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_SgNB_UE_X2AP_ID, create_dissector_handle(dissect_SgNB_UE_X2AP_ID_PDU, proto_x2ap));
- dissector_add_uint("x2ap.ies", id_RequestedMCGSplitSRBs, create_dissector_handle(dissect_MCGSplitSRBs_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_RequestedSplitSRBs, create_dissector_handle(dissect_SplitSRBs_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_E_RABs_ToBeAdded_SgNBAddReq_Item, create_dissector_handle(dissect_E_RABs_ToBeAdded_SgNBAddReq_Item_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_E_RABs_Admitted_ToBeAdded_SgNBAddReqAckList, create_dissector_handle(dissect_E_RABs_Admitted_ToBeAdded_SgNBAddReqAckList_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_SgNBtoMeNBContainer, create_dissector_handle(dissect_SgNBtoMeNBContainer_PDU, proto_x2ap));
- dissector_add_uint("x2ap.ies", id_AdmittedMCGSplitSRBs, create_dissector_handle(dissect_MCGSplitSRBs_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_AdmittedSplitSRBs, create_dissector_handle(dissect_SplitSRBs_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_E_RABs_Admitted_ToBeAdded_SgNBAddReqAck_Item, create_dissector_handle(dissect_E_RABs_Admitted_ToBeAdded_SgNBAddReqAck_Item_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_ResponseInformationSgNBReconfComp, create_dissector_handle(dissect_ResponseInformationSgNBReconfComp_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_UE_ContextInformation_SgNBModReq, create_dissector_handle(dissect_UE_ContextInformation_SgNBModReq_PDU, proto_x2ap));
@@ -19863,7 +21819,7 @@ proto_reg_handoff_x2ap(void)
dissector_add_uint("x2ap.ies", id_Target_SgNB_ID, create_dissector_handle(dissect_GNB_ID_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_HandoverRestrictionList, create_dissector_handle(dissect_HandoverRestrictionList_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_SCGConfigurationQuery, create_dissector_handle(dissect_SCGConfigurationQuery_PDU, proto_x2ap));
- dissector_add_uint("x2ap.ies", id_MCGSplitSRB, create_dissector_handle(dissect_MCGSplitSRB_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_SplitSRB, create_dissector_handle(dissect_SplitSRB_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_UENRMeasurement, create_dissector_handle(dissect_UENRMeasurement_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_InitiatingNodeType_EndcX2Setup, create_dissector_handle(dissect_InitiatingNodeType_EndcX2Setup_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_InitiatingNodeType_EndcConfigUpdate, create_dissector_handle(dissect_InitiatingNodeType_EndcConfigUpdate_PDU, proto_x2ap));
@@ -19890,6 +21846,30 @@ proto_reg_handoff_x2ap(void)
dissector_add_uint("x2ap.ies", id_ServedNRCellsToActivate, create_dissector_handle(dissect_ServedNRCellsToActivate_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_ActivatedNRCellList, create_dissector_handle(dissect_ActivatedNRCellList_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_SelectedPLMN, create_dissector_handle(dissect_PLMN_Identity_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_UEs_ToBeReset, create_dissector_handle(dissect_UEsToBeResetList_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_UEs_Admitted_ToBeReset, create_dissector_handle(dissect_UEsToBeResetList_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_RRCConfigIndication, create_dissector_handle(dissect_RRC_Config_Ind_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_SubscriberProfileIDforRFP, create_dissector_handle(dissect_SubscriberProfileIDforRFP_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_AerialUEsubscriptionInformation, create_dissector_handle(dissect_AerialUEsubscriptionInformation_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_SGNB_Addition_Trigger_Ind, create_dissector_handle(dissect_SGNB_Addition_Trigger_Ind_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_MeNBCell_ID, create_dissector_handle(dissect_ECGI_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_RequestedSplitSRBsrelease, create_dissector_handle(dissect_SplitSRBs_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_AdmittedSplitSRBsrelease, create_dissector_handle(dissect_SplitSRBs_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_InitiatingNodeType_EutranrCellResourceCoordination, create_dissector_handle(dissect_InitiatingNodeType_EutranrCellResourceCoordination_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_RespondingNodeType_EutranrCellResourceCoordination, create_dissector_handle(dissect_RespondingNodeType_EutranrCellResourceCoordination_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_DataTrafficResourceIndication, create_dissector_handle(dissect_DataTrafficResourceIndication_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_SpectrumSharingGroupID, create_dissector_handle(dissect_SpectrumSharingGroupID_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_ListofEUTRACellsinEUTRACoordinationReq, create_dissector_handle(dissect_ListofEUTRACellsinEUTRACoordinationReq_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_ListofEUTRACellsinEUTRACoordinationResp, create_dissector_handle(dissect_ListofEUTRACellsinEUTRACoordinationResp_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_ListofEUTRACellsinNRCoordinationReq, create_dissector_handle(dissect_ListofEUTRACellsinNRCoordinationReq_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_ListofNRCellsinNRCoordinationReq, create_dissector_handle(dissect_ListofNRCellsinNRCoordinationReq_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_ListofNRCellsinNRCoordinationResp, create_dissector_handle(dissect_ListofNRCellsinNRCoordinationResp_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_E_RABs_AdmittedToBeModified_SgNBModConfList, create_dissector_handle(dissect_E_RABs_AdmittedToBeModified_SgNBModConfList_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_E_RABs_AdmittedToBeModified_SgNBModConf_Item, create_dissector_handle(dissect_E_RABs_AdmittedToBeModified_SgNBModConf_Item_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_UEContextLevelUserPlaneActivity, create_dissector_handle(dissect_UserPlaneTrafficActivityReport_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_ERABActivityNotifyItemList, create_dissector_handle(dissect_ERABActivityNotifyItemList_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_InitiatingNodeType_EndcX2Removal, create_dissector_handle(dissect_InitiatingNodeType_EndcX2Removal_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_RespondingNodeType_EndcX2Removal, create_dissector_handle(dissect_RespondingNodeType_EndcX2Removal_PDU, proto_x2ap));
dissector_add_uint("x2ap.extension", id_Number_of_Antennaports, create_dissector_handle(dissect_Number_of_Antennaports_PDU, proto_x2ap));
dissector_add_uint("x2ap.extension", id_CompositeAvailableCapacityGroup, create_dissector_handle(dissect_CompositeAvailableCapacityGroup_PDU, proto_x2ap));
dissector_add_uint("x2ap.extension", id_PRACH_Configuration, create_dissector_handle(dissect_PRACH_Configuration_PDU, proto_x2ap));
@@ -19954,6 +21934,13 @@ proto_reg_handoff_x2ap(void)
dissector_add_uint("x2ap.extension", id_extended_uEaggregateMaximumBitRateDownlink, create_dissector_handle(dissect_ExtendedBitRate_PDU, proto_x2ap));
dissector_add_uint("x2ap.extension", id_extended_uEaggregateMaximumBitRateUplink, create_dissector_handle(dissect_ExtendedBitRate_PDU, proto_x2ap));
dissector_add_uint("x2ap.extension", id_NRrestriction, create_dissector_handle(dissect_NRrestriction_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_DownlinkPacketLossRate, create_dissector_handle(dissect_Packet_LossRate_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_UplinkPacketLossRate, create_dissector_handle(dissect_Packet_LossRate_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_SubscriberProfileIDforRFP, create_dissector_handle(dissect_SubscriberProfileIDforRFP_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_serviceType, create_dissector_handle(dissect_ServiceType_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_NRS_NSSS_PowerOffset, create_dissector_handle(dissect_NRS_NSSS_PowerOffset_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_NSSS_NumOccasionDifferentPrecoder, create_dissector_handle(dissect_NSSS_NumOccasionDifferentPrecoder_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_ProtectedEUTRAResourceIndication, create_dissector_handle(dissect_ProtectedEUTRAResourceIndication_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));
@@ -20035,10 +22022,18 @@ proto_reg_handoff_x2ap(void)
dissector_add_uint("x2ap.proc.imsg", id_endcCellActivation, create_dissector_handle(dissect_ENDCCellActivationRequest_PDU, proto_x2ap));
dissector_add_uint("x2ap.proc.sout", id_endcCellActivation, create_dissector_handle(dissect_ENDCCellActivationResponse_PDU, proto_x2ap));
dissector_add_uint("x2ap.proc.uout", id_endcCellActivation, create_dissector_handle(dissect_ENDCCellActivationFailure_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.proc.imsg", id_endcPartialReset, create_dissector_handle(dissect_ENDCPartialResetRequired_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.proc.sout", id_endcPartialReset, create_dissector_handle(dissect_ENDCPartialResetConfirm_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.proc.imsg", id_eUTRANRCellResourceCoordination, create_dissector_handle(dissect_EUTRANRCellResourceCoordinationRequest_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.proc.sout", id_eUTRANRCellResourceCoordination, create_dissector_handle(dissect_EUTRANRCellResourceCoordinationResponse_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.proc.imsg", id_SgNBActivityNotification, create_dissector_handle(dissect_SgNBActivityNotification_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.proc.imsg", id_endcX2Removal, create_dissector_handle(dissect_ENDCX2RemovalRequest_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.proc.sout", id_endcX2Removal, create_dissector_handle(dissect_ENDCX2RemovalResponse_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.proc.uout", id_endcX2Removal, create_dissector_handle(dissect_ENDCX2RemovalFailure_PDU, proto_x2ap));
/*--- End of included file: packet-x2ap-dis-tab.c ---*/
-#line 624 "./asn1/x2ap/packet-x2ap-template.c"
+#line 630 "./asn1/x2ap/packet-x2ap-template.c"
} else {
if (SctpPort != 0) {
dissector_delete_uint("sctp.port", SctpPort, x2ap_handle);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 22:34:34 +0000