X2AP: upgrade dissector to v16.3.0
This commit is contained in:
parent
1dbc6f1da7
commit
aeb68eb68c
|
@ -617,6 +617,7 @@ set(DISSECTOR_PUBLIC_HEADERS
|
|||
packet-xmpp-jingle.h
|
||||
packet-xmpp-other.h
|
||||
packet-xmpp-utils.h
|
||||
packet-xnap.h
|
||||
packet-ypbind.h
|
||||
packet-yppasswd.h
|
||||
packet-ypserv.h
|
||||
|
|
|
@ -77,6 +77,7 @@ UEAssistanceInformation-r11_PDU
|
|||
UECapabilityEnquiry_PDU
|
||||
UEPagingCoverageInformation_PDU
|
||||
UEPagingCoverageInformation-NB_PDU
|
||||
UERadioAccessCapabilityInformation_PDU
|
||||
UERadioPagingInformation_PDU
|
||||
UE-EUTRA-Capability_PDU
|
||||
UL-ConfigCommonList-NB-r14_PDU
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.423 V16.2.0 (2020-07)
|
||||
-- 3GPP TS 36.423 V16.3.0 (2020-09)
|
||||
-- 9.3.6 Common definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.423 V16.2.0 (2020-07)
|
||||
-- 3GPP TS 36.423 V16.3.0 (2020-09)
|
||||
-- 9.3.7 Constant definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
@ -81,6 +81,7 @@ id-cellTrafficTrace ProcedureCode ::= 52
|
|||
id-endcresourceStatusReporting ProcedureCode ::= 53
|
||||
id-endcresourceStatusReportingInitiation ProcedureCode ::= 54
|
||||
id-f1CTrafficTransfer ProcedureCode ::= 55
|
||||
id-UERadioCapabilityIDMapping ProcedureCode ::= 56
|
||||
|
||||
-- **************************************************************
|
||||
--
|
||||
|
@ -138,12 +139,12 @@ maxnoofextBPLMNs INTEGER ::= 12
|
|||
maxnoofTLAs INTEGER ::= 16
|
||||
maxnoofGTPTLAs INTEGER ::= 16
|
||||
maxnoofTNLAssociations INTEGER ::= 32
|
||||
maxnoofCellsinCHO INTEGER ::= 16
|
||||
maxnoofCellsinCHO INTEGER ::= 8
|
||||
maxnoofPC5QoSFlows INTEGER ::= 2048
|
||||
maxnoofSSBAreas INTEGER ::= 64
|
||||
maxnoofNRSCSs INTEGER ::= 5
|
||||
maxnoofPhysicalResourceBlocks INTEGER ::= 275
|
||||
maxnoofNRPhysicalResourceBlocks INTEGER ::= 275
|
||||
maxnoofNonAnchorCarrierFreqConfig INTEGER ::= 15
|
||||
|
||||
-- **************************************************************
|
||||
--
|
||||
|
@ -554,6 +555,8 @@ id-IABNodeIndication ProtocolIE-ID ::= 395
|
|||
id-QoS-Mapping-Information ProtocolIE-ID ::= 396
|
||||
id-F1CTrafficContainer ProtocolIE-ID ::= 397
|
||||
id-IABInformation ProtocolIE-ID ::= 398
|
||||
id-IntendedTDD-DL-ULConfiguration-NR ProtocolIE-ID ::= 399
|
||||
id-UERadioCapability ProtocolIE-ID ::= 400
|
||||
|
||||
|
||||
END
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.423 V16.2.0 (2020-07)
|
||||
-- 3GPP TS 36.423 V16.3.0 (2020-09)
|
||||
-- 9.3.8 Container definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.423 V16.2.0 (2020-07)
|
||||
-- 3GPP TS 36.423 V16.3.0 (2020-09)
|
||||
-- 9.3.5 Information Element definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
@ -83,6 +83,7 @@ IMPORTS
|
|||
id-MDTConfigurationNR,
|
||||
id-CSI-RSTransmissionIndication,
|
||||
id-QoS-Mapping-Information,
|
||||
id-IntendedTDD-DL-ULConfiguration-NR,
|
||||
|
||||
maxnoofBearers,
|
||||
maxCellineNB,
|
||||
|
@ -134,8 +135,8 @@ IMPORTS
|
|||
maxnoofCellsinCHO, maxnoofPC5QoSFlows,
|
||||
maxnoofSSBAreas,
|
||||
maxnoofNRSCSs,
|
||||
maxnoofPhysicalResourceBlocks,
|
||||
maxnoofNRPhysicalResourceBlocks
|
||||
maxnoofNRPhysicalResourceBlocks,
|
||||
maxnoofNonAnchorCarrierFreqConfig
|
||||
|
||||
|
||||
FROM X2AP-Constants
|
||||
|
@ -444,7 +445,8 @@ CauseRadioNetwork ::= ENUMERATED {
|
|||
count-reaches-max-value,
|
||||
unknown-old-en-gNB-UE-X2AP-ID,
|
||||
pDCP-Overload,
|
||||
cho-cpc-resources-tobechanged
|
||||
cho-cpc-resources-tobechanged,
|
||||
ue-power-saving
|
||||
|
||||
|
||||
}
|
||||
|
@ -1383,6 +1385,8 @@ IABNodeIndication ::= ENUMERATED {true,...}
|
|||
|
||||
IntegrityProtectionAlgorithms ::= BIT STRING (SIZE (16, ...))
|
||||
|
||||
IntendedTDD-DL-ULConfiguration-NR ::= OCTET STRING
|
||||
|
||||
InterfaceInstanceIndication ::= INTEGER (0..255, ...)
|
||||
|
||||
InterfacesToTrace ::= BIT STRING (SIZE (8))
|
||||
|
@ -1588,7 +1592,7 @@ ManagementBasedMDTallowed ::= ENUMERATED {allowed, ...}
|
|||
|
||||
Masked-IMEISV ::= BIT STRING (SIZE (64))
|
||||
|
||||
MaxCHOpreparations ::= INTEGER(1..16, ...)
|
||||
MaxCHOpreparations ::= INTEGER(1..8, ...)
|
||||
|
||||
MDT-Activation ::= ENUMERATED {
|
||||
immediate-MDT-only,
|
||||
|
@ -1787,7 +1791,7 @@ NRCarrierList ::= SEQUENCE (SIZE(1..maxnoofNRSCSs)) OF NRCarrierItem
|
|||
NRCarrierItem ::= SEQUENCE {
|
||||
carrierSCS NRSCS,
|
||||
offsetToCarrier INTEGER (0..2199, ...),
|
||||
carrierBandwidth INTEGER (0..maxnoofPhysicalResourceBlocks, ...),
|
||||
carrierBandwidth INTEGER (0..maxnoofNRPhysicalResourceBlocks, ...),
|
||||
iE-Extension ProtocolExtensionContainer { {NRCarrierItem-ExtIEs} } OPTIONAL,
|
||||
...
|
||||
}
|
||||
|
@ -1865,7 +1869,7 @@ NRNeighbour-Information ::= SEQUENCE (SIZE (1.. maxofNRNeighbours))OF SEQUENCE {
|
|||
}
|
||||
|
||||
NRNeighbour-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
|
||||
{ID id-CSI-RSTransmissionIndication CRITICALITY reject EXTENSION EARFCNExtension PRESENCE optional},
|
||||
{ID id-CSI-RSTransmissionIndication CRITICALITY ignore EXTENSION EARFCNExtension PRESENCE optional},
|
||||
...
|
||||
}
|
||||
|
||||
|
@ -1924,7 +1928,7 @@ NPRACH-preambleFormat::= ENUMERATED {fmt0,fmt1,fmt2,fmt0a,fmt1a,...}
|
|||
-- WS modification: define a dedicated type for dissection
|
||||
Non-anchorCarrierFrequency ::= OCTET STRING
|
||||
|
||||
Non-AnchorCarrierFrequencylist ::= SEQUENCE (SIZE(1..15)) OF
|
||||
Non-AnchorCarrierFrequencylist ::= SEQUENCE (SIZE(1..maxnoofNonAnchorCarrierFreqConfig)) OF
|
||||
SEQUENCE {
|
||||
-- WS modification: define a dedicated type for dissection
|
||||
-- non-anchorCarrioerFrquency OCTET STRING,
|
||||
|
@ -2923,6 +2927,7 @@ TDD-InfoNeighbourServedNRCell-Information ::= SEQUENCE {
|
|||
}
|
||||
|
||||
TDD-InfoNeighbourServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
|
||||
{ID id-IntendedTDD-DL-ULConfiguration-NR CRITICALITY ignore EXTENSION IntendedTDD-DL-ULConfiguration-NR PRESENCE optional},
|
||||
...
|
||||
}
|
||||
|
||||
|
@ -3077,7 +3082,6 @@ traceCollectionEntityIPAddress TraceCollectionEntityIPAddress,
|
|||
TraceActivation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
|
||||
{ ID id-MDTConfiguration CRITICALITY ignore EXTENSION MDT-Configuration PRESENCE optional}|
|
||||
{ ID id-UEAppLayerMeasConfig CRITICALITY ignore EXTENSION UEAppLayerMeasConfig PRESENCE optional}|
|
||||
-- WS modification: fix what seems to be an obvious typo (id-MDTConfiguration instead of id-MDTConfigurationNR)
|
||||
{ ID id-MDTConfigurationNR CRITICALITY ignore EXTENSION MDT-ConfigurationNR PRESENCE optional},
|
||||
...
|
||||
}
|
||||
|
@ -3175,6 +3179,8 @@ UE-X2AP-ID ::= INTEGER (0..4095)
|
|||
|
||||
UE-X2AP-ID-Extension ::= INTEGER (0..4095, ...)
|
||||
|
||||
UERadioCapability ::= OCTET STRING
|
||||
|
||||
UERadioCapabilityID ::= OCTET STRING
|
||||
|
||||
UE-RLF-Report-Container::= OCTET STRING
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.423 V16.2.0 (2020-07)
|
||||
-- 3GPP TS 36.423 V16.3.0 (2020-09)
|
||||
-- 9.3.4 PDU Definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
@ -224,12 +224,16 @@ IMPORTS
|
|||
NRCarrierList,
|
||||
SSB-PositionsInBurst,
|
||||
NRCellPRACHConfig,
|
||||
NBIoT-RLF-Report-Container, PrivacyIndicator,
|
||||
NBIoT-RLF-Report-Container,
|
||||
PrivacyIndicator,
|
||||
UERadioCapabilityID,
|
||||
CSI-RSTransmissionIndication,
|
||||
IABNodeIndication,
|
||||
F1CTrafficContainer,
|
||||
IABInformation
|
||||
IABInformation,
|
||||
IntendedTDD-DL-ULConfiguration-NR,
|
||||
UERadioCapability
|
||||
|
||||
|
||||
|
||||
FROM X2AP-IEs
|
||||
|
@ -574,6 +578,8 @@ FROM X2AP-Containers
|
|||
id-IABNodeIndication,
|
||||
id-F1CTrafficContainer,
|
||||
id-IABInformation,
|
||||
id-IntendedTDD-DL-ULConfiguration-NR,
|
||||
id-UERadioCapability,
|
||||
maxCellineNB,
|
||||
maxnoofBearers,
|
||||
maxnoofPDCP-SN,
|
||||
|
@ -943,7 +949,8 @@ HandoverCancel-IEs X2AP-PROTOCOL-IES ::= {
|
|||
{ 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-New-eNB-UE-X2AP-ID-Extension CRITICALITY ignore TYPE UE-X2AP-ID-Extension PRESENCE optional}|
|
||||
{ ID id-CandidateCellsToBeCancelledList CRITICALITY reject TYPE CandidateCellsToBeCancelledList PRESENCE optional},
|
||||
...
|
||||
}
|
||||
|
||||
|
@ -3930,7 +3937,8 @@ TDD-InfoServedNRCell-Information ::= SEQUENCE {
|
|||
|
||||
TDD-InfoServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
|
||||
{ ID id-TDDULDLConfigurationCommonNR CRITICALITY ignore EXTENSION TDDULDLConfigurationCommonNR PRESENCE optional}|
|
||||
{ ID id-CarrierList CRITICALITY ignore EXTENSION NRCarrierList PRESENCE optional},
|
||||
{ ID id-CarrierList CRITICALITY ignore EXTENSION NRCarrierList PRESENCE optional}|
|
||||
{ ID id-IntendedTDD-DL-ULConfiguration-NR CRITICALITY ignore EXTENSION IntendedTDD-DL-ULConfiguration-NR PRESENCE optional},
|
||||
...
|
||||
}
|
||||
|
||||
|
@ -3974,7 +3982,9 @@ ENDCX2SetupResponse ::= SEQUENCE {
|
|||
}
|
||||
|
||||
ENDCX2SetupResponse-IEs X2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-RespondingNodeType-EndcX2Setup CRITICALITY reject TYPE RespondingNodeType-EndcX2Setup PRESENCE mandatory},
|
||||
{ ID id-RespondingNodeType-EndcX2Setup CRITICALITY reject TYPE RespondingNodeType-EndcX2Setup PRESENCE mandatory}|
|
||||
{ ID id-InterfaceInstanceIndication CRITICALITY reject TYPE InterfaceInstanceIndication PRESENCE optional }|
|
||||
{ ID id-TNLConfigurationInfo CRITICALITY ignore TYPE TNLConfigurationInfo PRESENCE optional },
|
||||
...
|
||||
}
|
||||
|
||||
|
@ -3988,6 +3998,7 @@ ENB-ENDCX2SetupReqAckIEs X2AP-PROTOCOL-IES ::= {
|
|||
{ ID id-GlobalENB-ID CRITICALITY reject TYPE GlobalENB-ID PRESENCE mandatory}|
|
||||
{ ID id-ServedEUTRAcellsENDCX2ManagementList CRITICALITY reject TYPE ServedEUTRAcellsENDCX2ManagementList PRESENCE mandatory}|
|
||||
{ ID id-InterfaceInstanceIndication CRITICALITY reject TYPE InterfaceInstanceIndication PRESENCE optional }|
|
||||
-- NOTE: In the current version of this specification the Interface Instance Indication IE is not included in the Responding NodeType IE --
|
||||
{ ID id-CellandCapacityAssistInfo CRITICALITY ignore TYPE CellandCapacityAssistInfo PRESENCE optional },
|
||||
...
|
||||
}
|
||||
|
@ -4245,12 +4256,13 @@ ENDCResourceStatusRequest ::= SEQUENCE {
|
|||
}
|
||||
|
||||
ENDCResourceStatusRequest-IEs X2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-eNB-Measurement-ID-ENDC CRITICALITY reject TYPE Measurement-ID-ENDC PRESENCE mandatory}|
|
||||
{ ID id-eNB-Measurement-ID-ENDC CRITICALITY reject TYPE Measurement-ID-ENDC PRESENCE mandatory }|
|
||||
{ ID id-engNB-Measurement-ID-ENDC CRITICALITY ignore TYPE Measurement-ID-ENDC PRESENCE conditional}| -- The IE shall be present if the Registration Request IE is set to “Stop” or to “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-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 IE is set to “Start”
|
||||
{ ID id-CellToReport-ENDC CRITICALITY ignore TYPE CellToReport-ENDC-List PRESENCE optional},
|
||||
{ ID id-CellToReport-ENDC CRITICALITY ignore TYPE CellToReport-ENDC-List PRESENCE optional } |
|
||||
{ ID id-InterfaceInstanceIndication CRITICALITY reject TYPE InterfaceInstanceIndication PRESENCE optional },
|
||||
...
|
||||
}
|
||||
|
||||
|
@ -4299,7 +4311,8 @@ ENDCResourceStatusResponse ::= SEQUENCE {
|
|||
ENDCResourceStatusResponse-IEs X2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-eNB-Measurement-ID-ENDC CRITICALITY reject TYPE Measurement-ID-ENDC PRESENCE mandatory}|
|
||||
{ ID id-engNB-Measurement-ID-ENDC CRITICALITY reject TYPE Measurement-ID-ENDC PRESENCE mandatory}|
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional},
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional } |
|
||||
{ ID id-InterfaceInstanceIndication CRITICALITY reject TYPE InterfaceInstanceIndication PRESENCE optional },
|
||||
...
|
||||
}
|
||||
|
||||
|
@ -4318,7 +4331,8 @@ ENDCResourceStatusFailure-IEs X2AP-PROTOCOL-IES ::= {
|
|||
{ ID id-eNB-Measurement-ID-ENDC CRITICALITY reject TYPE Measurement-ID-ENDC PRESENCE mandatory}|
|
||||
{ ID id-engNB-Measurement-ID-ENDC CRITICALITY reject TYPE Measurement-ID-ENDC PRESENCE mandatory}|
|
||||
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional},
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
|
||||
{ ID id-InterfaceInstanceIndication CRITICALITY reject TYPE InterfaceInstanceIndication PRESENCE optional },
|
||||
...
|
||||
}
|
||||
|
||||
|
@ -4336,7 +4350,8 @@ ENDCResourceStatusUpdate ::= SEQUENCE {
|
|||
ENDCResourceStatusUpdate-IEs X2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-eNB-Measurement-ID-ENDC CRITICALITY reject TYPE Measurement-ID-ENDC PRESENCE mandatory}|
|
||||
{ ID id-engNB-Measurement-ID-ENDC CRITICALITY reject TYPE Measurement-ID-ENDC PRESENCE mandatory}|
|
||||
{ ID id-CellMeasurementResult-ENDC CRITICALITY ignore TYPE CellMeasurementResult-ENDC-List PRESENCE optional },
|
||||
{ ID id-CellMeasurementResult-ENDC CRITICALITY ignore TYPE CellMeasurementResult-ENDC-List PRESENCE optional }|
|
||||
{ ID id-InterfaceInstanceIndication CRITICALITY reject TYPE InterfaceInstanceIndication PRESENCE optional },
|
||||
...
|
||||
}
|
||||
|
||||
|
@ -4695,7 +4710,8 @@ TraceStart ::= SEQUENCE {
|
|||
TraceStartIEs X2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MeNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory }|
|
||||
{ ID id-SgNB-UE-X2AP-ID CRITICALITY reject TYPE SgNB-UE-X2AP-ID PRESENCE mandatory }|
|
||||
{ ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE mandatory },
|
||||
{ ID id-TraceActivation CRITICALITY ignore TYPE TraceActivation PRESENCE mandatory }|
|
||||
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional},
|
||||
...
|
||||
}
|
||||
|
||||
|
@ -4713,7 +4729,8 @@ DeactivateTrace ::= SEQUENCE {
|
|||
DeactivateTraceIEs X2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MeNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory }|
|
||||
{ ID id-SgNB-UE-X2AP-ID CRITICALITY reject TYPE SgNB-UE-X2AP-ID PRESENCE mandatory }|
|
||||
{ ID id-EUTRANTraceID CRITICALITY ignore TYPE EUTRANTraceID PRESENCE mandatory },
|
||||
{ ID id-EUTRANTraceID CRITICALITY ignore TYPE EUTRANTraceID PRESENCE mandatory }|
|
||||
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional},
|
||||
...
|
||||
}
|
||||
|
||||
|
@ -4733,7 +4750,8 @@ CellTrafficTraceIEs X2AP-PROTOCOL-IES ::= {
|
|||
{ ID id-SgNB-UE-X2AP-ID CRITICALITY reject TYPE SgNB-UE-X2AP-ID PRESENCE mandatory }|
|
||||
{ ID id-EUTRANTraceID CRITICALITY ignore TYPE EUTRANTraceID PRESENCE mandatory }|
|
||||
{ ID id-TraceCollectionEntityIPAddress CRITICALITY ignore TYPE TransportLayerAddress PRESENCE mandatory }|
|
||||
{ ID id-PrivacyIndicator CRITICALITY ignore TYPE PrivacyIndicator PRESENCE optional },
|
||||
{ ID id-PrivacyIndicator CRITICALITY ignore TYPE PrivacyIndicator PRESENCE optional }|
|
||||
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional},
|
||||
...
|
||||
}
|
||||
|
||||
|
@ -4751,9 +4769,43 @@ F1CTrafficTransfer ::= SEQUENCE {
|
|||
F1CTrafficTransfer-IEs X2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MeNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory}|
|
||||
{ ID id-SgNB-UE-X2AP-ID CRITICALITY reject TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}|
|
||||
{ ID id-F1CTrafficContainer CRITICALITY reject TYPE F1CTrafficContainer PRESENCE mandatory},
|
||||
{ ID id-F1CTrafficContainer CRITICALITY reject TYPE F1CTrafficContainer PRESENCE mandatory}|
|
||||
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional},
|
||||
...
|
||||
}
|
||||
|
||||
-- **************************************************************
|
||||
--
|
||||
-- UE RADIO CAPABILITY ID MAPPING REQUEST
|
||||
--
|
||||
-- **************************************************************
|
||||
|
||||
UERadioCapabilityIDMappingRequest::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container { { UERadioCapabilityIDMappingRequestIEs} },
|
||||
...
|
||||
}
|
||||
|
||||
UERadioCapabilityIDMappingRequestIEs X2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-UERadioCapabilityID CRITICALITY reject TYPE UERadioCapabilityID PRESENCE mandatory },
|
||||
...
|
||||
}
|
||||
|
||||
-- **************************************************************
|
||||
--
|
||||
-- UE RADIO CAPABILITY ID MAPPING RESPONSE
|
||||
--
|
||||
-- **************************************************************
|
||||
|
||||
UERadioCapabilityIDMappingResponse ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container { { UERadioCapabilityIDMappingResponseIEs} },
|
||||
...
|
||||
}
|
||||
|
||||
UERadioCapabilityIDMappingResponseIEs X2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-UERadioCapabilityID CRITICALITY reject TYPE UERadioCapabilityID PRESENCE mandatory }|
|
||||
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE mandatory }|
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
|
||||
...
|
||||
}
|
||||
|
||||
END
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.423 V16.2.0 (2020-07)
|
||||
-- 3GPP TS 36.423 V16.3.0 (2020-09)
|
||||
-- 9.3.3 Elementary Procedure Definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
@ -128,7 +128,9 @@ FROM X2AP-CommonDataTypes
|
|||
ENDCResourceStatusFailure,
|
||||
ENDCResourceStatusUpdate,
|
||||
CellTrafficTrace,
|
||||
F1CTrafficTransfer
|
||||
F1CTrafficTransfer,
|
||||
UERadioCapabilityIDMappingRequest,
|
||||
UERadioCapabilityIDMappingResponse
|
||||
|
||||
|
||||
|
||||
|
@ -192,7 +194,8 @@ FROM X2AP-PDU-Contents
|
|||
id-endcresourceStatusReporting,
|
||||
id-endcresourceStatusReportingInitiation,
|
||||
id-cellTrafficTrace,
|
||||
id-f1CTrafficTransfer
|
||||
id-f1CTrafficTransfer,
|
||||
id-UERadioCapabilityIDMapping
|
||||
|
||||
|
||||
|
||||
|
@ -289,7 +292,8 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-1 X2AP-ELEMENTARY-PROCEDURE ::= {
|
|||
endcPartialReset |
|
||||
eUTRANRCellResourceCoordination |
|
||||
endcX2Removal |
|
||||
endcresourceStatusReportingInitiation ,
|
||||
endcresourceStatusReportingInitiation |
|
||||
uERadioCapabilityIDMapping ,
|
||||
...
|
||||
}
|
||||
|
||||
|
@ -721,4 +725,11 @@ f1CTrafficTransfer X2AP-ELEMENTARY-PROCEDURE ::= {
|
|||
CRITICALITY ignore
|
||||
}
|
||||
|
||||
uERadioCapabilityIDMapping X2AP-ELEMENTARY-PROCEDURE ::= {
|
||||
INITIATING MESSAGE UERadioCapabilityIDMappingRequest
|
||||
SUCCESSFUL OUTCOME UERadioCapabilityIDMappingResponse
|
||||
PROCEDURE CODE id-UERadioCapabilityIDMapping
|
||||
CRITICALITY reject
|
||||
}
|
||||
|
||||
END
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* Ref:
|
||||
* 3GPP TS 36.423 V16.2.0 (2020-07)
|
||||
* 3GPP TS 36.423 V16.3.0 (2020-09)
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
@ -34,6 +34,7 @@
|
|||
#include "packet-ntp.h"
|
||||
#include "packet-s1ap.h"
|
||||
#include "packet-f1ap.h"
|
||||
#include "packet-xnap.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
/* disable: "warning C4146: unary minus operator applied to unsigned type, result still unsigned" */
|
||||
|
@ -173,6 +174,8 @@ 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;
|
||||
#include "packet-x2ap-ett.c"
|
||||
|
||||
/* Forward declarations */
|
||||
|
@ -689,6 +692,8 @@ void proto_register_x2ap(void) {
|
|||
&ett_x2ap_TDDULDLConfigurationCommonNR,
|
||||
&ett_x2ap_MDT_ConfigurationNR,
|
||||
&ett_x2ap_NRCellPRACHConfig,
|
||||
&ett_x2ap_IntendedTDD_DL_ULConfiguration_NR,
|
||||
&ett_x2ap_UERadioCapability,
|
||||
#include "packet-x2ap-ettarr.c"
|
||||
};
|
||||
|
||||
|
|
|
@ -861,6 +861,23 @@ ScheduledCommunicationTime/timeofDayEnd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRING
|
|||
dissect_f1ap_NRPRACHConfig_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
|
||||
}
|
||||
|
||||
#.FN_BODY IntendedTDD-DL-ULConfiguration-NR 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_IntendedTDD_DL_ULConfiguration_NR);
|
||||
dissect_xnap_IntendedTDD_DL_ULConfiguration_NR_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
|
||||
}
|
||||
|
||||
#.FN_BODY UERadioCapability 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_UERadioCapability);
|
||||
dissect_lte_rrc_UERadioAccessCapabilityInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
|
||||
}
|
||||
#.END
|
||||
|
||||
#.FN_HDR HandoverRequest
|
||||
|
@ -1069,6 +1086,10 @@ ScheduledCommunicationTime/timeofDayEnd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRING
|
|||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellTrafficTrace");
|
||||
#.FN_HDR F1CTrafficTransfer
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "F1CTrafficTransfer");
|
||||
#.FN_HDR UERadioCapabilityIDMappingRequest
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityIDMappingRequest");
|
||||
#.FN_HDR UERadioCapabilityIDMappingResponse
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityIDMappingResponse");
|
||||
|
||||
#.ASSIGN_VALUE_TO_TYPE # X2AP does not have constants assigned to types, they are pure INTEGER
|
||||
# ProcedureCode
|
||||
|
@ -1129,7 +1150,7 @@ id-cellTrafficTrace ProcedureCode
|
|||
id-endcresourceStatusReporting ProcedureCode
|
||||
id-endcresourceStatusReportingInitiation ProcedureCode
|
||||
id-f1CTrafficTransfer ProcedureCode
|
||||
|
||||
id-UERadioCapabilityIDMapping ProcedureCode
|
||||
|
||||
# ProtocolIE-ID
|
||||
|
||||
|
@ -1522,6 +1543,8 @@ id-IABNodeIndication ProtocolIE-ID
|
|||
id-QoS-Mapping-Information ProtocolIE-ID
|
||||
id-F1CTrafficContainer ProtocolIE-ID
|
||||
id-IABInformation ProtocolIE-ID
|
||||
id-IntendedTDD-DL-ULConfiguration-NR ProtocolIE-ID
|
||||
id-UERadioCapability ProtocolIE-ID
|
||||
|
||||
#.REGISTER
|
||||
|
||||
|
@ -1799,6 +1822,7 @@ CellMeasurementResult-ENDC-Item N x2ap.ies id-CellMeasurementResult-ENDC-Ite
|
|||
IABNodeIndication N x2ap.ies id-IABNodeIndication
|
||||
F1CTrafficContainer N x2ap.ies id-F1CTrafficContainer
|
||||
IABInformation N x2ap.ies id-IABInformation
|
||||
UERadioCapability N x2ap.ies id-UERadioCapability
|
||||
|
||||
#X2AP-PROTOCOL-EXTENSION
|
||||
Number-of-Antennaports N x2ap.extension id-Number-of-Antennaports
|
||||
|
@ -1917,6 +1941,7 @@ FrequencyShift7p5khz N x2ap.extension id-FrequencyShift7p5khz
|
|||
SSB-PositionsInBurst N x2ap.extension id-SSB-PositionsInBurst
|
||||
NRCellPRACHConfig N x2ap.extension id-NRCellPRACHConfig
|
||||
QoS-Mapping-Information N x2ap.extension id-QoS-Mapping-Information
|
||||
IntendedTDD-DL-ULConfiguration-NR N x2ap.extension id-IntendedTDD-DL-ULConfiguration-NR
|
||||
|
||||
# X2AP-PDU-Descriptions.asn Interface Elementary Procedures
|
||||
#X2AP-ELEMENTARY-PROCEDURE
|
||||
|
@ -2078,4 +2103,7 @@ ENDCResourceStatusUpdate N x2ap.proc.imsg id-endcresourceStatusReporting
|
|||
CellTrafficTrace N x2ap.proc.imsg id-cellTrafficTrace
|
||||
|
||||
F1CTrafficTransfer N x2ap.proc.imsg id-f1CTrafficTransfer
|
||||
|
||||
UERadioCapabilityIDMappingRequest N x2ap.proc.imsg id-UERadioCapabilityIDMapping
|
||||
UERadioCapabilityIDMappingResponse N x2ap.proc.sout id-UERadioCapabilityIDMapping
|
||||
#.END
|
||||
|
|
|
@ -26,6 +26,7 @@ set( ASN_FILE_LIST
|
|||
set( EXTRA_DIST
|
||||
${ASN_FILE_LIST}
|
||||
packet-${PROTOCOL_NAME}-template.c
|
||||
packet-${PROTOCOL_NAME}-template.h
|
||||
${PROTOCOL_NAME}.cnf
|
||||
)
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include <epan/proto_data.h>
|
||||
#include <epan/conversation.h>
|
||||
|
||||
#include "packet-xnap.h"
|
||||
#include "packet-per.h"
|
||||
#include "packet-lte-rrc.h"
|
||||
#include "packet-nr-rrc.h"
|
||||
|
|
|
@ -0,0 +1,29 @@
|
|||
/* packet-xnap.h
|
||||
* Routines for dissecting NG-RAN Xn application protocol (XnAP)
|
||||
*
|
||||
* Wireshark - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@wireshark.org>
|
||||
* Copyright 1998 Gerald Combs
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#ifndef PACKET_XnAP_H
|
||||
#define PACKET_XnAP_H
|
||||
|
||||
#include "packet-xnap-exp.h"
|
||||
|
||||
#endif /* PACKET_XnAP_H */
|
||||
|
||||
/*
|
||||
* Editor modelines
|
||||
*
|
||||
* Local Variables:
|
||||
* c-basic-offset: 2
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* ex: set shiftwidth=2 tabstop=8 expandtab:
|
||||
* :indentSize=2:tabSize=8:noTabs=true:
|
||||
*/
|
|
@ -19,8 +19,10 @@ ProcedureCode
|
|||
ProtocolIE-ID
|
||||
|
||||
#.EXPORTS
|
||||
IntendedTDD-DL-ULConfiguration-NR_PDU
|
||||
|
||||
#.PDU
|
||||
IntendedTDD-DL-ULConfiguration-NR
|
||||
XnAP-PDU
|
||||
|
||||
#.TYPE_RENAME
|
||||
|
|
|
@ -328,7 +328,7 @@ static int hf_lte_rrc_lte_rrc_HandoverPreparationInformation_PDU = -1; /* Hando
|
|||
static int hf_lte_rrc_lte_rrc_SCG_Config_r12_PDU = -1; /* SCG_Config_r12 */
|
||||
static int hf_lte_rrc_lte_rrc_SCG_ConfigInfo_r12_PDU = -1; /* SCG_ConfigInfo_r12 */
|
||||
static int hf_lte_rrc_lte_rrc_UEPagingCoverageInformation_PDU = -1; /* UEPagingCoverageInformation */
|
||||
static int hf_lte_rrc_UERadioAccessCapabilityInformation_PDU = -1; /* UERadioAccessCapabilityInformation */
|
||||
static int hf_lte_rrc_lte_rrc_UERadioAccessCapabilityInformation_PDU = -1; /* UERadioAccessCapabilityInformation */
|
||||
static int hf_lte_rrc_lte_rrc_UERadioPagingInformation_PDU = -1; /* UERadioPagingInformation */
|
||||
static int hf_lte_rrc_BCCH_BCH_Message_PDU = -1; /* BCCH_BCH_Message */
|
||||
static int hf_lte_rrc_BCCH_BCH_Message_MBMS_PDU = -1; /* BCCH_BCH_Message_MBMS */
|
||||
|
@ -125564,13 +125564,13 @@ int dissect_lte_rrc_UEPagingCoverageInformation_PDU(tvbuff_t *tvb _U_, packet_in
|
|||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_UERadioAccessCapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int dissect_lte_rrc_UERadioAccessCapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
|
||||
proto_item_set_hidden(prot_ti);
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
|
||||
offset = dissect_lte_rrc_UERadioAccessCapabilityInformation(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_UERadioAccessCapabilityInformation_PDU);
|
||||
offset = dissect_lte_rrc_UERadioAccessCapabilityInformation(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_UERadioAccessCapabilityInformation_PDU);
|
||||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
|
@ -126875,7 +126875,7 @@ void proto_register_lte_rrc(void) {
|
|||
{ "UEPagingCoverageInformation", "lte-rrc.UEPagingCoverageInformation_element",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lte_rrc_UERadioAccessCapabilityInformation_PDU,
|
||||
{ &hf_lte_rrc_lte_rrc_UERadioAccessCapabilityInformation_PDU,
|
||||
{ "UERadioAccessCapabilityInformation", "lte-rrc.UERadioAccessCapabilityInformation_element",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
|
@ -164880,7 +164880,7 @@ void proto_register_lte_rrc(void) {
|
|||
/*--- Included file: packet-lte-rrc-dis-reg.c ---*/
|
||||
#line 1 "./asn1/lte-rrc/packet-lte-rrc-dis-reg.c"
|
||||
register_dissector("lte-rrc.ue_paging_coverage_info", dissect_lte_rrc_UEPagingCoverageInformation_PDU, proto_lte_rrc);
|
||||
register_dissector("lte-rrc.ue_radio_access_cap_info", dissect_UERadioAccessCapabilityInformation_PDU, proto_lte_rrc);
|
||||
register_dissector("lte-rrc.ue_radio_access_cap_info", dissect_lte_rrc_UERadioAccessCapabilityInformation_PDU, proto_lte_rrc);
|
||||
register_dissector("lte-rrc.ue_radio_paging_info", dissect_lte_rrc_UERadioPagingInformation_PDU, proto_lte_rrc);
|
||||
register_dissector("lte-rrc.bcch.bch", dissect_BCCH_BCH_Message_PDU, proto_lte_rrc);
|
||||
register_dissector("lte-rrc.bcch.bch.mbms", dissect_BCCH_BCH_Message_MBMS_PDU, proto_lte_rrc);
|
||||
|
|
|
@ -29,6 +29,7 @@ int dissect_lte_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet
|
|||
int dissect_lte_rrc_SCG_Config_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
|
||||
int dissect_lte_rrc_SCG_ConfigInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
|
||||
int dissect_lte_rrc_UEPagingCoverageInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
|
||||
int dissect_lte_rrc_UERadioAccessCapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
|
||||
int dissect_lte_rrc_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
|
||||
int dissect_lte_rrc_DL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
|
||||
int dissect_lte_rrc_UL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,43 @@
|
|||
/* Do not modify this file. Changes will be overwritten. */
|
||||
/* Generated automatically by the ASN.1 to Wireshark dissector compiler */
|
||||
/* packet-xnap.h */
|
||||
/* asn2wrs.py -p xnap -c ./xnap.cnf -s ./packet-xnap-template -D . -O ../.. XnAP-CommonDataTypes.asn XnAP-Constants.asn XnAP-Containers.asn XnAP-IEs.asn XnAP-PDU-Contents.asn XnAP-PDU-Descriptions.asn */
|
||||
|
||||
/* Input file: packet-xnap-template.h */
|
||||
|
||||
#line 1 "./asn1/xnap/packet-xnap-template.h"
|
||||
/* packet-xnap.h
|
||||
* Routines for dissecting NG-RAN Xn application protocol (XnAP)
|
||||
*
|
||||
* Wireshark - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@wireshark.org>
|
||||
* Copyright 1998 Gerald Combs
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#ifndef PACKET_XnAP_H
|
||||
#define PACKET_XnAP_H
|
||||
|
||||
|
||||
/*--- Included file: packet-xnap-exp.h ---*/
|
||||
#line 1 "./asn1/xnap/packet-xnap-exp.h"
|
||||
int dissect_xnap_IntendedTDD_DL_ULConfiguration_NR_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
|
||||
|
||||
/*--- End of included file: packet-xnap-exp.h ---*/
|
||||
#line 15 "./asn1/xnap/packet-xnap-template.h"
|
||||
|
||||
#endif /* PACKET_XnAP_H */
|
||||
|
||||
/*
|
||||
* Editor modelines
|
||||
*
|
||||
* Local Variables:
|
||||
* c-basic-offset: 2
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* ex: set shiftwidth=2 tabstop=8 expandtab:
|
||||
* :indentSize=2:tabSize=8:noTabs=true:
|
||||
*/
|
Loading…
Reference in New Issue