forked from osmocom/wireshark
X2AP: upgrade dissector to v16.6.0
This commit is contained in:
Pascal Quantin
Wireshark GitLab Utility
parent
80c57b3d0b
commit
b403255234
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.423 V16.5.0 (2021-04)
|
||||
-- 3GPP TS 36.423 V16.6.0 (2021-07)
|
||||
-- 9.3.6 Common definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.423 V16.5.0 (2021-04)
|
||||
-- 3GPP TS 36.423 V16.6.0 (2021-07)
|
||||
-- 9.3.7 Constant definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
@ -539,8 +539,8 @@ id-SNtriggered ProtocolIE-ID ::= 379
|
|||
id-CSI-RSTransmissionIndication ProtocolIE-ID ::= 380
|
||||
id-DLCarrierList ProtocolIE-ID ::= 381
|
||||
id-TargetCellInNGRAN ProtocolIE-ID ::= 382
|
||||
id-eNB-Measurement-ID-ENDC ProtocolIE-ID ::= 383
|
||||
id-engNB-Measurement-ID-ENDC ProtocolIE-ID ::= 384
|
||||
id-E-UTRAN-Node1-Measurement-ID ProtocolIE-ID ::= 383
|
||||
id-E-UTRAN-Node2-Measurement-ID ProtocolIE-ID ::= 384
|
||||
id-TDDULDLConfigurationCommonNR ProtocolIE-ID ::= 385
|
||||
id-CarrierList ProtocolIE-ID ::= 386
|
||||
id-ULCarrierList ProtocolIE-ID ::= 387
|
||||
|
|
@ -564,6 +564,8 @@ id-CellToReport-E-UTRA-ENDC ProtocolIE-ID ::= 403
|
|||
id-CellToReport-E-UTRA-ENDC-Item ProtocolIE-ID ::= 404
|
||||
id-TraceCollectionEntityURI ProtocolIE-ID ::= 405
|
||||
id-SFN-Offset ProtocolIE-ID ::= 406
|
||||
id-CHO-DC-EarlyDataForwarding ProtocolIE-ID ::= 407
|
||||
id-IMSvoiceEPSfallbackfrom5G ProtocolIE-ID ::= 408
|
||||
|
||||
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.423 V16.5.0 (2021-04)
|
||||
-- 3GPP TS 36.423 V16.6.0 (2021-07)
|
||||
-- 9.3.8 Container definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.423 V16.5.0 (2021-04)
|
||||
-- 3GPP TS 36.423 V16.6.0 (2021-07)
|
||||
-- 9.3.5 Information Element definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
@ -450,7 +450,8 @@ CauseRadioNetwork ::= ENUMERATED {
|
|||
cho-cpc-resources-tobechanged,
|
||||
ue-power-saving,
|
||||
insufficient-ue-capabilities,
|
||||
normal-release
|
||||
normal-release,
|
||||
unknown-E-UTRAN-Node-Measurement-ID
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -514,6 +515,8 @@ CellType-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
|
|||
...
|
||||
}
|
||||
|
||||
CHO-DC-EarlyDataForwarding ::= ENUMERATED {stop, ...}
|
||||
|
||||
CHO-DC-Indicator ::= ENUMERATED {true, ...}
|
||||
|
||||
CNTypeRestrictions ::= SEQUENCE (SIZE(1.. maxnoofEPLMNsPlusOne)) OF CNTypeRestrictionsItem
|
||||
|
|
@ -1378,6 +1381,11 @@ HWLoadIndicator-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
|
|||
|
||||
IABNodeIndication ::= ENUMERATED {true,...}
|
||||
|
||||
IMSvoiceEPSfallbackfrom5G ::= ENUMERATED {
|
||||
true,
|
||||
...
|
||||
}
|
||||
|
||||
IntegrityProtectionAlgorithms ::= BIT STRING (SIZE (16, ...))
|
||||
|
||||
IntendedTDD-DL-ULConfiguration-NR ::= OCTET STRING
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.423 V16.5.0 (2021-04)
|
||||
-- 3GPP TS 36.423 V16.6.0 (2021-07)
|
||||
-- 9.3.4 PDU Definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
@ -206,6 +206,7 @@ IMPORTS
|
|||
DAPSRequestInfo,
|
||||
DAPSResponseInfo,
|
||||
CandidateCellsToBeCancelledList,
|
||||
CHO-DC-EarlyDataForwarding,
|
||||
CHO-DC-Indicator,
|
||||
Ethernet-Type,
|
||||
NRV2XServicesAuthorized,
|
||||
|
|
@ -231,7 +232,8 @@ IMPORTS
|
|||
F1CTrafficContainer,
|
||||
IntendedTDD-DL-ULConfiguration-NR,
|
||||
UERadioCapability,
|
||||
SFN-Offset
|
||||
SFN-Offset,
|
||||
IMSvoiceEPSfallbackfrom5G
|
||||
|
||||
|
||||
|
||||
|
|
@ -285,6 +287,7 @@ FROM X2AP-Containers
|
|||
id-GUGroupIDToDeleteList,
|
||||
id-GUMMEI-ID,
|
||||
id-Masked-IMEISV,
|
||||
id-IMSvoiceEPSfallbackfrom5G,
|
||||
id-InvokeIndication,
|
||||
id-New-eNB-UE-X2AP-ID,
|
||||
id-Old-eNB-UE-X2AP-ID,
|
||||
|
|
@ -558,14 +561,15 @@ FROM X2AP-Containers
|
|||
id-CandidateCellsToBeCancelledList,
|
||||
id-DAPSResponseInfo,
|
||||
id-ProcedureStage,
|
||||
id-CHO-DC-EarlyDataForwarding,
|
||||
id-CHO-DC-Indicator,
|
||||
id-Ethernet-Type,
|
||||
id-NRV2XServicesAuthorized,
|
||||
id-NRUESidelinkAggregateMaximumBitRate,
|
||||
id-PC5QoSParameters,
|
||||
id-TargetCellInNGRAN,
|
||||
id-eNB-Measurement-ID-ENDC,
|
||||
id-engNB-Measurement-ID-ENDC,
|
||||
id-E-UTRAN-Node1-Measurement-ID,
|
||||
id-E-UTRAN-Node2-Measurement-ID,
|
||||
id-TDDULDLConfigurationCommonNR,
|
||||
id-CarrierList,
|
||||
id-ULCarrierList,
|
||||
|
|
@ -662,7 +666,8 @@ UE-ContextInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
|
|||
{ ID id-EPCHandoverRestrictionListContainer CRITICALITY ignore EXTENSION EPCHandoverRestrictionListContainer PRESENCE optional }|
|
||||
{ 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-UERadioCapabilityID CRITICALITY reject EXTENSION UERadioCapabilityID PRESENCE optional }|
|
||||
{ ID id-IMSvoiceEPSfallbackfrom5G CRITICALITY ignore EXTENSION IMSvoiceEPSfallbackfrom5G PRESENCE optional},
|
||||
...
|
||||
}
|
||||
|
||||
|
|
@ -2540,7 +2545,8 @@ UE-ContextInformationRetrieve-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
|
|||
{ ID id-AdditionalRRMPriorityIndex CRITICALITY ignore EXTENSION AdditionalRRMPriorityIndex PRESENCE optional }|
|
||||
{ ID id-EPCHandoverRestrictionListContainer CRITICALITY ignore EXTENSION EPCHandoverRestrictionListContainer PRESENCE optional }|
|
||||
{ ID id-NRUESidelinkAggregateMaximumBitRate CRITICALITY ignore EXTENSION NRUESidelinkAggregateMaximumBitRate PRESENCE optional}|
|
||||
{ ID id-UERadioCapabilityID CRITICALITY reject EXTENSION UERadioCapabilityID PRESENCE optional },
|
||||
{ ID id-UERadioCapabilityID CRITICALITY reject EXTENSION UERadioCapabilityID PRESENCE optional }|
|
||||
{ ID id-IMSvoiceEPSfallbackfrom5G CRITICALITY ignore EXTENSION IMSvoiceEPSfallbackfrom5G PRESENCE optional },
|
||||
...
|
||||
}
|
||||
|
||||
|
|
@ -3907,10 +3913,10 @@ ServedNRCell-Information ::= SEQUENCE {
|
|||
}
|
||||
|
||||
ServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
|
||||
{ID id-additionalPLMNs-Item CRITICALITY ignore EXTENSION AdditionalPLMNs-Item PRESENCE optional}|
|
||||
{ ID id-BPLMN-ID-Info-NR CRITICALITY ignore EXTENSION BPLMN-ID-Info-NR PRESENCE optional}|
|
||||
{ ID id-SSB-PositionsInBurst CRITICALITY ignore EXTENSION SSB-PositionsInBurst PRESENCE optional}|
|
||||
{ ID id-NRCellPRACHConfig CRITICALITY ignore EXTENSION NRCellPRACHConfig PRESENCE optional}|
|
||||
{ ID id-additionalPLMNs-Item CRITICALITY ignore EXTENSION AdditionalPLMNs-Item PRESENCE optional}|
|
||||
{ ID id-BPLMN-ID-Info-NR CRITICALITY ignore EXTENSION BPLMN-ID-Info-NR PRESENCE optional}|
|
||||
{ ID id-SSB-PositionsInBurst CRITICALITY ignore EXTENSION SSB-PositionsInBurst PRESENCE optional}|
|
||||
{ ID id-NRCellPRACHConfig CRITICALITY ignore EXTENSION NRCellPRACHConfig PRESENCE optional}|
|
||||
{ ID id-CSI-RSTransmissionIndication CRITICALITY ignore EXTENSION CSI-RSTransmissionIndication PRESENCE optional}|
|
||||
{ ID id-SFN-Offset CRITICALITY ignore EXTENSION SFN-Offset PRESENCE optional},
|
||||
...
|
||||
|
|
@ -4259,8 +4265,8 @@ ENDCResourceStatusRequest ::= SEQUENCE {
|
|||
}
|
||||
|
||||
ENDCResourceStatusRequest-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 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-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-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”
|
||||
|
|
@ -4329,8 +4335,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-E-UTRAN-Node1-Measurement-ID CRITICALITY reject TYPE Measurement-ID-ENDC PRESENCE mandatory}|
|
||||
{ ID id-E-UTRAN-Node2-Measurement-ID CRITICALITY reject TYPE Measurement-ID-ENDC PRESENCE mandatory}|
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional } |
|
||||
{ ID id-InterfaceInstanceIndication CRITICALITY reject TYPE InterfaceInstanceIndication PRESENCE optional },
|
||||
...
|
||||
|
|
@ -4348,8 +4354,8 @@ ENDCResourceStatusFailure ::= SEQUENCE {
|
|||
}
|
||||
|
||||
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-E-UTRAN-Node1-Measurement-ID CRITICALITY reject TYPE Measurement-ID-ENDC PRESENCE mandatory}|
|
||||
{ ID id-E-UTRAN-Node2-Measurement-ID 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-InterfaceInstanceIndication CRITICALITY reject TYPE InterfaceInstanceIndication PRESENCE optional },
|
||||
|
|
@ -4368,8 +4374,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-E-UTRAN-Node1-Measurement-ID CRITICALITY reject TYPE Measurement-ID-ENDC PRESENCE mandatory}|
|
||||
{ ID id-E-UTRAN-Node2-Measurement-ID CRITICALITY reject TYPE Measurement-ID-ENDC PRESENCE mandatory}|
|
||||
{ ID id-CellMeasurementResult-NR-ENDC CRITICALITY ignore TYPE CellMeasurementResult-NR-ENDC-List PRESENCE optional }|
|
||||
{ ID id-InterfaceInstanceIndication CRITICALITY reject TYPE InterfaceInstanceIndication PRESENCE optional }|
|
||||
{ ID id-CellMeasurementResult-E-UTRA-ENDC CRITICALITY ignore TYPE CellMeasurementResult-E-UTRA-ENDC-List PRESENCE optional},
|
||||
|
|
@ -4681,7 +4687,8 @@ DataForwardingAddressIndication-IEs X2AP-PROTOCOL-IES ::= {
|
|||
{ ID id-Old-eNB-UE-X2AP-ID CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}|
|
||||
{ ID id-Old-eNB-UE-X2AP-ID-Extension CRITICALITY ignore TYPE UE-X2AP-ID-Extension PRESENCE optional }|
|
||||
{ ID id-E-RABs-DataForwardingAddress-List CRITICALITY ignore TYPE E-RABs-DataForwardingAddress-List PRESENCE mandatory}|
|
||||
{ ID id-CHO-DC-Indicator CRITICALITY reject TYPE CHO-DC-Indicator PRESENCE optional},
|
||||
{ ID id-CHO-DC-Indicator CRITICALITY reject TYPE CHO-DC-Indicator PRESENCE optional}|
|
||||
{ ID id-CHO-DC-EarlyDataForwarding CRITICALITY ignore TYPE CHO-DC-EarlyDataForwarding PRESENCE optional},
|
||||
...
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.423 V16.5.0 (2021-04)
|
||||
-- 3GPP TS 36.423 V16.6.0 (2021-07)
|
||||
-- 9.3.3 Elementary Procedure Definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* Ref:
|
||||
* 3GPP TS 36.423 V16.5.0 (2021-04)
|
||||
* 3GPP TS 36.423 V16.6.0 (2021-07)
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
|
|
|||
|
|
@ -1544,8 +1544,8 @@ id-SNtriggered ProtocolIE-ID
|
|||
id-CSI-RSTransmissionIndication ProtocolIE-ID
|
||||
id-DLCarrierList ProtocolIE-ID
|
||||
id-TargetCellInNGRAN ProtocolIE-ID
|
||||
id-eNB-Measurement-ID-ENDC ProtocolIE-ID
|
||||
id-engNB-Measurement-ID-ENDC ProtocolIE-ID
|
||||
id-E-UTRAN-Node1-Measurement-ID ProtocolIE-ID
|
||||
id-E-UTRAN-Node2-Measurement-ID ProtocolIE-ID
|
||||
id-TDDULDLConfigurationCommonNR ProtocolIE-ID
|
||||
id-CarrierList ProtocolIE-ID
|
||||
id-ULCarrierList ProtocolIE-ID
|
||||
|
|
@ -1567,6 +1567,8 @@ id-CellToReport-E-UTRA-ENDC ProtocolIE-ID
|
|||
id-CellToReport-E-UTRA-ENDC-Item ProtocolIE-ID
|
||||
id-TraceCollectionEntityURI ProtocolIE-ID
|
||||
id-SFN-Offset ProtocolIE-ID
|
||||
id-CHO-DC-EarlyDataForwarding ProtocolIE-ID
|
||||
id-IMSvoiceEPSfallbackfrom5G ProtocolIE-ID
|
||||
|
||||
#.REGISTER
|
||||
|
||||
|
|
@ -1835,8 +1837,8 @@ TransportLayerAddress N x2ap.ies id-TraceCollectionEntityIPAddress
|
|||
UERadioCapabilityID N x2ap.ies id-UERadioCapabilityID
|
||||
SNtriggered N x2ap.ies id-SNtriggered
|
||||
TargetCellInNGRAN N x2ap.ies id-TargetCellInNGRAN
|
||||
Measurement-ID-ENDC N x2ap.ies id-eNB-Measurement-ID-ENDC
|
||||
Measurement-ID-ENDC N x2ap.ies id-engNB-Measurement-ID-ENDC
|
||||
Measurement-ID-ENDC N x2ap.ies id-E-UTRAN-Node1-Measurement-ID
|
||||
Measurement-ID-ENDC N x2ap.ies id-E-UTRAN-Node2-Measurement-ID
|
||||
CellToReport-NR-ENDC-List N x2ap.ies id-CellToReport-NR-ENDC
|
||||
CellToReport-NR-ENDC-Item N x2ap.ies id-CellToReport-NR-ENDC-Item
|
||||
CellMeasurementResult-NR-ENDC-List N x2ap.ies id-CellMeasurementResult-NR-ENDC
|
||||
|
|
@ -1848,6 +1850,7 @@ CellMeasurementResult-E-UTRA-ENDC-List N x2ap.ies id-CellMeasurementResult-E-
|
|||
CellMeasurementResult-E-UTRA-ENDC-Item N x2ap.ies id-CellMeasurementResult-E-UTRA-ENDC-Item
|
||||
CellToReport-E-UTRA-ENDC-List N x2ap.ies id-CellToReport-E-UTRA-ENDC
|
||||
CellToReport-E-UTRA-ENDC-Item N x2ap.ies id-CellToReport-E-UTRA-ENDC-Item
|
||||
CHO-DC-EarlyDataForwarding N x2ap.ies id-CHO-DC-EarlyDataForwarding
|
||||
|
||||
#X2AP-PROTOCOL-EXTENSION
|
||||
Number-of-Antennaports N x2ap.extension id-Number-of-Antennaports
|
||||
|
|
@ -1969,6 +1972,7 @@ QoS-Mapping-Information N x2ap.extension id-QoS-Mapping-Information
|
|||
IntendedTDD-DL-ULConfiguration-NR N x2ap.extension id-IntendedTDD-DL-ULConfiguration-NR
|
||||
URI-Address N x2ap.extension id-TraceCollectionEntityURI
|
||||
SFN-Offset N x2ap.extension id-SFN-Offset
|
||||
IMSvoiceEPSfallbackfrom5G N x2ap.extension id-IMSvoiceEPSfallbackfrom5G
|
||||
|
||||
# X2AP-PDU-Descriptions.asn Interface Elementary Procedures
|
||||
#X2AP-ELEMENTARY-PROCEDURE
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* Ref:
|
||||
* 3GPP TS 36.423 V16.5.0 (2021-04)
|
||||
* 3GPP TS 36.423 V16.6.0 (2021-07)
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
|
@ -564,8 +564,8 @@ typedef enum _ProtocolIE_ID_enum {
|
|||
id_CSI_RSTransmissionIndication = 380,
|
||||
id_DLCarrierList = 381,
|
||||
id_TargetCellInNGRAN = 382,
|
||||
id_eNB_Measurement_ID_ENDC = 383,
|
||||
id_engNB_Measurement_ID_ENDC = 384,
|
||||
id_E_UTRAN_Node1_Measurement_ID = 383,
|
||||
id_E_UTRAN_Node2_Measurement_ID = 384,
|
||||
id_TDDULDLConfigurationCommonNR = 385,
|
||||
id_CarrierList = 386,
|
||||
id_ULCarrierList = 387,
|
||||
|
|
@ -587,7 +587,9 @@ typedef enum _ProtocolIE_ID_enum {
|
|||
id_CellToReport_E_UTRA_ENDC = 403,
|
||||
id_CellToReport_E_UTRA_ENDC_Item = 404,
|
||||
id_TraceCollectionEntityURI = 405,
|
||||
id_SFN_Offset = 406
|
||||
id_SFN_Offset = 406,
|
||||
id_CHO_DC_EarlyDataForwarding = 407,
|
||||
id_IMSvoiceEPSfallbackfrom5G = 408
|
||||
} ProtocolIE_ID_enum;
|
||||
|
||||
/*--- End of included file: packet-x2ap-val.h ---*/
|
||||
|
|
@ -685,6 +687,7 @@ static int hf_x2ap_BPLMN_ID_Info_EUTRA_PDU = -1; /* BPLMN_ID_Info_EUTRA */
|
|||
static int hf_x2ap_BPLMN_ID_Info_NR_PDU = -1; /* BPLMN_ID_Info_NR */
|
||||
static int hf_x2ap_Cause_PDU = -1; /* Cause */
|
||||
static int hf_x2ap_CellReportingIndicator_PDU = -1; /* CellReportingIndicator */
|
||||
static int hf_x2ap_CHO_DC_EarlyDataForwarding_PDU = -1; /* CHO_DC_EarlyDataForwarding */
|
||||
static int hf_x2ap_CHO_DC_Indicator_PDU = -1; /* CHO_DC_Indicator */
|
||||
static int hf_x2ap_CNTypeRestrictions_PDU = -1; /* CNTypeRestrictions */
|
||||
static int hf_x2ap_CoMPInformation_PDU = -1; /* CoMPInformation */
|
||||
|
|
@ -739,6 +742,7 @@ static int hf_x2ap_GUMMEI_PDU = -1; /* GUMMEI */
|
|||
static int hf_x2ap_HandoverReportType_PDU = -1; /* HandoverReportType */
|
||||
static int hf_x2ap_HandoverRestrictionList_PDU = -1; /* HandoverRestrictionList */
|
||||
static int hf_x2ap_IABNodeIndication_PDU = -1; /* IABNodeIndication */
|
||||
static int hf_x2ap_IMSvoiceEPSfallbackfrom5G_PDU = -1; /* IMSvoiceEPSfallbackfrom5G */
|
||||
static int hf_x2ap_IntendedTDD_DL_ULConfiguration_NR_PDU = -1; /* IntendedTDD_DL_ULConfiguration_NR */
|
||||
static int hf_x2ap_InterfaceInstanceIndication_PDU = -1; /* InterfaceInstanceIndication */
|
||||
static int hf_x2ap_InvokeIndication_PDU = -1; /* InvokeIndication */
|
||||
|
|
@ -3143,8 +3147,8 @@ static const value_string x2ap_ProtocolIE_ID_vals[] = {
|
|||
{ id_CSI_RSTransmissionIndication, "id-CSI-RSTransmissionIndication" },
|
||||
{ id_DLCarrierList, "id-DLCarrierList" },
|
||||
{ id_TargetCellInNGRAN, "id-TargetCellInNGRAN" },
|
||||
{ id_eNB_Measurement_ID_ENDC, "id-eNB-Measurement-ID-ENDC" },
|
||||
{ id_engNB_Measurement_ID_ENDC, "id-engNB-Measurement-ID-ENDC" },
|
||||
{ id_E_UTRAN_Node1_Measurement_ID, "id-E-UTRAN-Node1-Measurement-ID" },
|
||||
{ id_E_UTRAN_Node2_Measurement_ID, "id-E-UTRAN-Node2-Measurement-ID" },
|
||||
{ id_TDDULDLConfigurationCommonNR, "id-TDDULDLConfigurationCommonNR" },
|
||||
{ id_CarrierList, "id-CarrierList" },
|
||||
{ id_ULCarrierList, "id-ULCarrierList" },
|
||||
|
|
@ -3167,6 +3171,8 @@ static const value_string x2ap_ProtocolIE_ID_vals[] = {
|
|||
{ id_CellToReport_E_UTRA_ENDC_Item, "id-CellToReport-E-UTRA-ENDC-Item" },
|
||||
{ id_TraceCollectionEntityURI, "id-TraceCollectionEntityURI" },
|
||||
{ id_SFN_Offset, "id-SFN-Offset" },
|
||||
{ id_CHO_DC_EarlyDataForwarding, "id-CHO-DC-EarlyDataForwarding" },
|
||||
{ id_IMSvoiceEPSfallbackfrom5G, "id-IMSvoiceEPSfallbackfrom5G" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
|
@ -4472,6 +4478,7 @@ static const value_string x2ap_CauseRadioNetwork_vals[] = {
|
|||
{ 52, "ue-power-saving" },
|
||||
{ 53, "insufficient-ue-capabilities" },
|
||||
{ 54, "normal-release" },
|
||||
{ 55, "unknown-E-UTRAN-Node-Measurement-ID" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
|
@ -4481,7 +4488,7 @@ static value_string_ext x2ap_CauseRadioNetwork_vals_ext = VALUE_STRING_EXT_INIT(
|
|||
static int
|
||||
dissect_x2ap_CauseRadioNetwork(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
|
||||
22, NULL, TRUE, 33, NULL);
|
||||
22, NULL, TRUE, 34, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -4685,6 +4692,21 @@ dissect_x2ap_CellType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
|
|||
}
|
||||
|
||||
|
||||
static const value_string x2ap_CHO_DC_EarlyDataForwarding_vals[] = {
|
||||
{ 0, "stop" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
static int
|
||||
dissect_x2ap_CHO_DC_EarlyDataForwarding(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
|
||||
1, NULL, TRUE, 0, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const value_string x2ap_CHO_DC_Indicator_vals[] = {
|
||||
{ 0, "true" },
|
||||
{ 0, NULL }
|
||||
|
|
@ -7915,6 +7937,21 @@ dissect_x2ap_IABNodeIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
|
|||
}
|
||||
|
||||
|
||||
static const value_string x2ap_IMSvoiceEPSfallbackfrom5G_vals[] = {
|
||||
{ 0, "true" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
static int
|
||||
dissect_x2ap_IMSvoiceEPSfallbackfrom5G(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
|
||||
1, NULL, TRUE, 0, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_x2ap_IntegrityProtectionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
|
|
@ -18410,6 +18447,14 @@ static int dissect_CellReportingIndicator_PDU(tvbuff_t *tvb _U_, packet_info *pi
|
|||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_CHO_DC_EarlyDataForwarding_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
|
||||
offset = dissect_x2ap_CHO_DC_EarlyDataForwarding(tvb, offset, &asn1_ctx, tree, hf_x2ap_CHO_DC_EarlyDataForwarding_PDU);
|
||||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_CHO_DC_Indicator_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
|
@ -18842,6 +18887,14 @@ static int dissect_IABNodeIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _
|
|||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_IMSvoiceEPSfallbackfrom5G_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
|
||||
offset = dissect_x2ap_IMSvoiceEPSfallbackfrom5G(tvb, offset, &asn1_ctx, tree, hf_x2ap_IMSvoiceEPSfallbackfrom5G_PDU);
|
||||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_IntendedTDD_DL_ULConfiguration_NR_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
|
@ -22228,6 +22281,10 @@ void proto_register_x2ap(void) {
|
|||
{ "CellReportingIndicator", "x2ap.CellReportingIndicator",
|
||||
FT_UINT32, BASE_DEC, VALS(x2ap_CellReportingIndicator_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_x2ap_CHO_DC_EarlyDataForwarding_PDU,
|
||||
{ "CHO-DC-EarlyDataForwarding", "x2ap.CHO_DC_EarlyDataForwarding",
|
||||
FT_UINT32, BASE_DEC, VALS(x2ap_CHO_DC_EarlyDataForwarding_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_x2ap_CHO_DC_Indicator_PDU,
|
||||
{ "CHO-DC-Indicator", "x2ap.CHO_DC_Indicator",
|
||||
FT_UINT32, BASE_DEC, VALS(x2ap_CHO_DC_Indicator_vals), 0,
|
||||
|
|
@ -22444,6 +22501,10 @@ void proto_register_x2ap(void) {
|
|||
{ "IABNodeIndication", "x2ap.IABNodeIndication",
|
||||
FT_UINT32, BASE_DEC, VALS(x2ap_IABNodeIndication_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_x2ap_IMSvoiceEPSfallbackfrom5G_PDU,
|
||||
{ "IMSvoiceEPSfallbackfrom5G", "x2ap.IMSvoiceEPSfallbackfrom5G",
|
||||
FT_UINT32, BASE_DEC, VALS(x2ap_IMSvoiceEPSfallbackfrom5G_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_x2ap_IntendedTDD_DL_ULConfiguration_NR_PDU,
|
||||
{ "IntendedTDD-DL-ULConfiguration-NR", "x2ap.IntendedTDD_DL_ULConfiguration_NR",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
|
|
@ -27883,8 +27944,8 @@ proto_reg_handoff_x2ap(void)
|
|||
dissector_add_uint("x2ap.ies", id_UERadioCapabilityID, create_dissector_handle(dissect_UERadioCapabilityID_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.ies", id_SNtriggered, create_dissector_handle(dissect_SNtriggered_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.ies", id_TargetCellInNGRAN, create_dissector_handle(dissect_TargetCellInNGRAN_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.ies", id_eNB_Measurement_ID_ENDC, create_dissector_handle(dissect_Measurement_ID_ENDC_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.ies", id_engNB_Measurement_ID_ENDC, create_dissector_handle(dissect_Measurement_ID_ENDC_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.ies", id_E_UTRAN_Node1_Measurement_ID, create_dissector_handle(dissect_Measurement_ID_ENDC_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.ies", id_E_UTRAN_Node2_Measurement_ID, create_dissector_handle(dissect_Measurement_ID_ENDC_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.ies", id_CellToReport_NR_ENDC, create_dissector_handle(dissect_CellToReport_NR_ENDC_List_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.ies", id_CellToReport_NR_ENDC_Item, create_dissector_handle(dissect_CellToReport_NR_ENDC_Item_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.ies", id_CellMeasurementResult_NR_ENDC, create_dissector_handle(dissect_CellMeasurementResult_NR_ENDC_List_PDU, proto_x2ap));
|
||||
|
|
@ -27896,6 +27957,7 @@ proto_reg_handoff_x2ap(void)
|
|||
dissector_add_uint("x2ap.ies", id_CellMeasurementResult_E_UTRA_ENDC_Item, create_dissector_handle(dissect_CellMeasurementResult_E_UTRA_ENDC_Item_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.ies", id_CellToReport_E_UTRA_ENDC, create_dissector_handle(dissect_CellToReport_E_UTRA_ENDC_List_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.ies", id_CellToReport_E_UTRA_ENDC_Item, create_dissector_handle(dissect_CellToReport_E_UTRA_ENDC_Item_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.ies", id_CHO_DC_EarlyDataForwarding, create_dissector_handle(dissect_CHO_DC_EarlyDataForwarding_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.extension", id_Number_of_Antennaports, create_dissector_handle(dissect_Number_of_Antennaports_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.extension", id_CompositeAvailableCapacityGroup, create_dissector_handle(dissect_CompositeAvailableCapacityGroup_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.extension", id_PRACH_Configuration, create_dissector_handle(dissect_PRACH_Configuration_PDU, proto_x2ap));
|
||||
|
|
@ -28015,6 +28077,7 @@ proto_reg_handoff_x2ap(void)
|
|||
dissector_add_uint("x2ap.extension", id_IntendedTDD_DL_ULConfiguration_NR, create_dissector_handle(dissect_IntendedTDD_DL_ULConfiguration_NR_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.extension", id_TraceCollectionEntityURI, create_dissector_handle(dissect_URI_Address_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.extension", id_SFN_Offset, create_dissector_handle(dissect_SFN_Offset_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.extension", id_IMSvoiceEPSfallbackfrom5G, create_dissector_handle(dissect_IMSvoiceEPSfallbackfrom5G_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.proc.imsg", id_handoverPreparation, create_dissector_handle(dissect_HandoverRequest_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.proc.sout", id_handoverPreparation, create_dissector_handle(dissect_HandoverRequestAcknowledge_PDU, proto_x2ap));
|
||||
dissector_add_uint("x2ap.proc.uout", id_handoverPreparation, create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_x2ap));
|
||||
|
|
|
|||
Loading…
Reference in New Issue