diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-26 03:59:01 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-26 03:59:01 +0000 |
| commit | a34fdd3d616a1e1a403518768514863bc4e79eb9 (patch) | |
| tree | 07a3dee401d42d8df404bf7cd0d8ccaebc1e8d26 /epan/dissectors/packet-x2ap.c | |
| parent | 9b78c77ee67ab5173bab183a17071e2977df1c87 (diff) | |
Re-generate asn1 dissectors after hf_register_info cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28848 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-x2ap.c')
| -rw-r--r-- | epan/dissectors/packet-x2ap.c | 1859 |
1 files changed, 1429 insertions, 430 deletions
diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index 2602591a59..e4a80919b9 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -67,10 +67,9 @@ #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 -#define maxEARFCN 32767 +#define maxEARFCN 65535 #define maxInterfaces 16 #define maxCellineNB 256 -#define maxnoofCells 16 #define maxnoofBearers 256 #define maxNrOfErrors 256 #define maxnoofPDCP_SN 16 @@ -79,8 +78,10 @@ #define maxnoofForbLACs 4096 #define maxnoofForbTACs 4096 #define maxnoofBPLMNs 6 +#define maxnoofNeighbours 512 #define maxnoofPRBs 110 #define maxPools 16 +#define maxnoofCells 16 /* enumerated values for ProcedureCode */ #define X2AP_ID_HANDOVERPREPARATION 0 @@ -92,19 +93,19 @@ #define X2AP_ID_X2SETUP 6 #define X2AP_ID_RESET 7 #define X2AP_ID_ENBCONFIGURATIONUPDATE 8 -#define X2AP_ID_RESOURCESTATUSUPDATEINITIATION 9 +#define X2AP_ID_RESOURCESTATUSREPORTINGINITIATION 9 #define X2AP_ID_RESOURCESTATUSREPORTING 10 +#define X2AP_ID_PRIVATEMESSAGE 11 typedef enum _ProtocolIE_ID_enum { - id_Bearers_Admitted_Item = 0, - id_Bearers_Admitted_List = 1, - id_Bearers_NotAdmitted_Item = 2, - id_Bearers_NotAdmitted_List = 3, - id_Bearers_ToBeSetup_Item = 4, + id_E_RABs_Admitted_Item = 0, + id_E_RABs_Admitted_List = 1, + id_E_RAB_Item = 2, + id_E_RABs_NotAdmitted_List = 3, + id_E_RABs_ToBeSetup_Item = 4, id_Cause = 5, id_CellInformation = 6, id_CellInformation_Item = 7, - id_InterfacesToTrace_Item = 8, id_New_eNB_UE_X2AP_ID = 9, id_Old_eNB_UE_X2AP_ID = 10, id_TargetCell_ID = 11, @@ -114,8 +115,8 @@ typedef enum _ProtocolIE_ID_enum { id_UE_HistoryInformation = 15, id_UE_X2AP_ID = 16, id_CriticalityDiagnostics = 17, - id_Bearers_SubjectToStatusTransfer_List = 18, - id_Bearers_SubjectToStatusTransfer_Item = 19, + id_E_RABs_SubjectToStatusTransfer_List = 18, + id_E_RABs_SubjectToStatusTransfer_Item = 19, id_ServedCells = 20, id_GlobalENB_ID = 21, id_TimeToWait = 22, @@ -130,8 +131,14 @@ typedef enum _ProtocolIE_ID_enum { id_CellToReport_Item = 31, id_CellMeasurementResult = 32, id_CellMeasurementResult_Item = 33, - id_GUGroupIDListToAdd = 34, - id_GUGroupIDListToDelete = 35 + id_GUGroupIDToAddList = 34, + id_GUGroupIDToDeleteList = 35, + id_SRVCCOperationPossible = 36, + id_Measurement_ID = 37, + id_ReportCharacteristics = 38, + id_ENB1_Measurement_ID = 39, + id_ENB2_Measurement_ID = 40, + id_Number_of_Antennaports = 41 } ProtocolIE_ID_enum; /*--- End of included file: packet-x2ap-val.h ---*/ @@ -146,12 +153,17 @@ static int proto_x2ap = -1; static int hf_x2ap_Cause_PDU = -1; /* Cause */ static int hf_x2ap_CriticalityDiagnostics_PDU = -1; /* CriticalityDiagnostics */ static int hf_x2ap_ECGI_PDU = -1; /* ECGI */ +static int hf_x2ap_E_RAB_List_PDU = -1; /* E_RAB_List */ +static int hf_x2ap_E_RAB_Item_PDU = -1; /* E_RAB_Item */ static int hf_x2ap_GlobalENB_ID_PDU = -1; /* GlobalENB_ID */ static int hf_x2ap_GUGroupIDList_PDU = -1; /* GUGroupIDList */ static int hf_x2ap_GUMMEI_PDU = -1; /* GUMMEI */ -static int hf_x2ap_InterfacesToTrace_Item_PDU = -1; /* InterfacesToTrace_Item */ +static int hf_x2ap_Measurement_ID_PDU = -1; /* Measurement_ID */ +static int hf_x2ap_Number_of_Antennaports_PDU = -1; /* Number_of_Antennaports */ static int hf_x2ap_Registration_Request_PDU = -1; /* Registration_Request */ +static int hf_x2ap_ReportCharacteristics_PDU = -1; /* ReportCharacteristics */ static int hf_x2ap_ServedCells_PDU = -1; /* ServedCells */ +static int hf_x2ap_SRVCCOperationPossible_PDU = -1; /* SRVCCOperationPossible */ static int hf_x2ap_TargeteNBtoSource_eNBTransparentContainer_PDU = -1; /* TargeteNBtoSource_eNBTransparentContainer */ static int hf_x2ap_TimeToWait_PDU = -1; /* TimeToWait */ static int hf_x2ap_TraceActivation_PDU = -1; /* TraceActivation */ @@ -159,16 +171,14 @@ static int hf_x2ap_UE_HistoryInformation_PDU = -1; /* UE_HistoryInformation */ static int hf_x2ap_UE_X2AP_ID_PDU = -1; /* UE_X2AP_ID */ static int hf_x2ap_HandoverRequest_PDU = -1; /* HandoverRequest */ static int hf_x2ap_UE_ContextInformation_PDU = -1; /* UE_ContextInformation */ -static int hf_x2ap_Bearers_ToBeSetup_Item_PDU = -1; /* Bearers_ToBeSetup_Item */ +static int hf_x2ap_E_RABs_ToBeSetup_Item_PDU = -1; /* E_RABs_ToBeSetup_Item */ static int hf_x2ap_HandoverRequestAcknowledge_PDU = -1; /* HandoverRequestAcknowledge */ -static int hf_x2ap_Bearers_Admitted_List_PDU = -1; /* Bearers_Admitted_List */ -static int hf_x2ap_Bearers_Admitted_Item_PDU = -1; /* Bearers_Admitted_Item */ -static int hf_x2ap_Bearers_NotAdmitted_List_PDU = -1; /* Bearers_NotAdmitted_List */ -static int hf_x2ap_Bearers_NotAdmitted_Item_PDU = -1; /* Bearers_NotAdmitted_Item */ +static int hf_x2ap_E_RABs_Admitted_List_PDU = -1; /* E_RABs_Admitted_List */ +static int hf_x2ap_E_RABs_Admitted_Item_PDU = -1; /* E_RABs_Admitted_Item */ static int hf_x2ap_HandoverPreparationFailure_PDU = -1; /* HandoverPreparationFailure */ static int hf_x2ap_SNStatusTransfer_PDU = -1; /* SNStatusTransfer */ -static int hf_x2ap_Bearers_SubjectToStatusTransfer_List_PDU = -1; /* Bearers_SubjectToStatusTransfer_List */ -static int hf_x2ap_Bearers_SubjectToStatusTransfer_Item_PDU = -1; /* Bearers_SubjectToStatusTransfer_Item */ +static int hf_x2ap_E_RABs_SubjectToStatusTransfer_List_PDU = -1; /* E_RABs_SubjectToStatusTransfer_List */ +static int hf_x2ap_E_RABs_SubjectToStatusTransfer_Item_PDU = -1; /* E_RABs_SubjectToStatusTransfer_Item */ static int hf_x2ap_UEContextRelease_PDU = -1; /* UEContextRelease */ static int hf_x2ap_HandoverCancel_PDU = -1; /* HandoverCancel */ static int hf_x2ap_ErrorIndication_PDU = -1; /* ErrorIndication */ @@ -188,13 +198,16 @@ static int hf_x2ap_ENBConfigurationUpdateFailure_PDU = -1; /* ENBConfigurationU static int hf_x2ap_ResourceStatusRequest_PDU = -1; /* ResourceStatusRequest */ static int hf_x2ap_CellToReport_List_PDU = -1; /* CellToReport_List */ static int hf_x2ap_CellToReport_Item_PDU = -1; /* CellToReport_Item */ -static int hf_x2ap_ReportingPeriod_PDU = -1; /* ReportingPeriod */ +static int hf_x2ap_ReportingPeriodicity_PDU = -1; /* ReportingPeriodicity */ static int hf_x2ap_ResourceStatusResponse_PDU = -1; /* ResourceStatusResponse */ static int hf_x2ap_ResourceStatusFailure_PDU = -1; /* ResourceStatusFailure */ static int hf_x2ap_ResourceStatusUpdate_PDU = -1; /* ResourceStatusUpdate */ static int hf_x2ap_CellMeasurementResult_List_PDU = -1; /* CellMeasurementResult_List */ static int hf_x2ap_CellMeasurementResult_Item_PDU = -1; /* CellMeasurementResult_Item */ +static int hf_x2ap_PrivateMessage_PDU = -1; /* PrivateMessage */ static int hf_x2ap_X2AP_PDU_PDU = -1; /* X2AP_PDU */ +static int hf_x2ap_local = -1; /* INTEGER_0_maxPrivateIEs */ +static int hf_x2ap_global = -1; /* OBJECT_IDENTIFIER */ static int hf_x2ap_ProtocolIE_Container_item = -1; /* ProtocolIE_Field */ static int hf_x2ap_id = -1; /* ProtocolIE_ID */ static int hf_x2ap_criticality = -1; /* Criticality */ @@ -202,14 +215,23 @@ static int hf_x2ap_protocolIE_Field_value = -1; /* ProtocolIE_Field_value */ static int hf_x2ap_ProtocolExtensionContainer_item = -1; /* ProtocolExtensionField */ static int hf_x2ap_extension_id = -1; /* ProtocolIE_ID */ static int hf_x2ap_extensionValue = -1; /* T_extensionValue */ +static int hf_x2ap_PrivateIE_Container_item = -1; /* PrivateIE_Field */ +static int hf_x2ap_private_id = -1; /* PrivateIE_ID */ +static int hf_x2ap_privateIE_Field_value = -1; /* PrivateIE_Field_value */ +static int hf_x2ap_key_eNodeB_star = -1; /* Key_eNodeB_Star */ +static int hf_x2ap_nextHopChainingCount = -1; /* NextHopChainingCount */ +static int hf_x2ap_iE_Extensions = -1; /* ProtocolExtensionContainer */ +static int hf_x2ap_priorityLevel = -1; /* PriorityLevel */ +static int hf_x2ap_pre_emptionCapability = -1; /* Pre_emptionCapability */ +static int hf_x2ap_pre_emptionVulnerability = -1; /* Pre_emptionVulnerability */ static int hf_x2ap_BroadcastPLMNs_Item_item = -1; /* PLMN_Identity */ static int hf_x2ap_radioNetwork = -1; /* CauseRadioNetwork */ static int hf_x2ap_transport = -1; /* CauseTransport */ static int hf_x2ap_protocol = -1; /* CauseProtocol */ static int hf_x2ap_misc = -1; /* CauseMisc */ +static int hf_x2ap_cell_Size = -1; /* Cell_Size */ static int hf_x2ap_pDCP_SN = -1; /* PDCP_SN */ static int hf_x2ap_hFN = -1; /* HFN */ -static int hf_x2ap_iE_Extensions = -1; /* ProtocolExtensionContainer */ static int hf_x2ap_procedureCode = -1; /* ProcedureCode */ static int hf_x2ap_triggeringMessage = -1; /* TriggeringMessage */ static int hf_x2ap_procedureCriticality = -1; /* Criticality */ @@ -218,21 +240,37 @@ static int hf_x2ap_CriticalityDiagnostics_IE_List_item = -1; /* CriticalityDiag static int hf_x2ap_iECriticality = -1; /* Criticality */ static int hf_x2ap_iE_ID = -1; /* ProtocolIE_ID */ static int hf_x2ap_typeOfError = -1; /* TypeOfError */ +static int hf_x2ap_uL_EARFCN = -1; /* EARFCN */ +static int hf_x2ap_dL_EARFCN = -1; /* EARFCN */ +static int hf_x2ap_uL_Transmission_Bandwidth = -1; /* Transmission_Bandwidth */ +static int hf_x2ap_dL_Transmission_Bandwidth = -1; /* Transmission_Bandwidth */ +static int hf_x2ap_eARFCN = -1; /* EARFCN */ +static int hf_x2ap_transmission_Bandwidth = -1; /* Transmission_Bandwidth */ +static int hf_x2ap_subframeAssignment = -1; /* SubframeAssignment */ +static int hf_x2ap_specialSubframe_Info = -1; /* SpecialSubframe_Info */ +static int hf_x2ap_fDD = -1; /* FDD_Info */ +static int hf_x2ap_tDD = -1; /* TDD_Info */ static int hf_x2ap_pLMN_Identity = -1; /* PLMN_Identity */ static int hf_x2ap_eUTRANcellIdentifier = -1; /* EUTRANCellIdentifier */ static int hf_x2ap_macro_eNB_ID = -1; /* BIT_STRING_SIZE_20 */ static int hf_x2ap_home_eNB_ID = -1; /* BIT_STRING_SIZE_28 */ static int hf_x2ap_EPLMNs_item = -1; /* PLMN_Identity */ +static int hf_x2ap_qCI = -1; /* QCI */ +static int hf_x2ap_allocationAndRetentionPriority = -1; /* AllocationAndRetentionPriority */ +static int hf_x2ap_gbrQosInformation = -1; /* GBR_QosInformation */ +static int hf_x2ap_E_RAB_List_item = -1; /* ProtocolIE_Single_Container */ +static int hf_x2ap_e_RAB_ID = -1; /* E_RAB_ID */ +static int hf_x2ap_cause = -1; /* Cause */ static int hf_x2ap_ForbiddenTAs_item = -1; /* ForbiddenTAs_Item */ static int hf_x2ap_forbiddenTACs = -1; /* ForbiddenTACs */ static int hf_x2ap_ForbiddenTACs_item = -1; /* TAC */ static int hf_x2ap_ForbiddenLAs_item = -1; /* ForbiddenLAs_Item */ static int hf_x2ap_forbiddenLACs = -1; /* ForbiddenLACs */ static int hf_x2ap_ForbiddenLACs_item = -1; /* LAC */ -static int hf_x2ap_sAE_Bearer_MaximumBitrateDL = -1; /* BitRate */ -static int hf_x2ap_sAE_Bearer_MaximumBitrateUL = -1; /* BitRate */ -static int hf_x2ap_sAE_Bearer_GuaranteedBitrateDL = -1; /* BitRate */ -static int hf_x2ap_sAE_Bearer_GuaranteedBitrateUL = -1; /* BitRate */ +static int hf_x2ap_e_RAB_MaximumBitrateDL = -1; /* BitRate */ +static int hf_x2ap_e_RAB_MaximumBitrateUL = -1; /* BitRate */ +static int hf_x2ap_e_RAB_GuaranteedBitrateDL = -1; /* BitRate */ +static int hf_x2ap_e_RAB_GuaranteedBitrateUL = -1; /* BitRate */ static int hf_x2ap_eNB_ID = -1; /* ENB_ID */ static int hf_x2ap_transportLayerAddress = -1; /* TransportLayerAddress */ static int hf_x2ap_gTP_TEID = -1; /* GTP_TEI */ @@ -245,59 +283,74 @@ static int hf_x2ap_equivalentPLMNs = -1; /* EPLMNs */ static int hf_x2ap_forbiddenTAs = -1; /* ForbiddenTAs */ static int hf_x2ap_forbiddenLAs = -1; /* ForbiddenLAs */ static int hf_x2ap_forbiddenInterRATs = -1; /* ForbiddenInterRATs */ -static int hf_x2ap_InterfacesToTrace_item = -1; /* ProtocolIE_Single_Container */ -static int hf_x2ap_traceInterface = -1; /* TraceInterface */ -static int hf_x2ap_traceDepth = -1; /* TraceDepth */ +static int hf_x2ap_dLHWLoadIndicator = -1; /* LoadIndicator */ +static int hf_x2ap_uLHWLoadIndicator = -1; /* LoadIndicator */ +static int hf_x2ap_e_UTRAN_Cell = -1; /* LastVisitedEUTRANCellInformation */ +static int hf_x2ap_uTRAN_Cell = -1; /* LastVisitedUTRANCellInformation */ +static int hf_x2ap_gERAN_Cell = -1; /* LastVisitedGERANCellInformation */ static int hf_x2ap_global_Cell_ID = -1; /* ECGI */ static int hf_x2ap_cellType = -1; /* CellType */ static int hf_x2ap_time_UE_StayedInCell = -1; /* Time_UE_StayedInCell */ +static int hf_x2ap_undefined = -1; /* NULL */ static int hf_x2ap_eventType = -1; /* EventType */ static int hf_x2ap_reportArea = -1; /* ReportArea */ +static int hf_x2ap_Neighbour_Information_item = -1; /* Neighbour_Information_item */ +static int hf_x2ap_eCGI = -1; /* ECGI */ +static int hf_x2ap_pCI = -1; /* PCI */ static int hf_x2ap_rNTP_PerPRB = -1; /* BIT_STRING_SIZE_6_110_ */ static int hf_x2ap_rNTP_Threshold = -1; /* RNTP_Threshold */ static int hf_x2ap_numberOfCellSpecificAntennaPorts = -1; /* T_numberOfCellSpecificAntennaPorts */ static int hf_x2ap_p_B = -1; /* INTEGER_0_3_ */ static int hf_x2ap_pDCCH_InterferenceImpact = -1; /* INTEGER_0_4_ */ -static int hf_x2ap_qCI = -1; /* QCI */ -static int hf_x2ap_allocationAndRetentionPriority = -1; /* AllocationAndRetentionPriority */ -static int hf_x2ap_gbrQosInformation = -1; /* GBR_QosInformation */ -static int hf_x2ap_ServedCells_item = -1; /* ServedCell_Information */ -static int hf_x2ap_phyCID = -1; /* PhyCID */ +static int hf_x2ap_dL_GBR_PRB_usage = -1; /* DL_GBR_PRB_usage */ +static int hf_x2ap_uL_GBR_PRB_usage = -1; /* UL_GBR_PRB_usage */ +static int hf_x2ap_dL_non_GBR_PRB_usage = -1; /* DL_non_GBR_PRB_usage */ +static int hf_x2ap_uL_non_GBR_PRB_usage = -1; /* UL_non_GBR_PRB_usage */ +static int hf_x2ap_dL_Total_PRB_usage = -1; /* DL_Total_PRB_usage */ +static int hf_x2ap_uL_Total_PRB_usage = -1; /* UL_Total_PRB_usage */ +static int hf_x2ap_dLS1TNLLoadIndicator = -1; /* LoadIndicator */ +static int hf_x2ap_uLS1TNLLoadIndicator = -1; /* LoadIndicator */ +static int hf_x2ap_ServedCells_item = -1; /* ServedCells_item */ +static int hf_x2ap_servedCellInfo = -1; /* ServedCell_Information */ +static int hf_x2ap_neighbour_Info = -1; /* Neighbour_Information */ static int hf_x2ap_cellId = -1; /* ECGI */ static int hf_x2ap_tAC = -1; /* TAC */ static int hf_x2ap_broadcastPLMNs = -1; /* BroadcastPLMNs_Item */ -static int hf_x2ap_uL_EARFCN = -1; /* EARFCN */ -static int hf_x2ap_dL_EARFCN = -1; /* EARFCN */ -static int hf_x2ap_cell_Transmission_Bandwidth = -1; /* Cell_Transmission_Bandwidth */ -static int hf_x2ap_traceReference = -1; /* TraceReference */ +static int hf_x2ap_eUTRA_Mode_Info = -1; /* EUTRA_Mode_Info */ +static int hf_x2ap_specialSubframePatterns = -1; /* SpecialSubframePatterns */ +static int hf_x2ap_cyclicPrefixDL = -1; /* CyclicPrefixDL */ +static int hf_x2ap_cyclicPrefixUL = -1; /* CyclicPrefixUL */ +static int hf_x2ap_eUTRANTraceID = -1; /* EUTRANTraceID */ static int hf_x2ap_interfacesToTrace = -1; /* InterfacesToTrace */ +static int hf_x2ap_traceDepth = -1; /* TraceDepth */ +static int hf_x2ap_traceCollectionEntityIPAddress = -1; /* TraceCollectionEntityIPAddress */ static int hf_x2ap_UE_HistoryInformation_item = -1; /* LastVisitedCell_Item */ static int hf_x2ap_uEaggregateMaximumBitRateDownlink = -1; /* BitRate */ static int hf_x2ap_uEaggregateMaximumBitRateUplink = -1; /* BitRate */ +static int hf_x2ap_encryptionAlgorithms = -1; /* EncryptionAlgorithms */ +static int hf_x2ap_integrityProtectionAlgorithms = -1; /* IntegrityProtectionAlgorithms */ static int hf_x2ap_UL_InterferenceOverloadIndication_item = -1; /* UL_InterferenceOverloadIndication_Item */ static int hf_x2ap_UL_HighInterferenceIndicationInfo_item = -1; /* UL_HighInterferenceIndicationInfo_Item */ -static int hf_x2ap_ul_interferenceindication = -1; /* UL_HighInterferenceIndication */ static int hf_x2ap_target_Cell_ID = -1; /* ECGI */ +static int hf_x2ap_ul_interferenceindication = -1; /* UL_HighInterferenceIndication */ static int hf_x2ap_protocolIEs = -1; /* ProtocolIE_Container */ static int hf_x2ap_mME_UE_S1AP_ID = -1; /* UE_S1AP_ID */ +static int hf_x2ap_uESecurityCapabilities = -1; /* UESecurityCapabilities */ +static int hf_x2ap_aS_SecurityInformation = -1; /* AS_SecurityInformation */ static int hf_x2ap_uEaggregateMaximumBitRate = -1; /* UEAggregateMaximumBitRate */ static int hf_x2ap_subscriberProfileIDforRFP = -1; /* SubscriberProfileIDforRFP */ -static int hf_x2ap_bearers_ToBeSetup_List = -1; /* Bearers_ToBeSetup_List */ +static int hf_x2ap_e_RABs_ToBeSetup_List = -1; /* E_RABs_ToBeSetup_List */ static int hf_x2ap_rRC_Context = -1; /* RRC_Context */ static int hf_x2ap_handoverRestrictionList = -1; /* HandoverRestrictionList */ static int hf_x2ap_locationReportingInformation = -1; /* LocationReportingInformation */ -static int hf_x2ap_Bearers_ToBeSetup_List_item = -1; /* ProtocolIE_Single_Container */ -static int hf_x2ap_sAE_Bearer_ID = -1; /* Bearer_ID */ -static int hf_x2ap_sAE_BearerLevel_QoS_Parameters = -1; /* SAE_BearerLevel_QoS_Parameters */ +static int hf_x2ap_E_RABs_ToBeSetup_List_item = -1; /* ProtocolIE_Single_Container */ +static int hf_x2ap_e_RAB_Level_QoS_Parameters = -1; /* E_RAB_Level_QoS_Parameters */ static int hf_x2ap_dL_Forwarding = -1; /* DL_Forwarding */ static int hf_x2ap_uL_GTPtunnelEndpoint = -1; /* GTPtunnelEndpoint */ -static int hf_x2ap_Bearers_Admitted_List_item = -1; /* ProtocolIE_Single_Container */ -static int hf_x2ap_bearer_ID = -1; /* Bearer_ID */ +static int hf_x2ap_E_RABs_Admitted_List_item = -1; /* ProtocolIE_Single_Container */ static int hf_x2ap_uL_GTP_TunnelEndpoint = -1; /* GTPtunnelEndpoint */ static int hf_x2ap_dL_GTP_TunnelEndpoint = -1; /* GTPtunnelEndpoint */ -static int hf_x2ap_Bearers_NotAdmitted_List_item = -1; /* ProtocolIE_Single_Container */ -static int hf_x2ap_cause = -1; /* Cause */ -static int hf_x2ap_Bearers_SubjectToStatusTransfer_List_item = -1; /* ProtocolIE_Single_Container */ +static int hf_x2ap_E_RABs_SubjectToStatusTransfer_List_item = -1; /* ProtocolIE_Single_Container */ static int hf_x2ap_receiveStatusofULPDCPSDUs = -1; /* ReceiveStatusofULPDCPSDUs */ static int hf_x2ap_uL_COUNTvalue = -1; /* COUNTvalue */ static int hf_x2ap_dL_COUNTvalue = -1; /* COUNTvalue */ @@ -308,11 +361,13 @@ static int hf_x2ap_ul_HighInterferenceIndicationInfo = -1; /* UL_HighInterferen static int hf_x2ap_relativeNarrowbandTxPower = -1; /* RelativeNarrowbandTxPower */ static int hf_x2ap_ServedCellsToModify_item = -1; /* ServedCellsToModify_Item */ static int hf_x2ap_old_ecgi = -1; /* ECGI */ -static int hf_x2ap_served_cells = -1; /* ServedCell_Information */ static int hf_x2ap_Old_ECGIs_item = -1; /* ECGI */ static int hf_x2ap_CellToReport_List_item = -1; /* ProtocolIE_Single_Container */ static int hf_x2ap_CellMeasurementResult_List_item = -1; /* ProtocolIE_Single_Container */ -static int hf_x2ap_resoureStatus = -1; /* ResourceStatus */ +static int hf_x2ap_hWOverLoadIndicator = -1; /* HWLoadIndicator */ +static int hf_x2ap_s1TNLOverLoadIndicator = -1; /* S1TNLLoadIndicator */ +static int hf_x2ap_radioresourceStatus = -1; /* RadioResourceStatus */ +static int hf_x2ap_privateIEs = -1; /* PrivateIE_Container */ static int hf_x2ap_initiatingMessage = -1; /* InitiatingMessage */ static int hf_x2ap_successfulOutcome = -1; /* SuccessfulOutcome */ static int hf_x2ap_unsuccessfulOutcome = -1; /* UnsuccessfulOutcome */ @@ -329,19 +384,31 @@ static int ett_x2ap = -1; /*--- Included file: packet-x2ap-ett.c ---*/ #line 1 "packet-x2ap-ett.c" +static gint ett_x2ap_PrivateIE_ID = -1; static gint ett_x2ap_ProtocolIE_Container = -1; static gint ett_x2ap_ProtocolIE_Field = -1; static gint ett_x2ap_ProtocolExtensionContainer = -1; static gint ett_x2ap_ProtocolExtensionField = -1; +static gint ett_x2ap_PrivateIE_Container = -1; +static gint ett_x2ap_PrivateIE_Field = -1; +static gint ett_x2ap_AS_SecurityInformation = -1; +static gint ett_x2ap_AllocationAndRetentionPriority = -1; static gint ett_x2ap_BroadcastPLMNs_Item = -1; static gint ett_x2ap_Cause = -1; +static gint ett_x2ap_CellType = -1; static gint ett_x2ap_COUNTvalue = -1; static gint ett_x2ap_CriticalityDiagnostics = -1; static gint ett_x2ap_CriticalityDiagnostics_IE_List = -1; static gint ett_x2ap_CriticalityDiagnostics_IE_List_item = -1; +static gint ett_x2ap_FDD_Info = -1; +static gint ett_x2ap_TDD_Info = -1; +static gint ett_x2ap_EUTRA_Mode_Info = -1; static gint ett_x2ap_ECGI = -1; static gint ett_x2ap_ENB_ID = -1; static gint ett_x2ap_EPLMNs = -1; +static gint ett_x2ap_E_RAB_Level_QoS_Parameters = -1; +static gint ett_x2ap_E_RAB_List = -1; +static gint ett_x2ap_E_RAB_Item = -1; static gint ett_x2ap_ForbiddenTAs = -1; static gint ett_x2ap_ForbiddenTAs_Item = -1; static gint ett_x2ap_ForbiddenTACs = -1; @@ -355,33 +422,38 @@ static gint ett_x2ap_GUGroupIDList = -1; static gint ett_x2ap_GU_Group_ID = -1; static gint ett_x2ap_GUMMEI = -1; static gint ett_x2ap_HandoverRestrictionList = -1; -static gint ett_x2ap_InterfacesToTrace = -1; -static gint ett_x2ap_InterfacesToTrace_Item = -1; +static gint ett_x2ap_HWLoadIndicator = -1; static gint ett_x2ap_LastVisitedCell_Item = -1; +static gint ett_x2ap_LastVisitedEUTRANCellInformation = -1; +static gint ett_x2ap_LastVisitedGERANCellInformation = -1; static gint ett_x2ap_LocationReportingInformation = -1; +static gint ett_x2ap_Neighbour_Information = -1; +static gint ett_x2ap_Neighbour_Information_item = -1; static gint ett_x2ap_RelativeNarrowbandTxPower = -1; -static gint ett_x2ap_SAE_BearerLevel_QoS_Parameters = -1; +static gint ett_x2ap_RadioResourceStatus = -1; +static gint ett_x2ap_S1TNLLoadIndicator = -1; static gint ett_x2ap_ServedCells = -1; +static gint ett_x2ap_ServedCells_item = -1; static gint ett_x2ap_ServedCell_Information = -1; +static gint ett_x2ap_SpecialSubframe_Info = -1; static gint ett_x2ap_TraceActivation = -1; static gint ett_x2ap_UE_HistoryInformation = -1; static gint ett_x2ap_UEAggregateMaximumBitRate = -1; +static gint ett_x2ap_UESecurityCapabilities = -1; static gint ett_x2ap_UL_InterferenceOverloadIndication = -1; static gint ett_x2ap_UL_HighInterferenceIndicationInfo = -1; static gint ett_x2ap_UL_HighInterferenceIndicationInfo_Item = -1; static gint ett_x2ap_HandoverRequest = -1; static gint ett_x2ap_UE_ContextInformation = -1; -static gint ett_x2ap_Bearers_ToBeSetup_List = -1; -static gint ett_x2ap_Bearers_ToBeSetup_Item = -1; +static gint ett_x2ap_E_RABs_ToBeSetup_List = -1; +static gint ett_x2ap_E_RABs_ToBeSetup_Item = -1; static gint ett_x2ap_HandoverRequestAcknowledge = -1; -static gint ett_x2ap_Bearers_Admitted_List = -1; -static gint ett_x2ap_Bearers_Admitted_Item = -1; -static gint ett_x2ap_Bearers_NotAdmitted_List = -1; -static gint ett_x2ap_Bearers_NotAdmitted_Item = -1; +static gint ett_x2ap_E_RABs_Admitted_List = -1; +static gint ett_x2ap_E_RABs_Admitted_Item = -1; static gint ett_x2ap_HandoverPreparationFailure = -1; static gint ett_x2ap_SNStatusTransfer = -1; -static gint ett_x2ap_Bearers_SubjectToStatusTransfer_List = -1; -static gint ett_x2ap_Bearers_SubjectToStatusTransfer_Item = -1; +static gint ett_x2ap_E_RABs_SubjectToStatusTransfer_List = -1; +static gint ett_x2ap_E_RABs_SubjectToStatusTransfer_Item = -1; static gint ett_x2ap_UEContextRelease = -1; static gint ett_x2ap_HandoverCancel = -1; static gint ett_x2ap_ErrorIndication = -1; @@ -407,6 +479,7 @@ static gint ett_x2ap_ResourceStatusFailure = -1; static gint ett_x2ap_ResourceStatusUpdate = -1; static gint ett_x2ap_CellMeasurementResult_List = -1; static gint ett_x2ap_CellMeasurementResult_Item = -1; +static gint ett_x2ap_PrivateMessage = -1; static gint ett_x2ap_X2AP_PDU = -1; static gint ett_x2ap_InitiatingMessage = -1; static gint ett_x2ap_SuccessfulOutcome = -1; @@ -454,6 +527,47 @@ dissect_x2ap_Criticality(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } + +static int +dissect_x2ap_INTEGER_0_maxPrivateIEs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, maxPrivateIEs, NULL, FALSE); + + return offset; +} + + + +static int +dissect_x2ap_OBJECT_IDENTIFIER(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_object_identifier(tvb, offset, actx, tree, hf_index, NULL); + + return offset; +} + + +static const value_string x2ap_PrivateIE_ID_vals[] = { + { 0, "local" }, + { 1, "global" }, + { 0, NULL } +}; + +static const per_choice_t PrivateIE_ID_choice[] = { + { 0, &hf_x2ap_local , ASN1_NO_EXTENSIONS , dissect_x2ap_INTEGER_0_maxPrivateIEs }, + { 1, &hf_x2ap_global , ASN1_NO_EXTENSIONS , dissect_x2ap_OBJECT_IDENTIFIER }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_x2ap_PrivateIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_x2ap_PrivateIE_ID, PrivateIE_ID_choice, + NULL); + + return offset; +} + + static const value_string x2ap_ProcedureCode_vals[] = { { X2AP_ID_HANDOVERPREPARATION, "id-handoverPreparation" }, { X2AP_ID_HANDOVERCANCEL, "id-handoverCancel" }, @@ -464,21 +578,22 @@ static const value_string x2ap_ProcedureCode_vals[] = { { X2AP_ID_X2SETUP, "id-x2Setup" }, { X2AP_ID_RESET, "id-reset" }, { X2AP_ID_ENBCONFIGURATIONUPDATE, "id-eNBConfigurationUpdate" }, - { X2AP_ID_RESOURCESTATUSUPDATEINITIATION, "id-resourceStatusUpdateInitiation" }, + { X2AP_ID_RESOURCESTATUSREPORTINGINITIATION, "id-resourceStatusReportingInitiation" }, { X2AP_ID_RESOURCESTATUSREPORTING, "id-resourceStatusReporting" }, + { X2AP_ID_PRIVATEMESSAGE, "id-privateMessage" }, { 0, NULL } }; static int dissect_x2ap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 69 "x2ap.cnf" +#line 65 "x2ap.cnf" ProcedureCode = 0xFFFF; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 255U, &ProcedureCode, FALSE); -#line 62 "x2ap.cnf" +#line 58 "x2ap.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)) col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", val_to_str(ProcedureCode, x2ap_ProcedureCode_vals, @@ -489,15 +604,14 @@ dissect_x2ap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static const value_string x2ap_ProtocolIE_ID_vals[] = { - { id_Bearers_Admitted_Item, "id-Bearers-Admitted-Item" }, - { id_Bearers_Admitted_List, "id-Bearers-Admitted-List" }, - { id_Bearers_NotAdmitted_Item, "id-Bearers-NotAdmitted-Item" }, - { id_Bearers_NotAdmitted_List, "id-Bearers-NotAdmitted-List" }, - { id_Bearers_ToBeSetup_Item, "id-Bearers-ToBeSetup-Item" }, + { id_E_RABs_Admitted_Item, "id-E-RABs-Admitted-Item" }, + { id_E_RABs_Admitted_List, "id-E-RABs-Admitted-List" }, + { id_E_RAB_Item, "id-E-RAB-Item" }, + { id_E_RABs_NotAdmitted_List, "id-E-RABs-NotAdmitted-List" }, + { id_E_RABs_ToBeSetup_Item, "id-E-RABs-ToBeSetup-Item" }, { id_Cause, "id-Cause" }, { id_CellInformation, "id-CellInformation" }, { id_CellInformation_Item, "id-CellInformation-Item" }, - { id_InterfacesToTrace_Item, "id-InterfacesToTrace-Item" }, { id_New_eNB_UE_X2AP_ID, "id-New-eNB-UE-X2AP-ID" }, { id_Old_eNB_UE_X2AP_ID, "id-Old-eNB-UE-X2AP-ID" }, { id_TargetCell_ID, "id-TargetCell-ID" }, @@ -507,8 +621,8 @@ static const value_string x2ap_ProtocolIE_ID_vals[] = { { id_UE_HistoryInformation, "id-UE-HistoryInformation" }, { id_UE_X2AP_ID, "id-UE-X2AP-ID" }, { id_CriticalityDiagnostics, "id-CriticalityDiagnostics" }, - { id_Bearers_SubjectToStatusTransfer_List, "id-Bearers-SubjectToStatusTransfer-List" }, - { id_Bearers_SubjectToStatusTransfer_Item, "id-Bearers-SubjectToStatusTransfer-Item" }, + { id_E_RABs_SubjectToStatusTransfer_List, "id-E-RABs-SubjectToStatusTransfer-List" }, + { id_E_RABs_SubjectToStatusTransfer_Item, "id-E-RABs-SubjectToStatusTransfer-Item" }, { id_ServedCells, "id-ServedCells" }, { id_GlobalENB_ID, "id-GlobalENB-ID" }, { id_TimeToWait, "id-TimeToWait" }, @@ -523,8 +637,14 @@ static const value_string x2ap_ProtocolIE_ID_vals[] = { { id_CellToReport_Item, "id-CellToReport-Item" }, { id_CellMeasurementResult, "id-CellMeasurementResult" }, { id_CellMeasurementResult_Item, "id-CellMeasurementResult-Item" }, - { id_GUGroupIDListToAdd, "id-GUGroupIDListToAdd" }, - { id_GUGroupIDListToDelete, "id-GUGroupIDListToDelete" }, + { id_GUGroupIDToAddList, "id-GUGroupIDToAddList" }, + { id_GUGroupIDToDeleteList, "id-GUGroupIDToDeleteList" }, + { id_SRVCCOperationPossible, "id-SRVCCOperationPossible" }, + { id_Measurement_ID, "id-Measurement-ID" }, + { id_ReportCharacteristics, "id-ReportCharacteristics" }, + { id_ENB1_Measurement_ID, "id-ENB1-Measurement-ID" }, + { id_ENB2_Measurement_ID, "id-ENB2-Measurement-ID" }, + { id_Number_of_Antennaports, "id-Number-of-Antennaports" }, { 0, NULL } }; @@ -644,19 +764,141 @@ dissect_x2ap_ProtocolExtensionContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ static int -dissect_x2ap_AllocationAndRetentionPriority(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_PrivateIE_Field_value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, NULL); + + return offset; +} + + +static const per_sequence_t PrivateIE_Field_sequence[] = { + { &hf_x2ap_private_id , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PrivateIE_ID }, + { &hf_x2ap_criticality , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_Criticality }, + { &hf_x2ap_privateIE_Field_value, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PrivateIE_Field_value }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_PrivateIE_Field(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_PrivateIE_Field, PrivateIE_Field_sequence); + + return offset; +} + + +static const per_sequence_t PrivateIE_Container_sequence_of[1] = { + { &hf_x2ap_PrivateIE_Container_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PrivateIE_Field }, +}; + +static int +dissect_x2ap_PrivateIE_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_x2ap_PrivateIE_Container, PrivateIE_Container_sequence_of, + 1, maxPrivateIEs, FALSE); + + return offset; +} + + + +static int +dissect_x2ap_Key_eNodeB_Star(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 256, 256, FALSE, NULL); + + return offset; +} + + + +static int +dissect_x2ap_NextHopChainingCount(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 15U, NULL, FALSE); + 0U, 7U, NULL, FALSE); + + return offset; +} + + +static const per_sequence_t AS_SecurityInformation_sequence[] = { + { &hf_x2ap_key_eNodeB_star, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Key_eNodeB_Star }, + { &hf_x2ap_nextHopChainingCount, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NextHopChainingCount }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_AS_SecurityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_AS_SecurityInformation, AS_SecurityInformation_sequence); return offset; } +static const value_string x2ap_PriorityLevel_vals[] = { + { 0, "spare" }, + { 1, "highest" }, + { 14, "lowest" }, + { 15, "no-priority" }, + { 0, NULL } +}; + static int -dissect_x2ap_Bearer_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_PriorityLevel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 15U, NULL, TRUE); + 0U, 15U, NULL, FALSE); + + return offset; +} + + +static const value_string x2ap_Pre_emptionCapability_vals[] = { + { 0, "shall-not-trigger-pre-emption" }, + { 1, "may-trigger-pre-emption" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_Pre_emptionCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 2, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string x2ap_Pre_emptionVulnerability_vals[] = { + { 0, "not-pre-emptable" }, + { 1, "pre-emptable" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_Pre_emptionVulnerability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 2, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t AllocationAndRetentionPriority_sequence[] = { + { &hf_x2ap_priorityLevel , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PriorityLevel }, + { &hf_x2ap_pre_emptionCapability, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Pre_emptionCapability }, + { &hf_x2ap_pre_emptionVulnerability, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Pre_emptionVulnerability }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_AllocationAndRetentionPriority(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_AllocationAndRetentionPriority, AllocationAndRetentionPriority_sequence); return offset; } @@ -712,7 +954,13 @@ static const value_string x2ap_CauseRadioNetwork_vals[] = { { 12, "no-radio-resources-available-in-target-cell" }, { 13, "invalid-MME-GroupID" }, { 14, "unknown-MME-Code" }, - { 15, "unspecified" }, + { 15, "encryption-and-or-integrity-protection-algorithms-not-supported" }, + { 16, "reportCharacteristicsEmpty" }, + { 17, "noReportPeriodicity" }, + { 18, "existingMeasurementID" }, + { 19, "unknown-eNB-Measurement-ID" }, + { 20, "measurement-temporarily-not-available" }, + { 21, "unspecified" }, { 0, NULL } }; @@ -720,7 +968,7 @@ static const value_string x2ap_CauseRadioNetwork_vals[] = { 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, - 16, NULL, TRUE, 0, NULL); + 22, NULL, TRUE, 0, NULL); return offset; } @@ -808,17 +1056,17 @@ dissect_x2ap_Cause(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot } -static const value_string x2ap_CellType_vals[] = { - { 0, "macro" }, - { 1, "micro" }, - { 2, "pico" }, - { 3, "femto" }, +static const value_string x2ap_Cell_Size_vals[] = { + { 0, "verysmall" }, + { 1, "small" }, + { 2, "medium" }, + { 3, "large" }, { 0, NULL } }; static int -dissect_x2ap_CellType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_Cell_Size(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, TRUE, 0, NULL); @@ -826,21 +1074,16 @@ dissect_x2ap_CellType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p } -static const value_string x2ap_Cell_Transmission_Bandwidth_vals[] = { - { 0, "bw6" }, - { 1, "bw15" }, - { 2, "bw25" }, - { 3, "bw50" }, - { 4, "bw75" }, - { 5, "bw100" }, - { 0, NULL } +static const per_sequence_t CellType_sequence[] = { + { &hf_x2ap_cell_Size , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Cell_Size }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } }; - static int -dissect_x2ap_Cell_Transmission_Bandwidth(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, - 6, NULL, TRUE, 0, NULL); +dissect_x2ap_CellType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_CellType, CellType_sequence); return offset; } @@ -947,6 +1190,38 @@ dissect_x2ap_CriticalityDiagnostics(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } +static const value_string x2ap_CyclicPrefixDL_vals[] = { + { 0, "normal" }, + { 1, "extended" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_CyclicPrefixDL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 2, NULL, TRUE, 0, NULL); + + return offset; +} + + +static const value_string x2ap_CyclicPrefixUL_vals[] = { + { 0, "normal" }, + { 1, "extended" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_CyclicPrefixUL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 2, NULL, TRUE, 0, NULL); + + return offset; +} + + static const value_string x2ap_DL_Forwarding_vals[] = { { 0, "dL-forwardingProposed" }, { 0, NULL } @@ -972,6 +1247,145 @@ dissect_x2ap_EARFCN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro } +static const value_string x2ap_Transmission_Bandwidth_vals[] = { + { 0, "bw6" }, + { 1, "bw15" }, + { 2, "bw25" }, + { 3, "bw50" }, + { 4, "bw75" }, + { 5, "bw100" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_Transmission_Bandwidth(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, + 6, NULL, TRUE, 0, NULL); + + return offset; +} + + +static const per_sequence_t FDD_Info_sequence[] = { + { &hf_x2ap_uL_EARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EARFCN }, + { &hf_x2ap_dL_EARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EARFCN }, + { &hf_x2ap_uL_Transmission_Bandwidth, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Transmission_Bandwidth }, + { &hf_x2ap_dL_Transmission_Bandwidth, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Transmission_Bandwidth }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_FDD_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_FDD_Info, FDD_Info_sequence); + + return offset; +} + + +static const value_string x2ap_SubframeAssignment_vals[] = { + { 0, "sa0" }, + { 1, "sa1" }, + { 2, "sa2" }, + { 3, "sa3" }, + { 4, "sa4" }, + { 5, "sa5" }, + { 6, "sa6" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_SubframeAssignment(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, + 7, NULL, TRUE, 0, NULL); + + return offset; +} + + +static const value_string x2ap_SpecialSubframePatterns_vals[] = { + { 0, "ssp0" }, + { 1, "ssp1" }, + { 2, "ssp2" }, + { 3, "ssp3" }, + { 4, "ssp4" }, + { 5, "ssp5" }, + { 6, "ssp6" }, + { 7, "ssp7" }, + { 8, "ssp8" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_SpecialSubframePatterns(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, + 9, NULL, TRUE, 0, NULL); + + return offset; +} + + +static const per_sequence_t SpecialSubframe_Info_sequence[] = { + { &hf_x2ap_specialSubframePatterns, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_SpecialSubframePatterns }, + { &hf_x2ap_cyclicPrefixDL , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_CyclicPrefixDL }, + { &hf_x2ap_cyclicPrefixUL , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_CyclicPrefixUL }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_SpecialSubframe_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_SpecialSubframe_Info, SpecialSubframe_Info_sequence); + + return offset; +} + + +static const per_sequence_t TDD_Info_sequence[] = { + { &hf_x2ap_eARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EARFCN }, + { &hf_x2ap_transmission_Bandwidth, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Transmission_Bandwidth }, + { &hf_x2ap_subframeAssignment, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_SubframeAssignment }, + { &hf_x2ap_specialSubframe_Info, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_SpecialSubframe_Info }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_TDD_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_TDD_Info, TDD_Info_sequence); + + return offset; +} + + +static const value_string x2ap_EUTRA_Mode_Info_vals[] = { + { 0, "fDD" }, + { 1, "tDD" }, + { 0, NULL } +}; + +static const per_choice_t EUTRA_Mode_Info_choice[] = { + { 0, &hf_x2ap_fDD , ASN1_EXTENSION_ROOT , dissect_x2ap_FDD_Info }, + { 1, &hf_x2ap_tDD , ASN1_EXTENSION_ROOT , dissect_x2ap_TDD_Info }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_x2ap_EUTRA_Mode_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_x2ap_EUTRA_Mode_Info, EUTRA_Mode_Info_choice, + NULL); + + return offset; +} + + static int dissect_x2ap_EUTRANCellIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -1040,6 +1454,16 @@ dissect_x2ap_ENB_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro } + +static int +dissect_x2ap_EncryptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 16, 16, TRUE, NULL); + + return offset; +} + + static const per_sequence_t EPLMNs_sequence_of[1] = { { &hf_x2ap_EPLMNs_item , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity }, }; @@ -1054,6 +1478,101 @@ dissect_x2ap_EPLMNs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro } + +static int +dissect_x2ap_E_RAB_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 15U, NULL, TRUE); + + return offset; +} + + + +static int +dissect_x2ap_QCI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 255U, NULL, FALSE); + + return offset; +} + + +static const per_sequence_t GBR_QosInformation_sequence[] = { + { &hf_x2ap_e_RAB_MaximumBitrateDL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, + { &hf_x2ap_e_RAB_MaximumBitrateUL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, + { &hf_x2ap_e_RAB_GuaranteedBitrateDL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, + { &hf_x2ap_e_RAB_GuaranteedBitrateUL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_GBR_QosInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_GBR_QosInformation, GBR_QosInformation_sequence); + + return offset; +} + + +static const per_sequence_t E_RAB_Level_QoS_Parameters_sequence[] = { + { &hf_x2ap_qCI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_QCI }, + { &hf_x2ap_allocationAndRetentionPriority, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_AllocationAndRetentionPriority }, + { &hf_x2ap_gbrQosInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GBR_QosInformation }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_E_RAB_Level_QoS_Parameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_E_RAB_Level_QoS_Parameters, E_RAB_Level_QoS_Parameters_sequence); + + return offset; +} + + +static const per_sequence_t E_RAB_List_sequence_of[1] = { + { &hf_x2ap_E_RAB_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, +}; + +static int +dissect_x2ap_E_RAB_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_x2ap_E_RAB_List, E_RAB_List_sequence_of, + 1, maxnoofBearers, FALSE); + + return offset; +} + + +static const per_sequence_t E_RAB_Item_sequence[] = { + { &hf_x2ap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_ID }, + { &hf_x2ap_cause , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Cause }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_E_RAB_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_E_RAB_Item, E_RAB_Item_sequence); + + return offset; +} + + + +static int +dissect_x2ap_EUTRANTraceID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, + 8, 8, FALSE, NULL); + + return offset; +} + + static const value_string x2ap_EventType_vals[] = { { 0, "change-of-serving-cell" }, { 0, NULL } @@ -1073,6 +1592,7 @@ static const value_string x2ap_ForbiddenInterRATs_vals[] = { { 0, "all" }, { 1, "geran" }, { 2, "utran" }, + { 3, "cdma2000" }, { 0, NULL } }; @@ -1080,7 +1600,7 @@ static const value_string x2ap_ForbiddenInterRATs_vals[] = { static int dissect_x2ap_ForbiddenInterRATs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 3, NULL, TRUE, 0, NULL); + 4, NULL, TRUE, 0, NULL); return offset; } @@ -1090,7 +1610,7 @@ dissect_x2ap_ForbiddenInterRATs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_x2ap_TAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - NO_BOUND, NO_BOUND, FALSE, NULL); + 2, 2, FALSE, NULL); return offset; } @@ -1111,8 +1631,9 @@ dissect_x2ap_ForbiddenTACs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static const per_sequence_t ForbiddenTAs_Item_sequence[] = { - { &hf_x2ap_pLMN_Identity , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity }, - { &hf_x2ap_forbiddenTACs , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ForbiddenTACs }, + { &hf_x2ap_pLMN_Identity , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity }, + { &hf_x2ap_forbiddenTACs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ForbiddenTACs }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -1164,8 +1685,9 @@ dissect_x2ap_ForbiddenLACs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static const per_sequence_t ForbiddenLAs_Item_sequence[] = { - { &hf_x2ap_pLMN_Identity , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity }, - { &hf_x2ap_forbiddenLACs , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ForbiddenLACs }, + { &hf_x2ap_pLMN_Identity , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity }, + { &hf_x2ap_forbiddenLACs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ForbiddenLACs }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -1192,24 +1714,6 @@ dissect_x2ap_ForbiddenLAs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U } -static const per_sequence_t GBR_QosInformation_sequence[] = { - { &hf_x2ap_sAE_Bearer_MaximumBitrateDL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, - { &hf_x2ap_sAE_Bearer_MaximumBitrateUL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, - { &hf_x2ap_sAE_Bearer_GuaranteedBitrateDL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, - { &hf_x2ap_sAE_Bearer_GuaranteedBitrateUL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, - { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, - { NULL, 0, 0, NULL } -}; - -static int -dissect_x2ap_GBR_QosInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_GBR_QosInformation, GBR_QosInformation_sequence); - - return offset; -} - - static const per_sequence_t GlobalENB_ID_sequence[] = { { &hf_x2ap_pLMN_Identity , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity }, { &hf_x2ap_eNB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ENB_ID }, @@ -1347,68 +1851,82 @@ dissect_x2ap_HandoverRestrictionList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } -static const per_sequence_t InterfacesToTrace_sequence_of[1] = { - { &hf_x2ap_InterfacesToTrace_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, +static const value_string x2ap_LoadIndicator_vals[] = { + { 0, "lowLoad" }, + { 1, "mediumLoad" }, + { 2, "highLoad" }, + { 3, "overLoad" }, + { 0, NULL } }; + static int -dissect_x2ap_InterfacesToTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_x2ap_InterfacesToTrace, InterfacesToTrace_sequence_of, - 1, maxInterfaces, FALSE); +dissect_x2ap_LoadIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 4, NULL, TRUE, 0, NULL); return offset; } -static const value_string x2ap_TraceInterface_vals[] = { - { 0, "s1" }, - { 1, "x2" }, - { 2, "uu" }, - { 0, NULL } +static const per_sequence_t HWLoadIndicator_sequence[] = { + { &hf_x2ap_dLHWLoadIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_LoadIndicator }, + { &hf_x2ap_uLHWLoadIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_LoadIndicator }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } }; +static int +dissect_x2ap_HWLoadIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_HWLoadIndicator, HWLoadIndicator_sequence); + + return offset; +} + + static int -dissect_x2ap_TraceInterface(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 3, NULL, TRUE, 0, NULL); +dissect_x2ap_IntegrityProtectionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 16, 16, TRUE, NULL); return offset; } -static const value_string x2ap_TraceDepth_vals[] = { - { 0, "minimum" }, - { 1, "medium" }, - { 2, "maximum" }, - { 3, "vendorMinimum" }, - { 4, "vendorMedium" }, - { 5, "vendorMaximum" }, - { 0, NULL } -}; + +static int +dissect_x2ap_InterfacesToTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 8, 8, FALSE, NULL); + + return offset; +} + static int -dissect_x2ap_TraceDepth(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, - 6, NULL, TRUE, 0, NULL); +dissect_x2ap_Time_UE_StayedInCell(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 4095U, NULL, FALSE); return offset; } -static const per_sequence_t InterfacesToTrace_Item_sequence[] = { - { &hf_x2ap_traceInterface , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_TraceInterface }, - { &hf_x2ap_traceDepth , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_TraceDepth }, +static const per_sequence_t LastVisitedEUTRANCellInformation_sequence[] = { + { &hf_x2ap_global_Cell_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI }, + { &hf_x2ap_cellType , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_CellType }, + { &hf_x2ap_time_UE_StayedInCell, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Time_UE_StayedInCell }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; static int -dissect_x2ap_InterfacesToTrace_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_LastVisitedEUTRANCellInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_InterfacesToTrace_Item, InterfacesToTrace_Item_sequence); + ett_x2ap_LastVisitedEUTRANCellInformation, LastVisitedEUTRANCellInformation_sequence); return offset; } @@ -1416,25 +1934,62 @@ dissect_x2ap_InterfacesToTrace_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static int -dissect_x2ap_Time_UE_StayedInCell(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, NULL); +dissect_x2ap_LastVisitedUTRANCellInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, + NO_BOUND, NO_BOUND, FALSE, NULL); return offset; } -static const per_sequence_t LastVisitedCell_Item_sequence[] = { - { &hf_x2ap_global_Cell_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI }, - { &hf_x2ap_cellType , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_CellType }, - { &hf_x2ap_time_UE_StayedInCell, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_Time_UE_StayedInCell }, - { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, - { NULL, 0, 0, NULL } + +static int +dissect_x2ap_NULL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_null(tvb, offset, actx, tree, hf_index); + + return offset; +} + + +static const value_string x2ap_LastVisitedGERANCellInformation_vals[] = { + { 0, "undefined" }, + { 0, NULL } +}; + +static const per_choice_t LastVisitedGERANCellInformation_choice[] = { + { 0, &hf_x2ap_undefined , ASN1_EXTENSION_ROOT , dissect_x2ap_NULL }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_x2ap_LastVisitedGERANCellInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_x2ap_LastVisitedGERANCellInformation, LastVisitedGERANCellInformation_choice, + NULL); + + return offset; +} + + +static const value_string x2ap_LastVisitedCell_Item_vals[] = { + { 0, "e-UTRAN-Cell" }, + { 1, "uTRAN-Cell" }, + { 2, "gERAN-Cell" }, + { 0, NULL } +}; + +static const per_choice_t LastVisitedCell_Item_choice[] = { + { 0, &hf_x2ap_e_UTRAN_Cell , ASN1_EXTENSION_ROOT , dissect_x2ap_LastVisitedEUTRANCellInformation }, + { 1, &hf_x2ap_uTRAN_Cell , ASN1_EXTENSION_ROOT , dissect_x2ap_LastVisitedUTRANCellInformation }, + { 2, &hf_x2ap_gERAN_Cell , ASN1_EXTENSION_ROOT , dissect_x2ap_LastVisitedGERANCellInformation }, + { 0, NULL, 0, NULL } }; static int dissect_x2ap_LastVisitedCell_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_LastVisitedCell_Item, LastVisitedCell_Item_sequence); + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_x2ap_LastVisitedCell_Item, LastVisitedCell_Item_choice, + NULL); return offset; } @@ -1473,9 +2028,9 @@ dissect_x2ap_LocationReportingInformation(tvbuff_t *tvb _U_, int offset _U_, asn static int -dissect_x2ap_PhyCID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_Measurement_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 504U, NULL, TRUE); + 1U, 4095U, NULL, TRUE); return offset; } @@ -1483,9 +2038,57 @@ dissect_x2ap_PhyCID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro static int -dissect_x2ap_QCI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_PCI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 256U, NULL, FALSE); + 0U, 503U, NULL, TRUE); + + return offset; +} + + +static const per_sequence_t Neighbour_Information_item_sequence[] = { + { &hf_x2ap_eCGI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI }, + { &hf_x2ap_pCI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PCI }, + { &hf_x2ap_eARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EARFCN }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_Neighbour_Information_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_Neighbour_Information_item, Neighbour_Information_item_sequence); + + return offset; +} + + +static const per_sequence_t Neighbour_Information_sequence_of[1] = { + { &hf_x2ap_Neighbour_Information_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_Neighbour_Information_item }, +}; + +static int +dissect_x2ap_Neighbour_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_x2ap_Neighbour_Information, Neighbour_Information_sequence_of, + 0, maxnoofNeighbours, FALSE); + + return offset; +} + + +static const value_string x2ap_Number_of_Antennaports_vals[] = { + { 0, "an1" }, + { 1, "an2" }, + { 2, "an4" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_Number_of_Antennaports(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 3, NULL, TRUE, 0, NULL); return offset; } @@ -1615,6 +2218,16 @@ dissect_x2ap_RelativeNarrowbandTxPower(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int +dissect_x2ap_ReportCharacteristics(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 32, 32, FALSE, NULL); + + return offset; +} + + + +static int dissect_x2ap_RRC_Context(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, NULL); @@ -1625,38 +2238,106 @@ dissect_x2ap_RRC_Context(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int -dissect_x2ap_ResourceStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, NULL); +dissect_x2ap_DL_GBR_PRB_usage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 100U, NULL, FALSE); return offset; } -static const per_sequence_t SAE_BearerLevel_QoS_Parameters_sequence[] = { - { &hf_x2ap_qCI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_QCI }, - { &hf_x2ap_allocationAndRetentionPriority, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_AllocationAndRetentionPriority }, - { &hf_x2ap_gbrQosInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GBR_QosInformation }, + +static int +dissect_x2ap_UL_GBR_PRB_usage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 100U, NULL, FALSE); + + return offset; +} + + + +static int +dissect_x2ap_DL_non_GBR_PRB_usage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 100U, NULL, FALSE); + + return offset; +} + + + +static int +dissect_x2ap_UL_non_GBR_PRB_usage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 100U, NULL, FALSE); + + return offset; +} + + + +static int +dissect_x2ap_DL_Total_PRB_usage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 100U, NULL, FALSE); + + return offset; +} + + + +static int +dissect_x2ap_UL_Total_PRB_usage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 100U, NULL, FALSE); + + return offset; +} + + +static const per_sequence_t RadioResourceStatus_sequence[] = { + { &hf_x2ap_dL_GBR_PRB_usage, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_DL_GBR_PRB_usage }, + { &hf_x2ap_uL_GBR_PRB_usage, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UL_GBR_PRB_usage }, + { &hf_x2ap_dL_non_GBR_PRB_usage, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_DL_non_GBR_PRB_usage }, + { &hf_x2ap_uL_non_GBR_PRB_usage, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UL_non_GBR_PRB_usage }, + { &hf_x2ap_dL_Total_PRB_usage, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_DL_Total_PRB_usage }, + { &hf_x2ap_uL_Total_PRB_usage, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UL_Total_PRB_usage }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_RadioResourceStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_RadioResourceStatus, RadioResourceStatus_sequence); + + return offset; +} + + +static const per_sequence_t S1TNLLoadIndicator_sequence[] = { + { &hf_x2ap_dLS1TNLLoadIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_LoadIndicator }, + { &hf_x2ap_uLS1TNLLoadIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_LoadIndicator }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; static int -dissect_x2ap_SAE_BearerLevel_QoS_Parameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_S1TNLLoadIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_SAE_BearerLevel_QoS_Parameters, SAE_BearerLevel_QoS_Parameters_sequence); + ett_x2ap_S1TNLLoadIndicator, S1TNLLoadIndicator_sequence); return offset; } static const per_sequence_t ServedCell_Information_sequence[] = { - { &hf_x2ap_phyCID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PhyCID }, + { &hf_x2ap_pCI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PCI }, { &hf_x2ap_cellId , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI }, { &hf_x2ap_tAC , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_TAC }, { &hf_x2ap_broadcastPLMNs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BroadcastPLMNs_Item }, - { &hf_x2ap_uL_EARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EARFCN }, - { &hf_x2ap_dL_EARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EARFCN }, - { &hf_x2ap_cell_Transmission_Bandwidth, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Cell_Transmission_Bandwidth }, + { &hf_x2ap_eUTRA_Mode_Info, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EUTRA_Mode_Info }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -1670,8 +2351,24 @@ dissect_x2ap_ServedCell_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } +static const per_sequence_t ServedCells_item_sequence[] = { + { &hf_x2ap_servedCellInfo , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ServedCell_Information }, + { &hf_x2ap_neighbour_Info , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_Neighbour_Information }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_ServedCells_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_ServedCells_item, ServedCells_item_sequence); + + return offset; +} + + static const per_sequence_t ServedCells_sequence_of[1] = { - { &hf_x2ap_ServedCells_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ServedCell_Information }, + { &hf_x2ap_ServedCells_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ServedCells_item }, }; static int @@ -1684,6 +2381,21 @@ dissect_x2ap_ServedCells(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } +static const value_string x2ap_SRVCCOperationPossible_vals[] = { + { 0, "possible" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_SRVCCOperationPossible(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_SubscriberProfileIDforRFP(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -1704,29 +2416,61 @@ dissect_x2ap_TargeteNBtoSource_eNBTransparentContainer(tvbuff_t *tvb _U_, int of } +static const value_string x2ap_TimeToWait_vals[] = { + { 0, "v1s" }, + { 1, "v2s" }, + { 2, "v5s" }, + { 3, "v10s" }, + { 4, "v20s" }, + { 5, "v60s" }, + { 0, NULL } +}; + static int dissect_x2ap_TimeToWait(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - NO_BOUND, NO_BOUND, FALSE, NULL); + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 6, NULL, TRUE, 0, NULL); return offset; } +static const value_string x2ap_TraceDepth_vals[] = { + { 0, "minimum" }, + { 1, "medium" }, + { 2, "maximum" }, + { 3, "minimumWithoutVendorSpecificExtension" }, + { 4, "mediumWithoutVendorSpecificExtension" }, + { 5, "maximumWithoutVendorSpecificExtension" }, + { 0, NULL } +}; + static int -dissect_x2ap_TraceReference(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 8, 8, FALSE, NULL); +dissect_x2ap_TraceDepth(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, + 6, NULL, TRUE, 0, NULL); + + return offset; +} + + + +static int +dissect_x2ap_TraceCollectionEntityIPAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 1, 160, TRUE, NULL); return offset; } static const per_sequence_t TraceActivation_sequence[] = { - { &hf_x2ap_traceReference , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_TraceReference }, + { &hf_x2ap_eUTRANTraceID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EUTRANTraceID }, { &hf_x2ap_interfacesToTrace, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_InterfacesToTrace }, + { &hf_x2ap_traceDepth , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_TraceDepth }, + { &hf_x2ap_traceCollectionEntityIPAddress, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_TraceCollectionEntityIPAddress }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -1790,6 +2534,22 @@ dissect_x2ap_UEAggregateMaximumBitRate(tvbuff_t *tvb _U_, int offset _U_, asn1_c } +static const per_sequence_t UESecurityCapabilities_sequence[] = { + { &hf_x2ap_encryptionAlgorithms, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EncryptionAlgorithms }, + { &hf_x2ap_integrityProtectionAlgorithms, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_IntegrityProtectionAlgorithms }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_UESecurityCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_UESecurityCapabilities, UESecurityCapabilities_sequence); + + return offset; +} + + static const value_string x2ap_UL_InterferenceOverloadIndication_Item_vals[] = { { 0, "high-interference" }, { 1, "medium-interference" }, @@ -1832,8 +2592,8 @@ dissect_x2ap_UL_HighInterferenceIndication(tvbuff_t *tvb _U_, int offset _U_, as static const per_sequence_t UL_HighInterferenceIndicationInfo_Item_sequence[] = { - { &hf_x2ap_ul_interferenceindication, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UL_HighInterferenceIndication }, { &hf_x2ap_target_Cell_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI }, + { &hf_x2ap_ul_interferenceindication, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UL_HighInterferenceIndication }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -1875,14 +2635,14 @@ dissect_x2ap_HandoverRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const per_sequence_t Bearers_ToBeSetup_List_sequence_of[1] = { - { &hf_x2ap_Bearers_ToBeSetup_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, +static const per_sequence_t E_RABs_ToBeSetup_List_sequence_of[1] = { + { &hf_x2ap_E_RABs_ToBeSetup_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, }; static int -dissect_x2ap_Bearers_ToBeSetup_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_E_RABs_ToBeSetup_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_ToBeSetup_List, Bearers_ToBeSetup_List_sequence_of, + ett_x2ap_E_RABs_ToBeSetup_List, E_RABs_ToBeSetup_List_sequence_of, 1, maxnoofBearers, FALSE); return offset; @@ -1891,9 +2651,11 @@ dissect_x2ap_Bearers_ToBeSetup_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static const per_sequence_t UE_ContextInformation_sequence[] = { { &hf_x2ap_mME_UE_S1AP_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UE_S1AP_ID }, + { &hf_x2ap_uESecurityCapabilities, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UESecurityCapabilities }, + { &hf_x2ap_aS_SecurityInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_AS_SecurityInformation }, { &hf_x2ap_uEaggregateMaximumBitRate, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UEAggregateMaximumBitRate }, { &hf_x2ap_subscriberProfileIDforRFP, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_SubscriberProfileIDforRFP }, - { &hf_x2ap_bearers_ToBeSetup_List, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Bearers_ToBeSetup_List }, + { &hf_x2ap_e_RABs_ToBeSetup_List, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RABs_ToBeSetup_List }, { &hf_x2ap_rRC_Context , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_RRC_Context }, { &hf_x2ap_handoverRestrictionList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_HandoverRestrictionList }, { &hf_x2ap_locationReportingInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_LocationReportingInformation }, @@ -1910,9 +2672,9 @@ dissect_x2ap_UE_ContextInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const per_sequence_t Bearers_ToBeSetup_Item_sequence[] = { - { &hf_x2ap_sAE_Bearer_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Bearer_ID }, - { &hf_x2ap_sAE_BearerLevel_QoS_Parameters, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_SAE_BearerLevel_QoS_Parameters }, +static const per_sequence_t E_RABs_ToBeSetup_Item_sequence[] = { + { &hf_x2ap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_ID }, + { &hf_x2ap_e_RAB_Level_QoS_Parameters, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_Level_QoS_Parameters }, { &hf_x2ap_dL_Forwarding , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_DL_Forwarding }, { &hf_x2ap_uL_GTPtunnelEndpoint, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_GTPtunnelEndpoint }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, @@ -1920,9 +2682,9 @@ static const per_sequence_t Bearers_ToBeSetup_Item_sequence[] = { }; static int -dissect_x2ap_Bearers_ToBeSetup_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_E_RABs_ToBeSetup_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_ToBeSetup_Item, Bearers_ToBeSetup_Item_sequence); + ett_x2ap_E_RABs_ToBeSetup_Item, E_RABs_ToBeSetup_Item_sequence); return offset; } @@ -1942,22 +2704,22 @@ dissect_x2ap_HandoverRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ } -static const per_sequence_t Bearers_Admitted_List_sequence_of[1] = { - { &hf_x2ap_Bearers_Admitted_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, +static const per_sequence_t E_RABs_Admitted_List_sequence_of[1] = { + { &hf_x2ap_E_RABs_Admitted_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, }; static int -dissect_x2ap_Bearers_Admitted_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_E_RABs_Admitted_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_Admitted_List, Bearers_Admitted_List_sequence_of, + ett_x2ap_E_RABs_Admitted_List, E_RABs_Admitted_List_sequence_of, 1, maxnoofBearers, FALSE); return offset; } -static const per_sequence_t Bearers_Admitted_Item_sequence[] = { - { &hf_x2ap_bearer_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Bearer_ID }, +static const per_sequence_t E_RABs_Admitted_Item_sequence[] = { + { &hf_x2ap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_ID }, { &hf_x2ap_uL_GTP_TunnelEndpoint, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint }, { &hf_x2ap_dL_GTP_TunnelEndpoint, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, @@ -1965,39 +2727,9 @@ static const per_sequence_t Bearers_Admitted_Item_sequence[] = { }; static int -dissect_x2ap_Bearers_Admitted_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_Admitted_Item, Bearers_Admitted_Item_sequence); - - return offset; -} - - -static const per_sequence_t Bearers_NotAdmitted_List_sequence_of[1] = { - { &hf_x2ap_Bearers_NotAdmitted_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, -}; - -static int -dissect_x2ap_Bearers_NotAdmitted_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_NotAdmitted_List, Bearers_NotAdmitted_List_sequence_of, - 1, maxnoofBearers, FALSE); - - return offset; -} - - -static const per_sequence_t Bearers_NotAdmitted_Item_sequence[] = { - { &hf_x2ap_bearer_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Bearer_ID }, - { &hf_x2ap_cause , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Cause }, - { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, - { NULL, 0, 0, NULL } -}; - -static int -dissect_x2ap_Bearers_NotAdmitted_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_E_RABs_Admitted_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_NotAdmitted_Item, Bearers_NotAdmitted_Item_sequence); + ett_x2ap_E_RABs_Admitted_Item, E_RABs_Admitted_Item_sequence); return offset; } @@ -2031,22 +2763,22 @@ dissect_x2ap_SNStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const per_sequence_t Bearers_SubjectToStatusTransfer_List_sequence_of[1] = { - { &hf_x2ap_Bearers_SubjectToStatusTransfer_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, +static const per_sequence_t E_RABs_SubjectToStatusTransfer_List_sequence_of[1] = { + { &hf_x2ap_E_RABs_SubjectToStatusTransfer_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, }; static int -dissect_x2ap_Bearers_SubjectToStatusTransfer_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_E_RABs_SubjectToStatusTransfer_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_SubjectToStatusTransfer_List, Bearers_SubjectToStatusTransfer_List_sequence_of, + ett_x2ap_E_RABs_SubjectToStatusTransfer_List, E_RABs_SubjectToStatusTransfer_List_sequence_of, 1, maxnoofBearers, FALSE); return offset; } -static const per_sequence_t Bearers_SubjectToStatusTransfer_Item_sequence[] = { - { &hf_x2ap_bearer_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Bearer_ID }, +static const per_sequence_t E_RABs_SubjectToStatusTransfer_Item_sequence[] = { + { &hf_x2ap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_ID }, { &hf_x2ap_receiveStatusofULPDCPSDUs, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ReceiveStatusofULPDCPSDUs }, { &hf_x2ap_uL_COUNTvalue , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_COUNTvalue }, { &hf_x2ap_dL_COUNTvalue , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_COUNTvalue }, @@ -2055,9 +2787,9 @@ static const per_sequence_t Bearers_SubjectToStatusTransfer_Item_sequence[] = { }; static int -dissect_x2ap_Bearers_SubjectToStatusTransfer_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_E_RABs_SubjectToStatusTransfer_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_SubjectToStatusTransfer_Item, Bearers_SubjectToStatusTransfer_Item_sequence); + ett_x2ap_E_RABs_SubjectToStatusTransfer_Item, E_RABs_SubjectToStatusTransfer_Item_sequence); return offset; } @@ -2237,7 +2969,8 @@ dissect_x2ap_ENBConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static const per_sequence_t ServedCellsToModify_Item_sequence[] = { { &hf_x2ap_old_ecgi , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI }, - { &hf_x2ap_served_cells , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ServedCell_Information }, + { &hf_x2ap_servedCellInfo , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ServedCell_Information }, + { &hf_x2ap_neighbour_Info , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_Neighbour_Information }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -2350,16 +3083,19 @@ dissect_x2ap_CellToReport_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const value_string x2ap_ReportingPeriod_vals[] = { - { 0, "ffs" }, +static const value_string x2ap_ReportingPeriodicity_vals[] = { + { 0, "one-thousand-ms" }, + { 1, "two-thousand-ms" }, + { 2, "five-thousand-ms" }, + { 3, "ten-thousand-ms" }, { 0, NULL } }; static int -dissect_x2ap_ReportingPeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_ReportingPeriodicity(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); + 4, NULL, TRUE, 0, NULL); return offset; } @@ -2423,7 +3159,9 @@ dissect_x2ap_CellMeasurementResult_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ static const per_sequence_t CellMeasurementResult_Item_sequence[] = { { &hf_x2ap_cell_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI }, - { &hf_x2ap_resoureStatus , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ResourceStatus }, + { &hf_x2ap_hWOverLoadIndicator, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_HWLoadIndicator }, + { &hf_x2ap_s1TNLOverLoadIndicator, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_S1TNLLoadIndicator }, + { &hf_x2ap_radioresourceStatus, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_RadioResourceStatus }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -2437,6 +3175,20 @@ dissect_x2ap_CellMeasurementResult_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ } +static const per_sequence_t PrivateMessage_sequence[] = { + { &hf_x2ap_privateIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PrivateIE_Container }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_PrivateMessage, PrivateMessage_sequence); + + return offset; +} + + static int dissect_x2ap_InitiatingMessage_value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -2561,6 +3313,22 @@ static int dissect_ECGI_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre offset += 7; offset >>= 3; return offset; } +static int dissect_E_RAB_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_x2ap_E_RAB_List(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RAB_List_PDU); + offset += 7; offset >>= 3; + return offset; +} +static int dissect_E_RAB_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_x2ap_E_RAB_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RAB_Item_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_GlobalENB_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -2585,11 +3353,19 @@ static int dissect_GUMMEI_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t offset += 7; offset >>= 3; return offset; } -static int dissect_InterfacesToTrace_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_Measurement_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_InterfacesToTrace_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_InterfacesToTrace_Item_PDU); + offset = dissect_x2ap_Measurement_ID(tvb, offset, &asn1_ctx, tree, hf_x2ap_Measurement_ID_PDU); + offset += 7; offset >>= 3; + return offset; +} +static int dissect_Number_of_Antennaports_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_x2ap_Number_of_Antennaports(tvb, offset, &asn1_ctx, tree, hf_x2ap_Number_of_Antennaports_PDU); offset += 7; offset >>= 3; return offset; } @@ -2601,6 +3377,14 @@ static int dissect_Registration_Request_PDU(tvbuff_t *tvb _U_, packet_info *pinf offset += 7; offset >>= 3; return offset; } +static int dissect_ReportCharacteristics_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_x2ap_ReportCharacteristics(tvb, offset, &asn1_ctx, tree, hf_x2ap_ReportCharacteristics_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_ServedCells_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -2609,6 +3393,14 @@ static int dissect_ServedCells_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr offset += 7; offset >>= 3; return offset; } +static int dissect_SRVCCOperationPossible_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_x2ap_SRVCCOperationPossible(tvb, offset, &asn1_ctx, tree, hf_x2ap_SRVCCOperationPossible_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_TargeteNBtoSource_eNBTransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -2665,11 +3457,11 @@ static int dissect_UE_ContextInformation_PDU(tvbuff_t *tvb _U_, packet_info *pin offset += 7; offset >>= 3; return offset; } -static int dissect_Bearers_ToBeSetup_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_E_RABs_ToBeSetup_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_Bearers_ToBeSetup_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_Bearers_ToBeSetup_Item_PDU); + offset = dissect_x2ap_E_RABs_ToBeSetup_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RABs_ToBeSetup_Item_PDU); offset += 7; offset >>= 3; return offset; } @@ -2681,35 +3473,19 @@ static int dissect_HandoverRequestAcknowledge_PDU(tvbuff_t *tvb _U_, packet_info offset += 7; offset >>= 3; return offset; } -static int dissect_Bearers_Admitted_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { - int offset = 0; - asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_Bearers_Admitted_List(tvb, offset, &asn1_ctx, tree, hf_x2ap_Bearers_Admitted_List_PDU); - offset += 7; offset >>= 3; - return offset; -} -static int dissect_Bearers_Admitted_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_E_RABs_Admitted_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_Bearers_Admitted_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_Bearers_Admitted_Item_PDU); + offset = dissect_x2ap_E_RABs_Admitted_List(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RABs_Admitted_List_PDU); offset += 7; offset >>= 3; return offset; } -static int dissect_Bearers_NotAdmitted_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_E_RABs_Admitted_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_Bearers_NotAdmitted_List(tvb, offset, &asn1_ctx, tree, hf_x2ap_Bearers_NotAdmitted_List_PDU); - offset += 7; offset >>= 3; - return offset; -} -static int dissect_Bearers_NotAdmitted_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { - int offset = 0; - asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_Bearers_NotAdmitted_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_Bearers_NotAdmitted_Item_PDU); + offset = dissect_x2ap_E_RABs_Admitted_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RABs_Admitted_Item_PDU); offset += 7; offset >>= 3; return offset; } @@ -2729,19 +3505,19 @@ static int dissect_SNStatusTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U offset += 7; offset >>= 3; return offset; } -static int dissect_Bearers_SubjectToStatusTransfer_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_E_RABs_SubjectToStatusTransfer_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_Bearers_SubjectToStatusTransfer_List(tvb, offset, &asn1_ctx, tree, hf_x2ap_Bearers_SubjectToStatusTransfer_List_PDU); + offset = dissect_x2ap_E_RABs_SubjectToStatusTransfer_List(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RABs_SubjectToStatusTransfer_List_PDU); offset += 7; offset >>= 3; return offset; } -static int dissect_Bearers_SubjectToStatusTransfer_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_E_RABs_SubjectToStatusTransfer_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_Bearers_SubjectToStatusTransfer_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_Bearers_SubjectToStatusTransfer_Item_PDU); + offset = dissect_x2ap_E_RABs_SubjectToStatusTransfer_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RABs_SubjectToStatusTransfer_Item_PDU); offset += 7; offset >>= 3; return offset; } @@ -2897,11 +3673,11 @@ static int dissect_CellToReport_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ offset += 7; offset >>= 3; return offset; } -static int dissect_ReportingPeriod_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_ReportingPeriodicity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_ReportingPeriod(tvb, offset, &asn1_ctx, tree, hf_x2ap_ReportingPeriod_PDU); + offset = dissect_x2ap_ReportingPeriodicity(tvb, offset, &asn1_ctx, tree, hf_x2ap_ReportingPeriodicity_PDU); offset += 7; offset >>= 3; return offset; } @@ -2945,6 +3721,14 @@ static int dissect_CellMeasurementResult_Item_PDU(tvbuff_t *tvb _U_, packet_info offset += 7; offset >>= 3; return offset; } +static int dissect_PrivateMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_x2ap_PrivateMessage(tvb, offset, &asn1_ctx, tree, hf_x2ap_PrivateMessage_PDU); + offset += 7; offset >>= 3; + return offset; +} static void dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); @@ -3021,6 +3805,14 @@ void proto_register_x2ap(void) { { "ECGI", "x2ap.ECGI", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ECGI", HFILL }}, + { &hf_x2ap_E_RAB_List_PDU, + { "E-RAB-List", "x2ap.E_RAB_List", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.E_RAB_List", HFILL }}, + { &hf_x2ap_E_RAB_Item_PDU, + { "E-RAB-Item", "x2ap.E_RAB_Item", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.E_RAB_Item", HFILL }}, { &hf_x2ap_GlobalENB_ID_PDU, { "GlobalENB-ID", "x2ap.GlobalENB_ID", FT_NONE, BASE_NONE, NULL, 0, @@ -3033,25 +3825,37 @@ void proto_register_x2ap(void) { { "GUMMEI", "x2ap.GUMMEI", FT_NONE, BASE_NONE, NULL, 0, "x2ap.GUMMEI", HFILL }}, - { &hf_x2ap_InterfacesToTrace_Item_PDU, - { "InterfacesToTrace-Item", "x2ap.InterfacesToTrace_Item", - FT_NONE, BASE_NONE, NULL, 0, - "x2ap.InterfacesToTrace_Item", HFILL }}, + { &hf_x2ap_Measurement_ID_PDU, + { "Measurement-ID", "x2ap.Measurement_ID", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.Measurement_ID", HFILL }}, + { &hf_x2ap_Number_of_Antennaports_PDU, + { "Number-of-Antennaports", "x2ap.Number_of_Antennaports", + FT_UINT32, BASE_DEC, VALS(x2ap_Number_of_Antennaports_vals), 0, + "x2ap.Number_of_Antennaports", HFILL }}, { &hf_x2ap_Registration_Request_PDU, { "Registration-Request", "x2ap.Registration_Request", FT_UINT32, BASE_DEC, VALS(x2ap_Registration_Request_vals), 0, "x2ap.Registration_Request", HFILL }}, + { &hf_x2ap_ReportCharacteristics_PDU, + { "ReportCharacteristics", "x2ap.ReportCharacteristics", + FT_BYTES, BASE_NONE, NULL, 0, + "x2ap.ReportCharacteristics", HFILL }}, { &hf_x2ap_ServedCells_PDU, { "ServedCells", "x2ap.ServedCells", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.ServedCells", HFILL }}, + { &hf_x2ap_SRVCCOperationPossible_PDU, + { "SRVCCOperationPossible", "x2ap.SRVCCOperationPossible", + FT_UINT32, BASE_DEC, VALS(x2ap_SRVCCOperationPossible_vals), 0, + "x2ap.SRVCCOperationPossible", HFILL }}, { &hf_x2ap_TargeteNBtoSource_eNBTransparentContainer_PDU, { "TargeteNBtoSource-eNBTransparentContainer", "x2ap.TargeteNBtoSource_eNBTransparentContainer", FT_BYTES, BASE_NONE, NULL, 0, "x2ap.TargeteNBtoSource_eNBTransparentContainer", HFILL }}, { &hf_x2ap_TimeToWait_PDU, { "TimeToWait", "x2ap.TimeToWait", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, VALS(x2ap_TimeToWait_vals), 0, "x2ap.TimeToWait", HFILL }}, { &hf_x2ap_TraceActivation_PDU, { "TraceActivation", "x2ap.TraceActivation", @@ -3073,30 +3877,22 @@ void proto_register_x2ap(void) { { "UE-ContextInformation", "x2ap.UE_ContextInformation", FT_NONE, BASE_NONE, NULL, 0, "x2ap.UE_ContextInformation", HFILL }}, - { &hf_x2ap_Bearers_ToBeSetup_Item_PDU, - { "Bearers-ToBeSetup-Item", "x2ap.Bearers_ToBeSetup_Item", + { &hf_x2ap_E_RABs_ToBeSetup_Item_PDU, + { "E-RABs-ToBeSetup-Item", "x2ap.E_RABs_ToBeSetup_Item", FT_NONE, BASE_NONE, NULL, 0, - "x2ap.Bearers_ToBeSetup_Item", HFILL }}, + "x2ap.E_RABs_ToBeSetup_Item", HFILL }}, { &hf_x2ap_HandoverRequestAcknowledge_PDU, { "HandoverRequestAcknowledge", "x2ap.HandoverRequestAcknowledge", FT_NONE, BASE_NONE, NULL, 0, "x2ap.HandoverRequestAcknowledge", HFILL }}, - { &hf_x2ap_Bearers_Admitted_List_PDU, - { "Bearers-Admitted-List", "x2ap.Bearers_Admitted_List", - FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.Bearers_Admitted_List", HFILL }}, - { &hf_x2ap_Bearers_Admitted_Item_PDU, - { "Bearers-Admitted-Item", "x2ap.Bearers_Admitted_Item", - FT_NONE, BASE_NONE, NULL, 0, - "x2ap.Bearers_Admitted_Item", HFILL }}, - { &hf_x2ap_Bearers_NotAdmitted_List_PDU, - { "Bearers-NotAdmitted-List", "x2ap.Bearers_NotAdmitted_List", + { &hf_x2ap_E_RABs_Admitted_List_PDU, + { "E-RABs-Admitted-List", "x2ap.E_RABs_Admitted_List", FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.Bearers_NotAdmitted_List", HFILL }}, - { &hf_x2ap_Bearers_NotAdmitted_Item_PDU, - { "Bearers-NotAdmitted-Item", "x2ap.Bearers_NotAdmitted_Item", + "x2ap.E_RABs_Admitted_List", HFILL }}, + { &hf_x2ap_E_RABs_Admitted_Item_PDU, + { "E-RABs-Admitted-Item", "x2ap.E_RABs_Admitted_Item", FT_NONE, BASE_NONE, NULL, 0, - "x2ap.Bearers_NotAdmitted_Item", HFILL }}, + "x2ap.E_RABs_Admitted_Item", HFILL }}, { &hf_x2ap_HandoverPreparationFailure_PDU, { "HandoverPreparationFailure", "x2ap.HandoverPreparationFailure", FT_NONE, BASE_NONE, NULL, 0, @@ -3105,14 +3901,14 @@ void proto_register_x2ap(void) { { "SNStatusTransfer", "x2ap.SNStatusTransfer", FT_NONE, BASE_NONE, NULL, 0, "x2ap.SNStatusTransfer", HFILL }}, - { &hf_x2ap_Bearers_SubjectToStatusTransfer_List_PDU, - { "Bearers-SubjectToStatusTransfer-List", "x2ap.Bearers_SubjectToStatusTransfer_List", + { &hf_x2ap_E_RABs_SubjectToStatusTransfer_List_PDU, + { "E-RABs-SubjectToStatusTransfer-List", "x2ap.E_RABs_SubjectToStatusTransfer_List", FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.Bearers_SubjectToStatusTransfer_List", HFILL }}, - { &hf_x2ap_Bearers_SubjectToStatusTransfer_Item_PDU, - { "Bearers-SubjectToStatusTransfer-Item", "x2ap.Bearers_SubjectToStatusTransfer_Item", + "x2ap.E_RABs_SubjectToStatusTransfer_List", HFILL }}, + { &hf_x2ap_E_RABs_SubjectToStatusTransfer_Item_PDU, + { "E-RABs-SubjectToStatusTransfer-Item", "x2ap.E_RABs_SubjectToStatusTransfer_Item", FT_NONE, BASE_NONE, NULL, 0, - "x2ap.Bearers_SubjectToStatusTransfer_Item", HFILL }}, + "x2ap.E_RABs_SubjectToStatusTransfer_Item", HFILL }}, { &hf_x2ap_UEContextRelease_PDU, { "UEContextRelease", "x2ap.UEContextRelease", FT_NONE, BASE_NONE, NULL, 0, @@ -3189,10 +3985,10 @@ void proto_register_x2ap(void) { { "CellToReport-Item", "x2ap.CellToReport_Item", FT_NONE, BASE_NONE, NULL, 0, "x2ap.CellToReport_Item", HFILL }}, - { &hf_x2ap_ReportingPeriod_PDU, - { "ReportingPeriod", "x2ap.ReportingPeriod", - FT_UINT32, BASE_DEC, VALS(x2ap_ReportingPeriod_vals), 0, - "x2ap.ReportingPeriod", HFILL }}, + { &hf_x2ap_ReportingPeriodicity_PDU, + { "ReportingPeriodicity", "x2ap.ReportingPeriodicity", + FT_UINT32, BASE_DEC, VALS(x2ap_ReportingPeriodicity_vals), 0, + "x2ap.ReportingPeriodicity", HFILL }}, { &hf_x2ap_ResourceStatusResponse_PDU, { "ResourceStatusResponse", "x2ap.ResourceStatusResponse", FT_NONE, BASE_NONE, NULL, 0, @@ -3213,10 +4009,22 @@ void proto_register_x2ap(void) { { "CellMeasurementResult-Item", "x2ap.CellMeasurementResult_Item", FT_NONE, BASE_NONE, NULL, 0, "x2ap.CellMeasurementResult_Item", HFILL }}, + { &hf_x2ap_PrivateMessage_PDU, + { "PrivateMessage", "x2ap.PrivateMessage", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.PrivateMessage", HFILL }}, { &hf_x2ap_X2AP_PDU_PDU, { "X2AP-PDU", "x2ap.X2AP_PDU", FT_UINT32, BASE_DEC, VALS(x2ap_X2AP_PDU_vals), 0, "x2ap.X2AP_PDU", HFILL }}, + { &hf_x2ap_local, + { "local", "x2ap.local", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.INTEGER_0_maxPrivateIEs", HFILL }}, + { &hf_x2ap_global, + { "global", "x2ap.global", + FT_OID, BASE_NONE, NULL, 0, + "x2ap.OBJECT_IDENTIFIER", HFILL }}, { &hf_x2ap_ProtocolIE_Container_item, { "ProtocolIE-Field", "x2ap.ProtocolIE_Field", FT_NONE, BASE_NONE, NULL, 0, @@ -3245,6 +4053,42 @@ void proto_register_x2ap(void) { { "extensionValue", "x2ap.extensionValue", FT_NONE, BASE_NONE, NULL, 0, "x2ap.T_extensionValue", HFILL }}, + { &hf_x2ap_PrivateIE_Container_item, + { "PrivateIE-Field", "x2ap.PrivateIE_Field", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.PrivateIE_Field", HFILL }}, + { &hf_x2ap_private_id, + { "id", "x2ap.id", + FT_UINT32, BASE_DEC, VALS(x2ap_PrivateIE_ID_vals), 0, + "x2ap.PrivateIE_ID", HFILL }}, + { &hf_x2ap_privateIE_Field_value, + { "value", "x2ap.value", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.PrivateIE_Field_value", HFILL }}, + { &hf_x2ap_key_eNodeB_star, + { "key-eNodeB-star", "x2ap.key_eNodeB_star", + FT_BYTES, BASE_NONE, NULL, 0, + "x2ap.Key_eNodeB_Star", HFILL }}, + { &hf_x2ap_nextHopChainingCount, + { "nextHopChainingCount", "x2ap.nextHopChainingCount", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.NextHopChainingCount", HFILL }}, + { &hf_x2ap_iE_Extensions, + { "iE-Extensions", "x2ap.iE_Extensions", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.ProtocolExtensionContainer", HFILL }}, + { &hf_x2ap_priorityLevel, + { "priorityLevel", "x2ap.priorityLevel", + FT_UINT32, BASE_DEC, VALS(x2ap_PriorityLevel_vals), 0, + "x2ap.PriorityLevel", HFILL }}, + { &hf_x2ap_pre_emptionCapability, + { "pre-emptionCapability", "x2ap.pre_emptionCapability", + FT_UINT32, BASE_DEC, VALS(x2ap_Pre_emptionCapability_vals), 0, + "x2ap.Pre_emptionCapability", HFILL }}, + { &hf_x2ap_pre_emptionVulnerability, + { "pre-emptionVulnerability", "x2ap.pre_emptionVulnerability", + FT_UINT32, BASE_DEC, VALS(x2ap_Pre_emptionVulnerability_vals), 0, + "x2ap.Pre_emptionVulnerability", HFILL }}, { &hf_x2ap_BroadcastPLMNs_Item_item, { "PLMN-Identity", "x2ap.PLMN_Identity", FT_BYTES, BASE_NONE, NULL, 0, @@ -3265,6 +4109,10 @@ void proto_register_x2ap(void) { { "misc", "x2ap.misc", FT_UINT32, BASE_DEC, VALS(x2ap_CauseMisc_vals), 0, "x2ap.CauseMisc", HFILL }}, + { &hf_x2ap_cell_Size, + { "cell-Size", "x2ap.cell_Size", + FT_UINT32, BASE_DEC, VALS(x2ap_Cell_Size_vals), 0, + "x2ap.Cell_Size", HFILL }}, { &hf_x2ap_pDCP_SN, { "pDCP-SN", "x2ap.pDCP_SN", FT_UINT32, BASE_DEC, NULL, 0, @@ -3273,10 +4121,6 @@ void proto_register_x2ap(void) { { "hFN", "x2ap.hFN", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.HFN", HFILL }}, - { &hf_x2ap_iE_Extensions, - { "iE-Extensions", "x2ap.iE_Extensions", - FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.ProtocolExtensionContainer", HFILL }}, { &hf_x2ap_procedureCode, { "procedureCode", "x2ap.procedureCode", FT_UINT32, BASE_DEC, VALS(x2ap_ProcedureCode_vals), 0, @@ -3309,6 +4153,46 @@ void proto_register_x2ap(void) { { "typeOfError", "x2ap.typeOfError", FT_UINT32, BASE_DEC, VALS(x2ap_TypeOfError_vals), 0, "x2ap.TypeOfError", HFILL }}, + { &hf_x2ap_uL_EARFCN, + { "uL-EARFCN", "x2ap.uL_EARFCN", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.EARFCN", HFILL }}, + { &hf_x2ap_dL_EARFCN, + { "dL-EARFCN", "x2ap.dL_EARFCN", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.EARFCN", HFILL }}, + { &hf_x2ap_uL_Transmission_Bandwidth, + { "uL-Transmission-Bandwidth", "x2ap.uL_Transmission_Bandwidth", + FT_UINT32, BASE_DEC, VALS(x2ap_Transmission_Bandwidth_vals), 0, + "x2ap.Transmission_Bandwidth", HFILL }}, + { &hf_x2ap_dL_Transmission_Bandwidth, + { "dL-Transmission-Bandwidth", "x2ap.dL_Transmission_Bandwidth", + FT_UINT32, BASE_DEC, VALS(x2ap_Transmission_Bandwidth_vals), 0, + "x2ap.Transmission_Bandwidth", HFILL }}, + { &hf_x2ap_eARFCN, + { "eARFCN", "x2ap.eARFCN", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.EARFCN", HFILL }}, + { &hf_x2ap_transmission_Bandwidth, + { "transmission-Bandwidth", "x2ap.transmission_Bandwidth", + FT_UINT32, BASE_DEC, VALS(x2ap_Transmission_Bandwidth_vals), 0, + "x2ap.Transmission_Bandwidth", HFILL }}, + { &hf_x2ap_subframeAssignment, + { "subframeAssignment", "x2ap.subframeAssignment", + FT_UINT32, BASE_DEC, VALS(x2ap_SubframeAssignment_vals), 0, + "x2ap.SubframeAssignment", HFILL }}, + { &hf_x2ap_specialSubframe_Info, + { "specialSubframe-Info", "x2ap.specialSubframe_Info", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.SpecialSubframe_Info", HFILL }}, + { &hf_x2ap_fDD, + { "fDD", "x2ap.fDD", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.FDD_Info", HFILL }}, + { &hf_x2ap_tDD, + { "tDD", "x2ap.tDD", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.TDD_Info", HFILL }}, { &hf_x2ap_pLMN_Identity, { "pLMN-Identity", "x2ap.pLMN_Identity", FT_BYTES, BASE_NONE, NULL, 0, @@ -3329,6 +4213,30 @@ void proto_register_x2ap(void) { { "PLMN-Identity", "x2ap.PLMN_Identity", FT_BYTES, BASE_NONE, NULL, 0, "x2ap.PLMN_Identity", HFILL }}, + { &hf_x2ap_qCI, + { "qCI", "x2ap.qCI", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.QCI", HFILL }}, + { &hf_x2ap_allocationAndRetentionPriority, + { "allocationAndRetentionPriority", "x2ap.allocationAndRetentionPriority", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.AllocationAndRetentionPriority", HFILL }}, + { &hf_x2ap_gbrQosInformation, + { "gbrQosInformation", "x2ap.gbrQosInformation", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.GBR_QosInformation", HFILL }}, + { &hf_x2ap_E_RAB_List_item, + { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.ProtocolIE_Single_Container", HFILL }}, + { &hf_x2ap_e_RAB_ID, + { "e-RAB-ID", "x2ap.e_RAB_ID", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.E_RAB_ID", HFILL }}, + { &hf_x2ap_cause, + { "cause", "x2ap.cause", + FT_UINT32, BASE_DEC, VALS(x2ap_Cause_vals), 0, + "x2ap.Cause", HFILL }}, { &hf_x2ap_ForbiddenTAs_item, { "ForbiddenTAs-Item", "x2ap.ForbiddenTAs_Item", FT_NONE, BASE_NONE, NULL, 0, @@ -3353,20 +4261,20 @@ void proto_register_x2ap(void) { { "LAC", "x2ap.LAC", FT_BYTES, BASE_NONE, NULL, 0, "x2ap.LAC", HFILL }}, - { &hf_x2ap_sAE_Bearer_MaximumBitrateDL, - { "sAE-Bearer-MaximumBitrateDL", "x2ap.sAE_Bearer_MaximumBitrateDL", + { &hf_x2ap_e_RAB_MaximumBitrateDL, + { "e-RAB-MaximumBitrateDL", "x2ap.e_RAB_MaximumBitrateDL", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.BitRate", HFILL }}, - { &hf_x2ap_sAE_Bearer_MaximumBitrateUL, - { "sAE-Bearer-MaximumBitrateUL", "x2ap.sAE_Bearer_MaximumBitrateUL", + { &hf_x2ap_e_RAB_MaximumBitrateUL, + { "e-RAB-MaximumBitrateUL", "x2ap.e_RAB_MaximumBitrateUL", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.BitRate", HFILL }}, - { &hf_x2ap_sAE_Bearer_GuaranteedBitrateDL, - { "sAE-Bearer-GuaranteedBitrateDL", "x2ap.sAE_Bearer_GuaranteedBitrateDL", + { &hf_x2ap_e_RAB_GuaranteedBitrateDL, + { "e-RAB-GuaranteedBitrateDL", "x2ap.e_RAB_GuaranteedBitrateDL", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.BitRate", HFILL }}, - { &hf_x2ap_sAE_Bearer_GuaranteedBitrateUL, - { "sAE-Bearer-GuaranteedBitrateUL", "x2ap.sAE_Bearer_GuaranteedBitrateUL", + { &hf_x2ap_e_RAB_GuaranteedBitrateUL, + { "e-RAB-GuaranteedBitrateUL", "x2ap.e_RAB_GuaranteedBitrateUL", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.BitRate", HFILL }}, { &hf_x2ap_eNB_ID, @@ -3417,30 +4325,42 @@ void proto_register_x2ap(void) { { "forbiddenInterRATs", "x2ap.forbiddenInterRATs", FT_UINT32, BASE_DEC, VALS(x2ap_ForbiddenInterRATs_vals), 0, "x2ap.ForbiddenInterRATs", HFILL }}, - { &hf_x2ap_InterfacesToTrace_item, - { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container", + { &hf_x2ap_dLHWLoadIndicator, + { "dLHWLoadIndicator", "x2ap.dLHWLoadIndicator", + FT_UINT32, BASE_DEC, VALS(x2ap_LoadIndicator_vals), 0, + "x2ap.LoadIndicator", HFILL }}, + { &hf_x2ap_uLHWLoadIndicator, + { "uLHWLoadIndicator", "x2ap.uLHWLoadIndicator", + FT_UINT32, BASE_DEC, VALS(x2ap_LoadIndicator_vals), 0, + "x2ap.LoadIndicator", HFILL }}, + { &hf_x2ap_e_UTRAN_Cell, + { "e-UTRAN-Cell", "x2ap.e_UTRAN_Cell", FT_NONE, BASE_NONE, NULL, 0, - "x2ap.ProtocolIE_Single_Container", HFILL }}, - { &hf_x2ap_traceInterface, - { "traceInterface", "x2ap.traceInterface", - FT_UINT32, BASE_DEC, VALS(x2ap_TraceInterface_vals), 0, - "x2ap.TraceInterface", HFILL }}, - { &hf_x2ap_traceDepth, - { "traceDepth", "x2ap.traceDepth", - FT_UINT32, BASE_DEC, VALS(x2ap_TraceDepth_vals), 0, - "x2ap.TraceDepth", HFILL }}, + "x2ap.LastVisitedEUTRANCellInformation", HFILL }}, + { &hf_x2ap_uTRAN_Cell, + { "uTRAN-Cell", "x2ap.uTRAN_Cell", + FT_BYTES, BASE_NONE, NULL, 0, + "x2ap.LastVisitedUTRANCellInformation", HFILL }}, + { &hf_x2ap_gERAN_Cell, + { "gERAN-Cell", "x2ap.gERAN_Cell", + FT_UINT32, BASE_DEC, VALS(x2ap_LastVisitedGERANCellInformation_vals), 0, + "x2ap.LastVisitedGERANCellInformation", HFILL }}, { &hf_x2ap_global_Cell_ID, { "global-Cell-ID", "x2ap.global_Cell_ID", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ECGI", HFILL }}, { &hf_x2ap_cellType, { "cellType", "x2ap.cellType", - FT_UINT32, BASE_DEC, VALS(x2ap_CellType_vals), 0, + FT_NONE, BASE_NONE, NULL, 0, "x2ap.CellType", HFILL }}, { &hf_x2ap_time_UE_StayedInCell, { "time-UE-StayedInCell", "x2ap.time_UE_StayedInCell", - FT_INT32, BASE_DEC, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "x2ap.Time_UE_StayedInCell", HFILL }}, + { &hf_x2ap_undefined, + { "undefined", "x2ap.undefined", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.NULL", HFILL }}, { &hf_x2ap_eventType, { "eventType", "x2ap.eventType", FT_UINT32, BASE_DEC, VALS(x2ap_EventType_vals), 0, @@ -3449,6 +4369,18 @@ void proto_register_x2ap(void) { { "reportArea", "x2ap.reportArea", FT_UINT32, BASE_DEC, VALS(x2ap_ReportArea_vals), 0, "x2ap.ReportArea", HFILL }}, + { &hf_x2ap_Neighbour_Information_item, + { "Neighbour-Information item", "x2ap.Neighbour_Information_item", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.Neighbour_Information_item", HFILL }}, + { &hf_x2ap_eCGI, + { "eCGI", "x2ap.eCGI", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.ECGI", HFILL }}, + { &hf_x2ap_pCI, + { "pCI", "x2ap.pCI", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.PCI", HFILL }}, { &hf_x2ap_rNTP_PerPRB, { "rNTP-PerPRB", "x2ap.rNTP_PerPRB", FT_BYTES, BASE_NONE, NULL, 0, @@ -3469,26 +4401,50 @@ void proto_register_x2ap(void) { { "pDCCH-InterferenceImpact", "x2ap.pDCCH_InterferenceImpact", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.INTEGER_0_4_", HFILL }}, - { &hf_x2ap_qCI, - { "qCI", "x2ap.qCI", + { &hf_x2ap_dL_GBR_PRB_usage, + { "dL-GBR-PRB-usage", "x2ap.dL_GBR_PRB_usage", FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.QCI", HFILL }}, - { &hf_x2ap_allocationAndRetentionPriority, - { "allocationAndRetentionPriority", "x2ap.allocationAndRetentionPriority", + "x2ap.DL_GBR_PRB_usage", HFILL }}, + { &hf_x2ap_uL_GBR_PRB_usage, + { "uL-GBR-PRB-usage", "x2ap.uL_GBR_PRB_usage", FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.AllocationAndRetentionPriority", HFILL }}, - { &hf_x2ap_gbrQosInformation, - { "gbrQosInformation", "x2ap.gbrQosInformation", - FT_NONE, BASE_NONE, NULL, 0, - "x2ap.GBR_QosInformation", HFILL }}, + "x2ap.UL_GBR_PRB_usage", HFILL }}, + { &hf_x2ap_dL_non_GBR_PRB_usage, + { "dL-non-GBR-PRB-usage", "x2ap.dL_non_GBR_PRB_usage", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.DL_non_GBR_PRB_usage", HFILL }}, + { &hf_x2ap_uL_non_GBR_PRB_usage, + { "uL-non-GBR-PRB-usage", "x2ap.uL_non_GBR_PRB_usage", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.UL_non_GBR_PRB_usage", HFILL }}, + { &hf_x2ap_dL_Total_PRB_usage, + { "dL-Total-PRB-usage", "x2ap.dL_Total_PRB_usage", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.DL_Total_PRB_usage", HFILL }}, + { &hf_x2ap_uL_Total_PRB_usage, + { "uL-Total-PRB-usage", "x2ap.uL_Total_PRB_usage", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.UL_Total_PRB_usage", HFILL }}, + { &hf_x2ap_dLS1TNLLoadIndicator, + { "dLS1TNLLoadIndicator", "x2ap.dLS1TNLLoadIndicator", + FT_UINT32, BASE_DEC, VALS(x2ap_LoadIndicator_vals), 0, + "x2ap.LoadIndicator", HFILL }}, + { &hf_x2ap_uLS1TNLLoadIndicator, + { "uLS1TNLLoadIndicator", "x2ap.uLS1TNLLoadIndicator", + FT_UINT32, BASE_DEC, VALS(x2ap_LoadIndicator_vals), 0, + "x2ap.LoadIndicator", HFILL }}, { &hf_x2ap_ServedCells_item, - { "ServedCell-Information", "x2ap.ServedCell_Information", + { "ServedCells item", "x2ap.ServedCells_item", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.ServedCells_item", HFILL }}, + { &hf_x2ap_servedCellInfo, + { "servedCellInfo", "x2ap.servedCellInfo", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ServedCell_Information", HFILL }}, - { &hf_x2ap_phyCID, - { "phyCID", "x2ap.phyCID", + { &hf_x2ap_neighbour_Info, + { "neighbour-Info", "x2ap.neighbour_Info", FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.PhyCID", HFILL }}, + "x2ap.Neighbour_Information", HFILL }}, { &hf_x2ap_cellId, { "cellId", "x2ap.cellId", FT_NONE, BASE_NONE, NULL, 0, @@ -3501,29 +4457,41 @@ void proto_register_x2ap(void) { { "broadcastPLMNs", "x2ap.broadcastPLMNs", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.BroadcastPLMNs_Item", HFILL }}, - { &hf_x2ap_uL_EARFCN, - { "uL-EARFCN", "x2ap.uL_EARFCN", - FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.EARFCN", HFILL }}, - { &hf_x2ap_dL_EARFCN, - { "dL-EARFCN", "x2ap.dL_EARFCN", - FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.EARFCN", HFILL }}, - { &hf_x2ap_cell_Transmission_Bandwidth, - { "cell-Transmission-Bandwidth", "x2ap.cell_Transmission_Bandwidth", - FT_UINT32, BASE_DEC, VALS(x2ap_Cell_Transmission_Bandwidth_vals), 0, - "x2ap.Cell_Transmission_Bandwidth", HFILL }}, - { &hf_x2ap_traceReference, - { "traceReference", "x2ap.traceReference", + { &hf_x2ap_eUTRA_Mode_Info, + { "eUTRA-Mode-Info", "x2ap.eUTRA_Mode_Info", + FT_UINT32, BASE_DEC, VALS(x2ap_EUTRA_Mode_Info_vals), 0, + "x2ap.EUTRA_Mode_Info", HFILL }}, + { &hf_x2ap_specialSubframePatterns, + { "specialSubframePatterns", "x2ap.specialSubframePatterns", + FT_UINT32, BASE_DEC, VALS(x2ap_SpecialSubframePatterns_vals), 0, + "x2ap.SpecialSubframePatterns", HFILL }}, + { &hf_x2ap_cyclicPrefixDL, + { "cyclicPrefixDL", "x2ap.cyclicPrefixDL", + FT_UINT32, BASE_DEC, VALS(x2ap_CyclicPrefixDL_vals), 0, + "x2ap.CyclicPrefixDL", HFILL }}, + { &hf_x2ap_cyclicPrefixUL, + { "cyclicPrefixUL", "x2ap.cyclicPrefixUL", + FT_UINT32, BASE_DEC, VALS(x2ap_CyclicPrefixUL_vals), 0, + "x2ap.CyclicPrefixUL", HFILL }}, + { &hf_x2ap_eUTRANTraceID, + { "eUTRANTraceID", "x2ap.eUTRANTraceID", FT_BYTES, BASE_NONE, NULL, 0, - "x2ap.TraceReference", HFILL }}, + "x2ap.EUTRANTraceID", HFILL }}, { &hf_x2ap_interfacesToTrace, { "interfacesToTrace", "x2ap.interfacesToTrace", - FT_UINT32, BASE_DEC, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "x2ap.InterfacesToTrace", HFILL }}, + { &hf_x2ap_traceDepth, + { "traceDepth", "x2ap.traceDepth", + FT_UINT32, BASE_DEC, VALS(x2ap_TraceDepth_vals), 0, + "x2ap.TraceDepth", HFILL }}, + { &hf_x2ap_traceCollectionEntityIPAddress, + { "traceCollectionEntityIPAddress", "x2ap.traceCollectionEntityIPAddress", + FT_BYTES, BASE_NONE, NULL, 0, + "x2ap.TraceCollectionEntityIPAddress", HFILL }}, { &hf_x2ap_UE_HistoryInformation_item, { "LastVisitedCell-Item", "x2ap.LastVisitedCell_Item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, VALS(x2ap_LastVisitedCell_Item_vals), 0, "x2ap.LastVisitedCell_Item", HFILL }}, { &hf_x2ap_uEaggregateMaximumBitRateDownlink, { "uEaggregateMaximumBitRateDownlink", "x2ap.uEaggregateMaximumBitRateDownlink", @@ -3533,6 +4501,14 @@ void proto_register_x2ap(void) { { "uEaggregateMaximumBitRateUplink", "x2ap.uEaggregateMaximumBitRateUplink", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.BitRate", HFILL }}, + { &hf_x2ap_encryptionAlgorithms, + { "encryptionAlgorithms", "x2ap.encryptionAlgorithms", + FT_BYTES, BASE_NONE, NULL, 0, + "x2ap.EncryptionAlgorithms", HFILL }}, + { &hf_x2ap_integrityProtectionAlgorithms, + { "integrityProtectionAlgorithms", "x2ap.integrityProtectionAlgorithms", + FT_BYTES, BASE_NONE, NULL, 0, + "x2ap.IntegrityProtectionAlgorithms", HFILL }}, { &hf_x2ap_UL_InterferenceOverloadIndication_item, { "UL-InterferenceOverloadIndication-Item", "x2ap.UL_InterferenceOverloadIndication_Item", FT_UINT32, BASE_DEC, VALS(x2ap_UL_InterferenceOverloadIndication_Item_vals), 0, @@ -3541,14 +4517,14 @@ void proto_register_x2ap(void) { { "UL-HighInterferenceIndicationInfo-Item", "x2ap.UL_HighInterferenceIndicationInfo_Item", FT_NONE, BASE_NONE, NULL, 0, "x2ap.UL_HighInterferenceIndicationInfo_Item", HFILL }}, - { &hf_x2ap_ul_interferenceindication, - { "ul-interferenceindication", "x2ap.ul_interferenceindication", - FT_BYTES, BASE_NONE, NULL, 0, - "x2ap.UL_HighInterferenceIndication", HFILL }}, { &hf_x2ap_target_Cell_ID, { "target-Cell-ID", "x2ap.target_Cell_ID", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ECGI", HFILL }}, + { &hf_x2ap_ul_interferenceindication, + { "ul-interferenceindication", "x2ap.ul_interferenceindication", + FT_BYTES, BASE_NONE, NULL, 0, + "x2ap.UL_HighInterferenceIndication", HFILL }}, { &hf_x2ap_protocolIEs, { "protocolIEs", "x2ap.protocolIEs", FT_UINT32, BASE_DEC, NULL, 0, @@ -3557,6 +4533,14 @@ void proto_register_x2ap(void) { { "mME-UE-S1AP-ID", "x2ap.mME_UE_S1AP_ID", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.UE_S1AP_ID", HFILL }}, + { &hf_x2ap_uESecurityCapabilities, + { "uESecurityCapabilities", "x2ap.uESecurityCapabilities", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.UESecurityCapabilities", HFILL }}, + { &hf_x2ap_aS_SecurityInformation, + { "aS-SecurityInformation", "x2ap.aS_SecurityInformation", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.AS_SecurityInformation", HFILL }}, { &hf_x2ap_uEaggregateMaximumBitRate, { "uEaggregateMaximumBitRate", "x2ap.uEaggregateMaximumBitRate", FT_NONE, BASE_NONE, NULL, 0, @@ -3565,10 +4549,10 @@ void proto_register_x2ap(void) { { "subscriberProfileIDforRFP", "x2ap.subscriberProfileIDforRFP", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.SubscriberProfileIDforRFP", HFILL }}, - { &hf_x2ap_bearers_ToBeSetup_List, - { "bearers-ToBeSetup-List", "x2ap.bearers_ToBeSetup_List", + { &hf_x2ap_e_RABs_ToBeSetup_List, + { "e-RABs-ToBeSetup-List", "x2ap.e_RABs_ToBeSetup_List", FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.Bearers_ToBeSetup_List", HFILL }}, + "x2ap.E_RABs_ToBeSetup_List", HFILL }}, { &hf_x2ap_rRC_Context, { "rRC-Context", "x2ap.rRC_Context", FT_BYTES, BASE_NONE, NULL, 0, @@ -3581,18 +4565,14 @@ void proto_register_x2ap(void) { { "locationReportingInformation", "x2ap.locationReportingInformation", FT_NONE, BASE_NONE, NULL, 0, "x2ap.LocationReportingInformation", HFILL }}, - { &hf_x2ap_Bearers_ToBeSetup_List_item, + { &hf_x2ap_E_RABs_ToBeSetup_List_item, { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ProtocolIE_Single_Container", HFILL }}, - { &hf_x2ap_sAE_Bearer_ID, - { "sAE-Bearer-ID", "x2ap.sAE_Bearer_ID", - FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.Bearer_ID", HFILL }}, - { &hf_x2ap_sAE_BearerLevel_QoS_Parameters, - { "sAE-BearerLevel-QoS-Parameters", "x2ap.sAE_BearerLevel_QoS_Parameters", + { &hf_x2ap_e_RAB_Level_QoS_Parameters, + { "e-RAB-Level-QoS-Parameters", "x2ap.e_RAB_Level_QoS_Parameters", FT_NONE, BASE_NONE, NULL, 0, - "x2ap.SAE_BearerLevel_QoS_Parameters", HFILL }}, + "x2ap.E_RAB_Level_QoS_Parameters", HFILL }}, { &hf_x2ap_dL_Forwarding, { "dL-Forwarding", "x2ap.dL_Forwarding", FT_UINT32, BASE_DEC, VALS(x2ap_DL_Forwarding_vals), 0, @@ -3601,14 +4581,10 @@ void proto_register_x2ap(void) { { "uL-GTPtunnelEndpoint", "x2ap.uL_GTPtunnelEndpoint", FT_NONE, BASE_NONE, NULL, 0, "x2ap.GTPtunnelEndpoint", HFILL }}, - { &hf_x2ap_Bearers_Admitted_List_item, + { &hf_x2ap_E_RABs_Admitted_List_item, { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ProtocolIE_Single_Container", HFILL }}, - { &hf_x2ap_bearer_ID, - { "bearer-ID", "x2ap.bearer_ID", - FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.Bearer_ID", HFILL }}, { &hf_x2ap_uL_GTP_TunnelEndpoint, { "uL-GTP-TunnelEndpoint", "x2ap.uL_GTP_TunnelEndpoint", FT_NONE, BASE_NONE, NULL, 0, @@ -3617,15 +4593,7 @@ void proto_register_x2ap(void) { { "dL-GTP-TunnelEndpoint", "x2ap.dL_GTP_TunnelEndpoint", FT_NONE, BASE_NONE, NULL, 0, "x2ap.GTPtunnelEndpoint", HFILL }}, - { &hf_x2ap_Bearers_NotAdmitted_List_item, - { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container", - FT_NONE, BASE_NONE, NULL, 0, - "x2ap.ProtocolIE_Single_Container", HFILL }}, - { &hf_x2ap_cause, - { "cause", "x2ap.cause", - FT_UINT32, BASE_DEC, VALS(x2ap_Cause_vals), 0, - "x2ap.Cause", HFILL }}, - { &hf_x2ap_Bearers_SubjectToStatusTransfer_List_item, + { &hf_x2ap_E_RABs_SubjectToStatusTransfer_List_item, { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ProtocolIE_Single_Container", HFILL }}, @@ -3669,10 +4637,6 @@ void proto_register_x2ap(void) { { "old-ecgi", "x2ap.old_ecgi", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ECGI", HFILL }}, - { &hf_x2ap_served_cells, - { "served-cells", "x2ap.served_cells", - FT_NONE, BASE_NONE, NULL, 0, - "x2ap.ServedCell_Information", HFILL }}, { &hf_x2ap_Old_ECGIs_item, { "ECGI", "x2ap.ECGI", FT_NONE, BASE_NONE, NULL, 0, @@ -3685,10 +4649,22 @@ void proto_register_x2ap(void) { { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ProtocolIE_Single_Container", HFILL }}, - { &hf_x2ap_resoureStatus, - { "resoureStatus", "x2ap.resoureStatus", - FT_INT32, BASE_DEC, NULL, 0, - "x2ap.ResourceStatus", HFILL }}, + { &hf_x2ap_hWOverLoadIndicator, + { "hWOverLoadIndicator", "x2ap.hWOverLoadIndicator", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.HWLoadIndicator", HFILL }}, + { &hf_x2ap_s1TNLOverLoadIndicator, + { "s1TNLOverLoadIndicator", "x2ap.s1TNLOverLoadIndicator", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.S1TNLLoadIndicator", HFILL }}, + { &hf_x2ap_radioresourceStatus, + { "radioresourceStatus", "x2ap.radioresourceStatus", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.RadioResourceStatus", HFILL }}, + { &hf_x2ap_privateIEs, + { "privateIEs", "x2ap.privateIEs", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.PrivateIE_Container", HFILL }}, { &hf_x2ap_initiatingMessage, { "initiatingMessage", "x2ap.initiatingMessage", FT_NONE, BASE_NONE, NULL, 0, @@ -3724,19 +4700,31 @@ void proto_register_x2ap(void) { /*--- Included file: packet-x2ap-ettarr.c ---*/ #line 1 "packet-x2ap-ettarr.c" + &ett_x2ap_PrivateIE_ID, &ett_x2ap_ProtocolIE_Container, &ett_x2ap_ProtocolIE_Field, &ett_x2ap_ProtocolExtensionContainer, &ett_x2ap_ProtocolExtensionField, + &ett_x2ap_PrivateIE_Container, + &ett_x2ap_PrivateIE_Field, + &ett_x2ap_AS_SecurityInformation, + &ett_x2ap_AllocationAndRetentionPriority, &ett_x2ap_BroadcastPLMNs_Item, &ett_x2ap_Cause, + &ett_x2ap_CellType, &ett_x2ap_COUNTvalue, &ett_x2ap_CriticalityDiagnostics, &ett_x2ap_CriticalityDiagnostics_IE_List, &ett_x2ap_CriticalityDiagnostics_IE_List_item, + &ett_x2ap_FDD_Info, + &ett_x2ap_TDD_Info, + &ett_x2ap_EUTRA_Mode_Info, &ett_x2ap_ECGI, &ett_x2ap_ENB_ID, &ett_x2ap_EPLMNs, + &ett_x2ap_E_RAB_Level_QoS_Parameters, + &ett_x2ap_E_RAB_List, + &ett_x2ap_E_RAB_Item, &ett_x2ap_ForbiddenTAs, &ett_x2ap_ForbiddenTAs_Item, &ett_x2ap_ForbiddenTACs, @@ -3750,33 +4738,38 @@ void proto_register_x2ap(void) { &ett_x2ap_GU_Group_ID, &ett_x2ap_GUMMEI, &ett_x2ap_HandoverRestrictionList, - &ett_x2ap_InterfacesToTrace, - &ett_x2ap_InterfacesToTrace_Item, + &ett_x2ap_HWLoadIndicator, &ett_x2ap_LastVisitedCell_Item, + &ett_x2ap_LastVisitedEUTRANCellInformation, + &ett_x2ap_LastVisitedGERANCellInformation, &ett_x2ap_LocationReportingInformation, + &ett_x2ap_Neighbour_Information, + &ett_x2ap_Neighbour_Information_item, &ett_x2ap_RelativeNarrowbandTxPower, - &ett_x2ap_SAE_BearerLevel_QoS_Parameters, + &ett_x2ap_RadioResourceStatus, + &ett_x2ap_S1TNLLoadIndicator, &ett_x2ap_ServedCells, + &ett_x2ap_ServedCells_item, &ett_x2ap_ServedCell_Information, + &ett_x2ap_SpecialSubframe_Info, &ett_x2ap_TraceActivation, &ett_x2ap_UE_HistoryInformation, &ett_x2ap_UEAggregateMaximumBitRate, + &ett_x2ap_UESecurityCapabilities, &ett_x2ap_UL_InterferenceOverloadIndication, &ett_x2ap_UL_HighInterferenceIndicationInfo, &ett_x2ap_UL_HighInterferenceIndicationInfo_Item, &ett_x2ap_HandoverRequest, &ett_x2ap_UE_ContextInformation, - &ett_x2ap_Bearers_ToBeSetup_List, - &ett_x2ap_Bearers_ToBeSetup_Item, + &ett_x2ap_E_RABs_ToBeSetup_List, + &ett_x2ap_E_RABs_ToBeSetup_Item, &ett_x2ap_HandoverRequestAcknowledge, - &ett_x2ap_Bearers_Admitted_List, - &ett_x2ap_Bearers_Admitted_Item, - &ett_x2ap_Bearers_NotAdmitted_List, - &ett_x2ap_Bearers_NotAdmitted_Item, + &ett_x2ap_E_RABs_Admitted_List, + &ett_x2ap_E_RABs_Admitted_Item, &ett_x2ap_HandoverPreparationFailure, &ett_x2ap_SNStatusTransfer, - &ett_x2ap_Bearers_SubjectToStatusTransfer_List, - &ett_x2ap_Bearers_SubjectToStatusTransfer_Item, + &ett_x2ap_E_RABs_SubjectToStatusTransfer_List, + &ett_x2ap_E_RABs_SubjectToStatusTransfer_Item, &ett_x2ap_UEContextRelease, &ett_x2ap_HandoverCancel, &ett_x2ap_ErrorIndication, @@ -3802,6 +4795,7 @@ void proto_register_x2ap(void) { &ett_x2ap_ResourceStatusUpdate, &ett_x2ap_CellMeasurementResult_List, &ett_x2ap_CellMeasurementResult_Item, + &ett_x2ap_PrivateMessage, &ett_x2ap_X2AP_PDU, &ett_x2ap_InitiatingMessage, &ett_x2ap_SuccessfulOutcome, @@ -3843,15 +4837,14 @@ proto_reg_handoff_x2ap(void) /*--- Included file: packet-x2ap-dis-tab.c ---*/ #line 1 "packet-x2ap-dis-tab.c" - dissector_add("x2ap.ies", id_Bearers_Admitted_Item, new_create_dissector_handle(dissect_Bearers_Admitted_Item_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_Bearers_Admitted_List, new_create_dissector_handle(dissect_Bearers_Admitted_List_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_Bearers_NotAdmitted_Item, new_create_dissector_handle(dissect_Bearers_NotAdmitted_Item_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_Bearers_NotAdmitted_List, new_create_dissector_handle(dissect_Bearers_NotAdmitted_List_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_Bearers_ToBeSetup_Item, new_create_dissector_handle(dissect_Bearers_ToBeSetup_Item_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_E_RABs_Admitted_Item, new_create_dissector_handle(dissect_E_RABs_Admitted_Item_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_E_RABs_Admitted_List, new_create_dissector_handle(dissect_E_RABs_Admitted_List_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_E_RAB_Item, new_create_dissector_handle(dissect_E_RAB_Item_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_E_RABs_NotAdmitted_List, new_create_dissector_handle(dissect_E_RAB_List_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_E_RABs_ToBeSetup_Item, new_create_dissector_handle(dissect_E_RABs_ToBeSetup_Item_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_CellInformation, new_create_dissector_handle(dissect_CellInformation_List_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_CellInformation_Item, new_create_dissector_handle(dissect_CellInformation_Item_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_InterfacesToTrace_Item, new_create_dissector_handle(dissect_InterfacesToTrace_Item_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_New_eNB_UE_X2AP_ID, new_create_dissector_handle(dissect_UE_X2AP_ID_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_Old_eNB_UE_X2AP_ID, new_create_dissector_handle(dissect_UE_X2AP_ID_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_TargetCell_ID, new_create_dissector_handle(dissect_ECGI_PDU, proto_x2ap)); @@ -3861,8 +4854,8 @@ proto_reg_handoff_x2ap(void) dissector_add("x2ap.ies", id_UE_HistoryInformation, new_create_dissector_handle(dissect_UE_HistoryInformation_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_UE_X2AP_ID, new_create_dissector_handle(dissect_UE_X2AP_ID_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_Bearers_SubjectToStatusTransfer_List, new_create_dissector_handle(dissect_Bearers_SubjectToStatusTransfer_List_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_Bearers_SubjectToStatusTransfer_Item, new_create_dissector_handle(dissect_Bearers_SubjectToStatusTransfer_Item_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_E_RABs_SubjectToStatusTransfer_List, new_create_dissector_handle(dissect_E_RABs_SubjectToStatusTransfer_List_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_E_RABs_SubjectToStatusTransfer_Item, new_create_dissector_handle(dissect_E_RABs_SubjectToStatusTransfer_Item_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_ServedCells, new_create_dissector_handle(dissect_ServedCells_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_GlobalENB_ID, new_create_dissector_handle(dissect_GlobalENB_ID_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_TimeToWait, new_create_dissector_handle(dissect_TimeToWait_PDU, proto_x2ap)); @@ -3873,12 +4866,17 @@ proto_reg_handoff_x2ap(void) dissector_add("x2ap.ies", id_ServedCellsToDelete, new_create_dissector_handle(dissect_Old_ECGIs_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_Registration_Request, new_create_dissector_handle(dissect_Registration_Request_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_CellToReport, new_create_dissector_handle(dissect_CellToReport_List_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_ReportingPeriodicity, new_create_dissector_handle(dissect_ReportingPeriod_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_ReportingPeriodicity, new_create_dissector_handle(dissect_ReportingPeriodicity_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_CellToReport_Item, new_create_dissector_handle(dissect_CellToReport_Item_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_CellMeasurementResult, new_create_dissector_handle(dissect_CellMeasurementResult_List_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_CellMeasurementResult_Item, new_create_dissector_handle(dissect_CellMeasurementResult_Item_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_GUGroupIDListToAdd, new_create_dissector_handle(dissect_GUGroupIDList_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_GUGroupIDListToDelete, new_create_dissector_handle(dissect_GUGroupIDList_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_GUGroupIDToAddList, new_create_dissector_handle(dissect_GUGroupIDList_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_GUGroupIDToDeleteList, new_create_dissector_handle(dissect_GUGroupIDList_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_SRVCCOperationPossible, new_create_dissector_handle(dissect_SRVCCOperationPossible_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_ReportCharacteristics, new_create_dissector_handle(dissect_ReportCharacteristics_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_ENB1_Measurement_ID, new_create_dissector_handle(dissect_Measurement_ID_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_ENB2_Measurement_ID, new_create_dissector_handle(dissect_Measurement_ID_PDU, proto_x2ap)); + dissector_add("x2ap.extension", id_Number_of_Antennaports, new_create_dissector_handle(dissect_Number_of_Antennaports_PDU, proto_x2ap)); dissector_add_string("x2ap.proc.imsg", "id-handoverPreparation", new_create_dissector_handle(dissect_HandoverRequest_PDU, proto_x2ap)); dissector_add_string("x2ap.proc.sout", "id-handoverPreparation", new_create_dissector_handle(dissect_HandoverRequestAcknowledge_PDU, proto_x2ap)); dissector_add_string("x2ap.proc.uout", "id-handoverPreparation", new_create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_x2ap)); @@ -3895,10 +4893,11 @@ proto_reg_handoff_x2ap(void) dissector_add_string("x2ap.proc.imsg", "id-eNBConfigurationUpdate", new_create_dissector_handle(dissect_ENBConfigurationUpdate_PDU, proto_x2ap)); dissector_add_string("x2ap.proc.sout", "id-eNBConfigurationUpdate", new_create_dissector_handle(dissect_ENBConfigurationUpdateAcknowledge_PDU, proto_x2ap)); dissector_add_string("x2ap.proc.uout", "id-eNBConfigurationUpdate", new_create_dissector_handle(dissect_ENBConfigurationUpdateFailure_PDU, proto_x2ap)); - dissector_add_string("x2ap.proc.imsg", "id-resourceStatusUpdateInitiation", new_create_dissector_handle(dissect_ResourceStatusRequest_PDU, proto_x2ap)); - dissector_add_string("x2ap.proc.sout", "id-resourceStatusUpdateInitiation", new_create_dissector_handle(dissect_ResourceStatusResponse_PDU, proto_x2ap)); - dissector_add_string("x2ap.proc.uout", "id-resourceStatusUpdateInitiation", new_create_dissector_handle(dissect_ResourceStatusFailure_PDU, proto_x2ap)); + dissector_add_string("x2ap.proc.imsg", "id-resourceStatusReportingInitiation", new_create_dissector_handle(dissect_ResourceStatusRequest_PDU, proto_x2ap)); + dissector_add_string("x2ap.proc.sout", "id-resourceStatusReportingInitiation", new_create_dissector_handle(dissect_ResourceStatusResponse_PDU, proto_x2ap)); + dissector_add_string("x2ap.proc.uout", "id-resourceStatusReportingInitiation", new_create_dissector_handle(dissect_ResourceStatusFailure_PDU, proto_x2ap)); dissector_add_string("x2ap.proc.imsg", "id-resourceStatusReporting", new_create_dissector_handle(dissect_ResourceStatusUpdate_PDU, proto_x2ap)); + dissector_add_string("x2ap.proc.imsg", "id-privateMessage", new_create_dissector_handle(dissect_PrivateMessage_PDU, proto_x2ap)); /*--- End of included file: packet-x2ap-dis-tab.c ---*/ |