aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndersBroman <anders.broman@ericsson.com>2014-09-10 18:14:44 +0200
committerAnders Broman <a.broman58@gmail.com>2014-09-10 17:06:58 +0000
commit76d776ee8a1567c8ef882ba2c7af62e37f173a5a (patch)
treec1fc08b483645c5ab5f2f9f6cc6eef5dbdba34e8
parent0164b7582106ceaf244e8792ee635257ab4bace4 (diff)
Update to V12.2.0 (2014-06), remove deprecated APIs
Change-Id: Icfd140f39a440dda197c6e68a4cb7daec2ae0e09 Reviewed-on: https://code.wireshark.org/review/4066 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--asn1/x2ap/X2AP-CommonDataTypes.asn2
-rw-r--r--asn1/x2ap/X2AP-Constants.asn34
-rw-r--r--asn1/x2ap/X2AP-Containers.asn2
-rw-r--r--asn1/x2ap/X2AP-IEs.asn226
-rw-r--r--asn1/x2ap/X2AP-PDU-Contents.asn144
-rw-r--r--asn1/x2ap/X2AP-PDU-Descriptions.asn28
-rw-r--r--asn1/x2ap/x2ap.cnf65
-rw-r--r--epan/dissectors/packet-x2ap.c1215
8 files changed, 1551 insertions, 165 deletions
diff --git a/asn1/x2ap/X2AP-CommonDataTypes.asn b/asn1/x2ap/X2AP-CommonDataTypes.asn
index bd3c7096cc..a738ddfcec 100644
--- a/asn1/x2ap/X2AP-CommonDataTypes.asn
+++ b/asn1/x2ap/X2AP-CommonDataTypes.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V10.3.0 (2011-09)
+-- 3GPP TS 36.423 V12.2.0 (2014-06)
-- 9.3.6 Common definitions
-- **************************************************************
diff --git a/asn1/x2ap/X2AP-Constants.asn b/asn1/x2ap/X2AP-Constants.asn
index 548ba66171..2fadd89053 100644
--- a/asn1/x2ap/X2AP-Constants.asn
+++ b/asn1/x2ap/X2AP-Constants.asn
@@ -41,6 +41,8 @@ id-mobilitySettingsChange ProcedureCode ::= 12
id-rLFIndication ProcedureCode ::= 13
id-handoverReport ProcedureCode ::= 14
id-cellActivation ProcedureCode ::= 15
+id-x2Release ProcedureCode ::= 16
+id-x2MessageTransfer ProcedureCode ::= 17
@@ -51,8 +53,11 @@ id-cellActivation ProcedureCode ::= 15
-- **************************************************************
maxEARFCN INTEGER ::= 65535
+maxEARFCNPlusOne INTEGER ::= 65536
+newmaxEARFCN INTEGER ::= 262143
maxInterfaces INTEGER ::= 16
maxCellineNB INTEGER ::= 256
+maxnoofBands INTEGER ::= 16
maxnoofBearers INTEGER ::= 256
maxNrOfErrors INTEGER ::= 256
maxnoofPDCP-SN INTEGER ::= 16
@@ -69,6 +74,8 @@ maxnoofMBSFN INTEGER ::= 8
maxFailedMeasObjects INTEGER ::= 32
maxnoofCellIDforMDT INTEGER ::= 32
maxnoofTAforMDT INTEGER ::= 8
+maxnoofMBMSServiceAreaIdentities INTEGER ::= 256
+maxnoofMDTPLMNs INTEGER ::= 16
-- **************************************************************
@@ -151,5 +158,32 @@ id-CSGMembershipStatus ProtocolIE-ID ::= 71
id-MDTConfiguration ProtocolIE-ID ::= 72
id-ManagementBasedMDTallowed ProtocolIE-ID ::= 74
id-RRCConnSetupIndicator ProtocolIE-ID ::= 75
+id-NeighbourTAC ProtocolIE-ID ::= 76
+id-Time-UE-StayedInCell-EnhancedGranularity ProtocolIE-ID ::= 77
+id-RRCConnReestabIndicator ProtocolIE-ID ::= 78
+id-MBMS-Service-Area-List ProtocolIE-ID ::= 79
+id-HO-cause ProtocolIE-ID ::= 80
+id-TargetCellInUTRAN ProtocolIE-ID ::= 81
+id-MobilityInformation ProtocolIE-ID ::= 82
+id-SourceCellCRNTI ProtocolIE-ID ::= 83
+id-MultibandInfoList ProtocolIE-ID ::= 84
+id-M3Configuration ProtocolIE-ID ::= 85
+id-M4Configuration ProtocolIE-ID ::= 86
+id-M5Configuration ProtocolIE-ID ::= 87
+id-MDT-Location-Info ProtocolIE-ID ::= 88
+id-ManagementBasedMDTPLMNList ProtocolIE-ID ::= 89
+id-SignallingBasedMDTPLMNList ProtocolIE-ID ::= 90
+id-ReceiveStatusOfULPDCPSDUsExtended ProtocolIE-ID ::= 91
+id-ULCOUNTValueExtended ProtocolIE-ID ::= 92
+id-DLCOUNTValueExtended ProtocolIE-ID ::= 93
+id-eARFCNExtension ProtocolIE-ID ::= 94
+id-UL-EARFCNExtension ProtocolIE-ID ::= 95
+id-DL-EARFCNExtension ProtocolIE-ID ::= 96
+id-AdditionalSpecialSubframe-Info ProtocolIE-ID ::= 97
+id-Masked-IMEISV ProtocolIE-ID ::= 98
+id-IntendedULDLConfiguration ProtocolIE-ID ::= 99
+id-ExtendedULInterferenceOverloadInfo ProtocolIE-ID ::= 100
+id-RNL-Header ProtocolIE-ID ::= 101
+id-x2APMessage ProtocolIE-ID ::= 102
END
diff --git a/asn1/x2ap/X2AP-Containers.asn b/asn1/x2ap/X2AP-Containers.asn
index 9aa4977d24..caf6a5f95e 100644
--- a/asn1/x2ap/X2AP-Containers.asn
+++ b/asn1/x2ap/X2AP-Containers.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V10.3.0 (2011-09)
+-- 3GPP TS 36.423 V12.2.0 (2014-06)
-- 9.3.8 Container Definitions
-- **************************************************************
--
diff --git a/asn1/x2ap/X2AP-IEs.asn b/asn1/x2ap/X2AP-IEs.asn
index f7bf089d12..2431695732 100644
--- a/asn1/x2ap/X2AP-IEs.asn
+++ b/asn1/x2ap/X2AP-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V10.3.0 (2011-09)
+-- 3GPP TS 36.423 V12.2.0 (2014-06)
-- 9.3.5 Information Element Definitions
-- **************************************************************
--
@@ -22,11 +22,28 @@ IMPORTS
id-PRACH-Configuration,
id-CSG-Id,
id-MDTConfiguration,
+ id-SignallingBasedMDTPLMNList,
+ id-MultibandInfoList,
+ id-NeighbourTAC,
+ id-Time-UE-StayedInCell-EnhancedGranularity,
+ id-MBMS-Service-Area-List,
+ id-HO-cause,
+ id-eARFCNExtension,
+ id-DL-EARFCNExtension,
+ id-UL-EARFCNExtension,
+ id-M3Configuration,
+ id-M4Configuration,
+ id-M5Configuration,
+ id-MDT-Location-Info,
+ id-AdditionalSpecialSubframe-Info,
maxnoofBearers,
maxCellineNB,
maxEARFCN,
+ maxEARFCNPlusOne,
+ newmaxEARFCN,
maxInterfaces,
+ maxnoofBands,
maxnoofBPLMNs,
maxnoofCells,
maxnoofEPLMNs,
@@ -39,7 +56,9 @@ IMPORTS
maxPools,
maxnoofMBSFN,
maxnoofTAforMDT,
- maxnoofCellIDforMDT
+ maxnoofCellIDforMDT,
+ maxnoofMBMSServiceAreaIdentities,
+ maxnoofMDTPLMNs
FROM X2AP-Constants
@@ -102,6 +121,32 @@ ABS-Status-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
DL-ABS-status::= INTEGER (0..100)
+AdditionalSpecialSubframe-Info ::= SEQUENCE {
+ additionalspecialSubframePatterns AdditionalSpecialSubframePatterns,
+ cyclicPrefixDL CyclicPrefixDL,
+ cyclicPrefixUL CyclicPrefixUL,
+ iE-Extensions ProtocolExtensionContainer { { AdditionalSpecialSubframe-Info-ExtIEs} } OPTIONAL,
+ ...
+}
+
+AdditionalSpecialSubframe-Info-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+AdditionalSpecialSubframePatterns ::= ENUMERATED {
+ ssp0,
+ ssp1,
+ ssp2,
+ ssp3,
+ ssp4,
+ ssp5,
+ ssp6,
+ ssp7,
+ ssp8,
+ ssp9,
+ ...
+}
+
AS-SecurityInformation ::= SEQUENCE {
key-eNodeB-star Key-eNodeB-Star,
nextHopChainingCount NextHopChainingCount,
@@ -130,7 +175,8 @@ AreaScopeOfMDT ::= CHOICE {
cellBased CellBasedMDT,
tABased TABasedMDT,
pLMNWide NULL,
- ...
+ ...,
+ tAIBased TAIBasedMDT
}
-- B
@@ -272,6 +318,16 @@ COUNTvalue-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
+COUNTValueExtended ::= SEQUENCE {
+ pDCP-SNExtended PDCP-SNExtended,
+ hFNModified HFNModified,
+ iE-Extensions ProtocolExtensionContainer { { COUNTValueExtended-ExtIEs} } OPTIONAL,
+ ...
+}
+
+COUNTValueExtended-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
CriticalityDiagnostics ::= SEQUENCE {
procedureCode ProcedureCode OPTIONAL,
@@ -344,6 +400,8 @@ DL-Total-PRB-usage::= INTEGER (0..100)
EARFCN ::= INTEGER (0..maxEARFCN)
+EARFCNExtension ::= INTEGER(maxEARFCNPlusOne..newmaxEARFCN, ...)
+
FDD-Info ::= SEQUENCE {
uL-EARFCN EARFCN,
dL-EARFCN EARFCN,
@@ -354,6 +412,8 @@ 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},
...
}
@@ -366,6 +426,8 @@ TDD-Info ::= SEQUENCE {
...
}
TDD-Info-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ { ID id-AdditionalSpecialSubframe-Info CRITICALITY ignore EXTENSION AdditionalSpecialSubframe-Info PRESENCE optional}|
+ { ID id-eARFCNExtension CRITICALITY reject EXTENSION EARFCNExtension PRESENCE optional},
...
}
@@ -438,6 +500,16 @@ EventType ::= ENUMERATED{
...
}
+ExtendedULInterferenceOverloadInfo ::= SEQUENCE {
+ associatedSubframes BIT STRING (SIZE (5)),
+ extended-ul-InterferenceOverloadIndication UL-InterferenceOverloadIndication,
+ iE-Extensions ProtocolExtensionContainer { { ExtendedULInterferenceOverloadInfo-ExtIEs} } OPTIONAL,
+ ...
+}
+
+ExtendedULInterferenceOverloadInfo-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
-- F
@@ -484,6 +556,8 @@ ForbiddenLACs ::= SEQUENCE (SIZE(1..maxnoofForbLACs)) OF LAC
Fourframes ::= BIT STRING (SIZE (24))
+FreqBandIndicator ::= INTEGER (1..256, ...)
+
-- G
GBR-QosInformation ::= SEQUENCE {
@@ -557,7 +631,8 @@ GUMMEI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
HandoverReportType ::= ENUMERATED {
hoTooEarly,
hoToWrongCell,
- ...
+ ...,
+ interRATpingpong
}
HandoverRestrictionList ::= SEQUENCE {
@@ -576,6 +651,8 @@ HandoverRestrictionList-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
HFN ::= INTEGER (0..1048575)
+HFNModified ::= INTEGER (0..131071)
+
HWLoadIndicator ::= SEQUENCE {
dLHWLoadIndicator LoadIndicator,
uLHWLoadIndicator LoadIndicator,
@@ -590,6 +667,8 @@ HWLoadIndicator-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-- I
+Masked-IMEISV ::= BIT STRING (SIZE (64))
+
InvokeIndication ::= ENUMERATED{
abs-information,
...
@@ -625,6 +704,9 @@ 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},
...
}
@@ -635,6 +717,7 @@ LastVisitedGERANCellInformation ::= CHOICE {
...
}
+Links-to-log ::= ENUMERATED {uplink, downlink, both-uplink-and-downlink, ...}
LoadIndicator ::= ENUMERATED {
lowLoad,
@@ -659,6 +742,45 @@ LocationReportingInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::={
-- M
+M3Configuration ::= SEQUENCE {
+ m3period M3period,
+ iE-Extensions ProtocolExtensionContainer { { M3Configuration-ExtIEs} } OPTIONAL,
+ ...
+}
+
+M3Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+M3period ::= ENUMERATED {ms100, ms1000, ms10000, ... }
+
+M4Configuration ::= SEQUENCE {
+ m4period M4period,
+ m4-links-to-log Links-to-log,
+ iE-Extensions ProtocolExtensionContainer { { M4Configuration-ExtIEs} } OPTIONAL,
+ ...
+}
+
+M4Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+M4period ::= ENUMERATED {ms1024, ms2048, ms5120, ms10240, min1, ... }
+
+
+M5Configuration ::= SEQUENCE {
+ m5period M5period,
+ m5-links-to-log Links-to-log,
+ iE-Extensions ProtocolExtensionContainer { { M5Configuration-ExtIEs} } OPTIONAL,
+ ...
+}
+
+M5Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+M5period ::= ENUMERATED {ms1024, ms2048, ms5120, ms10240, min1, ... }
+
MDT-Activation ::= ENUMERATED {
immediate-MDT-only,
immediate-MDT-and-Trace,
@@ -669,19 +791,28 @@ MDT-Configuration ::= SEQUENCE {
mdt-Activation MDT-Activation,
areaScopeOfMDT AreaScopeOfMDT,
measurementsToActivate MeasurementsToActivate,
- reportingTriggerMDT ReportingTriggerMDT,
- thresholdeventA2 ThresholdEventA2 OPTIONAL,
--- Included in case of event-triggered reporting for measurement M1
- periodicReportingMDT PeriodicReportingMDT OPTIONAL,
--- Included in case of periodic reporting
+ m1reportingTrigger M1ReportingTrigger,
+ m1thresholdeventA2 M1ThresholdEventA2 OPTIONAL,
+-- Included in case of event-triggered, or event-triggered periodic reporting for measurement M1
+ m1periodicReporting M1PeriodicReporting OPTIONAL,
+-- Included in case of periodic, or event-triggered periodic reporting for measurement M1
iE-Extensions ProtocolExtensionContainer { { MDT-Configuration-ExtIEs} } OPTIONAL,
...
}
MDT-Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ {ID id-M3Configuration CRITICALITY ignore EXTENSION M3Configuration PRESENCE conditional}|
+ {ID id-M4Configuration CRITICALITY ignore EXTENSION M4Configuration PRESENCE conditional}|
+ {ID id-M5Configuration CRITICALITY ignore EXTENSION M5Configuration PRESENCE conditional}|
+ {ID id-MDT-Location-Info CRITICALITY ignore EXTENSION MDT-Location-Info PRESENCE optional}|
+ {ID id-SignallingBasedMDTPLMNList CRITICALITY ignore EXTENSION MDTPLMNList PRESENCE optional},
...
}
+MDTPLMNList ::= SEQUENCE (SIZE(1..maxnoofMDTPLMNs)) OF PLMN-Identity
+
+MDT-Location-Info ::= BIT STRING (SIZE (8))
+
MeasurementsToActivate::= BIT STRING (SIZE (8))
MeasurementThresholdA2 ::= CHOICE {
@@ -696,6 +827,10 @@ MME-Code ::= OCTET STRING (SIZE (1))
Measurement-ID ::= INTEGER (1..4095, ...)
+MBMS-Service-Area-Identity-List ::= SEQUENCE (SIZE(1.. maxnoofMBMSServiceAreaIdentities)) OF MBMS-Service-Area-Identity
+
+MBMS-Service-Area-Identity ::= OCTET STRING (SIZE (2))
+
MBSFN-Subframe-Infolist::= SEQUENCE (SIZE(1.. maxnoofMBSFN)) OF MBSFN-Subframe-Info
MBSFN-Subframe-Info ::= SEQUENCE {
@@ -723,6 +858,18 @@ MobilityParametersInformation ::= SEQUENCE {
...
}
+MultibandInfoList ::= SEQUENCE (SIZE(1..maxnoofBands)) OF BandInfo
+
+
+BandInfo ::= SEQUENCE {
+ freqBandIndicator FreqBandIndicator,
+ iE-Extensions ProtocolExtensionContainer { { BandInfo-ExtIEs } } OPTIONAL,
+ ...
+}
+
+BandInfo-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
-- N
@@ -735,6 +882,8 @@ Neighbour-Information ::= SEQUENCE (SIZE (0..maxnoofNeighbours)) OF SEQUENCE {
}
Neighbour-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ { ID id-NeighbourTAC CRITICALITY ignore EXTENSION TAC PRESENCE optional}|
+ { ID id-eARFCNExtension CRITICALITY reject EXTENSION EARFCNExtension PRESENCE optional},
...
}
@@ -753,18 +902,20 @@ Oneframe ::= BIT STRING (SIZE (6))
-- P
-PDCP-SN ::= INTEGER (0..4095)
+PDCP-SN ::= INTEGER (0..4095)
+
+PDCP-SNExtended ::= INTEGER (0..32767)
PCI ::= INTEGER (0..503, ...)
-PeriodicReportingMDT ::= SEQUENCE {
+M1PeriodicReporting ::= SEQUENCE {
reportInterval ReportIntervalMDT,
reportAmount ReportAmountMDT,
- iE-Extensions ProtocolExtensionContainer { { PeriodicReportingMDT-ExtIEs} } OPTIONAL,
+ iE-Extensions ProtocolExtensionContainer { { M1PeriodicReporting-ExtIEs} } OPTIONAL,
...
}
-PeriodicReportingMDT-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+M1PeriodicReporting-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
@@ -832,6 +983,8 @@ RadioResourceStatus-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
ReceiveStatusofULPDCPSDUs ::= BIT STRING (SIZE(4096))
+ReceiveStatusOfULPDCPSDUsExtended ::= BIT STRING (SIZE(1..16384))
+
Registration-Request ::= ENUMERATED {
start,
stop,
@@ -864,10 +1017,11 @@ ReportIntervalMDT ::= ENUMERATED {ms120, ms240, ms480, ms640, ms1024, ms2048, ms
ReportCharacteristics ::= BIT STRING (SIZE (32))
-ReportingTriggerMDT::= ENUMERATED{
+M1ReportingTrigger::= ENUMERATED{
periodic,
a2eventtriggered,
- ...
+ ...,
+ a2eventtriggered-periodic
}
RNTP-Threshold ::= ENUMERATED {
@@ -892,6 +1046,11 @@ RNTP-Threshold ::= ENUMERATED {
RRC-Context ::= OCTET STRING
+RRCConnReestabIndicator ::= ENUMERATED {
+ reconfigurationFailure, handoverFailure, otherFailure, ...
+}
+-- The values correspond to the values of ReestablishmentCause reported from the UE in the RRCConnectionReestablishmentRequest, as defined in TS 36.331 [9]
+
RRCConnSetupIndicator::= ENUMERATED {
rrcConnSetup,
...
@@ -938,7 +1097,9 @@ 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-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 },
...
}
@@ -1010,13 +1171,38 @@ TABasedMDT-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
TAListforMDT ::= SEQUENCE (SIZE(1..maxnoofTAforMDT)) OF TAC
-ThresholdEventA2 ::= SEQUENCE {
+TAIBasedMDT ::= SEQUENCE {
+ tAIListforMDT TAIListforMDT,
+ iE-Extensions ProtocolExtensionContainer { {TAIBasedMDT-ExtIEs} } OPTIONAL,
+ ...
+}
+
+TAIBasedMDT-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+TAIListforMDT ::= SEQUENCE (SIZE(1..maxnoofTAforMDT)) OF TAI-Item
+
+TAI-Item ::= SEQUENCE {
+ tAC TAC,
+ pLMN-Identity PLMN-Identity,
+ iE-Extensions ProtocolExtensionContainer { { TAI-Item-ExtIEs} } OPTIONAL,
+ ...
+}
+
+TAI-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+TargetCellInUTRAN ::= OCTET STRING -- This IE is to be encoded according to the UTRAN Cell ID in the Last Visited UTRAN Cell Information IE in TS 25.413 [24]
+
+M1ThresholdEventA2 ::= SEQUENCE {
measurementThreshold MeasurementThresholdA2,
- iE-Extensions ProtocolExtensionContainer { { ThresholdEventA2-ExtIEs} } OPTIONAL,
+ iE-Extensions ProtocolExtensionContainer { { M1ThresholdEventA2-ExtIEs} } OPTIONAL,
...
}
-ThresholdEventA2-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+M1ThresholdEventA2-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
@@ -1038,6 +1224,8 @@ TimeToWait ::= ENUMERATED {
Time-UE-StayedInCell ::= INTEGER (0..4095)
+Time-UE-StayedInCell-EnhancedGranularity ::= INTEGER (0..40950)
+
TraceActivation ::= SEQUENCE {
eUTRANTraceID EUTRANTraceID,
diff --git a/asn1/x2ap/X2AP-PDU-Contents.asn b/asn1/x2ap/X2AP-PDU-Contents.asn
index 35b2e56865..a73d78794f 100644
--- a/asn1/x2ap/X2AP-PDU-Contents.asn
+++ b/asn1/x2ap/X2AP-PDU-Contents.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V10.3.0 (2011-09)
+-- 3GPP TS 36.423 V12.2.0 (2014-06)
-- 9.3.4 PDU Definitions
-- **************************************************************
--
@@ -7,10 +7,10 @@
-- **************************************************************
X2AP-PDU-Contents {
-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-Contents (1) }
-DEFINITIONS AUTOMATIC TAGS ::=
+DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
@@ -44,10 +44,12 @@ IMPORTS
GUMMEI,
HandoverReportType,
HandoverRestrictionList,
+ Masked-IMEISV,
InvokeIndication,
LocationReportingInformation,
MDT-Configuration,
ManagementBasedMDTallowed,
+ MDTPLMNList,
Neighbour-Information,
PCI,
PDCP-SN,
@@ -56,6 +58,7 @@ IMPORTS
Registration-Request,
RelativeNarrowbandTxPower,
RadioResourceStatus,
+ RRCConnReestabIndicator,
RRCConnSetupIndicator,
UE-RLF-Report-Container,
RRC-Context,
@@ -64,11 +67,12 @@ IMPORTS
ShortMAC-I,
SRVCCOperationPossible,
SubscriberProfileIDforRFP,
+ TargetCellInUTRAN,
TargeteNBtoSource-eNBTransparentContainer,
TimeToWait,
TraceActivation,
TraceDepth,
-
+
TransportLayerAddress,
UEAggregateMaximumBitRate,
UE-HistoryInformation,
@@ -82,11 +86,14 @@ IMPORTS
Measurement-ID,
ReportCharacteristics,
MobilityParametersInformation,
- MobilityParametersModificationRange
-
-
-
-
+ MobilityParametersModificationRange,
+ ReceiveStatusOfULPDCPSDUsExtended,
+ COUNTValueExtended,
+ SubframeAssignment,
+ ExtendedULInterferenceOverloadInfo
+
+
+
FROM X2AP-IEs
PrivateIE-Container{},
@@ -125,6 +132,7 @@ FROM X2AP-Containers
id-GUGroupIDToAddList,
id-GUGroupIDToDeleteList,
id-GUMMEI-ID,
+ id-Masked-IMEISV,
id-InvokeIndication,
id-New-eNB-UE-X2AP-ID,
id-Old-eNB-UE-X2AP-ID,
@@ -172,6 +180,18 @@ FROM X2AP-Containers
id-ManagementBasedMDTallowed,
id-ABS-Status,
id-RRCConnSetupIndicator,
+ id-RRCConnReestabIndicator,
+ id-TargetCellInUTRAN,
+ id-MobilityInformation,
+ id-SourceCellCRNTI,
+ id-ManagementBasedMDTPLMNList,
+ id-ReceiveStatusOfULPDCPSDUsExtended,
+ id-ULCOUNTValueExtended,
+ id-DLCOUNTValueExtended,
+ id-IntendedULDLConfiguration,
+ id-ExtendedULInterferenceOverloadInfo,
+ id-RNL-Header,
+ id-x2APMessage,
maxCellineNB,
maxnoofBearers,
@@ -179,7 +199,7 @@ FROM X2AP-Containers
maxFailedMeasObjects,
maxnoofCellIDforMDT,
maxnoofTAforMDT
-
+
FROM X2AP-Constants;
-- **************************************************************
@@ -194,15 +214,17 @@ 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-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-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},
...
}
@@ -221,7 +243,8 @@ UE-ContextInformation ::= SEQUENCE {
}
UE-ContextInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-{ ID id-ManagementBasedMDTallowed CRITICALITY ignore EXTENSION ManagementBasedMDTallowed PRESENCE optional },
+{ ID id-ManagementBasedMDTallowed CRITICALITY ignore EXTENSION ManagementBasedMDTallowed PRESENCE optional }|
+{ ID id-ManagementBasedMDTPLMNList CRITICALITY ignore EXTENSION MDTPLMNList PRESENCE optional },
...
}
@@ -245,6 +268,7 @@ E-RABs-ToBeSetup-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
+MobilityInformation ::= BIT STRING (SIZE(32))
-- **************************************************************
@@ -319,11 +343,15 @@ HandoverReport ::= SEQUENCE {
}
HandoverReport-IEs X2AP-PROTOCOL-IES ::= {
- { ID id-HandoverReportType CRITICALITY ignore TYPE HandoverReportType PRESENCE mandatory}|
- { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory} |
- { ID id-SourceCellECGI CRITICALITY ignore TYPE ECGI PRESENCE mandatory}|
- { ID id-FailureCellECGI CRITICALITY ignore TYPE ECGI PRESENCE mandatory} |
- { ID id-Re-establishmentCellECGI CRITICALITY ignore TYPE ECGI PRESENCE conditional} -- The IE shall be present if the Handover Report Type IE is set to "HO to Wrong Cell" -- ,
+ { ID id-HandoverReportType CRITICALITY ignore TYPE HandoverReportType PRESENCE mandatory}|
+ { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
+ { ID id-SourceCellECGI CRITICALITY ignore TYPE ECGI PRESENCE mandatory}|
+ { ID id-FailureCellECGI CRITICALITY ignore TYPE ECGI PRESENCE mandatory}|
+ { ID id-Re-establishmentCellECGI CRITICALITY ignore TYPE ECGI PRESENCE conditional} -- The IE shall be present if the Handover Report Type IE is set to “HO to Wrong Cell” -- |
+ { ID id-TargetCellInUTRAN CRITICALITY ignore TYPE TargetCellInUTRAN PRESENCE conditional} -- The IE shall be present if the Handover Report Type IE is set to "InterRAT ping-pong" --|
+ { ID id-SourceCellCRNTI CRITICALITY ignore TYPE CRNTI PRESENCE optional}|
+ { ID id-MobilityInformation CRITICALITY ignore TYPE MobilityInformation PRESENCE optional}|
+ { ID id-UE-RLF-Report-Container CRITICALITY ignore TYPE UE-RLF-Report-Container PRESENCE optional},
...
}
@@ -353,7 +381,7 @@ E-RABs-SubjectToStatusTransfer-ItemIEs X2AP-PROTOCOL-IES ::= {
E-RABs-SubjectToStatusTransfer-Item ::= SEQUENCE {
e-RAB-ID E-RAB-ID,
-
+
receiveStatusofULPDCPSDUs ReceiveStatusofULPDCPSDUs OPTIONAL,
uL-COUNTvalue COUNTvalue,
dL-COUNTvalue COUNTvalue,
@@ -362,6 +390,9 @@ E-RABs-SubjectToStatusTransfer-Item ::= SEQUENCE {
}
E-RABs-SubjectToStatusTransfer-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ { ID id-ReceiveStatusOfULPDCPSDUsExtended CRITICALITY ignore EXTENSION ReceiveStatusOfULPDCPSDUsExtended PRESENCE optional}|
+ { ID id-ULCOUNTValueExtended CRITICALITY ignore EXTENSION COUNTValueExtended PRESENCE optional}|
+ { ID id-DLCOUNTValueExtended CRITICALITY ignore EXTENSION COUNTValueExtended PRESENCE optional},
...
}
@@ -371,7 +402,7 @@ E-RABs-SubjectToStatusTransfer-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-- **************************************************************
--
--- UE Context Release
+-- UE Context Release
--
-- **************************************************************
@@ -550,8 +581,10 @@ CellInformation-Item ::= SEQUENCE {
}
CellInformation-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-{ ID id-ABSInformation CRITICALITY ignore EXTENSION ABSInformation PRESENCE optional }|
-{ ID id-InvokeIndication CRITICALITY ignore EXTENSION InvokeIndication PRESENCE optional },
+{ ID id-ABSInformation CRITICALITY ignore EXTENSION ABSInformation PRESENCE optional }|
+{ ID id-InvokeIndication CRITICALITY ignore EXTENSION InvokeIndication PRESENCE optional }|
+{ ID id-IntendedULDLConfiguration CRITICALITY ignore EXTENSION SubframeAssignment PRESENCE optional }|
+{ ID id-ExtendedULInterferenceOverloadInfo CRITICALITY ignore EXTENSION ExtendedULInterferenceOverloadInfo PRESENCE optional },
...
}
@@ -576,7 +609,7 @@ ENBConfigurationUpdate-IEs X2AP-PROTOCOL-IES ::= {
}
ServedCellsToModify::= SEQUENCE (SIZE (1..maxCellineNB)) OF ServedCellsToModify-Item
-
+
ServedCellsToModify-Item::= SEQUENCE {
old-ecgi ECGI,
servedCellInfo ServedCell-Information,
@@ -642,7 +675,7 @@ ResourceStatusRequest ::= SEQUENCE {
ResourceStatusRequest-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-ENB1-Measurement-ID CRITICALITY reject TYPE Measurement-ID PRESENCE mandatory}|
- { ID id-ENB2-Measurement-ID CRITICALITY ignore TYPE Measurement-ID PRESENCE conditional}|-- The IE shall be present if the Registration Request IE is set to "Stop"--
+ { ID id-ENB2-Measurement-ID CRITICALITY ignore TYPE Measurement-ID PRESENCE conditional}|-- The IE shall be present if the Registration Request IE is set to “Stop”--
{ ID id-Registration-Request CRITICALITY reject TYPE Registration-Request PRESENCE mandatory}|
{ ID id-ReportCharacteristics CRITICALITY reject TYPE ReportCharacteristics PRESENCE optional}|
{ ID id-CellToReport CRITICALITY ignore TYPE CellToReport-List PRESENCE mandatory}|
@@ -904,7 +937,8 @@ RLFIndication-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-FailureCellCRNTI CRITICALITY ignore TYPE CRNTI PRESENCE mandatory}|
{ ID id-ShortMAC-I CRITICALITY ignore TYPE ShortMAC-I PRESENCE optional}|
{ ID id-UE-RLF-Report-Container CRITICALITY ignore TYPE UE-RLF-Report-Container PRESENCE optional}|
- { ID id-RRCConnSetupIndicator CRITICALITY reject TYPE RRCConnSetupIndicator PRESENCE optional},
+ { ID id-RRCConnSetupIndicator CRITICALITY reject TYPE RRCConnSetupIndicator PRESENCE optional}|
+ { ID id-RRCConnReestabIndicator CRITICALITY ignore TYPE RRCConnReestabIndicator PRESENCE optional},
...
}
@@ -926,7 +960,7 @@ CellActivationRequest-IEs X2AP-PROTOCOL-IES ::= {
}
ServedCellsToActivate::= SEQUENCE (SIZE (1..maxCellineNB)) OF ServedCellsToActivate-Item
-
+
ServedCellsToActivate-Item::= SEQUENCE {
ecgi ECGI,
iE-Extensions ProtocolExtensionContainer { { ServedCellsToActivate-Item-ExtIEs} } OPTIONAL,
@@ -955,7 +989,7 @@ CellActivationResponse-IEs X2AP-PROTOCOL-IES ::= {
}
ActivatedCellList ::= SEQUENCE (SIZE (1..maxCellineNB)) OF ActivatedCellList-Item
-
+
ActivatedCellList-Item::= SEQUENCE {
ecgi ECGI,
iE-Extensions ProtocolExtensionContainer { { ActivatedCellList-Item-ExtIEs} } OPTIONAL,
@@ -983,4 +1017,50 @@ CellActivationFailure-IEs X2AP-PROTOCOL-IES ::= {
...
}
+-- **************************************************************
+--
+-- X2 RELEASE
+--
+-- **************************************************************
+
+X2Release ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container {{X2Release-IEs}},
+ ...
+}
+
+X2Release-IEs X2AP-PROTOCOL-IES ::= {
+ { ID id-GlobalENB-ID CRITICALITY reject TYPE GlobalENB-ID PRESENCE mandatory},
+...
+}
+
+-- **************************************************************
+--
+-- X2 Message Transfer
+--
+-- **************************************************************
+
+X2MessageTransfer ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container {{X2MessageTransfer-IEs}},
+ ...
+}
+
+X2MessageTransfer-IEs X2AP-PROTOCOL-IES ::= {
+ { ID id-RNL-Header CRITICALITY reject TYPE RNL-Header PRESENCE mandatory}|
+ { ID id-x2APMessage CRITICALITY reject TYPE X2AP-Message PRESENCE optional},
+ ...
+}
+
+RNL-Header ::= SEQUENCE {
+ target-GlobalENB-ID GlobalENB-ID OPTIONAL,
+ source-GlobalENB-ID GlobalENB-ID,
+ iE-Extensions ProtocolExtensionContainer { { RNL-Header-Item-ExtIEs} } OPTIONAL,
+ ...
+}
+
+RNL-Header-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+X2AP-Message ::= OCTET STRING
+
END
diff --git a/asn1/x2ap/X2AP-PDU-Descriptions.asn b/asn1/x2ap/X2AP-PDU-Descriptions.asn
index e08e878987..189e45ad5a 100644
--- a/asn1/x2ap/X2AP-PDU-Descriptions.asn
+++ b/asn1/x2ap/X2AP-PDU-Descriptions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V10.3.0 (2011-09)
+-- 3GPP TS 36.423 V12.2.0 (2014-06)
-- 9.3.3 Elementary Procedure Definitions
-- **************************************************************
--
@@ -6,7 +6,7 @@
--
-- **************************************************************
-X2AP-PDU-Descriptions {
+ X2AP-PDU-Descriptions {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) x2ap (2) version1 (1) x2ap-PDU-Descriptions (0) }
@@ -54,7 +54,9 @@ FROM X2AP-CommonDataTypes
X2SetupResponse,
MobilityChangeRequest,
MobilityChangeAcknowledge,
- MobilityChangeFailure
+ MobilityChangeFailure,
+ X2Release,
+ X2MessageTransfer
@@ -77,7 +79,9 @@ FROM X2AP-PDU-Contents
id-snStatusTransfer,
id-uEContextRelease,
id-x2Setup,
- id-mobilitySettingsChange
+ id-mobilitySettingsChange,
+ id-x2Release,
+ id-x2MessageTransfer
@@ -168,7 +172,10 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-2 X2AP-ELEMENTARY-PROCEDURE ::= {
resourceStatusReporting |
loadIndication |
privateMessage |
- rLFIndication | handoverReport,
+ rLFIndication |
+ handoverReport |
+ x2Release |
+ x2MessageTransfer,
...
}
@@ -291,5 +298,16 @@ cellActivation X2AP-ELEMENTARY-PROCEDURE ::= {
CRITICALITY reject
}
+x2Release X2AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE X2Release
+ PROCEDURE CODE id-x2Release
+ CRITICALITY reject
+}
+
+x2MessageTransfer X2AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE X2MessageTransfer
+ PROCEDURE CODE id-x2MessageTransfer
+ CRITICALITY reject
+}
END
diff --git a/asn1/x2ap/x2ap.cnf b/asn1/x2ap/x2ap.cnf
index 761c050ba4..c8cbb7ebed 100644
--- a/asn1/x2ap/x2ap.cnf
+++ b/asn1/x2ap/x2ap.cnf
@@ -78,7 +78,7 @@ ProtocolIE-ContainerPairList
%(DEFAULT_BODY)s
- if(tvb_length(tvb)==0)
+ if(tvb_reported_length(tvb)==0)
return offset;
if (!parameter_tvb)
@@ -115,7 +115,7 @@ ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(x2ap_Prot
if (!parameter_tvb)
return offset;
/* Get the length */
- tvb_len = tvb_length(parameter_tvb);
+ tvb_len = tvb_reported_length(parameter_tvb);
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_TransportLayerAddress);
if (tvb_len==4){
/* IPv4 */
@@ -157,6 +157,9 @@ id-mobilitySettingsChange ProcedureCode
id-rLFIndication ProcedureCode
id-handoverReport ProcedureCode
id-cellActivation ProcedureCode
+id-x2Release ProcedureCode
+id-x2MessageTransfer ProcedureCode
+
# ProtocolIE-ID
@@ -234,6 +237,33 @@ id-CSGMembershipStatus ProtocolIE-ID
id-MDTConfiguration ProtocolIE-ID
id-ManagementBasedMDTallowed ProtocolIE-ID
id-RRCConnSetupIndicator ProtocolIE-ID
+id-NeighbourTAC ProtocolIE-ID
+id-Time-UE-StayedInCell-EnhancedGranularity ProtocolIE-ID
+id-RRCConnReestabIndicator ProtocolIE-ID
+id-MBMS-Service-Area-List ProtocolIE-ID
+id-HO-cause ProtocolIE-ID
+id-TargetCellInUTRAN ProtocolIE-ID
+id-MobilityInformation ProtocolIE-ID
+id-SourceCellCRNTI ProtocolIE-ID
+id-MultibandInfoList ProtocolIE-ID
+id-M3Configuration ProtocolIE-ID
+id-M4Configuration ProtocolIE-ID
+id-M5Configuration ProtocolIE-ID
+id-MDT-Location-Info ProtocolIE-ID
+id-ManagementBasedMDTPLMNList ProtocolIE-ID
+id-SignallingBasedMDTPLMNList ProtocolIE-ID
+id-ReceiveStatusOfULPDCPSDUsExtended ProtocolIE-ID
+id-ULCOUNTValueExtended ProtocolIE-ID
+id-DLCOUNTValueExtended ProtocolIE-ID
+id-eARFCNExtension ProtocolIE-ID
+id-UL-EARFCNExtension ProtocolIE-ID
+id-DL-EARFCNExtension ProtocolIE-ID
+id-AdditionalSpecialSubframe-Info ProtocolIE-ID
+id-Masked-IMEISV ProtocolIE-ID
+id-IntendedULDLConfiguration ProtocolIE-ID
+id-ExtendedULInterferenceOverloadInfo ProtocolIE-ID
+id-RNL-Header ProtocolIE-ID
+id-x2APMessage ProtocolIE-ID
#.REGISTER_NEW
@@ -301,7 +331,13 @@ CompleteFailureCauseInformation-List N x2ap.ies id-CompleteFailureCauseInformat
CompleteFailureCauseInformation-Item N x2ap.ies id-CompleteFailureCauseInformation-Item
CSGMembershipStatus N x2ap.ies id-CSGMembershipStatus
RRCConnSetupIndicator N x2ap.ies id-RRCConnSetupIndicator
-
+RRCConnReestabIndicator N x2ap.ies id-RRCConnReestabIndicator
+TargetCellInUTRAN N x2ap.ies id-TargetCellInUTRAN
+MobilityInformation N x2ap.ies id-MobilityInformation
+CRNTI N x2ap.ies id-SourceCellCRNTI
+Masked-IMEISV N x2ap.ies id-Masked-IMEISV
+RNL-Header N x2ap.ies id-RNL-Header
+X2AP-Message N x2ap.ies id-x2APMessage
#X2AP-PROTOCOL-EXTENSION
Number-of-Antennaports N x2ap.extension id-Number-of-Antennaports
@@ -316,6 +352,26 @@ ABS-Status N x2ap.extension id-ABS-Status
CSG-Id N x2ap.extension id-CSG-Id
MDT-Configuration N x2ap.extension id-MDTConfiguration
ManagementBasedMDTallowed N x2ap.extension id-ManagementBasedMDTallowed
+TAC N x2ap.extension id-NeighbourTAC
+Time-UE-StayedInCell-EnhancedGranularity N x2ap.extension id-Time-UE-StayedInCell-EnhancedGranularity
+MBMS-Service-Area-Identity-List N x2ap.extension id-MBMS-Service-Area-List
+Cause N x2ap.extension id-HO-cause
+MultibandInfoList N x2ap.extension id-MultibandInfoList
+M3Configuration N x2ap.extension id-M3Configuration
+M4Configuration N x2ap.extension id-M4Configuration
+M5Configuration N x2ap.extension id-M5Configuration
+MDT-Location-Info N x2ap.extension id-MDT-Location-Info
+MDTPLMNList N x2ap.extension id-ManagementBasedMDTPLMNList
+MDTPLMNList N x2ap.extension id-SignallingBasedMDTPLMNList
+ReceiveStatusOfULPDCPSDUsExtended N x2ap.extension id-ReceiveStatusOfULPDCPSDUsExtended
+COUNTValueExtended N x2ap.extension id-ULCOUNTValueExtended
+COUNTValueExtended N x2ap.extension id-DLCOUNTValueExtended
+EARFCNExtension N x2ap.extension id-eARFCNExtension
+EARFCNExtension N x2ap.extension id-UL-EARFCNExtension
+EARFCNExtension N x2ap.extension id-DL-EARFCNExtension
+AdditionalSpecialSubframe-Info N x2ap.extension id-AdditionalSpecialSubframe-Info
+SubframeAssignment N x2ap.extension id-IntendedULDLConfiguration
+ExtendedULInterferenceOverloadInfo N x2ap.extension id-ExtendedULInterferenceOverloadInfo
# X2AP-PDU-Descriptions.asn Interface Elementary Procedures
#X2AP-ELEMENTARY-PROCEDURE
@@ -364,6 +420,9 @@ CellActivationRequest N x2ap.proc.imsg id-cellActivation
CellActivationResponse N x2ap.proc.sout id-cellActivation
CellActivationFailure N x2ap.proc.uout id-cellActivation
+X2Release N x2ap.proc.imsg id-x2Release
+
+X2MessageTransfer N x2ap.proc.imsg id-x2MessageTransfer
#.TYPE_ATTR
BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL
diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c
index a3950c2394..bd550fff98 100644
--- a/epan/dissectors/packet-x2ap.c
+++ b/epan/dissectors/packet-x2ap.c
@@ -68,8 +68,11 @@ void proto_register_x2ap(void);
#define maxProtocolExtensions 65535
#define maxProtocolIEs 65535
#define maxEARFCN 65535
+#define maxEARFCNPlusOne 65536
+#define newmaxEARFCN 262143
#define maxInterfaces 16
#define maxCellineNB 256
+#define maxnoofBands 16
#define maxnoofBearers 256
#define maxNrOfErrors 256
#define maxnoofPDCP_SN 16
@@ -86,6 +89,8 @@ void proto_register_x2ap(void);
#define maxFailedMeasObjects 32
#define maxnoofCellIDforMDT 32
#define maxnoofTAforMDT 8
+#define maxnoofMBMSServiceAreaIdentities 256
+#define maxnoofMDTPLMNs 16
typedef enum _ProcedureCode_enum {
id_handoverPreparation = 0,
@@ -103,7 +108,9 @@ typedef enum _ProcedureCode_enum {
id_mobilitySettingsChange = 12,
id_rLFIndication = 13,
id_handoverReport = 14,
- id_cellActivation = 15
+ id_cellActivation = 15,
+ id_x2Release = 16,
+ id_x2MessageTransfer = 17
} ProcedureCode_enum;
typedef enum _ProtocolIE_ID_enum {
@@ -180,7 +187,34 @@ typedef enum _ProtocolIE_ID_enum {
id_CSGMembershipStatus = 71,
id_MDTConfiguration = 72,
id_ManagementBasedMDTallowed = 74,
- id_RRCConnSetupIndicator = 75
+ id_RRCConnSetupIndicator = 75,
+ id_NeighbourTAC = 76,
+ id_Time_UE_StayedInCell_EnhancedGranularity = 77,
+ id_RRCConnReestabIndicator = 78,
+ id_MBMS_Service_Area_List = 79,
+ id_HO_cause = 80,
+ id_TargetCellInUTRAN = 81,
+ id_MobilityInformation = 82,
+ id_SourceCellCRNTI = 83,
+ id_MultibandInfoList = 84,
+ id_M3Configuration = 85,
+ id_M4Configuration = 86,
+ id_M5Configuration = 87,
+ id_MDT_Location_Info = 88,
+ id_ManagementBasedMDTPLMNList = 89,
+ id_SignallingBasedMDTPLMNList = 90,
+ id_ReceiveStatusOfULPDCPSDUsExtended = 91,
+ id_ULCOUNTValueExtended = 92,
+ id_DLCOUNTValueExtended = 93,
+ id_eARFCNExtension = 94,
+ id_UL_EARFCNExtension = 95,
+ id_DL_EARFCNExtension = 96,
+ id_AdditionalSpecialSubframe_Info = 97,
+ id_Masked_IMEISV = 98,
+ id_IntendedULDLConfiguration = 99,
+ id_ExtendedULInterferenceOverloadInfo = 100,
+ id_RNL_Header = 101,
+ id_x2APMessage = 102
} ProtocolIE_ID_enum;
/*--- End of included file: packet-x2ap-val.h ---*/
@@ -195,38 +229,56 @@ static int hf_x2ap_transportLayerAddressIPv6 = -1;
#line 1 "../../asn1/x2ap/packet-x2ap-hf.c"
static int hf_x2ap_ABSInformation_PDU = -1; /* ABSInformation */
static int hf_x2ap_ABS_Status_PDU = -1; /* ABS_Status */
+static int hf_x2ap_AdditionalSpecialSubframe_Info_PDU = -1; /* AdditionalSpecialSubframe_Info */
static int hf_x2ap_Cause_PDU = -1; /* Cause */
static int hf_x2ap_CompositeAvailableCapacityGroup_PDU = -1; /* CompositeAvailableCapacityGroup */
+static int hf_x2ap_COUNTValueExtended_PDU = -1; /* COUNTValueExtended */
static int hf_x2ap_CriticalityDiagnostics_PDU = -1; /* CriticalityDiagnostics */
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_DeactivationIndication_PDU = -1; /* DeactivationIndication */
+static int hf_x2ap_EARFCNExtension_PDU = -1; /* EARFCNExtension */
static int hf_x2ap_ECGI_PDU = -1; /* ECGI */
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_ExtendedULInterferenceOverloadInfo_PDU = -1; /* ExtendedULInterferenceOverloadInfo */
static int hf_x2ap_GlobalENB_ID_PDU = -1; /* GlobalENB_ID */
static int hf_x2ap_GUGroupIDList_PDU = -1; /* GUGroupIDList */
static int hf_x2ap_GUMMEI_PDU = -1; /* GUMMEI */
static int hf_x2ap_HandoverReportType_PDU = -1; /* HandoverReportType */
+static int hf_x2ap_Masked_IMEISV_PDU = -1; /* Masked_IMEISV */
static int hf_x2ap_InvokeIndication_PDU = -1; /* InvokeIndication */
+static int hf_x2ap_M3Configuration_PDU = -1; /* M3Configuration */
+static int hf_x2ap_M4Configuration_PDU = -1; /* M4Configuration */
+static int hf_x2ap_M5Configuration_PDU = -1; /* M5Configuration */
static int hf_x2ap_MDT_Configuration_PDU = -1; /* MDT_Configuration */
+static int hf_x2ap_MDTPLMNList_PDU = -1; /* MDTPLMNList */
+static int hf_x2ap_MDT_Location_Info_PDU = -1; /* MDT_Location_Info */
static int hf_x2ap_Measurement_ID_PDU = -1; /* Measurement_ID */
+static int hf_x2ap_MBMS_Service_Area_Identity_List_PDU = -1; /* MBMS_Service_Area_Identity_List */
static int hf_x2ap_MBSFN_Subframe_Infolist_PDU = -1; /* MBSFN_Subframe_Infolist */
static int hf_x2ap_ManagementBasedMDTallowed_PDU = -1; /* ManagementBasedMDTallowed */
static int hf_x2ap_MobilityParametersModificationRange_PDU = -1; /* MobilityParametersModificationRange */
static int hf_x2ap_MobilityParametersInformation_PDU = -1; /* MobilityParametersInformation */
+static int hf_x2ap_MultibandInfoList_PDU = -1; /* MultibandInfoList */
static int hf_x2ap_Number_of_Antennaports_PDU = -1; /* Number_of_Antennaports */
static int hf_x2ap_PCI_PDU = -1; /* PCI */
static int hf_x2ap_PRACH_Configuration_PDU = -1; /* PRACH_Configuration */
+static int hf_x2ap_ReceiveStatusOfULPDCPSDUsExtended_PDU = -1; /* ReceiveStatusOfULPDCPSDUsExtended */
static int hf_x2ap_Registration_Request_PDU = -1; /* Registration_Request */
static int hf_x2ap_ReportCharacteristics_PDU = -1; /* ReportCharacteristics */
+static int hf_x2ap_RRCConnReestabIndicator_PDU = -1; /* RRCConnReestabIndicator */
static int hf_x2ap_RRCConnSetupIndicator_PDU = -1; /* RRCConnSetupIndicator */
static int hf_x2ap_ServedCells_PDU = -1; /* ServedCells */
static int hf_x2ap_ShortMAC_I_PDU = -1; /* ShortMAC_I */
static int hf_x2ap_SRVCCOperationPossible_PDU = -1; /* SRVCCOperationPossible */
+static int hf_x2ap_SubframeAssignment_PDU = -1; /* SubframeAssignment */
+static int hf_x2ap_TAC_PDU = -1; /* TAC */
+static int hf_x2ap_TargetCellInUTRAN_PDU = -1; /* TargetCellInUTRAN */
static int hf_x2ap_TargeteNBtoSource_eNBTransparentContainer_PDU = -1; /* TargeteNBtoSource_eNBTransparentContainer */
static int hf_x2ap_TimeToWait_PDU = -1; /* TimeToWait */
+static int hf_x2ap_Time_UE_StayedInCell_EnhancedGranularity_PDU = -1; /* Time_UE_StayedInCell_EnhancedGranularity */
static int hf_x2ap_TraceActivation_PDU = -1; /* TraceActivation */
static int hf_x2ap_UE_HistoryInformation_PDU = -1; /* UE_HistoryInformation */
static int hf_x2ap_UE_X2AP_ID_PDU = -1; /* UE_X2AP_ID */
@@ -234,6 +286,7 @@ static int hf_x2ap_UE_RLF_Report_Container_PDU = -1; /* UE_RLF_Report_Container
static int hf_x2ap_HandoverRequest_PDU = -1; /* HandoverRequest */
static int hf_x2ap_UE_ContextInformation_PDU = -1; /* UE_ContextInformation */
static int hf_x2ap_E_RABs_ToBeSetup_Item_PDU = -1; /* E_RABs_ToBeSetup_Item */
+static int hf_x2ap_MobilityInformation_PDU = -1; /* MobilityInformation */
static int hf_x2ap_HandoverRequestAcknowledge_PDU = -1; /* HandoverRequestAcknowledge */
static int hf_x2ap_E_RABs_Admitted_List_PDU = -1; /* E_RABs_Admitted_List */
static int hf_x2ap_E_RABs_Admitted_Item_PDU = -1; /* E_RABs_Admitted_Item */
@@ -283,6 +336,10 @@ static int hf_x2ap_ServedCellsToActivate_PDU = -1; /* ServedCellsToActivate */
static int hf_x2ap_CellActivationResponse_PDU = -1; /* CellActivationResponse */
static int hf_x2ap_ActivatedCellList_PDU = -1; /* ActivatedCellList */
static int hf_x2ap_CellActivationFailure_PDU = -1; /* CellActivationFailure */
+static int hf_x2ap_X2Release_PDU = -1; /* X2Release */
+static int hf_x2ap_X2MessageTransfer_PDU = -1; /* X2MessageTransfer */
+static int hf_x2ap_RNL_Header_PDU = -1; /* RNL_Header */
+static int hf_x2ap_X2AP_Message_PDU = -1; /* X2AP_Message */
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 */
@@ -308,6 +365,9 @@ static int hf_x2ap_numberOfCellSpecificAntennaPorts_01 = -1; /* T_numberOfCellS
static int hf_x2ap_measurement_subset_01 = -1; /* BIT_STRING_SIZE_1_70_ */
static int hf_x2ap_dL_ABS_status = -1; /* DL_ABS_status */
static int hf_x2ap_usableABSInformation = -1; /* UsableABSInformation */
+static int hf_x2ap_additionalspecialSubframePatterns = -1; /* AdditionalSpecialSubframePatterns */
+static int hf_x2ap_cyclicPrefixDL = -1; /* CyclicPrefixDL */
+static int hf_x2ap_cyclicPrefixUL = -1; /* CyclicPrefixUL */
static int hf_x2ap_key_eNodeB_star = -1; /* Key_eNodeB_Star */
static int hf_x2ap_nextHopChainingCount = -1; /* NextHopChainingCount */
static int hf_x2ap_priorityLevel = -1; /* PriorityLevel */
@@ -316,6 +376,7 @@ static int hf_x2ap_pre_emptionVulnerability = -1; /* Pre_emptionVulnerability *
static int hf_x2ap_cellBased = -1; /* CellBasedMDT */
static int hf_x2ap_tABased = -1; /* TABasedMDT */
static int hf_x2ap_pLMNWide = -1; /* NULL */
+static int hf_x2ap_tAIBased = -1; /* TAIBasedMDT */
static int hf_x2ap_BroadcastPLMNs_Item_item = -1; /* PLMN_Identity */
static int hf_x2ap_radioNetwork = -1; /* CauseRadioNetwork */
static int hf_x2ap_transport = -1; /* CauseTransport */
@@ -330,6 +391,8 @@ static int hf_x2ap_cellCapacityClassValue = -1; /* CellCapacityClassValue */
static int hf_x2ap_capacityValue = -1; /* CapacityValue */
static int hf_x2ap_pDCP_SN = -1; /* PDCP_SN */
static int hf_x2ap_hFN = -1; /* HFN */
+static int hf_x2ap_pDCP_SNExtended = -1; /* PDCP_SNExtended */
+static int hf_x2ap_hFNModified = -1; /* HFNModified */
static int hf_x2ap_procedureCode = -1; /* ProcedureCode */
static int hf_x2ap_triggeringMessage = -1; /* TriggeringMessage */
static int hf_x2ap_procedureCriticality = -1; /* Criticality */
@@ -359,6 +422,8 @@ 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_associatedSubframes = -1; /* BIT_STRING_SIZE_5 */
+static int hf_x2ap_extended_ul_InterferenceOverloadIndication = -1; /* UL_InterferenceOverloadIndication */
static int hf_x2ap_ForbiddenTAs_item = -1; /* ForbiddenTAs_Item */
static int hf_x2ap_forbiddenTACs = -1; /* ForbiddenTACs */
static int hf_x2ap_ForbiddenTACs_item = -1; /* TAC */
@@ -392,14 +457,21 @@ static int hf_x2ap_time_UE_StayedInCell = -1; /* Time_UE_StayedInCell */
static int hf_x2ap_undefined = -1; /* NULL */
static int hf_x2ap_eventType = -1; /* EventType */
static int hf_x2ap_reportArea = -1; /* ReportArea */
+static int hf_x2ap_m3period = -1; /* M3period */
+static int hf_x2ap_m4period = -1; /* M4period */
+static int hf_x2ap_m4_links_to_log = -1; /* Links_to_log */
+static int hf_x2ap_m5period = -1; /* M5period */
+static int hf_x2ap_m5_links_to_log = -1; /* Links_to_log */
static int hf_x2ap_mdt_Activation = -1; /* MDT_Activation */
static int hf_x2ap_areaScopeOfMDT = -1; /* AreaScopeOfMDT */
static int hf_x2ap_measurementsToActivate = -1; /* MeasurementsToActivate */
-static int hf_x2ap_reportingTriggerMDT = -1; /* ReportingTriggerMDT */
-static int hf_x2ap_thresholdeventA2 = -1; /* ThresholdEventA2 */
-static int hf_x2ap_periodicReportingMDT = -1; /* PeriodicReportingMDT */
+static int hf_x2ap_m1reportingTrigger = -1; /* M1ReportingTrigger */
+static int hf_x2ap_m1thresholdeventA2 = -1; /* M1ThresholdEventA2 */
+static int hf_x2ap_m1periodicReporting = -1; /* M1PeriodicReporting */
+static int hf_x2ap_MDTPLMNList_item = -1; /* PLMN_Identity */
static int hf_x2ap_threshold_RSRP = -1; /* Threshold_RSRP */
static int hf_x2ap_threshold_RSRQ = -1; /* Threshold_RSRQ */
+static int hf_x2ap_MBMS_Service_Area_Identity_List_item = -1; /* MBMS_Service_Area_Identity */
static int hf_x2ap_MBSFN_Subframe_Infolist_item = -1; /* MBSFN_Subframe_Info */
static int hf_x2ap_radioframeAllocationPeriod = -1; /* RadioframeAllocationPeriod */
static int hf_x2ap_radioframeAllocationOffset = -1; /* RadioframeAllocationOffset */
@@ -407,6 +479,8 @@ static int hf_x2ap_subframeAllocation = -1; /* SubframeAllocation */
static int hf_x2ap_handoverTriggerChangeLowerLimit = -1; /* INTEGER_M20_20 */
static int hf_x2ap_handoverTriggerChangeUpperLimit = -1; /* INTEGER_M20_20 */
static int hf_x2ap_handoverTriggerChange = -1; /* INTEGER_M20_20 */
+static int hf_x2ap_MultibandInfoList_item = -1; /* BandInfo */
+static int hf_x2ap_freqBandIndicator = -1; /* FreqBandIndicator */
static int hf_x2ap_Neighbour_Information_item = -1; /* Neighbour_Information_item */
static int hf_x2ap_eCGI = -1; /* ECGI */
static int hf_x2ap_pCI = -1; /* PCI */
@@ -438,12 +512,12 @@ 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_specialSubframePatterns = -1; /* SpecialSubframePatterns */
-static int hf_x2ap_cyclicPrefixDL = -1; /* CyclicPrefixDL */
-static int hf_x2ap_cyclicPrefixUL = -1; /* CyclicPrefixUL */
static int hf_x2ap_oneframe = -1; /* Oneframe */
static int hf_x2ap_fourframes = -1; /* Fourframes */
static int hf_x2ap_tAListforMDT = -1; /* TAListforMDT */
static int hf_x2ap_TAListforMDT_item = -1; /* TAC */
+static int hf_x2ap_tAIListforMDT = -1; /* TAIListforMDT */
+static int hf_x2ap_TAIListforMDT_item = -1; /* TAI_Item */
static int hf_x2ap_measurementThreshold = -1; /* MeasurementThresholdA2 */
static int hf_x2ap_eUTRANTraceID = -1; /* EUTRANTraceID */
static int hf_x2ap_interfacesToTrace = -1; /* InterfacesToTrace */
@@ -505,6 +579,8 @@ static int hf_x2ap_privateIEs = -1; /* PrivateIE_Container */
static int hf_x2ap_ServedCellsToActivate_item = -1; /* ServedCellsToActivate_Item */
static int hf_x2ap_ecgi = -1; /* ECGI */
static int hf_x2ap_ActivatedCellList_item = -1; /* ActivatedCellList_Item */
+static int hf_x2ap_target_GlobalENB_ID = -1; /* GlobalENB_ID */
+static int hf_x2ap_source_GlobalENB_ID = -1; /* GlobalENB_ID */
static int hf_x2ap_initiatingMessage = -1; /* InitiatingMessage */
static int hf_x2ap_successfulOutcome = -1; /* SuccessfulOutcome */
static int hf_x2ap_unsuccessfulOutcome = -1; /* UnsuccessfulOutcome */
@@ -532,6 +608,7 @@ static gint ett_x2ap_ABSInformation = -1;
static gint ett_x2ap_ABSInformationFDD = -1;
static gint ett_x2ap_ABSInformationTDD = -1;
static gint ett_x2ap_ABS_Status = -1;
+static gint ett_x2ap_AdditionalSpecialSubframe_Info = -1;
static gint ett_x2ap_AS_SecurityInformation = -1;
static gint ett_x2ap_AllocationAndRetentionPriority = -1;
static gint ett_x2ap_AreaScopeOfMDT = -1;
@@ -543,6 +620,7 @@ static gint ett_x2ap_CellType = -1;
static gint ett_x2ap_CompositeAvailableCapacityGroup = -1;
static gint ett_x2ap_CompositeAvailableCapacity = -1;
static gint ett_x2ap_COUNTvalue = -1;
+static gint ett_x2ap_COUNTValueExtended = -1;
static gint ett_x2ap_CriticalityDiagnostics = -1;
static gint ett_x2ap_CriticalityDiagnostics_IE_List = -1;
static gint ett_x2ap_CriticalityDiagnostics_IE_List_item = -1;
@@ -555,6 +633,7 @@ static gint ett_x2ap_EPLMNs = -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;
+static gint ett_x2ap_ExtendedULInterferenceOverloadInfo = -1;
static gint ett_x2ap_ForbiddenTAs = -1;
static gint ett_x2ap_ForbiddenTAs_Item = -1;
static gint ett_x2ap_ForbiddenTACs = -1;
@@ -573,15 +652,22 @@ static gint ett_x2ap_LastVisitedCell_Item = -1;
static gint ett_x2ap_LastVisitedEUTRANCellInformation = -1;
static gint ett_x2ap_LastVisitedGERANCellInformation = -1;
static gint ett_x2ap_LocationReportingInformation = -1;
+static gint ett_x2ap_M3Configuration = -1;
+static gint ett_x2ap_M4Configuration = -1;
+static gint ett_x2ap_M5Configuration = -1;
static gint ett_x2ap_MDT_Configuration = -1;
+static gint ett_x2ap_MDTPLMNList = -1;
static gint ett_x2ap_MeasurementThresholdA2 = -1;
+static gint ett_x2ap_MBMS_Service_Area_Identity_List = -1;
static gint ett_x2ap_MBSFN_Subframe_Infolist = -1;
static gint ett_x2ap_MBSFN_Subframe_Info = -1;
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_Neighbour_Information = -1;
static gint ett_x2ap_Neighbour_Information_item = -1;
-static gint ett_x2ap_PeriodicReportingMDT = -1;
+static gint ett_x2ap_M1PeriodicReporting = -1;
static gint ett_x2ap_PRACH_Configuration = -1;
static gint ett_x2ap_RadioResourceStatus = -1;
static gint ett_x2ap_RelativeNarrowbandTxPower = -1;
@@ -593,7 +679,10 @@ static gint ett_x2ap_SpecialSubframe_Info = -1;
static gint ett_x2ap_SubframeAllocation = -1;
static gint ett_x2ap_TABasedMDT = -1;
static gint ett_x2ap_TAListforMDT = -1;
-static gint ett_x2ap_ThresholdEventA2 = -1;
+static gint ett_x2ap_TAIBasedMDT = -1;
+static gint ett_x2ap_TAIListforMDT = -1;
+static gint ett_x2ap_TAI_Item = -1;
+static gint ett_x2ap_M1ThresholdEventA2 = -1;
static gint ett_x2ap_TraceActivation = -1;
static gint ett_x2ap_UE_HistoryInformation = -1;
static gint ett_x2ap_UEAggregateMaximumBitRate = -1;
@@ -659,6 +748,9 @@ static gint ett_x2ap_CellActivationResponse = -1;
static gint ett_x2ap_ActivatedCellList = -1;
static gint ett_x2ap_ActivatedCellList_Item = -1;
static gint ett_x2ap_CellActivationFailure = -1;
+static gint ett_x2ap_X2Release = -1;
+static gint ett_x2ap_X2MessageTransfer = -1;
+static gint ett_x2ap_RNL_Header = -1;
static gint ett_x2ap_X2AP_PDU = -1;
static gint ett_x2ap_InitiatingMessage = -1;
static gint ett_x2ap_SuccessfulOutcome = -1;
@@ -765,6 +857,8 @@ static const value_string x2ap_ProcedureCode_vals[] = {
{ id_rLFIndication, "id-rLFIndication" },
{ id_handoverReport, "id-handoverReport" },
{ id_cellActivation, "id-cellActivation" },
+ { id_x2Release, "id-x2Release" },
+ { id_x2MessageTransfer, "id-x2MessageTransfer" },
{ 0, NULL }
};
@@ -861,6 +955,33 @@ static const value_string x2ap_ProtocolIE_ID_vals[] = {
{ id_MDTConfiguration, "id-MDTConfiguration" },
{ id_ManagementBasedMDTallowed, "id-ManagementBasedMDTallowed" },
{ id_RRCConnSetupIndicator, "id-RRCConnSetupIndicator" },
+ { id_NeighbourTAC, "id-NeighbourTAC" },
+ { id_Time_UE_StayedInCell_EnhancedGranularity, "id-Time-UE-StayedInCell-EnhancedGranularity" },
+ { id_RRCConnReestabIndicator, "id-RRCConnReestabIndicator" },
+ { id_MBMS_Service_Area_List, "id-MBMS-Service-Area-List" },
+ { id_HO_cause, "id-HO-cause" },
+ { id_TargetCellInUTRAN, "id-TargetCellInUTRAN" },
+ { id_MobilityInformation, "id-MobilityInformation" },
+ { id_SourceCellCRNTI, "id-SourceCellCRNTI" },
+ { id_MultibandInfoList, "id-MultibandInfoList" },
+ { id_M3Configuration, "id-M3Configuration" },
+ { id_M4Configuration, "id-M4Configuration" },
+ { id_M5Configuration, "id-M5Configuration" },
+ { id_MDT_Location_Info, "id-MDT-Location-Info" },
+ { id_ManagementBasedMDTPLMNList, "id-ManagementBasedMDTPLMNList" },
+ { id_SignallingBasedMDTPLMNList, "id-SignallingBasedMDTPLMNList" },
+ { id_ReceiveStatusOfULPDCPSDUsExtended, "id-ReceiveStatusOfULPDCPSDUsExtended" },
+ { id_ULCOUNTValueExtended, "id-ULCOUNTValueExtended" },
+ { id_DLCOUNTValueExtended, "id-DLCOUNTValueExtended" },
+ { id_eARFCNExtension, "id-eARFCNExtension" },
+ { id_UL_EARFCNExtension, "id-UL-EARFCNExtension" },
+ { id_DL_EARFCNExtension, "id-DL-EARFCNExtension" },
+ { id_AdditionalSpecialSubframe_Info, "id-AdditionalSpecialSubframe-Info" },
+ { id_Masked_IMEISV, "id-Masked-IMEISV" },
+ { id_IntendedULDLConfiguration, "id-IntendedULDLConfiguration" },
+ { id_ExtendedULInterferenceOverloadInfo, "id-ExtendedULInterferenceOverloadInfo" },
+ { id_RNL_Header, "id-RNL-Header" },
+ { id_x2APMessage, "id-x2APMessage" },
{ 0, NULL }
};
@@ -1221,6 +1342,79 @@ dissect_x2ap_ABS_Status(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
}
+static const value_string x2ap_AdditionalSpecialSubframePatterns_vals[] = {
+ { 0, "ssp0" },
+ { 1, "ssp1" },
+ { 2, "ssp2" },
+ { 3, "ssp3" },
+ { 4, "ssp4" },
+ { 5, "ssp5" },
+ { 6, "ssp6" },
+ { 7, "ssp7" },
+ { 8, "ssp8" },
+ { 9, "ssp9" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_AdditionalSpecialSubframePatterns(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,
+ 10, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
+static const value_string x2ap_CyclicPrefixDL_vals[] = {
+ { 0, "normal" },
+ { 1, "extended" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_CyclicPrefixDL(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_CyclicPrefixUL_vals[] = {
+ { 0, "normal" },
+ { 1, "extended" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_CyclicPrefixUL(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 AdditionalSpecialSubframe_Info_sequence[] = {
+ { &hf_x2ap_additionalspecialSubframePatterns, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_AdditionalSpecialSubframePatterns },
+ { &hf_x2ap_cyclicPrefixDL , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_CyclicPrefixDL },
+ { &hf_x2ap_cyclicPrefixUL , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_CyclicPrefixUL },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_AdditionalSpecialSubframe_Info(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_AdditionalSpecialSubframe_Info, AdditionalSpecialSubframe_Info_sequence);
+
+ return offset;
+}
+
+
static int
dissect_x2ap_Key_eNodeB_Star(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -1334,7 +1528,7 @@ dissect_x2ap_PLMN_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
3, 3, FALSE, &parameter_tvb);
- if(tvb_length(tvb)==0)
+ if(tvb_reported_length(tvb)==0)
return offset;
if (!parameter_tvb)
@@ -1440,10 +1634,56 @@ dissect_x2ap_TABasedMDT(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
}
+static const per_sequence_t TAI_Item_sequence[] = {
+ { &hf_x2ap_tAC , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_TAC },
+ { &hf_x2ap_pLMN_Identity , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_TAI_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_TAI_Item, TAI_Item_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t TAIListforMDT_sequence_of[1] = {
+ { &hf_x2ap_TAIListforMDT_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_TAI_Item },
+};
+
+static int
+dissect_x2ap_TAIListforMDT(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_TAIListforMDT, TAIListforMDT_sequence_of,
+ 1, maxnoofTAforMDT, FALSE);
+
+ return offset;
+}
+
+
+static const per_sequence_t TAIBasedMDT_sequence[] = {
+ { &hf_x2ap_tAIListforMDT , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_TAIListforMDT },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_TAIBasedMDT(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_TAIBasedMDT, TAIBasedMDT_sequence);
+
+ return offset;
+}
+
+
static const value_string x2ap_AreaScopeOfMDT_vals[] = {
{ 0, "cellBased" },
{ 1, "tABased" },
{ 2, "pLMNWide" },
+ { 3, "tAIBased" },
{ 0, NULL }
};
@@ -1451,6 +1691,7 @@ static const per_choice_t AreaScopeOfMDT_choice[] = {
{ 0, &hf_x2ap_cellBased , ASN1_EXTENSION_ROOT , dissect_x2ap_CellBasedMDT },
{ 1, &hf_x2ap_tABased , ASN1_EXTENSION_ROOT , dissect_x2ap_TABasedMDT },
{ 2, &hf_x2ap_pLMNWide , ASN1_EXTENSION_ROOT , dissect_x2ap_NULL },
+ { 3, &hf_x2ap_tAIBased , ASN1_NOT_EXTENSION_ROOT, dissect_x2ap_TAIBasedMDT },
{ 0, NULL, 0, NULL }
};
@@ -1734,6 +1975,42 @@ dissect_x2ap_COUNTvalue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
}
+
+static int
+dissect_x2ap_PDCP_SNExtended(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, 32767U, NULL, FALSE);
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_HFNModified(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, 131071U, NULL, FALSE);
+
+ return offset;
+}
+
+
+static const per_sequence_t COUNTValueExtended_sequence[] = {
+ { &hf_x2ap_pDCP_SNExtended, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PDCP_SNExtended },
+ { &hf_x2ap_hFNModified , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_HFNModified },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_COUNTValueExtended(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_COUNTValueExtended, COUNTValueExtended_sequence);
+
+ return offset;
+}
+
+
static const value_string x2ap_TypeOfError_vals[] = {
{ 0, "not-understood" },
{ 1, "missing" },
@@ -1835,38 +2112,6 @@ dissect_x2ap_CSG_Id(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
}
-static const value_string x2ap_CyclicPrefixDL_vals[] = {
- { 0, "normal" },
- { 1, "extended" },
- { 0, NULL }
-};
-
-
-static int
-dissect_x2ap_CyclicPrefixDL(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_CyclicPrefixUL_vals[] = {
- { 0, "normal" },
- { 1, "extended" },
- { 0, NULL }
-};
-
-
-static int
-dissect_x2ap_CyclicPrefixUL(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_DeactivationIndication_vals[] = {
{ 0, "deactivated" },
{ 0, NULL }
@@ -1937,6 +2182,16 @@ dissect_x2ap_EARFCN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
}
+
+static int
+dissect_x2ap_EARFCNExtension(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,
+ maxEARFCNPlusOne, newmaxEARFCN, NULL, TRUE);
+
+ return offset;
+}
+
+
static const value_string x2ap_Transmission_Bandwidth_vals[] = {
{ 0, "bw6" },
{ 1, "bw15" },
@@ -2252,6 +2507,63 @@ dissect_x2ap_EventType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
}
+
+static int
+dissect_x2ap_BIT_STRING_SIZE_5(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,
+ 5, 5, FALSE, NULL, NULL);
+
+ return offset;
+}
+
+
+static const value_string x2ap_UL_InterferenceOverloadIndication_Item_vals[] = {
+ { 0, "high-interference" },
+ { 1, "medium-interference" },
+ { 2, "low-interference" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_UL_InterferenceOverloadIndication_Item(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 const per_sequence_t UL_InterferenceOverloadIndication_sequence_of[1] = {
+ { &hf_x2ap_UL_InterferenceOverloadIndication_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_UL_InterferenceOverloadIndication_Item },
+};
+
+static int
+dissect_x2ap_UL_InterferenceOverloadIndication(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_UL_InterferenceOverloadIndication, UL_InterferenceOverloadIndication_sequence_of,
+ 1, maxnoofPRBs, FALSE);
+
+ return offset;
+}
+
+
+static const per_sequence_t ExtendedULInterferenceOverloadInfo_sequence[] = {
+ { &hf_x2ap_associatedSubframes, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BIT_STRING_SIZE_5 },
+ { &hf_x2ap_extended_ul_InterferenceOverloadIndication, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UL_InterferenceOverloadIndication },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_ExtendedULInterferenceOverloadInfo(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_ExtendedULInterferenceOverloadInfo, ExtendedULInterferenceOverloadInfo_sequence);
+
+ return offset;
+}
+
+
static const value_string x2ap_ForbiddenInterRATs_vals[] = {
{ 0, "all" },
{ 1, "geran" },
@@ -2380,6 +2692,16 @@ dissect_x2ap_Fourframes(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
}
+
+static int
+dissect_x2ap_FreqBandIndicator(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, 256U, NULL, TRUE);
+
+ 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 },
@@ -2410,7 +2732,7 @@ dissect_x2ap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
if (!parameter_tvb)
return offset;
/* Get the length */
- tvb_len = tvb_length(parameter_tvb);
+ tvb_len = tvb_reported_length(parameter_tvb);
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_TransportLayerAddress);
if (tvb_len==4){
/* IPv4 */
@@ -2522,6 +2844,7 @@ dissect_x2ap_GUMMEI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
static const value_string x2ap_HandoverReportType_vals[] = {
{ 0, "hoTooEarly" },
{ 1, "hoToWrongCell" },
+ { 2, "interRATpingpong" },
{ 0, NULL }
};
@@ -2529,7 +2852,7 @@ static const value_string x2ap_HandoverReportType_vals[] = {
static int
dissect_x2ap_HandoverReportType(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);
+ 2, NULL, TRUE, 1, NULL);
return offset;
}
@@ -2588,6 +2911,16 @@ dissect_x2ap_HWLoadIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
}
+
+static int
+dissect_x2ap_Masked_IMEISV(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,
+ 64, 64, FALSE, NULL, NULL);
+
+ return offset;
+}
+
+
static const value_string x2ap_InvokeIndication_vals[] = {
{ 0, "abs-information" },
{ 0, NULL }
@@ -2704,6 +3037,23 @@ dissect_x2ap_LastVisitedCell_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
}
+static const value_string x2ap_Links_to_log_vals[] = {
+ { 0, "uplink" },
+ { 1, "downlink" },
+ { 2, "both-uplink-and-downlink" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_Links_to_log(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 const value_string x2ap_ReportArea_vals[] = {
{ 0, "ecgi" },
{ 0, NULL }
@@ -2735,6 +3085,108 @@ dissect_x2ap_LocationReportingInformation(tvbuff_t *tvb _U_, int offset _U_, asn
}
+static const value_string x2ap_M3period_vals[] = {
+ { 0, "ms100" },
+ { 1, "ms1000" },
+ { 2, "ms10000" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_M3period(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 const per_sequence_t M3Configuration_sequence[] = {
+ { &hf_x2ap_m3period , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_M3period },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_M3Configuration(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_M3Configuration, M3Configuration_sequence);
+
+ return offset;
+}
+
+
+static const value_string x2ap_M4period_vals[] = {
+ { 0, "ms1024" },
+ { 1, "ms2048" },
+ { 2, "ms5120" },
+ { 3, "ms10240" },
+ { 4, "min1" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_M4period(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,
+ 5, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t M4Configuration_sequence[] = {
+ { &hf_x2ap_m4period , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_M4period },
+ { &hf_x2ap_m4_links_to_log, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Links_to_log },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_M4Configuration(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_M4Configuration, M4Configuration_sequence);
+
+ return offset;
+}
+
+
+static const value_string x2ap_M5period_vals[] = {
+ { 0, "ms1024" },
+ { 1, "ms2048" },
+ { 2, "ms5120" },
+ { 3, "ms10240" },
+ { 4, "min1" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_M5period(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,
+ 5, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t M5Configuration_sequence[] = {
+ { &hf_x2ap_m5period , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_M5period },
+ { &hf_x2ap_m5_links_to_log, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Links_to_log },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_M5Configuration(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_M5Configuration, M5Configuration_sequence);
+
+ return offset;
+}
+
+
static const value_string x2ap_MDT_Activation_vals[] = {
{ 0, "immediate-MDT-only" },
{ 1, "immediate-MDT-and-Trace" },
@@ -2761,17 +3213,18 @@ dissect_x2ap_MeasurementsToActivate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
}
-static const value_string x2ap_ReportingTriggerMDT_vals[] = {
+static const value_string x2ap_M1ReportingTrigger_vals[] = {
{ 0, "periodic" },
{ 1, "a2eventtriggered" },
+ { 2, "a2eventtriggered-periodic" },
{ 0, NULL }
};
static int
-dissect_x2ap_ReportingTriggerMDT(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_x2ap_M1ReportingTrigger(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);
+ 2, NULL, TRUE, 1, NULL);
return offset;
}
@@ -2819,16 +3272,16 @@ dissect_x2ap_MeasurementThresholdA2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
}
-static const per_sequence_t ThresholdEventA2_sequence[] = {
+static const per_sequence_t M1ThresholdEventA2_sequence[] = {
{ &hf_x2ap_measurementThreshold, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_MeasurementThresholdA2 },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
static int
-dissect_x2ap_ThresholdEventA2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_x2ap_M1ThresholdEventA2(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_ThresholdEventA2, ThresholdEventA2_sequence);
+ ett_x2ap_M1ThresholdEventA2, M1ThresholdEventA2_sequence);
return offset;
}
@@ -2883,7 +3336,7 @@ dissect_x2ap_ReportAmountMDT(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
}
-static const per_sequence_t PeriodicReportingMDT_sequence[] = {
+static const per_sequence_t M1PeriodicReporting_sequence[] = {
{ &hf_x2ap_reportInterval , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ReportIntervalMDT },
{ &hf_x2ap_reportAmount , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ReportAmountMDT },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
@@ -2891,9 +3344,9 @@ static const per_sequence_t PeriodicReportingMDT_sequence[] = {
};
static int
-dissect_x2ap_PeriodicReportingMDT(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_x2ap_M1PeriodicReporting(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_PeriodicReportingMDT, PeriodicReportingMDT_sequence);
+ ett_x2ap_M1PeriodicReporting, M1PeriodicReporting_sequence);
return offset;
}
@@ -2903,9 +3356,9 @@ static const per_sequence_t MDT_Configuration_sequence[] = {
{ &hf_x2ap_mdt_Activation , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_MDT_Activation },
{ &hf_x2ap_areaScopeOfMDT , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_AreaScopeOfMDT },
{ &hf_x2ap_measurementsToActivate, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_MeasurementsToActivate },
- { &hf_x2ap_reportingTriggerMDT, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ReportingTriggerMDT },
- { &hf_x2ap_thresholdeventA2, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ThresholdEventA2 },
- { &hf_x2ap_periodicReportingMDT, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_PeriodicReportingMDT },
+ { &hf_x2ap_m1reportingTrigger, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_M1ReportingTrigger },
+ { &hf_x2ap_m1thresholdeventA2, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_M1ThresholdEventA2 },
+ { &hf_x2ap_m1periodicReporting, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_M1PeriodicReporting },
{ &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -2919,6 +3372,30 @@ dissect_x2ap_MDT_Configuration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
}
+static const per_sequence_t MDTPLMNList_sequence_of[1] = {
+ { &hf_x2ap_MDTPLMNList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity },
+};
+
+static int
+dissect_x2ap_MDTPLMNList(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_MDTPLMNList, MDTPLMNList_sequence_of,
+ 1, maxnoofMDTPLMNs, FALSE);
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_MDT_Location_Info(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,
+ 8, 8, FALSE, NULL, NULL);
+
+ return offset;
+}
+
+
static int
dissect_x2ap_Measurement_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -2929,6 +3406,30 @@ dissect_x2ap_Measurement_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
}
+
+static int
+dissect_x2ap_MBMS_Service_Area_Identity(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,
+ 2, 2, FALSE, NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t MBMS_Service_Area_Identity_List_sequence_of[1] = {
+ { &hf_x2ap_MBMS_Service_Area_Identity_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_MBMS_Service_Area_Identity },
+};
+
+static int
+dissect_x2ap_MBMS_Service_Area_Identity_List(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_MBMS_Service_Area_Identity_List, MBMS_Service_Area_Identity_List_sequence_of,
+ 1, maxnoofMBMSServiceAreaIdentities, FALSE);
+
+ return offset;
+}
+
+
static const value_string x2ap_RadioframeAllocationPeriod_vals[] = {
{ 0, "n1" },
{ 1, "n2" },
@@ -3076,6 +3577,35 @@ dissect_x2ap_MobilityParametersInformation(tvbuff_t *tvb _U_, int offset _U_, as
}
+static const per_sequence_t BandInfo_sequence[] = {
+ { &hf_x2ap_freqBandIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_FreqBandIndicator },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_BandInfo(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_BandInfo, BandInfo_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t MultibandInfoList_sequence_of[1] = {
+ { &hf_x2ap_MultibandInfoList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_BandInfo },
+};
+
+static int
+dissect_x2ap_MultibandInfoList(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_MultibandInfoList, MultibandInfoList_sequence_of,
+ 1, maxnoofBands, FALSE);
+
+ return offset;
+}
+
+
static int
dissect_x2ap_PCI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -3262,6 +3792,16 @@ dissect_x2ap_ReceiveStatusofULPDCPSDUs(tvbuff_t *tvb _U_, int offset _U_, asn1_c
}
+
+static int
+dissect_x2ap_ReceiveStatusOfULPDCPSDUsExtended(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,
+ 1, 16384, FALSE, NULL, NULL);
+
+ return offset;
+}
+
+
static const value_string x2ap_Registration_Request_vals[] = {
{ 0, "start" },
{ 1, "stop" },
@@ -3403,6 +3943,23 @@ dissect_x2ap_RRC_Context(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
}
+static const value_string x2ap_RRCConnReestabIndicator_vals[] = {
+ { 0, "reconfigurationFailure" },
+ { 1, "handoverFailure" },
+ { 2, "otherFailure" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_x2ap_RRCConnReestabIndicator(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 const value_string x2ap_RRCConnSetupIndicator_vals[] = {
{ 0, "rrcConnSetup" },
{ 0, NULL }
@@ -3520,6 +4077,16 @@ dissect_x2ap_SubscriberProfileIDforRFP(tvbuff_t *tvb _U_, int offset _U_, asn1_c
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_) {
+ offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+ NO_BOUND, NO_BOUND, FALSE, NULL);
+
+ return offset;
+}
+
+
+
+static int
dissect_x2ap_TargeteNBtoSource_eNBTransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 90 "../../asn1/x2ap/x2ap.cnf"
tvbuff_t *parameter_tvb=NULL;
@@ -3558,6 +4125,16 @@ dissect_x2ap_TimeToWait(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
}
+
+static int
+dissect_x2ap_Time_UE_StayedInCell_EnhancedGranularity(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, 40950U, NULL, FALSE);
+
+ return offset;
+}
+
+
static const value_string x2ap_TraceDepth_vals[] = {
{ 0, "minimum" },
{ 1, "medium" },
@@ -3672,37 +4249,6 @@ dissect_x2ap_UESecurityCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
}
-static const value_string x2ap_UL_InterferenceOverloadIndication_Item_vals[] = {
- { 0, "high-interference" },
- { 1, "medium-interference" },
- { 2, "low-interference" },
- { 0, NULL }
-};
-
-
-static int
-dissect_x2ap_UL_InterferenceOverloadIndication_Item(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 const per_sequence_t UL_InterferenceOverloadIndication_sequence_of[1] = {
- { &hf_x2ap_UL_InterferenceOverloadIndication_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_UL_InterferenceOverloadIndication_Item },
-};
-
-static int
-dissect_x2ap_UL_InterferenceOverloadIndication(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_UL_InterferenceOverloadIndication, UL_InterferenceOverloadIndication_sequence_of,
- 1, maxnoofPRBs, FALSE);
-
- return offset;
-}
-
-
static int
dissect_x2ap_UL_HighInterferenceIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -3822,6 +4368,16 @@ dissect_x2ap_E_RABs_ToBeSetup_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
}
+
+static int
+dissect_x2ap_MobilityInformation(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,
+ 32, 32, FALSE, NULL, NULL);
+
+ return offset;
+}
+
+
static const per_sequence_t HandoverRequestAcknowledge_sequence[] = {
{ &hf_x2ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Container },
{ NULL, 0, 0, NULL }
@@ -4596,6 +5152,60 @@ dissect_x2ap_CellActivationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
}
+static const per_sequence_t X2Release_sequence[] = {
+ { &hf_x2ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+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_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_x2ap_X2Release, X2Release_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t X2MessageTransfer_sequence[] = {
+ { &hf_x2ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_X2MessageTransfer(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_X2MessageTransfer, X2MessageTransfer_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t RNL_Header_sequence[] = {
+ { &hf_x2ap_target_GlobalENB_ID, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GlobalENB_ID },
+ { &hf_x2ap_source_GlobalENB_ID, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_GlobalENB_ID },
+ { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_x2ap_RNL_Header(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_RNL_Header, RNL_Header_sequence);
+
+ return offset;
+}
+
+
+
+static int
+dissect_x2ap_X2AP_Message(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 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_) {
@@ -4712,6 +5322,14 @@ static int dissect_ABS_Status_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_AdditionalSpecialSubframe_Info_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_AdditionalSpecialSubframe_Info(tvb, offset, &asn1_ctx, tree, hf_x2ap_AdditionalSpecialSubframe_Info_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_Cause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4728,6 +5346,14 @@ static int dissect_CompositeAvailableCapacityGroup_PDU(tvbuff_t *tvb _U_, packet
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_COUNTValueExtended_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_COUNTValueExtended(tvb, offset, &asn1_ctx, tree, hf_x2ap_COUNTValueExtended_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_CriticalityDiagnostics_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4768,6 +5394,14 @@ static int dissect_DeactivationIndication_PDU(tvbuff_t *tvb _U_, packet_info *pi
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_EARFCNExtension_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_EARFCNExtension(tvb, offset, &asn1_ctx, tree, hf_x2ap_EARFCNExtension_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_ECGI_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4792,6 +5426,14 @@ static int dissect_E_RAB_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_ExtendedULInterferenceOverloadInfo_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_ExtendedULInterferenceOverloadInfo(tvb, offset, &asn1_ctx, tree, hf_x2ap_ExtendedULInterferenceOverloadInfo_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_GlobalENB_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4824,6 +5466,14 @@ static int dissect_HandoverReportType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_Masked_IMEISV_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_Masked_IMEISV(tvb, offset, &asn1_ctx, tree, hf_x2ap_Masked_IMEISV_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_InvokeIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4832,6 +5482,30 @@ static int dissect_InvokeIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_M3Configuration_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_M3Configuration(tvb, offset, &asn1_ctx, tree, hf_x2ap_M3Configuration_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_M4Configuration_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_M4Configuration(tvb, offset, &asn1_ctx, tree, hf_x2ap_M4Configuration_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_M5Configuration_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_M5Configuration(tvb, offset, &asn1_ctx, tree, hf_x2ap_M5Configuration_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_MDT_Configuration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4840,6 +5514,22 @@ static int dissect_MDT_Configuration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_MDTPLMNList_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_MDTPLMNList(tvb, offset, &asn1_ctx, tree, hf_x2ap_MDTPLMNList_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_MDT_Location_Info_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_MDT_Location_Info(tvb, offset, &asn1_ctx, tree, hf_x2ap_MDT_Location_Info_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_Measurement_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4848,6 +5538,14 @@ static int dissect_Measurement_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_MBMS_Service_Area_Identity_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;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_x2ap_MBMS_Service_Area_Identity_List(tvb, offset, &asn1_ctx, tree, hf_x2ap_MBMS_Service_Area_Identity_List_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_MBSFN_Subframe_Infolist_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4880,6 +5578,14 @@ static int dissect_MobilityParametersInformation_PDU(tvbuff_t *tvb _U_, packet_i
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_MultibandInfoList_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_MultibandInfoList(tvb, offset, &asn1_ctx, tree, hf_x2ap_MultibandInfoList_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_Number_of_Antennaports_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4904,6 +5610,14 @@ static int dissect_PRACH_Configuration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
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;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_x2ap_ReceiveStatusOfULPDCPSDUsExtended(tvb, offset, &asn1_ctx, tree, hf_x2ap_ReceiveStatusOfULPDCPSDUsExtended_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_Registration_Request_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4920,6 +5634,14 @@ static int dissect_ReportCharacteristics_PDU(tvbuff_t *tvb _U_, packet_info *pin
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;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_x2ap_RRCConnReestabIndicator(tvb, offset, &asn1_ctx, tree, hf_x2ap_RRCConnReestabIndicator_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_RRCConnSetupIndicator_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4952,6 +5674,30 @@ static int dissect_SRVCCOperationPossible_PDU(tvbuff_t *tvb _U_, packet_info *pi
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;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_x2ap_SubframeAssignment(tvb, offset, &asn1_ctx, tree, hf_x2ap_SubframeAssignment_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_TAC_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_x2ap_TAC(tvb, offset, &asn1_ctx, tree, hf_x2ap_TAC_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_TargetCellInUTRAN_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_TargetCellInUTRAN(tvb, offset, &asn1_ctx, tree, hf_x2ap_TargetCellInUTRAN_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_TargeteNBtoSource_eNBTransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -4968,6 +5714,14 @@ static int dissect_TimeToWait_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_Time_UE_StayedInCell_EnhancedGranularity_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_Time_UE_StayedInCell_EnhancedGranularity(tvb, offset, &asn1_ctx, tree, hf_x2ap_Time_UE_StayedInCell_EnhancedGranularity_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_TraceActivation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -5024,6 +5778,14 @@ static int dissect_E_RABs_ToBeSetup_Item_PDU(tvbuff_t *tvb _U_, packet_info *pin
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_MobilityInformation_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_MobilityInformation(tvb, offset, &asn1_ctx, tree, hf_x2ap_MobilityInformation_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_HandoverRequestAcknowledge_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -5416,6 +6178,38 @@ static int dissect_CellActivationFailure_PDU(tvbuff_t *tvb _U_, packet_info *pin
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_X2Release_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_X2Release(tvb, offset, &asn1_ctx, tree, hf_x2ap_X2Release_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_X2MessageTransfer_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_X2MessageTransfer(tvb, offset, &asn1_ctx, tree, hf_x2ap_X2MessageTransfer_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_RNL_Header_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_RNL_Header(tvb, offset, &asn1_ctx, tree, hf_x2ap_RNL_Header_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_X2AP_Message_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_X2AP_Message(tvb, offset, &asn1_ctx, tree, hf_x2ap_X2AP_Message_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static void dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
@@ -5493,6 +6287,10 @@ void proto_register_x2ap(void) {
{ "ABS-Status", "x2ap.ABS_Status_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_AdditionalSpecialSubframe_Info_PDU,
+ { "AdditionalSpecialSubframe-Info", "x2ap.AdditionalSpecialSubframe_Info_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_Cause_PDU,
{ "Cause", "x2ap.Cause",
FT_UINT32, BASE_DEC, VALS(x2ap_Cause_vals), 0,
@@ -5501,6 +6299,10 @@ void proto_register_x2ap(void) {
{ "CompositeAvailableCapacityGroup", "x2ap.CompositeAvailableCapacityGroup_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_COUNTValueExtended_PDU,
+ { "COUNTValueExtended", "x2ap.COUNTValueExtended_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_CriticalityDiagnostics_PDU,
{ "CriticalityDiagnostics", "x2ap.CriticalityDiagnostics_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -5521,6 +6323,10 @@ void proto_register_x2ap(void) {
{ "DeactivationIndication", "x2ap.DeactivationIndication",
FT_UINT32, BASE_DEC, VALS(x2ap_DeactivationIndication_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_EARFCNExtension_PDU,
+ { "EARFCNExtension", "x2ap.EARFCNExtension",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_ECGI_PDU,
{ "ECGI", "x2ap.ECGI_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -5533,6 +6339,10 @@ void proto_register_x2ap(void) {
{ "E-RAB-Item", "x2ap.E_RAB_Item_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_ExtendedULInterferenceOverloadInfo_PDU,
+ { "ExtendedULInterferenceOverloadInfo", "x2ap.ExtendedULInterferenceOverloadInfo_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_GlobalENB_ID_PDU,
{ "GlobalENB-ID", "x2ap.GlobalENB_ID_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -5549,18 +6359,46 @@ void proto_register_x2ap(void) {
{ "HandoverReportType", "x2ap.HandoverReportType",
FT_UINT32, BASE_DEC, VALS(x2ap_HandoverReportType_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_Masked_IMEISV_PDU,
+ { "Masked-IMEISV", "x2ap.Masked_IMEISV",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_InvokeIndication_PDU,
{ "InvokeIndication", "x2ap.InvokeIndication",
FT_UINT32, BASE_DEC, VALS(x2ap_InvokeIndication_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_M3Configuration_PDU,
+ { "M3Configuration", "x2ap.M3Configuration_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_M4Configuration_PDU,
+ { "M4Configuration", "x2ap.M4Configuration_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_M5Configuration_PDU,
+ { "M5Configuration", "x2ap.M5Configuration_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_MDT_Configuration_PDU,
{ "MDT-Configuration", "x2ap.MDT_Configuration_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_MDTPLMNList_PDU,
+ { "MDTPLMNList", "x2ap.MDTPLMNList",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_MDT_Location_Info_PDU,
+ { "MDT-Location-Info", "x2ap.MDT_Location_Info",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_Measurement_ID_PDU,
{ "Measurement-ID", "x2ap.Measurement_ID",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_MBMS_Service_Area_Identity_List_PDU,
+ { "MBMS-Service-Area-Identity-List", "x2ap.MBMS_Service_Area_Identity_List",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_MBSFN_Subframe_Infolist_PDU,
{ "MBSFN-Subframe-Infolist", "x2ap.MBSFN_Subframe_Infolist",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -5577,6 +6415,10 @@ void proto_register_x2ap(void) {
{ "MobilityParametersInformation", "x2ap.MobilityParametersInformation_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_MultibandInfoList_PDU,
+ { "MultibandInfoList", "x2ap.MultibandInfoList",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_Number_of_Antennaports_PDU,
{ "Number-of-Antennaports", "x2ap.Number_of_Antennaports",
FT_UINT32, BASE_DEC, VALS(x2ap_Number_of_Antennaports_vals), 0,
@@ -5589,6 +6431,10 @@ void proto_register_x2ap(void) {
{ "PRACH-Configuration", "x2ap.PRACH_Configuration_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_ReceiveStatusOfULPDCPSDUsExtended_PDU,
+ { "ReceiveStatusOfULPDCPSDUsExtended", "x2ap.ReceiveStatusOfULPDCPSDUsExtended",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_Registration_Request_PDU,
{ "Registration-Request", "x2ap.Registration_Request",
FT_UINT32, BASE_DEC, VALS(x2ap_Registration_Request_vals), 0,
@@ -5597,6 +6443,10 @@ void proto_register_x2ap(void) {
{ "ReportCharacteristics", "x2ap.ReportCharacteristics",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_RRCConnReestabIndicator_PDU,
+ { "RRCConnReestabIndicator", "x2ap.RRCConnReestabIndicator",
+ FT_UINT32, BASE_DEC, VALS(x2ap_RRCConnReestabIndicator_vals), 0,
+ NULL, HFILL }},
{ &hf_x2ap_RRCConnSetupIndicator_PDU,
{ "RRCConnSetupIndicator", "x2ap.RRCConnSetupIndicator",
FT_UINT32, BASE_DEC, VALS(x2ap_RRCConnSetupIndicator_vals), 0,
@@ -5613,6 +6463,18 @@ void proto_register_x2ap(void) {
{ "SRVCCOperationPossible", "x2ap.SRVCCOperationPossible",
FT_UINT32, BASE_DEC, VALS(x2ap_SRVCCOperationPossible_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_SubframeAssignment_PDU,
+ { "SubframeAssignment", "x2ap.SubframeAssignment",
+ FT_UINT32, BASE_DEC, VALS(x2ap_SubframeAssignment_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_TAC_PDU,
+ { "TAC", "x2ap.TAC",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_TargetCellInUTRAN_PDU,
+ { "TargetCellInUTRAN", "x2ap.TargetCellInUTRAN",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_TargeteNBtoSource_eNBTransparentContainer_PDU,
{ "TargeteNBtoSource-eNBTransparentContainer", "x2ap.TargeteNBtoSource_eNBTransparentContainer",
FT_BYTES, BASE_NONE, NULL, 0,
@@ -5621,6 +6483,10 @@ void proto_register_x2ap(void) {
{ "TimeToWait", "x2ap.TimeToWait",
FT_UINT32, BASE_DEC, VALS(x2ap_TimeToWait_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_Time_UE_StayedInCell_EnhancedGranularity_PDU,
+ { "Time-UE-StayedInCell-EnhancedGranularity", "x2ap.Time_UE_StayedInCell_EnhancedGranularity",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_TraceActivation_PDU,
{ "TraceActivation", "x2ap.TraceActivation_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -5649,6 +6515,10 @@ void proto_register_x2ap(void) {
{ "E-RABs-ToBeSetup-Item", "x2ap.E_RABs_ToBeSetup_Item_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_MobilityInformation_PDU,
+ { "MobilityInformation", "x2ap.MobilityInformation",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_HandoverRequestAcknowledge_PDU,
{ "HandoverRequestAcknowledge", "x2ap.HandoverRequestAcknowledge_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -5845,6 +6715,22 @@ void proto_register_x2ap(void) {
{ "CellActivationFailure", "x2ap.CellActivationFailure_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_X2Release_PDU,
+ { "X2Release", "x2ap.X2Release_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_X2MessageTransfer_PDU,
+ { "X2MessageTransfer", "x2ap.X2MessageTransfer_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_RNL_Header_PDU,
+ { "RNL-Header", "x2ap.RNL_Header_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_X2AP_Message_PDU,
+ { "X2AP-Message", "x2ap.X2AP_Message",
+ FT_BYTES, 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,
@@ -5945,6 +6831,18 @@ void proto_register_x2ap(void) {
{ "usableABSInformation", "x2ap.usableABSInformation",
FT_UINT32, BASE_DEC, VALS(x2ap_UsableABSInformation_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_additionalspecialSubframePatterns,
+ { "additionalspecialSubframePatterns", "x2ap.additionalspecialSubframePatterns",
+ FT_UINT32, BASE_DEC, VALS(x2ap_AdditionalSpecialSubframePatterns_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_cyclicPrefixDL,
+ { "cyclicPrefixDL", "x2ap.cyclicPrefixDL",
+ FT_UINT32, BASE_DEC, VALS(x2ap_CyclicPrefixDL_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_cyclicPrefixUL,
+ { "cyclicPrefixUL", "x2ap.cyclicPrefixUL",
+ FT_UINT32, BASE_DEC, VALS(x2ap_CyclicPrefixUL_vals), 0,
+ NULL, HFILL }},
{ &hf_x2ap_key_eNodeB_star,
{ "key-eNodeB-star", "x2ap.key_eNodeB_star",
FT_BYTES, BASE_NONE, NULL, 0,
@@ -5977,6 +6875,10 @@ void proto_register_x2ap(void) {
{ "pLMNWide", "x2ap.pLMNWide_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_tAIBased,
+ { "tAIBased", "x2ap.tAIBased_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "TAIBasedMDT", HFILL }},
{ &hf_x2ap_BroadcastPLMNs_Item_item,
{ "PLMN-Identity", "x2ap.PLMN_Identity",
FT_BYTES, BASE_NONE, NULL, 0,
@@ -6033,6 +6935,14 @@ void proto_register_x2ap(void) {
{ "hFN", "x2ap.hFN",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_pDCP_SNExtended,
+ { "pDCP-SNExtended", "x2ap.pDCP_SNExtended",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_hFNModified,
+ { "hFNModified", "x2ap.hFNModified",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_procedureCode,
{ "procedureCode", "x2ap.procedureCode",
FT_UINT32, BASE_DEC, VALS(x2ap_ProcedureCode_vals), 0,
@@ -6149,6 +7059,14 @@ void proto_register_x2ap(void) {
{ "cause", "x2ap.cause",
FT_UINT32, BASE_DEC, VALS(x2ap_Cause_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_associatedSubframes,
+ { "associatedSubframes", "x2ap.associatedSubframes",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "BIT_STRING_SIZE_5", HFILL }},
+ { &hf_x2ap_extended_ul_InterferenceOverloadIndication,
+ { "extended-ul-InterferenceOverloadIndication", "x2ap.extended_ul_InterferenceOverloadIndication",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "UL_InterferenceOverloadIndication", HFILL }},
{ &hf_x2ap_ForbiddenTAs_item,
{ "ForbiddenTAs-Item", "x2ap.ForbiddenTAs_Item_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -6281,6 +7199,26 @@ void proto_register_x2ap(void) {
{ "reportArea", "x2ap.reportArea",
FT_UINT32, BASE_DEC, VALS(x2ap_ReportArea_vals), 0,
NULL, HFILL }},
+ { &hf_x2ap_m3period,
+ { "m3period", "x2ap.m3period",
+ FT_UINT32, BASE_DEC, VALS(x2ap_M3period_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_m4period,
+ { "m4period", "x2ap.m4period",
+ FT_UINT32, BASE_DEC, VALS(x2ap_M4period_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_m4_links_to_log,
+ { "m4-links-to-log", "x2ap.m4_links_to_log",
+ FT_UINT32, BASE_DEC, VALS(x2ap_Links_to_log_vals), 0,
+ "Links_to_log", HFILL }},
+ { &hf_x2ap_m5period,
+ { "m5period", "x2ap.m5period",
+ FT_UINT32, BASE_DEC, VALS(x2ap_M5period_vals), 0,
+ NULL, HFILL }},
+ { &hf_x2ap_m5_links_to_log,
+ { "m5-links-to-log", "x2ap.m5_links_to_log",
+ FT_UINT32, BASE_DEC, VALS(x2ap_Links_to_log_vals), 0,
+ "Links_to_log", HFILL }},
{ &hf_x2ap_mdt_Activation,
{ "mdt-Activation", "x2ap.mdt_Activation",
FT_UINT32, BASE_DEC, VALS(x2ap_MDT_Activation_vals), 0,
@@ -6293,18 +7231,22 @@ void proto_register_x2ap(void) {
{ "measurementsToActivate", "x2ap.measurementsToActivate",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
- { &hf_x2ap_reportingTriggerMDT,
- { "reportingTriggerMDT", "x2ap.reportingTriggerMDT",
- FT_UINT32, BASE_DEC, VALS(x2ap_ReportingTriggerMDT_vals), 0,
+ { &hf_x2ap_m1reportingTrigger,
+ { "m1reportingTrigger", "x2ap.m1reportingTrigger",
+ FT_UINT32, BASE_DEC, VALS(x2ap_M1ReportingTrigger_vals), 0,
NULL, HFILL }},
- { &hf_x2ap_thresholdeventA2,
- { "thresholdeventA2", "x2ap.thresholdeventA2_element",
+ { &hf_x2ap_m1thresholdeventA2,
+ { "m1thresholdeventA2", "x2ap.m1thresholdeventA2_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
- { &hf_x2ap_periodicReportingMDT,
- { "periodicReportingMDT", "x2ap.periodicReportingMDT_element",
+ { &hf_x2ap_m1periodicReporting,
+ { "m1periodicReporting", "x2ap.m1periodicReporting_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_MDTPLMNList_item,
+ { "PLMN-Identity", "x2ap.PLMN_Identity",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_threshold_RSRP,
{ "threshold-RSRP", "x2ap.threshold_RSRP",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -6313,6 +7255,10 @@ void proto_register_x2ap(void) {
{ "threshold-RSRQ", "x2ap.threshold_RSRQ",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_MBMS_Service_Area_Identity_List_item,
+ { "MBMS-Service-Area-Identity", "x2ap.MBMS_Service_Area_Identity",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_MBSFN_Subframe_Infolist_item,
{ "MBSFN-Subframe-Info", "x2ap.MBSFN_Subframe_Info_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -6341,6 +7287,14 @@ void proto_register_x2ap(void) {
{ "handoverTriggerChange", "x2ap.handoverTriggerChange",
FT_INT32, BASE_DEC, NULL, 0,
"INTEGER_M20_20", HFILL }},
+ { &hf_x2ap_MultibandInfoList_item,
+ { "BandInfo", "x2ap.BandInfo_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_freqBandIndicator,
+ { "freqBandIndicator", "x2ap.freqBandIndicator",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_Neighbour_Information_item,
{ "Neighbour-Information item", "x2ap.Neighbour_Information_item_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -6465,14 +7419,6 @@ void proto_register_x2ap(void) {
{ "specialSubframePatterns", "x2ap.specialSubframePatterns",
FT_UINT32, BASE_DEC, VALS(x2ap_SpecialSubframePatterns_vals), 0,
NULL, HFILL }},
- { &hf_x2ap_cyclicPrefixDL,
- { "cyclicPrefixDL", "x2ap.cyclicPrefixDL",
- FT_UINT32, BASE_DEC, VALS(x2ap_CyclicPrefixDL_vals), 0,
- NULL, HFILL }},
- { &hf_x2ap_cyclicPrefixUL,
- { "cyclicPrefixUL", "x2ap.cyclicPrefixUL",
- FT_UINT32, BASE_DEC, VALS(x2ap_CyclicPrefixUL_vals), 0,
- NULL, HFILL }},
{ &hf_x2ap_oneframe,
{ "oneframe", "x2ap.oneframe",
FT_BYTES, BASE_NONE, NULL, 0,
@@ -6489,6 +7435,14 @@ void proto_register_x2ap(void) {
{ "TAC", "x2ap.TAC",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_tAIListforMDT,
+ { "tAIListforMDT", "x2ap.tAIListforMDT",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
+ { &hf_x2ap_TAIListforMDT_item,
+ { "TAI-Item", "x2ap.TAI_Item_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_x2ap_measurementThreshold,
{ "measurementThreshold", "x2ap.measurementThreshold",
FT_UINT32, BASE_DEC, VALS(x2ap_MeasurementThresholdA2_vals), 0,
@@ -6733,6 +7687,14 @@ void proto_register_x2ap(void) {
{ "ActivatedCellList-Item", "x2ap.ActivatedCellList_Item_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_x2ap_target_GlobalENB_ID,
+ { "target-GlobalENB-ID", "x2ap.target_GlobalENB_ID_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "GlobalENB_ID", HFILL }},
+ { &hf_x2ap_source_GlobalENB_ID,
+ { "source-GlobalENB-ID", "x2ap.source_GlobalENB_ID_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "GlobalENB_ID", HFILL }},
{ &hf_x2ap_initiatingMessage,
{ "initiatingMessage", "x2ap.initiatingMessage_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -6780,6 +7742,7 @@ void proto_register_x2ap(void) {
&ett_x2ap_ABSInformationFDD,
&ett_x2ap_ABSInformationTDD,
&ett_x2ap_ABS_Status,
+ &ett_x2ap_AdditionalSpecialSubframe_Info,
&ett_x2ap_AS_SecurityInformation,
&ett_x2ap_AllocationAndRetentionPriority,
&ett_x2ap_AreaScopeOfMDT,
@@ -6791,6 +7754,7 @@ void proto_register_x2ap(void) {
&ett_x2ap_CompositeAvailableCapacityGroup,
&ett_x2ap_CompositeAvailableCapacity,
&ett_x2ap_COUNTvalue,
+ &ett_x2ap_COUNTValueExtended,
&ett_x2ap_CriticalityDiagnostics,
&ett_x2ap_CriticalityDiagnostics_IE_List,
&ett_x2ap_CriticalityDiagnostics_IE_List_item,
@@ -6803,6 +7767,7 @@ void proto_register_x2ap(void) {
&ett_x2ap_E_RAB_Level_QoS_Parameters,
&ett_x2ap_E_RAB_List,
&ett_x2ap_E_RAB_Item,
+ &ett_x2ap_ExtendedULInterferenceOverloadInfo,
&ett_x2ap_ForbiddenTAs,
&ett_x2ap_ForbiddenTAs_Item,
&ett_x2ap_ForbiddenTACs,
@@ -6821,15 +7786,22 @@ void proto_register_x2ap(void) {
&ett_x2ap_LastVisitedEUTRANCellInformation,
&ett_x2ap_LastVisitedGERANCellInformation,
&ett_x2ap_LocationReportingInformation,
+ &ett_x2ap_M3Configuration,
+ &ett_x2ap_M4Configuration,
+ &ett_x2ap_M5Configuration,
&ett_x2ap_MDT_Configuration,
+ &ett_x2ap_MDTPLMNList,
&ett_x2ap_MeasurementThresholdA2,
+ &ett_x2ap_MBMS_Service_Area_Identity_List,
&ett_x2ap_MBSFN_Subframe_Infolist,
&ett_x2ap_MBSFN_Subframe_Info,
&ett_x2ap_MobilityParametersModificationRange,
&ett_x2ap_MobilityParametersInformation,
+ &ett_x2ap_MultibandInfoList,
+ &ett_x2ap_BandInfo,
&ett_x2ap_Neighbour_Information,
&ett_x2ap_Neighbour_Information_item,
- &ett_x2ap_PeriodicReportingMDT,
+ &ett_x2ap_M1PeriodicReporting,
&ett_x2ap_PRACH_Configuration,
&ett_x2ap_RadioResourceStatus,
&ett_x2ap_RelativeNarrowbandTxPower,
@@ -6841,7 +7813,10 @@ void proto_register_x2ap(void) {
&ett_x2ap_SubframeAllocation,
&ett_x2ap_TABasedMDT,
&ett_x2ap_TAListforMDT,
- &ett_x2ap_ThresholdEventA2,
+ &ett_x2ap_TAIBasedMDT,
+ &ett_x2ap_TAIListforMDT,
+ &ett_x2ap_TAI_Item,
+ &ett_x2ap_M1ThresholdEventA2,
&ett_x2ap_TraceActivation,
&ett_x2ap_UE_HistoryInformation,
&ett_x2ap_UEAggregateMaximumBitRate,
@@ -6907,6 +7882,9 @@ void proto_register_x2ap(void) {
&ett_x2ap_ActivatedCellList,
&ett_x2ap_ActivatedCellList_Item,
&ett_x2ap_CellActivationFailure,
+ &ett_x2ap_X2Release,
+ &ett_x2ap_X2MessageTransfer,
+ &ett_x2ap_RNL_Header,
&ett_x2ap_X2AP_PDU,
&ett_x2ap_InitiatingMessage,
&ett_x2ap_SuccessfulOutcome,
@@ -7024,6 +8002,13 @@ proto_reg_handoff_x2ap(void)
dissector_add_uint("x2ap.ies", id_CompleteFailureCauseInformation_Item, new_create_dissector_handle(dissect_CompleteFailureCauseInformation_Item_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_CSGMembershipStatus, new_create_dissector_handle(dissect_CSGMembershipStatus_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_RRCConnSetupIndicator, new_create_dissector_handle(dissect_RRCConnSetupIndicator_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_RRCConnReestabIndicator, new_create_dissector_handle(dissect_RRCConnReestabIndicator_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_TargetCellInUTRAN, new_create_dissector_handle(dissect_TargetCellInUTRAN_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_MobilityInformation, new_create_dissector_handle(dissect_MobilityInformation_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_SourceCellCRNTI, new_create_dissector_handle(dissect_CRNTI_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_Masked_IMEISV, new_create_dissector_handle(dissect_Masked_IMEISV_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_RNL_Header, new_create_dissector_handle(dissect_RNL_Header_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.ies", id_x2APMessage, new_create_dissector_handle(dissect_X2AP_Message_PDU, proto_x2ap));
dissector_add_uint("x2ap.extension", id_Number_of_Antennaports, new_create_dissector_handle(dissect_Number_of_Antennaports_PDU, proto_x2ap));
dissector_add_uint("x2ap.extension", id_CompositeAvailableCapacityGroup, new_create_dissector_handle(dissect_CompositeAvailableCapacityGroup_PDU, proto_x2ap));
dissector_add_uint("x2ap.extension", id_PRACH_Configuration, new_create_dissector_handle(dissect_PRACH_Configuration_PDU, proto_x2ap));
@@ -7035,6 +8020,26 @@ proto_reg_handoff_x2ap(void)
dissector_add_uint("x2ap.extension", id_CSG_Id, new_create_dissector_handle(dissect_CSG_Id_PDU, proto_x2ap));
dissector_add_uint("x2ap.extension", id_MDTConfiguration, new_create_dissector_handle(dissect_MDT_Configuration_PDU, proto_x2ap));
dissector_add_uint("x2ap.extension", id_ManagementBasedMDTallowed, new_create_dissector_handle(dissect_ManagementBasedMDTallowed_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_NeighbourTAC, new_create_dissector_handle(dissect_TAC_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_Time_UE_StayedInCell_EnhancedGranularity, new_create_dissector_handle(dissect_Time_UE_StayedInCell_EnhancedGranularity_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_MBMS_Service_Area_List, new_create_dissector_handle(dissect_MBMS_Service_Area_Identity_List_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_HO_cause, new_create_dissector_handle(dissect_Cause_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_MultibandInfoList, new_create_dissector_handle(dissect_MultibandInfoList_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_M3Configuration, new_create_dissector_handle(dissect_M3Configuration_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_M4Configuration, new_create_dissector_handle(dissect_M4Configuration_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_M5Configuration, new_create_dissector_handle(dissect_M5Configuration_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_MDT_Location_Info, new_create_dissector_handle(dissect_MDT_Location_Info_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_ManagementBasedMDTPLMNList, new_create_dissector_handle(dissect_MDTPLMNList_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_SignallingBasedMDTPLMNList, new_create_dissector_handle(dissect_MDTPLMNList_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_ReceiveStatusOfULPDCPSDUsExtended, new_create_dissector_handle(dissect_ReceiveStatusOfULPDCPSDUsExtended_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_ULCOUNTValueExtended, new_create_dissector_handle(dissect_COUNTValueExtended_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_DLCOUNTValueExtended, new_create_dissector_handle(dissect_COUNTValueExtended_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_eARFCNExtension, new_create_dissector_handle(dissect_EARFCNExtension_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_UL_EARFCNExtension, new_create_dissector_handle(dissect_EARFCNExtension_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_DL_EARFCNExtension, new_create_dissector_handle(dissect_EARFCNExtension_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_AdditionalSpecialSubframe_Info, new_create_dissector_handle(dissect_AdditionalSpecialSubframe_Info_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_IntendedULDLConfiguration, new_create_dissector_handle(dissect_SubframeAssignment_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.extension", id_ExtendedULInterferenceOverloadInfo, new_create_dissector_handle(dissect_ExtendedULInterferenceOverloadInfo_PDU, proto_x2ap));
dissector_add_uint("x2ap.proc.imsg", id_handoverPreparation, new_create_dissector_handle(dissect_HandoverRequest_PDU, proto_x2ap));
dissector_add_uint("x2ap.proc.sout", id_handoverPreparation, new_create_dissector_handle(dissect_HandoverRequestAcknowledge_PDU, proto_x2ap));
dissector_add_uint("x2ap.proc.uout", id_handoverPreparation, new_create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_x2ap));
@@ -7064,6 +8069,8 @@ proto_reg_handoff_x2ap(void)
dissector_add_uint("x2ap.proc.imsg", id_cellActivation, new_create_dissector_handle(dissect_CellActivationRequest_PDU, proto_x2ap));
dissector_add_uint("x2ap.proc.sout", id_cellActivation, new_create_dissector_handle(dissect_CellActivationResponse_PDU, proto_x2ap));
dissector_add_uint("x2ap.proc.uout", id_cellActivation, new_create_dissector_handle(dissect_CellActivationFailure_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.proc.imsg", id_x2Release, new_create_dissector_handle(dissect_X2Release_PDU, proto_x2ap));
+ dissector_add_uint("x2ap.proc.imsg", id_x2MessageTransfer, new_create_dissector_handle(dissect_X2MessageTransfer_PDU, proto_x2ap));
/*--- End of included file: packet-x2ap-dis-tab.c ---*/