diff options
Diffstat (limited to 'epan/dissectors/asn1/x2ap')
| -rw-r--r-- | epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn | 2 | ||||
| -rw-r--r-- | epan/dissectors/asn1/x2ap/X2AP-Constants.asn | 21 | ||||
| -rw-r--r-- | epan/dissectors/asn1/x2ap/X2AP-Containers.asn | 2 | ||||
| -rw-r--r-- | epan/dissectors/asn1/x2ap/X2AP-IEs.asn | 105 | ||||
| -rw-r--r-- | epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn | 96 | ||||
| -rw-r--r-- | epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn | 30 | ||||
| -rw-r--r-- | epan/dissectors/asn1/x2ap/packet-x2ap-template.c | 372 | ||||
| -rw-r--r-- | epan/dissectors/asn1/x2ap/x2ap.cnf | 77 |
8 files changed, 436 insertions, 269 deletions
diff --git a/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn b/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn index c993cc41..c40ce866 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V17.5.0 (2023-06) +-- 3GPP TS 36.423 V18.2.0 (2024-06) -- 9.3.6 Common definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/x2ap/X2AP-Constants.asn b/epan/dissectors/asn1/x2ap/X2AP-Constants.asn index 0f406d19..79fa8467 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-Constants.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-Constants.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V17.5.0 (2023-06) +-- 3GPP TS 36.423 V18.2.0 (2024-06) -- 9.3.7 Constant definitions -- ************************************************************** -- @@ -85,6 +85,7 @@ id-UERadioCapabilityIDMapping ProcedureCode ::= 56 id-accessAndMobilityIndication ProcedureCode ::= 57 id-procedure-code-58-not-to-be-used ProcedureCode ::= 58 id-CPC-cancel ProcedureCode ::= 59 +id-rachIndication ProcedureCode ::= 60 -- ************************************************************** -- @@ -148,7 +149,7 @@ maxnoofSSBAreas INTEGER ::= 64 maxnoofNRSCSs INTEGER ::= 5 maxnoofNRPhysicalResourceBlocks INTEGER ::= 275 maxnoofNonAnchorCarrierFreqConfig INTEGER ::= 15 -maxnoofRACHReports INTEGER ::= 64 +maxnoofRAReports INTEGER ::= 64 maxnoofPSCellsPerSN INTEGER ::= 8 maxnoofPSCellsPerPrimaryCellinUEHistoryInfo INTEGER ::= 8 maxnoofReportedNRCellsPossiblyAggregated INTEGER ::= 16 @@ -160,6 +161,9 @@ maxnoofCSIRSneighbourCells INTEGER ::= 16 maxnoofCSIRSneighbourCellsInMTC INTEGER ::= 16 maxnoofSensorName INTEGER ::= 3 maxnoofTargetSgNBsMinusOne INTEGER ::= 7 +maxnoofUEsforRAReportIndications INTEGER ::= 64 + + -- ************************************************************** -- @@ -425,7 +429,7 @@ id-ServedEUTRAcellsENDCX2ManagementList ProtocolIE-ID ::= 250 id-CellAssistanceInformation ProtocolIE-ID ::= 251 id-Globalen-gNB-ID ProtocolIE-ID ::= 252 id-ServedNRcellsENDCX2ManagementList ProtocolIE-ID ::= 253 -id-UE-ContextReferenceAtSgNB ProtocolIE-ID ::= 254 +id-UE-ContextReferenceAtSgNB ProtocolIE-ID ::= 254 id-SecondaryRATUsageReport ProtocolIE-ID ::= 255 id-ActivationID ProtocolIE-ID ::= 256 id-MeNBResourceCoordinationInformation ProtocolIE-ID ::= 257 @@ -586,7 +590,7 @@ id-DirectForwardingPathAvailability ProtocolIE-ID ::= 410 id-sourceNG-RAN-node-id ProtocolIE-ID ::= 411 id-SourceDLForwardingIPAddress ProtocolIE-ID ::= 412 id-SourceNodeDLForwardingIPAddress ProtocolIE-ID ::= 413 -id-NRRACHReportInformation ProtocolIE-ID ::= 414 +id-NRRAReport ProtocolIE-ID ::= 414 id-SCG-UE-HistoryInformation ProtocolIE-ID ::= 415 id-PSCellHistoryInformationRetrieve ProtocolIE-ID ::= 416 id-MeasurementResultforNRCellsPossiblyAggregated ProtocolIE-ID ::= 417 @@ -614,5 +618,14 @@ id-SCGreconfigNotification ProtocolIE-ID ::= 438 id-MIMOPRBusageInformation ProtocolIE-ID ::= 439 id-SensorMeasurementConfiguration ProtocolIE-ID ::= 440 id-AdditionalListofForwardingGTPTunnelEndpoint ProtocolIE-ID ::= 441 +id-M4ReportAmount ProtocolIE-ID ::= 442 +id-M5ReportAmount ProtocolIE-ID ::= 443 +id-M6ReportAmount ProtocolIE-ID ::= 444 +id-M7ReportAmount ProtocolIE-ID ::= 445 +id-CHOTimeBasedInformation ProtocolIE-ID ::= 446 +id-RaReportIndicationList ProtocolIE-ID ::= 447 +id-PSCellListContainer ProtocolIE-ID ::= 448 +id-IABAuthorized ProtocolIE-ID ::= 449 + END diff --git a/epan/dissectors/asn1/x2ap/X2AP-Containers.asn b/epan/dissectors/asn1/x2ap/X2AP-Containers.asn index 31cb1c0e..3d63ea88 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-Containers.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-Containers.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V17.5.0 (2023-06) +-- 3GPP TS 36.423 V18.2.0 (2024-06) -- 9.3.8 Container definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/x2ap/X2AP-IEs.asn b/epan/dissectors/asn1/x2ap/X2AP-IEs.asn index 4fb6042b..2ef824de 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-IEs.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-IEs.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V17.5.0 (2023-06) +-- 3GPP TS 36.423 V18.2.0 (2024-06) -- 9.3.5 Information Element definitions -- ************************************************************** -- @@ -95,8 +95,14 @@ IMPORTS id-Additional-Measurement-Timing-Configuration-List, id-ServedCellSpecificInfoReq-NR, id-RAT-Restrictions, + id-PSCellListContainer, id-PSCell-UE-HistoryInformation, id-SensorMeasurementConfiguration, + id-M4ReportAmount, + id-M5ReportAmount, + id-M6ReportAmount, + id-M7ReportAmount, + id-CHOTimeBasedInformation, maxnoofBearers, maxCellineNB, @@ -150,7 +156,7 @@ IMPORTS maxnoofNRSCSs, maxnoofNRPhysicalResourceBlocks, maxnoofNonAnchorCarrierFreqConfig, - maxnoofRACHReports, + maxnoofRAReports, maxnoofPSCellsPerSN, maxnoofPSCellsPerPrimaryCellinUEHistoryInfo, maxnoofReportedNRCellsPossiblyAggregated, @@ -162,7 +168,8 @@ IMPORTS maxnoofCSIRSneighbourCellsInMTC, maxCellinengNB, maxnoofSensorName, - maxnoofTargetSgNBsMinusOne + maxnoofTargetSgNBsMinusOne, + maxnoofUEsforRAReportIndications FROM X2AP-Constants @@ -550,7 +557,8 @@ CauseRadioNetwork ::= ENUMERATED { unknown-E-UTRAN-Node-Measurement-ID, sCG-activation-deactivation-failure, sCG-deactivation-failure-due-to-data-transmission, - up-integrity-protection-not-possible + up-integrity-protection-not-possible, + iAB-not-Authorized } @@ -913,7 +921,7 @@ CoverageModification-Item ::= SEQUENCE { coverageState INTEGER (0..15, ...), cellDeploymentStatusIndicator CellDeploymentStatusIndicator OPTIONAL, cellReplacingInfo CellReplacingInfo OPTIONAL, --- Included in case the Cell Deployment Status Indicator IE is present +-- This IE shall be present if the Cell Deployment Status Indicator IE is present. ... } @@ -1018,7 +1026,7 @@ CHOtrigger ::= ENUMERATED { CHOinformation-REQ ::= SEQUENCE { cho-trigger CHOtrigger, new-eNB-UE-X2AP-ID UE-X2AP-ID OPTIONAL - -- This IE shall be present if the cho-trigger IE is present and set to "CHO-replace" --, + -- This IE shall be present if the CHO Trigger IE is present and set to "CHO-replace" --, new-eNB-UE-X2AP-ID-Extension UE-X2AP-ID-Extension OPTIONAL, cHO-EstimatedArrivalProbability CHO-Probability OPTIONAL, iE-Extensions ProtocolExtensionContainer { { CHOinformation-REQ-ExtIEs} } OPTIONAL, @@ -1026,6 +1034,18 @@ CHOinformation-REQ ::= SEQUENCE { } CHOinformation-REQ-ExtIEs X2AP-PROTOCOL-EXTENSION ::={ + {ID id-CHOTimeBasedInformation CRITICALITY reject EXTENSION CHOTimeBasedInformation PRESENCE optional}, + ... +} + +CHOTimeBasedInformation ::= SEQUENCE { + cHO-HOWindowStart CHO-HandoverWindowStart, + cHO-HOWindowDuration CHO-HandoverWindowDuration, + iE-Extensions ProtocolExtensionContainer { {CHOTimeBasedInformation-ExtIEs} } OPTIONAL, + ... +} + +CHOTimeBasedInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { ... } @@ -1045,6 +1065,10 @@ CandidateCellsToBeCancelledList ::= SEQUENCE (SIZE (1..maxnoofCellsinCHO)) OF EC CHO-Probability ::= INTEGER (1..100) +CHO-HandoverWindowStart ::= INTEGER (0..1048575) + +CHO-HandoverWindowDuration ::= INTEGER (1..6000) + CHOinformation-AddReq ::= SEQUENCE { source-eNB-ID GlobalENB-ID, source-eNB-UE-X2AP-ID UE-X2AP-ID, @@ -1695,6 +1719,13 @@ HWLoadIndicator-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { IABNodeIndication ::= ENUMERATED {true,...} +IABAuthorized ::= ENUMERATED { + authorized, + not-authorized, + ... +} + + IMSvoiceEPSfallbackfrom5G ::= ENUMERATED { true, ... @@ -1871,11 +1902,14 @@ M4Configuration ::= SEQUENCE { } M4Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { +{ ID id-M4ReportAmount CRITICALITY ignore EXTENSION M4ReportAmountMDT PRESENCE optional}, + ... } M4period ::= ENUMERATED {ms1024, ms2048, ms5120, ms10240, min1, ... } +M4ReportAmountMDT ::= ENUMERATED {r1, r2, r4, r8, r16, r32, r64, infinity, ...} M5Configuration ::= SEQUENCE { m5period M5period, @@ -1885,11 +1919,15 @@ M5Configuration ::= SEQUENCE { } M5Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { +{ ID id-M5ReportAmount CRITICALITY ignore EXTENSION M5ReportAmountMDT PRESENCE optional }, + ... } M5period ::= ENUMERATED {ms1024, ms2048, ms5120, ms10240, min1, ... } +M5ReportAmountMDT ::= ENUMERATED {r1, r2, r4, r8, r16, r32, r64, infinity, ...} + M6Configuration ::= SEQUENCE { m6report-interval M6report-interval, m6delay-threshold M6delay-threshold OPTIONAL, @@ -1900,6 +1938,8 @@ M6Configuration ::= SEQUENCE { } M6Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { +{ ID id-M6ReportAmount CRITICALITY ignore EXTENSION M6ReportAmountMDT PRESENCE optional }, + ... } @@ -1907,6 +1947,8 @@ M6report-interval ::= ENUMERATED { ms1024, ms2048, ms5120, ms10240, ... } M6delay-threshold ::= ENUMERATED { ms30, ms40, ms50, ms60, ms70, ms80, ms90, ms100, ms150, ms300, ms500, ms750, ... } +M6ReportAmountMDT ::= ENUMERATED {r1, r2, r4, r8, r16, r32, r64, infinity, ...} + M7Configuration ::= SEQUENCE { m7period M7period, m7-links-to-log Links-to-log, @@ -1915,11 +1957,15 @@ M7Configuration ::= SEQUENCE { } M7Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { +{ ID id-M7ReportAmount CRITICALITY ignore EXTENSION M7ReportAmountMDT PRESENCE optional }, + ... } M7period ::= INTEGER(1..60, ...) +M7ReportAmountMDT ::= ENUMERATED {r1, r2, r4, r8, r16, r32, r64, infinity, ...} + MakeBeforeBreakIndicator::= ENUMERATED {true, ...} ManagementBasedMDTallowed ::= ENUMERATED {allowed, ...} @@ -1940,21 +1986,26 @@ MDT-Configuration ::= SEQUENCE { measurementsToActivate MeasurementsToActivate, m1reportingTrigger M1ReportingTrigger, m1thresholdeventA2 M1ThresholdEventA2 OPTIONAL, --- Included in case of event-triggered, or event-triggered periodic reporting for measurement M1 +-- This IE shall be present if the Measurements to Activate IE has the first bit set to "1" and the M1 Reporting Trigger IE is set to "A2event-triggered" or to "A2event-triggered periodic". m1periodicReporting M1PeriodicReporting OPTIONAL, --- Included in case of periodic, or event-triggered periodic reporting for measurement M1 +-- This IE shall be present if the M1 Reporting Trigger IE is set to "periodic" or to "A2event-triggered periodic". iE-Extensions ProtocolExtensionContainer { {MDT-Configuration-ExtIEs} } OPTIONAL, ... } MDT-Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { {ID id-M3Configuration CRITICALITY ignore EXTENSION M3Configuration PRESENCE conditional}| +-- This IE shall be present if the Measurements to Activate IE has the third bit set to "1". This IE shall be present if the Measurements to Activate IE has the third bit set to "1".-- {ID id-M4Configuration CRITICALITY ignore EXTENSION M4Configuration PRESENCE conditional}| +-- This IE shall be present if the Measurements to Activate IE has the fourth bit set to "1". -- {ID id-M5Configuration CRITICALITY ignore EXTENSION M5Configuration PRESENCE conditional}| +-- This IE shall be present if the Measurements to Activate IE has the fifth bit set to "1". -- {ID id-MDT-Location-Info CRITICALITY ignore EXTENSION MDT-Location-Info PRESENCE optional}| {ID id-SignallingBasedMDTPLMNList CRITICALITY ignore EXTENSION MDTPLMNList PRESENCE optional}| {ID id-M6Configuration CRITICALITY ignore EXTENSION M6Configuration PRESENCE conditional}| +-- This IE shall be present if the Measurements to Activate IE has the seventh bit set to "1". -- {ID id-M7Configuration CRITICALITY ignore EXTENSION M7Configuration PRESENCE conditional}| +-- This IE shall be present if the Measurements to Activate IE has the eighth bit set to "1". -- { ID id-BluetoothMeasurementConfiguration CRITICALITY ignore EXTENSION BluetoothMeasurementConfiguration PRESENCE optional}| { ID id-WLANMeasurementConfiguration CRITICALITY ignore EXTENSION WLANMeasurementConfiguration PRESENCE optional}| { ID id-SensorMeasurementConfiguration CRITICALITY ignore EXTENSION SensorMeasurementConfiguration PRESENCE optional}, @@ -2188,18 +2239,19 @@ NRCGI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { ... } -NRRACHReportContainer ::= OCTET STRING +NRRAReportContainer ::= OCTET STRING -NRRACHReportInformation ::= SEQUENCE (SIZE(1.. maxnoofRACHReports)) OF NRRACHReportList-Item +NRRAReport ::= SEQUENCE (SIZE(1.. maxnoofRAReports)) OF NRRAReportList-Item -NRRACHReportList-Item ::= SEQUENCE { - nRRACHReport NRRACHReportContainer, +NRRAReportList-Item ::= SEQUENCE { + nRRAReport NRRAReportContainer, uEAssitantIdentifier SgNB-UE-X2AP-ID OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { NRRACHReportList-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { NRRAReportList-Item-ExtIEs} } OPTIONAL, ... } -NRRACHReportList-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { +NRRAReportList-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { +{ ID id-PSCellListContainer CRITICALITY ignore EXTENSION PSCellListContainer PRESENCE optional}, ... } @@ -2327,7 +2379,7 @@ NRRadioResourceStatus-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { } MIMOPRBusageInformation ::= SEQUENCE { -dl-GBR-PRB-usage-for-MIMO DL-GBR-PRB-usage-for-MIMO, + dl-GBR-PRB-usage-for-MIMO DL-GBR-PRB-usage-for-MIMO, ul-GBR-PRB-usage-for-MIMO UL-GBR-PRB-usage-for-MIMO, dl-non-GBR-PRB-usage-for-MIMO DL-non-GBR-PRB-usage-for-MIMO, ul-non-GBR-PRB-usage-for-MIMO UL-non-GBR-PRB-usage-for-MIMO, @@ -2636,6 +2688,8 @@ PSCell-UE-HistoryInformation ::= SEQUENCE (SIZE(1.. maxnoofPSCellsPerPrimaryCell PSCellChangeHistory ::= ENUMERATED {reportingFullHistory,...} +PSCellListContainer ::= OCTET STRING + -- Q @@ -2894,6 +2948,19 @@ RSRPMRList-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { RRCContainer ::= OCTET STRING +RaReportIndicationList ::= SEQUENCE (SIZE(1..maxnoofUEsforRAReportIndications)) OF RaReportIndicationList-Item + +RaReportIndicationList-Item ::= SEQUENCE { + meNB-UE-X2AP-ID UE-X2AP-ID, + meNB-UE-X2AP-ID-Extension UE-X2AP-ID-Extension OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {RaReportIndicationList-Item-ExtIEs} } OPTIONAL, + ... +} + +RaReportIndicationList-Item-ExtIEs X2AP-PROTOCOL-EXTENSION::= { + ... +} + -- S S1TNLLoadIndicator ::= SEQUENCE { @@ -3101,8 +3168,8 @@ SGNB-Addition-Trigger-Ind ::= ENUMERATED { } SNtriggered ::=ENUMERATED{ -true, -... + true, + ... } SourceOfUEActivityBehaviourInformation ::= ENUMERATED { @@ -3680,10 +3747,10 @@ UERadioCapability ::= OCTET STRING UERadioCapabilityID ::= OCTET STRING UE-RLF-Report-Container::= OCTET STRING --- This IE is a transparent container and shall be encoded as the RLF-Report-r9 field contained in the UEInformationResponse message as defined in TS 36.331 [9] +-- This IE is a transparent container and shall be encoded as the rLF-Report-r9 field contained in the UEInformationResponse message as defined in TS 36.331 [9] UE-RLF-Report-Container-for-extended-bands ::= OCTET STRING --- This IE is a transparent container and shall be encoded as the RLF-Report-v9e0 field contained in the UEInformationResponse message as defined in TS 36.331 [9] +-- This IE is a transparent container and shall be encoded as the rLF-Report-v9e0 field contained in the UEInformationResponse message as defined in TS 36.331 [9] UESecurityCapabilities ::= SEQUENCE { encryptionAlgorithms EncryptionAlgorithms, diff --git a/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn b/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn index 9f5ca165..b9e767f0 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V17.5.0 (2023-06) +-- 3GPP TS 36.423 V18.2.0 (2024-06) -- 9.3.4 PDU Definitions -- ************************************************************** -- @@ -238,7 +238,7 @@ IMPORTS IMSvoiceEPSfallbackfrom5G, Global-RAN-NODE-ID, DirectForwardingPathAvailability, - NRRACHReportInformation, + NRRAReport, SCG-UE-HistoryInformation, PSCellHistoryInformationRetrieve, @@ -262,7 +262,9 @@ IMPORTS SecurityResult, TraceCollectionEntityIPAddress, SCGreconfigNotification, - AdditionalListofForwardingGTPTunnelEndpoint + AdditionalListofForwardingGTPTunnelEndpoint, + RaReportIndicationList, + IABAuthorized @@ -623,7 +625,7 @@ FROM X2AP-Containers id-sourceNG-RAN-node-id, id-SourceDLForwardingIPAddress, id-SourceNodeDLForwardingIPAddress, - id-NRRACHReportInformation, + id-NRRAReport, id-SCG-UE-HistoryInformation, id-PSCellHistoryInformationRetrieve, id-MeasurementResultforNRCellsPossiblyAggregated, @@ -645,6 +647,8 @@ FROM X2AP-Containers id-SecurityResult, id-SCGreconfigNotification, id-AdditionalListofForwardingGTPTunnelEndpoint, + id-RaReportIndicationList, + id-IABAuthorized, maxCellineNB, maxnoofBearers, maxnoofPDCP-SN, @@ -692,11 +696,11 @@ HandoverRequest-IEs X2AP-PROTOCOL-IES ::= { { ID id-Old-eNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}| { ID id-V2XServicesAuthorized CRITICALITY ignore TYPE V2XServicesAuthorized PRESENCE optional}| { ID id-UE-ContextReferenceAtWT CRITICALITY ignore TYPE UE-ContextReferenceAtWT PRESENCE optional}| - { ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}| + { ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}| { ID id-UE-ContextReferenceAtSgNB CRITICALITY ignore TYPE UE-ContextReferenceAtSgNB PRESENCE optional}| { ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional}| { ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional}| - { ID id-CHOinformation-REQ CRITICALITY ignore TYPE CHOinformation-REQ PRESENCE optional}| + { ID id-CHOinformation-REQ CRITICALITY reject TYPE CHOinformation-REQ PRESENCE optional}| { ID id-NRV2XServicesAuthorized CRITICALITY ignore TYPE NRV2XServicesAuthorized PRESENCE optional}| { ID id-PC5QoSParameters CRITICALITY ignore TYPE PC5QoSParameters PRESENCE optional }| { ID id-IABNodeIndication CRITICALITY reject TYPE IABNodeIndication PRESENCE optional}, @@ -725,7 +729,7 @@ UE-ContextInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { { ID id-AdditionalRRMPriorityIndex CRITICALITY ignore EXTENSION AdditionalRRMPriorityIndex PRESENCE optional}| { ID id-NRUESidelinkAggregateMaximumBitRate CRITICALITY ignore EXTENSION NRUESidelinkAggregateMaximumBitRate PRESENCE optional}| { ID id-UERadioCapabilityID CRITICALITY reject EXTENSION UERadioCapabilityID PRESENCE optional }| -{ ID id-IMSvoiceEPSfallbackfrom5G CRITICALITY ignore EXTENSION IMSvoiceEPSfallbackfrom5G PRESENCE optional}, +{ ID id-IMSvoiceEPSfallbackfrom5G CRITICALITY ignore EXTENSION IMSvoiceEPSfallbackfrom5G PRESENCE optional}, ... } @@ -876,13 +880,13 @@ HandoverReport-IEs X2AP-PROTOCOL-IES ::= { { 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-Re-establishmentCellECGI CRITICALITY ignore TYPE ECGI PRESENCE conditional} -- This IE shall be present if the Handover Report Type IE is set to the value "HO to wrong cell" -- | + { ID id-TargetCellInUTRAN CRITICALITY ignore TYPE TargetCellInUTRAN PRESENCE conditional} -- This IE shall be present if the Handover Report Type IE is set to the value "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}| { ID id-UE-RLF-Report-Container-for-extended-bands CRITICALITY ignore TYPE UE-RLF-Report-Container-for-extended-bands PRESENCE optional}| - { ID id-TargetCellInNGRAN CRITICALITY ignore TYPE TargetCellInNGRAN PRESENCE conditional} -- The IE shall be present if the Handover Report Type IE is set to "interSystemPingpong" --, + { ID id-TargetCellInNGRAN CRITICALITY ignore TYPE TargetCellInNGRAN PRESENCE conditional} -- This IE shall be present if the Handover Report Type IE is set to the value "Inter-system ping-pong" --, ... } @@ -953,7 +957,7 @@ SNStatusTransfer-IEs X2AP-PROTOCOL-IES ::= { { ID id-E-RABs-SubjectToStatusTransfer-List CRITICALITY ignore TYPE E-RABs-SubjectToStatusTransfer-List PRESENCE mandatory}| { ID id-Old-eNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}| { ID id-New-eNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}| - { ID id-SgNB-UE-X2AP-ID CRITICALITY ignore TYPE SgNB-UE-X2AP-ID PRESENCE optional}, + { ID id-SgNB-UE-X2AP-ID CRITICALITY ignore TYPE SgNB-UE-X2AP-ID PRESENCE optional}, ... } @@ -1020,9 +1024,9 @@ HandoverCancel-IEs X2AP-PROTOCOL-IES ::= { { ID id-Old-eNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory}| { ID id-New-eNB-UE-X2AP-ID CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE optional}| { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}| - { ID id-Old-eNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}| - { ID id-New-eNB-UE-X2AP-ID-Extension CRITICALITY ignore TYPE UE-X2AP-ID-Extension PRESENCE optional}| - { ID id-CandidateCellsToBeCancelledList CRITICALITY reject TYPE CandidateCellsToBeCancelledList PRESENCE optional}, + { ID id-Old-eNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}| + { ID id-New-eNB-UE-X2AP-ID-Extension CRITICALITY ignore TYPE UE-X2AP-ID-Extension PRESENCE optional}| + { ID id-CandidateCellsToBeCancelledList CRITICALITY reject TYPE CandidateCellsToBeCancelledList PRESENCE optional}, ... } @@ -1319,7 +1323,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”, “Partial stop” or to “Add”-- + { 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”, “Partial stop” or “Add”-- { 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}| @@ -2554,9 +2558,9 @@ RetrieveUEContextRequest ::= SEQUENCE { RetrieveUEContextRequest-IEs X2AP-PROTOCOL-IES ::= { { ID id-New-eNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory}| { ID id-SeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}| --- Allocated at the new eNB. --- This IE contains an Extended eNB UE X2AP ID, which, together with the New eNB UE X2AP ID IE --- represents the eNB UE X2AP ID allocated at the new eNB. +-- Allocated at the new eNB. -- +-- This IE contains an Extended eNB UE X2AP ID, which, together with the New eNB UE X2AP ID IE -- +-- represents the eNB UE X2AP ID allocated at the new eNB. -- { ID id-resumeID CRITICALITY reject TYPE ResumeID PRESENCE mandatory}| { ID id-ShortMAC-I CRITICALITY reject TYPE ShortMAC-I PRESENCE mandatory}| { ID id-NewEUTRANCellIdentifier CRITICALITY reject TYPE EUTRANCellIdentifier PRESENCE mandatory}| @@ -2711,7 +2715,8 @@ SgNBAdditionRequest-IEs X2AP-PROTOCOL-IES ::= { { ID id-PSCellChangeHistory CRITICALITY ignore TYPE PSCellChangeHistory PRESENCE optional}| { ID id-CHOinformation-AddReq CRITICALITY reject TYPE CHOinformation-AddReq PRESENCE optional}| { ID id-SCGActivationRequest CRITICALITY ignore TYPE SCGActivationRequest PRESENCE optional}| - { ID id-CPAinformation-REQ CRITICALITY reject TYPE CPAinformation-REQ PRESENCE optional}, + { ID id-CPAinformation-REQ CRITICALITY reject TYPE CPAinformation-REQ PRESENCE optional}| + { ID id-IABAuthorized CRITICALITY ignore TYPE IABAuthorized PRESENCE optional}, ... } @@ -2742,10 +2747,10 @@ E-RABs-ToBeAdded-SgNBAddReq-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= { E-RABs-ToBeAdded-SgNBAddReq-Item-SgNBPDCPpresent ::= SEQUENCE { full-E-RAB-Level-QoS-Parameters E-RAB-Level-QoS-Parameters, max-MCG-admit-E-RAB-Level-QoS-Parameters GBR-QosInformation OPTIONAL, --- This IE shall be present if MCG resource and SCG resources IEs in the EN-DC Resource Configuration IE are set to “present” and GBR QoS Information IE is present in Full E-RAB Level QoS Parameters IE -- +-- This IE shall be present if, for the E-RAB requested to be added, the MCG resources and SCG resources IEs in the EN-DC Resource Configuration IE are set to the value "present", and GBR QoS Information IE is present in the Full E-RAB Level QoS Parameters IE. -- dL-Forwarding DL-Forwarding OPTIONAL, meNB-DL-GTP-TEIDatMCG GTPtunnelEndpoint OPTIONAL, --- This IE shall be present if MCG resource IE in the EN-DC Resource Configuration IE is set to “present” -- +-- This IE shall be present if, for the E-RAB requested to be added, the MCG resources IE in the EN-DC Resource Configuration IE is set to the value "present". -- s1-UL-GTPtunnelEndpoint GTPtunnelEndpoint, iE-Extensions ProtocolExtensionContainer { {E-RABs-ToBeAdded-SgNBAddReq-Item-SgNBPDCPpresentExtIEs} } OPTIONAL, ... @@ -2767,7 +2772,7 @@ E-RABs-ToBeAdded-SgNBAddReq-Item-SgNBPDCPnotpresent ::= SEQUENCE { secondary-meNB-UL-GTP-TEIDatPDCP GTPtunnelEndpoint OPTIONAL, rlc-Mode RLCMode, uL-Configuration ULConfiguration OPTIONAL, --- This IE shall be present if MCG resource and SCG resources IEs in the EN-DC Resource Configuration IE are set to “present” -- +-- This IE shall be present if, for the E-RAB requested to be added, the MCG resources and SCG resources IEs in the EN-DC Resource Configuration IE are set to the value "present". -- iE-Extensions ProtocolExtensionContainer { {E-RABs-ToBeAdded-SgNBAddReq-Item-SgNBPDCPnotpresentExtIEs} } OPTIONAL, ... } @@ -2834,15 +2839,15 @@ E-RABs-ToBeAdded-SgNBAddReqAck-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= { E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item-SgNBPDCPpresent ::= SEQUENCE { s1-DL-GTPtunnelEndpoint GTPtunnelEndpoint, sgNB-UL-GTP-TEIDatPDCP GTPtunnelEndpoint OPTIONAL, --- This IE shall be present if MCG resource IE in the EN-DC Resource Configuration IE is set to “present” -- +-- This IE shall be present if, for the E-RAB admitted to be added, the MCG resources IE in the EN-DC Resource Configuration IE is set to the value "present". -- rlc-Mode RLCMode OPTIONAL, --- This IE shall be present if MCG resource IE in the EN-DC Resource Configuration IE is set to “present” -- +-- This IE shall be present if, for the E-RAB admitted to be added, the MCG resources IE in the EN-DC Resource Configuration IE is set to the value "present". -- dL-Forwarding-GTPtunnelEndpoint GTPtunnelEndpoint OPTIONAL, uL-Forwarding-GTPtunnelEndpoint GTPtunnelEndpoint OPTIONAL, mCG-E-RAB-Level-QoS-Parameters E-RAB-Level-QoS-Parameters OPTIONAL, --- This IE shall be present if MCG resource and SCG resource IEs in the EN-DC Resource Configuration IE are set to “present” and the GBR QoS Information IE is present in the Requested MCG E-RAB Level QoS Parameters IE -- +-- This IE shall be present if, for the E-RAB admitted to be added, the MCG resources and SCG resources IEs in the EN-DC Resource Configuration IE are set to the value "present", and the GBR QoS Information IE is present in the Requested MCG E-RAB Level QoS Parameters IE. -- uL-Configuration ULConfiguration OPTIONAL, --- This IE shall be present if MCG resource and SCG resources IEs in the EN-DC Resource Configuration IE are set to “present” -- +-- This IE shall be present if, for the E-RAB admitted to be added, the MCG resources and SCG resources IEs in the EN-DC Resource Configuration IE are set to the value "present". -- iE-Extensions ProtocolExtensionContainer { {E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item-SgNBPDCPpresentExtIEs} } OPTIONAL, ... } @@ -2972,7 +2977,8 @@ SgNBModificationRequest-IEs X2AP-PROTOCOL-IES ::= { { ID id-CHOinformation-ModReq CRITICALITY ignore TYPE CHOinformation-ModReq PRESENCE optional}| { ID id-SCGActivationRequest CRITICALITY ignore TYPE SCGActivationRequest PRESENCE optional}| { ID id-CPAinformation-MOD CRITICALITY ignore TYPE CPAinformation-MOD PRESENCE optional}| - { ID id-CPCupdate-MOD CRITICALITY ignore TYPE CPCupdate-MOD PRESENCE optional}, + { ID id-CPCupdate-MOD CRITICALITY ignore TYPE CPCupdate-MOD PRESENCE optional}| + { ID id-IABAuthorized CRITICALITY ignore TYPE IABAuthorized PRESENCE optional}, ... } @@ -3021,10 +3027,10 @@ E-RABs-ToBeAdded-SgNBModReq-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= { E-RABs-ToBeAdded-SgNBModReq-Item-SgNBPDCPpresent ::= SEQUENCE { full-E-RAB-Level-QoS-Parameters E-RAB-Level-QoS-Parameters, max-MN-admit-E-RAB-Level-QoS-Parameters GBR-QosInformation OPTIONAL, --- This IE shall be present if MCG resource and SCG resources IEs in the EN-DC Resource Configuration IE are set to “present” and GBR QoS Information IE is present in Full E-RAB Level QoS Parameters IE -- +-- This IE shall be present if, for the E-RAB requested to be added, the MCG resources and SCG resources IEs in the EN-DC Resource Configuration IE are set to the value "present", and GBR QoS Information IE is present in the Full E-RAB Level QoS Parameters IE. -- dL-Forwarding DL-Forwarding OPTIONAL, meNB-DL-GTP-TEIDatMCG GTPtunnelEndpoint OPTIONAL, --- This IE shall be present if MCG resource IE in the EN-DC Resource Configuration IE is set to “present” -- +-- This IE shall be present if, for the E-RAB requested to be added, the MCG resources IE in the EN-DC Resource Configuration IE is set to the value "present". -- s1-UL-GTPtunnelEndpoint GTPtunnelEndpoint, iE-Extensions ProtocolExtensionContainer { {E-RABs-ToBeAdded-SgNBModReq-Item-SgNBPDCPpresentExtIEs} } OPTIONAL, ... @@ -3045,7 +3051,7 @@ E-RABs-ToBeAdded-SgNBModReq-Item-SgNBPDCPnotpresent ::= SEQUENCE { secondary-meNB-UL-GTP-TEIDatPDCP GTPtunnelEndpoint OPTIONAL, rlc-Mode RLCMode, uL-Configuration ULConfiguration OPTIONAL, --- This IE shall be present if MCG resource and SCG resources IEs in the EN-DC Resource Configuration IE are set to “present” -- +-- This IE shall be present if, for the E-RAB requested to be added, the MCG resources and SCG resources IEs in the EN-DC Resource Configuration IE are set to the value "present". -- iE-Extensions ProtocolExtensionContainer { {E-RABs-ToBeAdded-SgNBModReq-Item-SgNBPDCPnotpresentExtIEs} } OPTIONAL, ... } @@ -3215,15 +3221,15 @@ E-RABs-Admitted-ToBeAdded-SgNBModAck-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= { E-RABs-Admitted-ToBeAdded-SgNBModAck-Item-SgNBPDCPpresent ::= SEQUENCE { s1-DL-GTPtunnelEndpoint GTPtunnelEndpoint, sgNB-UL-GTP-TEIDatPDCP GTPtunnelEndpoint OPTIONAL, --- This IE shall be present if MCG resource IE in the EN-DC Resource Configuration IE are set to “present” -- +-- This IE shall be present if, for the E-RAB admitted to be added, the MCG resources IE in the EN-DC Resource Configuration IE is set to the value "present". -- rlc-Mode RLCMode OPTIONAL, --- This IE shall be present if MCG resource IE in the EN-DC Resource Configuration IE are set to “present” -- +-- This IE shall be present if, for the E-RAB admitted to be added, the MCG resources IE in the EN-DC Resource Configuration IE is set to the value "present". -- dL-Forwarding-GTPtunnelEndpoint GTPtunnelEndpoint OPTIONAL, uL-Forwarding-GTPtunnelEndpoint GTPtunnelEndpoint OPTIONAL, mCG-E-RAB-Level-QoS-Parameters E-RAB-Level-QoS-Parameters OPTIONAL, --- This IE shall be present if MCG resource and SCG resource IEs in the EN-DC Resource Configuration IE are set to “present” and the GBR QoS Information IE is present in the Requested MCG E-RAB Level QoS Parameters IE -- +-- This IE shall be present if, for the E-RAB admitted to be added, the MCG resources and SCG resources IEs in the EN-DC Resource Configuration IE are set to the value "present", and the GBR QoS Information IE is present in the Requested MCG E-RAB Level QoS Parameters IE. -- uL-Configuration ULConfiguration OPTIONAL, --- This IE shall be present if MCG resource and SCG resources IEs in the EN-DC Resource Configuration IE are set to “present” -- +-- This IE shall be present if, for the E-RAB admitted to be added, the MCG resources and SCG resources IEs in the EN-DC Resource Configuration IE are set to the value "present". -- iE-Extensions ProtocolExtensionContainer { {E-RABs-Admitted-ToBeAdded-SgNBModAck-Item-SgNBPDCPpresentExtIEs} } OPTIONAL, ... } @@ -3853,7 +3859,7 @@ AccessAndMobilityIndication ::= SEQUENCE { ... } AccessAndMobilityIndication-IEs X2AP-PROTOCOL-IES ::= { - { ID id-NRRACHReportInformation CRITICALITY ignore TYPE NRRACHReportInformation PRESENCE optional}, + { ID id-NRRAReport CRITICALITY ignore TYPE NRRAReport PRESENCE optional}, ... } @@ -4399,10 +4405,10 @@ ENDCResourceStatusRequest ::= SEQUENCE { ENDCResourceStatusRequest-IEs X2AP-PROTOCOL-IES ::= { { ID id-E-UTRAN-Node1-Measurement-ID CRITICALITY reject TYPE Measurement-ID-ENDC PRESENCE mandatory }| - { ID id-E-UTRAN-Node2-Measurement-ID CRITICALITY ignore TYPE Measurement-ID-ENDC PRESENCE conditional}| -- The IE shall be present if the Registration Request EN-DC IE is set to “Stop” or to “Add” + { ID id-E-UTRAN-Node2-Measurement-ID CRITICALITY ignore TYPE Measurement-ID-ENDC PRESENCE conditional}| -- This IE shall be present if the Registration Request EN-DC IE is set to the value “Stop”, or “Add” { ID id-Registration-Request CRITICALITY reject TYPE Registration-Request-ENDC PRESENCE mandatory }| { ID id-ReportingPeriodicity CRITICALITY ignore TYPE ReportingPeriodicity-ENDC PRESENCE optional }| - { ID id-ReportCharacteristics CRITICALITY ignore TYPE ReportCharacteristics-ENDC PRESENCE conditional}| -- The IE shall be present if the Registration Request EN-DC IE is set to “Start” + { ID id-ReportCharacteristics CRITICALITY ignore TYPE ReportCharacteristics-ENDC PRESENCE conditional}| -- This IE shall be present if the Registration Request EN-DC IE is set to the value “Start” { ID id-CellToReport-NR-ENDC CRITICALITY ignore TYPE CellToReport-NR-ENDC-List PRESENCE optional } | { ID id-InterfaceInstanceIndication CRITICALITY reject TYPE InterfaceInstanceIndication PRESENCE optional }| { ID id-CellToReport-E-UTRA-ENDC CRITICALITY ignore TYPE CellToReport-E-UTRA-ENDC-List PRESENCE optional}, @@ -5014,4 +5020,20 @@ CPC-cancel-IEs X2AP-PROTOCOL-IES ::= { } +-- ************************************************************** +-- +-- RACH INDICATION +-- +-- ************************************************************** + +RachIndication ::= SEQUENCE { + protocolIEs ProtocolIE-Container {{ RachIndication-IEs}}, + ... +} + +RachIndication-IEs X2AP-PROTOCOL-IES ::= { + { ID id-RaReportIndicationList CRITICALITY reject TYPE RaReportIndicationList PRESENCE mandatory }, + ... +} + END diff --git a/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn b/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn index cbc5b2e5..8838f0da 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V17.5.0 (2023-06) +-- 3GPP TS 36.423 V18.2.0 (2024-06) -- 9.3.3 Elementary Procedure Definitions -- ************************************************************** -- @@ -132,7 +132,9 @@ FROM X2AP-CommonDataTypes UERadioCapabilityIDMappingRequest, UERadioCapabilityIDMappingResponse, AccessAndMobilityIndication, - CPC-cancel + CPC-cancel, + RachIndication + @@ -199,7 +201,8 @@ FROM X2AP-PDU-Contents id-f1CTrafficTransfer, id-UERadioCapabilityIDMapping, id-accessAndMobilityIndication, - id-CPC-cancel + id-CPC-cancel, + id-rachIndication @@ -285,15 +288,15 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-1 X2AP-ELEMENTARY-PROCEDURE ::= { x2Removal | retrieveUEContext | sgNBAdditionPreparation | - meNBinitiatedSgNBModificationPreparation | + meNBinitiatedSgNBModificationPreparation | sgNBinitiatedSgNBModification | - meNBinitiatedSgNBRelease | - sgNBinitiatedSgNBRelease | + meNBinitiatedSgNBRelease | + sgNBinitiatedSgNBRelease | sgNBChange | endcX2Setup | endcConfigurationUpdate | endcCellActivation | - endcPartialReset | + endcPartialReset | eUTRANRCellResourceCoordination | endcX2Removal | endcresourceStatusReportingInitiation | @@ -317,10 +320,10 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-2 X2AP-ELEMENTARY-PROCEDURE ::= { meNBinitiatedSeNBRelease | seNBCounterCheck | sgNBReconfigurationCompletion | - sgNBCounterCheck | + sgNBCounterCheck | rRCTransfer | secondaryRATDataUsageReport | - sgNBActivityNotification | + sgNBActivityNotification | dataForwardingAddressIndication | gNBStatusIndication | endcConfigurationTransfer | @@ -333,7 +336,8 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-2 X2AP-ELEMENTARY-PROCEDURE ::= { cellTrafficTrace | f1CTrafficTransfer | accessAndMobilityIndication | - cPC-cancel , + cPC-cancel | + rachIndication , ... } @@ -752,4 +756,10 @@ cPC-cancel X2AP-ELEMENTARY-PROCEDURE ::= { } +rachIndication X2AP-ELEMENTARY-PROCEDURE ::= { + INITIATING MESSAGE RachIndication + PROCEDURE CODE id-rachIndication + CRITICALITY ignore +} + END diff --git a/epan/dissectors/asn1/x2ap/packet-x2ap-template.c b/epan/dissectors/asn1/x2ap/packet-x2ap-template.c index ccae93d0..3629c8d2 100644 --- a/epan/dissectors/asn1/x2ap/packet-x2ap-template.c +++ b/epan/dissectors/asn1/x2ap/packet-x2ap-template.c @@ -3,7 +3,7 @@ * X2 Application Protocol (X2AP); * 3GPP TS 36.423 packet dissection * Copyright 2007-2014, Anders Broman <anders.broman@ericsson.com> - * Copyright 2016-2023, Pascal Quantin <pascal@wireshark.org> + * Copyright 2016-2024, Pascal Quantin <pascal@wireshark.org> * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -12,7 +12,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later * * Ref: - * 3GPP TS 36.423 V17.5.0 (2023-06) + * 3GPP TS 36.423 V18.2.0 (2024-06) */ #include "config.h" @@ -23,6 +23,9 @@ #include <epan/prefs.h> #include <epan/sctpppids.h> #include <epan/proto_data.h> +#include <epan/tfs.h> +#include <epan/unit_strings.h> +#include <wsutil/array.h> #include "packet-x2ap.h" #include "packet-per.h" @@ -53,138 +56,142 @@ void proto_register_x2ap(void); #include "packet-x2ap-val.h" /* Initialize the protocol and registered fields */ -static int proto_x2ap = -1; -static int hf_x2ap_transportLayerAddressIPv4 = -1; -static int hf_x2ap_transportLayerAddressIPv6 = -1; -static int hf_x2ap_ReportCharacteristics_PRBPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_TNLLoadIndPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_HWLoadIndPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_CompositeAvailableCapacityPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_ABSStatusPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_RSRPMeasurementReportPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_CSIReportPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_Reserved = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_PRBPeriodic = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_TNLLoadIndPeriodic = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_HWLoadIndPeriodic = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_CompositeAvailableCapacityPeriodic = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_ABSStatusPeriodic = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_RSRPMeasurementReportPeriodic = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_CSIReportPeriodic = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_Reserved = -1; -static int hf_x2ap_eUTRANTraceID_TraceID = -1; -static int hf_x2ap_eUTRANTraceID_TraceRecordingSessionReference = -1; -static int hf_x2ap_interfacesToTrace_S1_MME = -1; -static int hf_x2ap_interfacesToTrace_X2 = -1; -static int hf_x2ap_interfacesToTrace_Uu = -1; -static int hf_x2ap_interfacesToTrace_F1_C = -1; -static int hf_x2ap_interfacesToTrace_E1 = -1; -static int hf_x2ap_interfacesToTrace_Reserved = -1; -static int hf_x2ap_traceCollectionEntityIPAddress_IPv4 = -1; -static int hf_x2ap_traceCollectionEntityIPAddress_IPv6 = -1; -static int hf_x2ap_encryptionAlgorithms_EEA1 = -1; -static int hf_x2ap_encryptionAlgorithms_EEA2 = -1; -static int hf_x2ap_encryptionAlgorithms_EEA3 = -1; -static int hf_x2ap_encryptionAlgorithms_Reserved = -1; -static int hf_x2ap_integrityProtectionAlgorithms_EIA1 = -1; -static int hf_x2ap_integrityProtectionAlgorithms_EIA2 = -1; -static int hf_x2ap_integrityProtectionAlgorithms_EIA3 = -1; -static int hf_x2ap_integrityProtectionAlgorithms_EIA7 = -1; -static int hf_x2ap_integrityProtectionAlgorithms_Reserved = -1; -static int hf_x2ap_measurementsToActivate_M1 = -1; -static int hf_x2ap_measurementsToActivate_M2 = -1; -static int hf_x2ap_measurementsToActivate_M3 = -1; -static int hf_x2ap_measurementsToActivate_M4 = -1; -static int hf_x2ap_measurementsToActivate_M5 = -1; -static int hf_x2ap_measurementsToActivate_LoggingM1FromEventTriggered = -1; -static int hf_x2ap_measurementsToActivate_M6 = -1; -static int hf_x2ap_measurementsToActivate_M7 = -1; -static int hf_x2ap_MDT_Location_Info_GNSS = -1; -static int hf_x2ap_MDT_Location_Info_E_CID = -1; -static int hf_x2ap_MDT_Location_Info_Reserved = -1; -static int hf_x2ap_MDT_transmissionModes_tm1 = -1; -static int hf_x2ap_MDT_transmissionModes_tm2 = -1; -static int hf_x2ap_MDT_transmissionModes_tm3 = -1; -static int hf_x2ap_MDT_transmissionModes_tm4 = -1; -static int hf_x2ap_MDT_transmissionModes_tm6 = -1; -static int hf_x2ap_MDT_transmissionModes_tm8 = -1; -static int hf_x2ap_MDT_transmissionModes_tm9 = -1; -static int hf_x2ap_MDT_transmissionModes_tm10 = -1; -static int hf_x2ap_NRencryptionAlgorithms_NEA1 = -1; -static int hf_x2ap_NRencryptionAlgorithms_NEA2 = -1; -static int hf_x2ap_NRencryptionAlgorithms_NEA3 = -1; -static int hf_x2ap_NRencryptionAlgorithms_Reserved = -1; -static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA1 = -1; -static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA2 = -1; -static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA3 = -1; -static int hf_x2ap_NRintegrityProtectionAlgorithms_Reserved = -1; -static int hf_x2ap_ReportCharacteristics_ENDC_PRBPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_ENDC_TNLCapacityIndPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_ENDC_CompositeAvailableCapacityPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_ENDC_NumberOfActiveUEs = -1; -static int hf_x2ap_ReportCharacteristics_ENDC_Reserved = -1; -static int hf_x2ap_Registration_Request_ENDC_PDU = -1; -static int hf_x2ap_ReportingPeriodicity_ENDC_PDU = -1; -static int hf_x2ap_ReportCharacteristics_ENDC_PDU = -1; -static int hf_x2ap_rAT_RestrictionInformation_LEO = -1; -static int hf_x2ap_rAT_RestrictionInformation_MEO = -1; -static int hf_x2ap_rAT_RestrictionInformation_GEO = -1; -static int hf_x2ap_rAT_RestrictionInformation_OTHERSAT = -1; -static int hf_x2ap_rAT_RestrictionInformation_Reserved = -1; +static int proto_x2ap; +static int hf_x2ap_transportLayerAddressIPv4; +static int hf_x2ap_transportLayerAddressIPv6; +static int hf_x2ap_ReportCharacteristics_PRBPeriodic; +static int hf_x2ap_ReportCharacteristics_TNLLoadIndPeriodic; +static int hf_x2ap_ReportCharacteristics_HWLoadIndPeriodic; +static int hf_x2ap_ReportCharacteristics_CompositeAvailableCapacityPeriodic; +static int hf_x2ap_ReportCharacteristics_ABSStatusPeriodic; +static int hf_x2ap_ReportCharacteristics_RSRPMeasurementReportPeriodic; +static int hf_x2ap_ReportCharacteristics_CSIReportPeriodic; +static int hf_x2ap_ReportCharacteristics_Reserved; +static int hf_x2ap_measurementFailedReportCharacteristics_PRBPeriodic; +static int hf_x2ap_measurementFailedReportCharacteristics_TNLLoadIndPeriodic; +static int hf_x2ap_measurementFailedReportCharacteristics_HWLoadIndPeriodic; +static int hf_x2ap_measurementFailedReportCharacteristics_CompositeAvailableCapacityPeriodic; +static int hf_x2ap_measurementFailedReportCharacteristics_ABSStatusPeriodic; +static int hf_x2ap_measurementFailedReportCharacteristics_RSRPMeasurementReportPeriodic; +static int hf_x2ap_measurementFailedReportCharacteristics_CSIReportPeriodic; +static int hf_x2ap_measurementFailedReportCharacteristics_Reserved; +static int hf_x2ap_eUTRANTraceID_TraceID; +static int hf_x2ap_eUTRANTraceID_TraceRecordingSessionReference; +static int hf_x2ap_interfacesToTrace_S1_MME; +static int hf_x2ap_interfacesToTrace_X2; +static int hf_x2ap_interfacesToTrace_Uu; +static int hf_x2ap_interfacesToTrace_F1_C; +static int hf_x2ap_interfacesToTrace_E1; +static int hf_x2ap_interfacesToTrace_Reserved; +static int hf_x2ap_traceCollectionEntityIPAddress_IPv4; +static int hf_x2ap_traceCollectionEntityIPAddress_IPv6; +static int hf_x2ap_encryptionAlgorithms_EEA1; +static int hf_x2ap_encryptionAlgorithms_EEA2; +static int hf_x2ap_encryptionAlgorithms_EEA3; +static int hf_x2ap_encryptionAlgorithms_Reserved; +static int hf_x2ap_integrityProtectionAlgorithms_EIA1; +static int hf_x2ap_integrityProtectionAlgorithms_EIA2; +static int hf_x2ap_integrityProtectionAlgorithms_EIA3; +static int hf_x2ap_integrityProtectionAlgorithms_EIA7; +static int hf_x2ap_integrityProtectionAlgorithms_Reserved; +static int hf_x2ap_measurementsToActivate_M1; +static int hf_x2ap_measurementsToActivate_M2; +static int hf_x2ap_measurementsToActivate_M3; +static int hf_x2ap_measurementsToActivate_M4; +static int hf_x2ap_measurementsToActivate_M5; +static int hf_x2ap_measurementsToActivate_LoggingM1FromEventTriggered; +static int hf_x2ap_measurementsToActivate_M6; +static int hf_x2ap_measurementsToActivate_M7; +static int hf_x2ap_MDT_Location_Info_GNSS; +static int hf_x2ap_MDT_Location_Info_E_CID; +static int hf_x2ap_MDT_Location_Info_Reserved; +static int hf_x2ap_MDT_transmissionModes_tm1; +static int hf_x2ap_MDT_transmissionModes_tm2; +static int hf_x2ap_MDT_transmissionModes_tm3; +static int hf_x2ap_MDT_transmissionModes_tm4; +static int hf_x2ap_MDT_transmissionModes_tm6; +static int hf_x2ap_MDT_transmissionModes_tm8; +static int hf_x2ap_MDT_transmissionModes_tm9; +static int hf_x2ap_MDT_transmissionModes_tm10; +static int hf_x2ap_NRencryptionAlgorithms_NEA1; +static int hf_x2ap_NRencryptionAlgorithms_NEA2; +static int hf_x2ap_NRencryptionAlgorithms_NEA3; +static int hf_x2ap_NRencryptionAlgorithms_Reserved; +static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA1; +static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA2; +static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA3; +static int hf_x2ap_NRintegrityProtectionAlgorithms_Reserved; +static int hf_x2ap_ReportCharacteristics_ENDC_PRBPeriodic; +static int hf_x2ap_ReportCharacteristics_ENDC_TNLCapacityIndPeriodic; +static int hf_x2ap_ReportCharacteristics_ENDC_CompositeAvailableCapacityPeriodic; +static int hf_x2ap_ReportCharacteristics_ENDC_NumberOfActiveUEs; +static int hf_x2ap_ReportCharacteristics_ENDC_Reserved; +static int hf_x2ap_Registration_Request_ENDC_PDU; +static int hf_x2ap_ReportingPeriodicity_ENDC_PDU; +static int hf_x2ap_ReportCharacteristics_ENDC_PDU; +static int hf_x2ap_rAT_RestrictionInformation_LEO; +static int hf_x2ap_rAT_RestrictionInformation_MEO; +static int hf_x2ap_rAT_RestrictionInformation_GEO; +static int hf_x2ap_rAT_RestrictionInformation_OTHERSAT; +static int hf_x2ap_rAT_RestrictionInformation_NR_LEO; +static int hf_x2ap_rAT_RestrictionInformation_NR_MEO; +static int hf_x2ap_rAT_RestrictionInformation_NR_GEO; +static int hf_x2ap_rAT_RestrictionInformation_NR_OTHERSAT; #include "packet-x2ap-hf.c" /* Initialize the subtree pointers */ -static int ett_x2ap = -1; -static int ett_x2ap_TransportLayerAddress = -1; -static int ett_x2ap_PLMN_Identity = -1; -static int ett_x2ap_TargeteNBtoSource_eNBTransparentContainer = -1; -static int ett_x2ap_RRC_Context = -1; -static int ett_x2ap_UE_HistoryInformationFromTheUE = -1; -static int ett_x2ap_ReportCharacteristics = -1; -static int ett_x2ap_measurementFailedReportCharacteristics = -1; -static int ett_x2ap_UE_RLF_Report_Container = -1; -static int ett_x2ap_UE_RLF_Report_Container_for_extended_bands = -1; -static int ett_x2ap_MeNBtoSeNBContainer = -1; -static int ett_x2ap_SeNBtoMeNBContainer = -1; -static int ett_x2ap_EUTRANTraceID = -1; -static int ett_x2ap_InterfacesToTrace = -1; -static int ett_x2ap_TraceCollectionEntityIPAddress = -1; -static int ett_x2ap_EncryptionAlgorithms = -1; -static int ett_x2ap_IntegrityProtectionAlgorithms = -1; -static int ett_x2ap_MeasurementsToActivate = -1; -static int ett_x2ap_MDT_Location_Info = -1; -static int ett_x2ap_transmissionModes = -1; -static int ett_x2ap_X2AP_Message = -1; -static int ett_x2ap_MeNBtoSgNBContainer = -1; -static int ett_x2ap_SgNBtoMeNBContainer = -1; -static int ett_x2ap_RRCContainer = -1; -static int ett_x2ap_NRencryptionAlgorithms = -1; -static int ett_x2ap_NRintegrityProtectionAlgorithms = -1; -static int ett_x2ap_measurementTimingConfiguration = -1; -static int ett_x2ap_LastVisitedNGRANCellInformation = -1; -static int ett_x2ap_LastVisitedUTRANCellInformation = -1; -static int ett_x2ap_EndcSONConfigurationTransfer = -1; -static int ett_x2ap_EPCHandoverRestrictionListContainer = -1; -static int ett_x2ap_NBIoT_RLF_Report_Container = -1; -static int ett_x2ap_anchorCarrier_NPRACHConfig = -1; -static int ett_x2ap_anchorCarrier_EDT_NPRACHConfig = -1; -static int ett_x2ap_anchorCarrier_Format2_NPRACHConfig = -1; -static int ett_x2ap_anchorCarrier_Format2_EDT_NPRACHConfig = -1; -static int ett_x2ap_non_anchorCarrier_NPRACHConfig = -1; -static int ett_x2ap_non_anchorCarrier_Format2_NPRACHConfig = -1; -static int ett_x2ap_anchorCarrier_NPRACHConfigTDD = -1; -static int ett_x2ap_non_anchorCarrier_NPRACHConfigTDD = -1; -static int ett_x2ap_Non_anchorCarrierFrequency = -1; -static int ett_x2ap_ReportCharacteristics_ENDC = -1; -static int ett_x2ap_TargetCellInNGRAN = -1; -static int ett_x2ap_TDDULDLConfigurationCommonNR = -1; -static int ett_x2ap_MDT_ConfigurationNR = -1; -static int ett_x2ap_NRCellPRACHConfig = -1; -static int ett_x2ap_IntendedTDD_DL_ULConfiguration_NR = -1; -static int ett_x2ap_UERadioCapability = -1; -static int ett_x2ap_LastVisitedPSCell_Item = -1; -static int ett_x2ap_NRRACHReportContainer = -1; -static int ett_x2ap_rAT_RestrictionInformation = -1; +static int ett_x2ap; +static int ett_x2ap_TransportLayerAddress; +static int ett_x2ap_PLMN_Identity; +static int ett_x2ap_TargeteNBtoSource_eNBTransparentContainer; +static int ett_x2ap_RRC_Context; +static int ett_x2ap_UE_HistoryInformationFromTheUE; +static int ett_x2ap_ReportCharacteristics; +static int ett_x2ap_measurementFailedReportCharacteristics; +static int ett_x2ap_UE_RLF_Report_Container; +static int ett_x2ap_UE_RLF_Report_Container_for_extended_bands; +static int ett_x2ap_MeNBtoSeNBContainer; +static int ett_x2ap_SeNBtoMeNBContainer; +static int ett_x2ap_EUTRANTraceID; +static int ett_x2ap_InterfacesToTrace; +static int ett_x2ap_TraceCollectionEntityIPAddress; +static int ett_x2ap_EncryptionAlgorithms; +static int ett_x2ap_IntegrityProtectionAlgorithms; +static int ett_x2ap_MeasurementsToActivate; +static int ett_x2ap_MDT_Location_Info; +static int ett_x2ap_transmissionModes; +static int ett_x2ap_X2AP_Message; +static int ett_x2ap_MeNBtoSgNBContainer; +static int ett_x2ap_SgNBtoMeNBContainer; +static int ett_x2ap_RRCContainer; +static int ett_x2ap_NRencryptionAlgorithms; +static int ett_x2ap_NRintegrityProtectionAlgorithms; +static int ett_x2ap_measurementTimingConfiguration; +static int ett_x2ap_LastVisitedNGRANCellInformation; +static int ett_x2ap_LastVisitedUTRANCellInformation; +static int ett_x2ap_EndcSONConfigurationTransfer; +static int ett_x2ap_EPCHandoverRestrictionListContainer; +static int ett_x2ap_NBIoT_RLF_Report_Container; +static int ett_x2ap_anchorCarrier_NPRACHConfig; +static int ett_x2ap_anchorCarrier_EDT_NPRACHConfig; +static int ett_x2ap_anchorCarrier_Format2_NPRACHConfig; +static int ett_x2ap_anchorCarrier_Format2_EDT_NPRACHConfig; +static int ett_x2ap_non_anchorCarrier_NPRACHConfig; +static int ett_x2ap_non_anchorCarrier_Format2_NPRACHConfig; +static int ett_x2ap_anchorCarrier_NPRACHConfigTDD; +static int ett_x2ap_non_anchorCarrier_NPRACHConfigTDD; +static int ett_x2ap_Non_anchorCarrierFrequency; +static int ett_x2ap_ReportCharacteristics_ENDC; +static int ett_x2ap_TargetCellInNGRAN; +static int ett_x2ap_TDDULDLConfigurationCommonNR; +static int ett_x2ap_MDT_ConfigurationNR; +static int ett_x2ap_NRCellPRACHConfig; +static int ett_x2ap_IntendedTDD_DL_ULConfiguration_NR; +static int ett_x2ap_UERadioCapability; +static int ett_x2ap_LastVisitedPSCell_Item; +static int ett_x2ap_NRRAReportContainer; +static int ett_x2ap_rAT_RestrictionInformation; +static int ett_x2ap_PSCellListContainer; #include "packet-x2ap-ett.c" /* Forward declarations */ @@ -207,9 +214,9 @@ enum{ }; struct x2ap_private_data { - guint32 procedure_code; - guint32 protocol_ie_id; - guint32 message_type; + uint32_t procedure_code; + uint32_t protocol_ie_id; + uint32_t message_type; rrc_container_type_e rrc_container_type; e212_number_type_t number_type; }; @@ -226,7 +233,7 @@ static const enum_val_t x2ap_rrc_context_vals[] = { }; /* Global variables */ -static gint g_x2ap_dissect_rrc_context_as = X2AP_RRC_CONTEXT_LTE; +static int g_x2ap_dissect_rrc_context_as = X2AP_RRC_CONTEXT_LTE; /* Dissector tables */ static dissector_table_t x2ap_ies_dissector_table; @@ -250,46 +257,42 @@ static const true_false_string x2ap_tfs_failed_succeeded = { "Succeeded" }; -static const true_false_string x2ap_tfs_interfacesToTrace = { - "Should be traced", - "Should not be traced" -}; - -static const true_false_string x2ap_tfs_activate_do_not_activate = { - "Activate", - "Do not activate" -}; - static void -x2ap_Time_UE_StayedInCell_EnhancedGranularity_fmt(gchar *s, guint32 v) +x2ap_Time_UE_StayedInCell_EnhancedGranularity_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%.1fs", ((float)v)/10); } static void -x2ap_handoverTriggerChange_fmt(gchar *s, guint32 v) +x2ap_handoverTriggerChange_fmt(char *s, uint32_t v) { - snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%d)", ((float)v)/2, (gint32)v); + snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%d)", ((float)v)/2, (int32_t)v); } static void -x2ap_Threshold_RSRP_fmt(gchar *s, guint32 v) +x2ap_Threshold_RSRP_fmt(char *s, uint32_t v) { - snprintf(s, ITEM_LABEL_LENGTH, "%ddBm (%u)", (gint32)v-140, v); + snprintf(s, ITEM_LABEL_LENGTH, "%ddBm (%u)", (int32_t)v-140, v); } static void -x2ap_Threshold_RSRQ_fmt(gchar *s, guint32 v) +x2ap_Threshold_RSRQ_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%u)", ((float)v/2)-20, v); } static void -x2ap_Packet_LossRate_fmt(gchar *s, guint32 v) +x2ap_Packet_LossRate_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%.1f %% (%u)", (float)v/10, v); } +static void +x2ap_cho_handover_window_duration_fmt(char *s, uint32_t v) +{ + snprintf(s, ITEM_LABEL_LENGTH, "%dms (%u)", v*100, v); +} + static struct x2ap_private_data* x2ap_get_private_data(packet_info *pinfo) { @@ -307,14 +310,14 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto { struct x2ap_private_data *x2ap_data = x2ap_get_private_data(pinfo); - return (dissector_try_uint_new(x2ap_ies_dissector_table, x2ap_data->protocol_ie_id, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(x2ap_ies_dissector_table, x2ap_data->protocol_ie_id, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { struct x2ap_private_data *x2ap_data = x2ap_get_private_data(pinfo); - return (dissector_try_uint_new(x2ap_extension_dissector_table, x2ap_data->protocol_ie_id, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(x2ap_extension_dissector_table, x2ap_data->protocol_ie_id, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -322,7 +325,7 @@ static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, pro struct x2ap_private_data *x2ap_data = x2ap_get_private_data(pinfo); x2ap_data->message_type = INITIATING_MESSAGE; - return (dissector_try_uint_new(x2ap_proc_imsg_dissector_table, x2ap_data->procedure_code, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(x2ap_proc_imsg_dissector_table, x2ap_data->procedure_code, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -330,7 +333,7 @@ static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, pro struct x2ap_private_data *x2ap_data = x2ap_get_private_data(pinfo); x2ap_data->message_type = SUCCESSFUL_OUTCOME; - return (dissector_try_uint_new(x2ap_proc_sout_dissector_table, x2ap_data->procedure_code, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(x2ap_proc_sout_dissector_table, x2ap_data->procedure_code, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -338,7 +341,7 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p struct x2ap_private_data *x2ap_data = x2ap_get_private_data(pinfo); x2ap_data->message_type = UNSUCCESSFUL_OUTCOME; - return (dissector_try_uint_new(x2ap_proc_uout_dissector_table, x2ap_data->procedure_code, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(x2ap_proc_uout_dissector_table, x2ap_data->procedure_code, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } static int @@ -447,23 +450,23 @@ void proto_register_x2ap(void) { NULL, HFILL }}, { &hf_x2ap_interfacesToTrace_S1_MME, { "S1-MME", "x2ap.interfacesToTrace.S1_MME", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_interfacesToTrace), 0x80, + FT_BOOLEAN, 8, TFS(&tfs_should_be_traced_should_not_be_traced), 0x80, NULL, HFILL }}, { &hf_x2ap_interfacesToTrace_X2, { "X2", "x2ap.interfacesToTrace.X2", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_interfacesToTrace), 0x40, + FT_BOOLEAN, 8, TFS(&tfs_should_be_traced_should_not_be_traced), 0x40, NULL, HFILL }}, { &hf_x2ap_interfacesToTrace_Uu, { "Uu", "x2ap.interfacesToTrace.Uu", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_interfacesToTrace), 0x20, + FT_BOOLEAN, 8, TFS(&tfs_should_be_traced_should_not_be_traced), 0x20, NULL, HFILL }}, { &hf_x2ap_interfacesToTrace_F1_C, { "F1-C", "x2ap.interfacesToTrace.F1_C", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_interfacesToTrace), 0x10, + FT_BOOLEAN, 8, TFS(&tfs_should_be_traced_should_not_be_traced), 0x10, NULL, HFILL }}, { &hf_x2ap_interfacesToTrace_E1, { "E1", "x2ap.interfacesToTrace.E1", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_interfacesToTrace), 0x08, + FT_BOOLEAN, 8, TFS(&tfs_should_be_traced_should_not_be_traced), 0x08, NULL, HFILL }}, { &hf_x2ap_interfacesToTrace_Reserved, { "Reserved", "x2ap.interfacesToTrace.Reserved", @@ -515,43 +518,43 @@ void proto_register_x2ap(void) { NULL, HFILL }}, { &hf_x2ap_measurementsToActivate_M1, { "M1", "x2ap.measurementsToActivate.M1", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_activate_do_not_activate), 0x80, + FT_BOOLEAN, 8, TFS(&tfs_activate_do_not_activate), 0x80, NULL, HFILL }}, { &hf_x2ap_measurementsToActivate_M2, { "M2", "x2ap.measurementsToActivate.M2", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_activate_do_not_activate), 0x40, + FT_BOOLEAN, 8, TFS(&tfs_activate_do_not_activate), 0x40, NULL, HFILL }}, { &hf_x2ap_measurementsToActivate_M3, { "M3", "x2ap.measurementsToActivate.M3", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_activate_do_not_activate), 0x20, + FT_BOOLEAN, 8, TFS(&tfs_activate_do_not_activate), 0x20, NULL, HFILL }}, { &hf_x2ap_measurementsToActivate_M4, { "M4", "x2ap.measurementsToActivate.M4", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_activate_do_not_activate), 0x10, + FT_BOOLEAN, 8, TFS(&tfs_activate_do_not_activate), 0x10, NULL, HFILL }}, { &hf_x2ap_measurementsToActivate_M5, { "M5", "x2ap.measurementsToActivate.M5", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_activate_do_not_activate), 0x08, + FT_BOOLEAN, 8, TFS(&tfs_activate_do_not_activate), 0x08, NULL, HFILL }}, { &hf_x2ap_measurementsToActivate_LoggingM1FromEventTriggered, { "LoggingOfM1FromEventTriggeredMeasurementReports", "x2ap.measurementsToActivate.LoggingM1FromEventTriggered", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_activate_do_not_activate), 0x04, + FT_BOOLEAN, 8, TFS(&tfs_activate_do_not_activate), 0x04, NULL, HFILL }}, { &hf_x2ap_measurementsToActivate_M6, { "M6", "x2ap.measurementsToActivate.M6", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_activate_do_not_activate), 0x02, + FT_BOOLEAN, 8, TFS(&tfs_activate_do_not_activate), 0x02, NULL, HFILL }}, { &hf_x2ap_measurementsToActivate_M7, { "M7", "x2ap.measurementsToActivate.M7", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_activate_do_not_activate), 0x01, + FT_BOOLEAN, 8, TFS(&tfs_activate_do_not_activate), 0x01, NULL, HFILL }}, { &hf_x2ap_MDT_Location_Info_GNSS, { "GNSS", "x2ap.MDT_Location_Info.GNSS", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_activate_do_not_activate), 0x80, + FT_BOOLEAN, 8, TFS(&tfs_activate_do_not_activate), 0x80, NULL, HFILL }}, { &hf_x2ap_MDT_Location_Info_E_CID, { "E-CID", "x2ap.MDT_Location_Info.E_CID", - FT_BOOLEAN, 8, TFS(&x2ap_tfs_activate_do_not_activate), 0x40, + FT_BOOLEAN, 8, TFS(&tfs_activate_do_not_activate), 0x40, NULL, HFILL }}, { &hf_x2ap_MDT_Location_Info_Reserved, { "Reserved", "x2ap.MDT_Location_Info.Reserved", @@ -669,15 +672,27 @@ void proto_register_x2ap(void) { { "OTHERSAT", "x2ap.rAT_RestrictionInformation.OTHERSAT", FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x10, NULL, HFILL }}, - { &hf_x2ap_rAT_RestrictionInformation_Reserved, - { "Reserved", "x2ap.rAT_RestrictionInformation.Reserved", - FT_UINT8, BASE_HEX, NULL, 0x0f, + { &hf_x2ap_rAT_RestrictionInformation_NR_LEO, + { "NR-LEO", "x2ap.rAT_RestrictionInformation.NR_LEO", + FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x08, + NULL, HFILL }}, + { &hf_x2ap_rAT_RestrictionInformation_NR_MEO, + { "NR-MEO", "x2ap.rAT_RestrictionInformation.NR_MEO", + FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x04, + NULL, HFILL }}, + { &hf_x2ap_rAT_RestrictionInformation_NR_GEO, + { "NR-GEO", "x2ap.rAT_RestrictionInformation.NR_GEO", + FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x02, + NULL, HFILL }}, + { &hf_x2ap_rAT_RestrictionInformation_NR_OTHERSAT, + { "NR-OTHERSAT", "x2ap.rAT_RestrictionInformation.NR_OTHERSAT", + FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x01, NULL, HFILL }}, #include "packet-x2ap-hfarr.c" }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_x2ap, &ett_x2ap_TransportLayerAddress, &ett_x2ap_PLMN_Identity, @@ -727,8 +742,9 @@ void proto_register_x2ap(void) { &ett_x2ap_IntendedTDD_DL_ULConfiguration_NR, &ett_x2ap_UERadioCapability, &ett_x2ap_LastVisitedPSCell_Item, - &ett_x2ap_NRRACHReportContainer, + &ett_x2ap_NRRAReportContainer, &ett_x2ap_rAT_RestrictionInformation, + &ett_x2ap_PSCellListContainer, #include "packet-x2ap-ettarr.c" }; @@ -755,7 +771,7 @@ void proto_register_x2ap(void) { prefs_register_enum_preference(x2ap_module, "dissect_rrc_context_as", "Dissect RRC Context as", "Select whether RRC Context should be dissected as legacy LTE or NB-IOT", - &g_x2ap_dissect_rrc_context_as, x2ap_rrc_context_vals, FALSE); + &g_x2ap_dissect_rrc_context_as, x2ap_rrc_context_vals, false); } diff --git a/epan/dissectors/asn1/x2ap/x2ap.cnf b/epan/dissectors/asn1/x2ap/x2ap.cnf index 85488b5c..8d2152aa 100644 --- a/epan/dissectors/asn1/x2ap/x2ap.cnf +++ b/epan/dissectors/asn1/x2ap/x2ap.cnf @@ -86,7 +86,7 @@ PrivateIE-Field/value privateIE_Field_value #.FN_BODY PrivateIE-ID/global FN_VARIANT = _str VAL_PTR = &actx->external.direct_reference %(DEFAULT_BODY)s - actx->external.direct_ref_present = (actx->external.direct_reference != NULL) ? TRUE : FALSE; + actx->external.direct_ref_present = (actx->external.direct_reference != NULL) ? true : false; #.FN_BODY PrivateIE-Field/value if (actx->external.direct_ref_present){ @@ -183,7 +183,10 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC &hf_x2ap_rAT_RestrictionInformation_MEO, &hf_x2ap_rAT_RestrictionInformation_GEO, &hf_x2ap_rAT_RestrictionInformation_OTHERSAT, - &hf_x2ap_rAT_RestrictionInformation_Reserved, + &hf_x2ap_rAT_RestrictionInformation_NR_LEO, + &hf_x2ap_rAT_RestrictionInformation_NR_MEO, + &hf_x2ap_rAT_RestrictionInformation_NR_GEO, + &hf_x2ap_rAT_RestrictionInformation_NR_OTHERSAT, NULL }; proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_rAT_RestrictionInformation); @@ -213,7 +216,7 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC tvbuff_t *parameter_tvb = NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, - 32, 32, FALSE, NULL, 0, ¶meter_tvb, NULL); + 32, 32, false, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ static int * const fields[] = { @@ -352,7 +355,7 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC if (!parameter_tvb) return offset; subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_EUTRANTraceID); - dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, E212_NONE, FALSE); + dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, E212_NONE, false); proto_tree_add_item(subtree, hf_x2ap_eUTRANTraceID_TraceID, parameter_tvb, 3, 3, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_x2ap_eUTRANTraceID_TraceRecordingSessionReference, parameter_tvb, 6, 2, ENC_BIG_ENDIAN); @@ -463,10 +466,10 @@ FiveGS-TAC TYPE = FT_UINT24 DISPLAY = BASE_DEC_HEX return offset; subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_PLMN_Identity); - dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, number_type, FALSE); + dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, number_type, false); #.TYPE_ATTR -BitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec +BitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_bit_sec) #.FN_BODY GUMMEI struct x2ap_private_data *x2ap_data = x2ap_get_private_data(actx->pinfo); @@ -523,7 +526,7 @@ MME-Group-ID TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX } #.TYPE_ATTR -Time-UE-StayedInCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +Time-UE-StayedInCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR Time-UE-StayedInCell-EnhancedGranularity DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(x2ap_Time_UE_StayedInCell_EnhancedGranularity_fmt) @@ -577,10 +580,10 @@ Threshold-RSRQ DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(x2ap_Threshold_RSRQ_fmt) } #.TYPE_ATTR -ExpectedActivityPeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +ExpectedActivityPeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR -ExpectedIdlePeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +ExpectedIdlePeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR RSRPMeasurementResult/_item/rSRPMeasured DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(x2ap_Threshold_RSRP_fmt) @@ -620,7 +623,7 @@ LHN-ID TYPE=FT_STRING DISPLAY = BASE_NONE } #.TYPE_ATTR -ExtendedBitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec +ExtendedBitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_bit_sec) #.FN_BODY NRencryptionAlgorithms VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb = NULL; @@ -671,10 +674,10 @@ ExtendedBitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec } #.TYPE_ATTR -E-RABUsageReport-Item/usageCountUL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_octet_octets +E-RABUsageReport-Item/usageCountUL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_octet_octets) #.TYPE_ATTR -E-RABUsageReport-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_octet_octets +E-RABUsageReport-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_octet_octets) #.FN_BODY ServedNRCell-Information/measurementTimingConfiguration VAL_PTR = ¶m_tvb tvbuff_t *param_tvb = NULL; @@ -721,13 +724,13 @@ WLANName TYPE=FT_STRING DISPLAY = BASE_NONE #.END #.TYPE_ATTR -Subscription-Based-UE-DifferentiationInfo/periodicTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +Subscription-Based-UE-DifferentiationInfo/periodicTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR -ScheduledCommunicationTime/timeofDayStart DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +ScheduledCommunicationTime/timeofDayStart DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR -ScheduledCommunicationTime/timeofDayEnd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +ScheduledCommunicationTime/timeofDayEnd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.FN_BODY LastVisitedNGRANCellInformation VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb = NULL; @@ -913,12 +916,12 @@ ScheduledCommunicationTime/timeofDayEnd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRING dissect_f1ap_NRPRACHConfig_PDU(parameter_tvb, actx->pinfo, subtree, NULL); } -#.FN_BODY NRRACHReportContainer VAL_PTR = ¶meter_tvb +#.FN_BODY NRRAReportContainer VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb = NULL; proto_tree *subtree; %(DEFAULT_BODY)s if (parameter_tvb) { - subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_NRRACHReportContainer); + subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_NRRAReportContainer); dissect_nr_rrc_RA_ReportList_r16_PDU(parameter_tvb, actx->pinfo, subtree, NULL); } @@ -939,8 +942,23 @@ ScheduledCommunicationTime/timeofDayEnd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRING subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_UERadioCapability); dissect_lte_rrc_UERadioAccessCapabilityInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL); } + +#.TYPE_ATTR +CHO-HandoverWindowStart DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) + +#.TYPE_ATTR +CHO-HandoverWindowDuration DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(x2ap_cho_handover_window_duration_fmt) #.END +#.FN_BODY PSCellListContainer VAL_PTR = ¶meter_tvb + tvbuff_t *parameter_tvb = NULL; + proto_tree *subtree; +%(DEFAULT_BODY)s + if (parameter_tvb) { + subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_PSCellListContainer); + dissect_lte_rrc_CellIdListNR_r18_PDU(parameter_tvb, actx->pinfo, subtree, NULL); + } + #.FN_HDR HandoverRequest col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequest"); #.FN_HDR HandoverRequestAcknowledge @@ -1155,6 +1173,8 @@ ScheduledCommunicationTime/timeofDayEnd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRING col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AccessAndMobilityIndication"); #.FN_HDR CPC-cancel col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CPC-cancel"); +#.FN_HDR RachIndication + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RachIndication"); #.ASSIGN_VALUE_TO_TYPE # X2AP does not have constants assigned to types, they are pure INTEGER # ProcedureCode @@ -1219,6 +1239,7 @@ id-UERadioCapabilityIDMapping ProcedureCode id-accessAndMobilityIndication ProcedureCode id-procedure-code-58-not-to-be-used ProcedureCode id-CPC-cancel ProcedureCode +id-rachIndication ProcedureCode # ProtocolIE-ID @@ -1626,7 +1647,7 @@ id-DirectForwardingPathAvailability ProtocolIE-ID id-sourceNG-RAN-node-id ProtocolIE-ID id-SourceDLForwardingIPAddress ProtocolIE-ID id-SourceNodeDLForwardingIPAddress ProtocolIE-ID -id-NRRACHReportInformation ProtocolIE-ID +id-NRRAReport ProtocolIE-ID id-SCG-UE-HistoryInformation ProtocolIE-ID id-PSCellHistoryInformationRetrieve ProtocolIE-ID id-MeasurementResultforNRCellsPossiblyAggregated ProtocolIE-ID @@ -1654,6 +1675,14 @@ id-SCGreconfigNotification ProtocolIE-ID id-MIMOPRBusageInformation ProtocolIE-ID id-SensorMeasurementConfiguration ProtocolIE-ID id-AdditionalListofForwardingGTPTunnelEndpoint ProtocolIE-ID +id-M4ReportAmount ProtocolIE-ID +id-M5ReportAmount ProtocolIE-ID +id-M6ReportAmount ProtocolIE-ID +id-M7ReportAmount ProtocolIE-ID +id-CHOTimeBasedInformation ProtocolIE-ID +id-RaReportIndicationList ProtocolIE-ID +id-PSCellListContainer ProtocolIE-ID +id-IABAuthorized ProtocolIE-ID #.REGISTER @@ -1938,7 +1967,7 @@ CellToReport-E-UTRA-ENDC-Item N x2ap.ies id-CellToReport-E-UTRA-ENDC-Item CHO-DC-EarlyDataForwarding N x2ap.ies id-CHO-DC-EarlyDataForwarding DirectForwardingPathAvailability N x2ap.ies id-DirectForwardingPathAvailability Global-RAN-NODE-ID N x2ap.ies id-sourceNG-RAN-node-id -NRRACHReportInformation N x2ap.ies id-NRRACHReportInformation +NRRAReport N x2ap.ies id-NRRAReport SCG-UE-HistoryInformation N x2ap.ies id-SCG-UE-HistoryInformation PSCellHistoryInformationRetrieve N x2ap.ies id-PSCellHistoryInformationRetrieve PSCellChangeHistory N x2ap.ies id-PSCellChangeHistory @@ -1956,6 +1985,8 @@ CPCinformation-CONF N x2ap.ies id-CPCinformation-CONF CPCinformation-NOTIFY N x2ap.ies id-CPCinformation-NOTIFY CPCupdate-MOD N x2ap.ies id-CPCupdate-MOD SCGreconfigNotification N x2ap.ies id-SCGreconfigNotification +RaReportIndicationList N x2ap.ies id-RaReportIndicationList +IABAuthorized N x2ap.ies id-IABAuthorized #X2AP-PROTOCOL-EXTENSION Number-of-Antennaports N x2ap.extension id-Number-of-Antennaports @@ -2091,6 +2122,12 @@ RAT-Restrictions N x2ap.extension id-RAT-Restrictions MIMOPRBusageInformation N x2ap.extension id-MIMOPRBusageInformation SensorMeasurementConfiguration N x2ap.extension id-SensorMeasurementConfiguration AdditionalListofForwardingGTPTunnelEndpoint N x2ap.extension id-AdditionalListofForwardingGTPTunnelEndpoint +M4ReportAmountMDT N x2ap.extension id-M4ReportAmount +M5ReportAmountMDT N x2ap.extension id-M5ReportAmount +M6ReportAmountMDT N x2ap.extension id-M6ReportAmount +M7ReportAmountMDT N x2ap.extension id-M7ReportAmount +CHOTimeBasedInformation N x2ap.extension id-CHOTimeBasedInformation +PSCellListContainer N x2ap.extension id-PSCellListContainer # X2AP-PDU-Descriptions.asn Interface Elementary Procedures #X2AP-ELEMENTARY-PROCEDURE @@ -2259,4 +2296,6 @@ UERadioCapabilityIDMappingResponse N x2ap.proc.sout id-UERadioCapabilityIDMappi AccessAndMobilityIndication N x2ap.proc.imsg id-accessAndMobilityIndication CPC-cancel N x2ap.proc.imsg id-CPC-cancel + +RachIndication N x2ap.proc.imsg id-rachIndication #.END |