forked from osmocom/wireshark
XnAP: upgrade dissector to v16.6.0
This commit is contained in:
Pascal Quantin
Wireshark GitLab Utility
parent
e1b31629d7
commit
95bc8cf328
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 38.423 V16.5.0 (2021-04)
|
||||
-- 3GPP TS 38.423 V16.6.0 (2021-07)
|
||||
-- 9.3.6 Common definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 38.423 V16.5.0 (2021-04)
|
||||
-- 3GPP TS 38.423 V16.6.0 (2021-07)
|
||||
-- 9.3.7 Constant definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
@ -323,7 +323,7 @@ id-AlternativeQoSParaSetList ProtocolIE-ID ::= 174
|
|||
id-CurrentQoSParaSetIndex ProtocolIE-ID ::= 175
|
||||
id-MobilityInformation ProtocolIE-ID ::= 176
|
||||
id-InitiatingCondition-FailureIndication ProtocolIE-ID ::= 177
|
||||
id-UEHistoryInformationFromTheUE ProtocolIE-ID ::= 178
|
||||
id-UEHistoryInformationFromTheUE ProtocolIE-ID ::= 178
|
||||
id-HandoverReportType ProtocolIE-ID ::= 179
|
||||
id-HandoverCause ProtocolIE-ID ::= 180
|
||||
id-SourceCellCGI ProtocolIE-ID ::= 181
|
||||
|
|
@ -384,11 +384,15 @@ id-pdcpDuplicationConfiguration ProtocolIE-ID ::= 235
|
|||
id-duplicationActivation ProtocolIE-ID ::= 236
|
||||
id-NPRACHConfiguration ProtocolIE-ID ::= 237
|
||||
id-QosMonitoringReportingFrequency ProtocolIE-ID ::= 238
|
||||
id-QoSFlowsMappedtoDRB-SetupResponse-MNterminated ProtocolIE-ID ::= 239
|
||||
id-QoSFlowsMappedtoDRB-SetupResponse-MNterminated ProtocolIE-ID ::= 239
|
||||
id-DL-scheduling-PDCCH-CCE-usage ProtocolIE-ID ::= 240
|
||||
id-UL-scheduling-PDCCH-CCE-usage ProtocolIE-ID ::= 241
|
||||
id-SFN-Offset ProtocolIE-ID ::= 242
|
||||
id-QoSMonitoringDisabled ProtocolIE-ID ::= 243
|
||||
id-ExtendedUEIdentityIndexValue ProtocolIE-ID ::= 244
|
||||
id-PagingeDRXInformation ProtocolIE-ID ::= 245
|
||||
id-CHO-MRDC-EarlyDataForwarding ProtocolIE-ID ::= 246
|
||||
id-SCGIndicator ProtocolIE-ID ::= 247
|
||||
id-UESpecificDRX ProtocolIE-ID ::= 248
|
||||
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 38.423 V16.5.0 (2021-04)
|
||||
-- 3GPP TS 38.423 V16.6.0 (2021-07)
|
||||
-- 9.3.8 Container definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 38.423 V16.5.0 (2021-04)
|
||||
-- 3GPP TS 38.423 V16.6.0 (2021-07)
|
||||
-- 9.3.5 Information Element definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
@ -697,8 +697,8 @@ CellToReport ::= SEQUENCE (SIZE(1..maxnoofCellsinNG-RANnode)) OF CellToReport-It
|
|||
|
||||
CellToReport-Item ::= SEQUENCE {
|
||||
cell-ID GlobalNG-RANCell-ID,
|
||||
sSBToReport-List SSBToReport-List,
|
||||
sliceToReport-List SliceToReport-List,
|
||||
sSBToReport-List SSBToReport-List OPTIONAL,
|
||||
sliceToReport-List SliceToReport-List OPTIONAL,
|
||||
iE-Extensions ProtocolExtensionContainer { { CellToReport-Item-ExtIEs} } OPTIONAL,
|
||||
...
|
||||
}
|
||||
|
|
@ -734,7 +734,7 @@ CompositeAvailableCapacityGroup-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
|
|||
|
||||
CompositeAvailableCapacity ::= SEQUENCE {
|
||||
cellCapacityClassValue CellCapacityClassValue OPTIONAL,
|
||||
capacityValueInfo CapacityValueInfo, -- this IE represents the IE “CapacityValue” in 9.2.2.a, it’s used to distinguish the “CapacityValue” in 9.2.2.c
|
||||
capacityValueInfo CapacityValueInfo, -- this IE represents the IE "CapacityValue" in 9.2.2.a, it’s used to distinguish the "CapacityValue" in 9.2.2.c
|
||||
iE-Extensions ProtocolExtensionContainer { { CompositeAvailableCapacity-ExtIEs} }OPTIONAL,
|
||||
...
|
||||
}
|
||||
|
|
@ -743,6 +743,8 @@ CompositeAvailableCapacity-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
|
|||
...
|
||||
}
|
||||
|
||||
CHO-MRDC-EarlyDataForwarding ::= ENUMERATED {stop, ...}
|
||||
|
||||
CHO-MRDC-Indicator ::= ENUMERATED {true, ...}
|
||||
|
||||
|
||||
|
|
@ -1230,7 +1232,7 @@ E-UTRAPRACHConfiguration ::= SEQUENCE {
|
|||
highSpeedFlag ENUMERATED {true, false, ...},
|
||||
prach-FreqOffset INTEGER (0..94),
|
||||
prach-ConfigIndex INTEGER (0..63) OPTIONAL,
|
||||
-- C-ifTDD: This IE shall be present if the EUTRA-Mode-Info IE in the Served Cell Information IE is set to the value “TDD” --
|
||||
-- C-ifTDD: This IE shall be present if the EUTRA-Mode-Info IE in the Served Cell Information IE is set to the value "TDD" --
|
||||
iE-Extensions ProtocolExtensionContainer { {E-UTRAPRACHConfiguration-ExtIEs} } OPTIONAL,
|
||||
...
|
||||
}
|
||||
|
|
@ -2786,6 +2788,33 @@ PagingDRX ::= ENUMERATED {
|
|||
}
|
||||
|
||||
|
||||
PagingeDRXInformation ::= SEQUENCE {
|
||||
paging-eDRX-Cycle Paging-eDRX-Cycle,
|
||||
paging-Time-Window Paging-Time-Window OPTIONAL,
|
||||
iE-Extensions ProtocolExtensionContainer { {PagingeDRXInformation-ExtIEs} } OPTIONAL,
|
||||
...
|
||||
}
|
||||
|
||||
PagingeDRXInformation-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
|
||||
...
|
||||
}
|
||||
|
||||
Paging-eDRX-Cycle ::= ENUMERATED {
|
||||
hfhalf, hf1, hf2, hf4, hf6,
|
||||
hf8, hf10, hf12, hf14, hf16,
|
||||
hf32, hf64, hf128, hf256,
|
||||
...
|
||||
}
|
||||
|
||||
|
||||
Paging-Time-Window ::= ENUMERATED {
|
||||
s1, s2, s3, s4, s5,
|
||||
s6, s7, s8, s9, s10,
|
||||
s11, s12, s13, s14, s15, s16,
|
||||
...
|
||||
}
|
||||
|
||||
|
||||
PagingPriority ::= ENUMERATED {
|
||||
priolevel1,
|
||||
priolevel2,
|
||||
|
|
@ -4361,6 +4390,8 @@ SecondarydataForwardingInfoFromTarget-List ::= SEQUENCE (SIZE(1..maxnoofMultiCon
|
|||
|
||||
SCGConfigurationQuery ::= ENUMERATED {true, ...}
|
||||
|
||||
SCGIndicator ::= ENUMERATED{released, ...}
|
||||
|
||||
SecondaryRATUsageInformation ::= SEQUENCE {
|
||||
pDUSessionUsageReport PDUSessionUsageReport OPTIONAL,
|
||||
qosFlowsUsageReportList QoSFlowsUsageReportList OPTIONAL,
|
||||
|
|
@ -4582,7 +4613,7 @@ ServedCellInformation-NR-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
|
|||
|
||||
SFN-Offset ::= SEQUENCE {
|
||||
sFN-Time-Offset BIT STRING (SIZE(24)),
|
||||
|
||||
|
||||
iE-Extensions ProtocolExtensionContainer { {SFN-Offset-ExtIEs} } OPTIONAL,
|
||||
...
|
||||
}
|
||||
|
|
@ -5383,6 +5414,13 @@ UESecurityCapabilities-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
|
|||
...
|
||||
}
|
||||
|
||||
UESpecificDRX ::= ENUMERATED {
|
||||
v32,
|
||||
v64,
|
||||
v128,
|
||||
v256,
|
||||
...
|
||||
}
|
||||
|
||||
ULConfiguration::= SEQUENCE {
|
||||
uL-PDCP UL-UE-Configuration,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 38.423 V16.5.0 (2021-04)
|
||||
-- 3GPP TS 38.423 V16.6.0 (2021-07)
|
||||
-- 9.3.4 PDU Definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
@ -35,6 +35,7 @@ IMPORTS
|
|||
CellAssistanceInfo-NR,
|
||||
CHOinformation-Req,
|
||||
CHOinformation-Ack,
|
||||
CHO-MRDC-EarlyDataForwarding,
|
||||
CHO-MRDC-Indicator,
|
||||
CPTransportLayerInformation,
|
||||
TNLA-To-Add-List,
|
||||
|
|
@ -87,6 +88,7 @@ IMPORTS
|
|||
NRUESidelinkAggregateMaximumBitRate,
|
||||
NRV2XServicesAuthorized,
|
||||
PagingDRX,
|
||||
PagingeDRXInformation,
|
||||
PagingPriority,
|
||||
PartialListIndicator,
|
||||
PLMN-Identity,
|
||||
|
|
@ -175,7 +177,9 @@ IMPORTS
|
|||
MobilityParametersModificationRange,
|
||||
RACHReportInformation,
|
||||
IABNodeIndication,
|
||||
SNTriggered
|
||||
SNTriggered,
|
||||
SCGIndicator,
|
||||
UESpecificDRX
|
||||
|
||||
|
||||
FROM XnAP-IEs
|
||||
|
|
@ -240,6 +244,7 @@ FROM XnAP-Containers
|
|||
id-oldNG-RANnodeUEXnAPID,
|
||||
id-OldtoNewNG-RANnodeResumeContainer,
|
||||
id-PagingDRX,
|
||||
id-PagingeDRXInformation,
|
||||
id-PagingPriority,
|
||||
id-PartialListIndicator-EUTRA,
|
||||
id-PartialListIndicator-NR,
|
||||
|
|
@ -346,6 +351,7 @@ FROM XnAP-Containers
|
|||
id-targetCellsToCancel,
|
||||
id-requestedTargetCellGlobalID,
|
||||
id-DAPSResponseInfo-List,
|
||||
id-CHO-MRDC-EarlyDataForwarding,
|
||||
id-CHO-MRDC-Indicator,
|
||||
id-MobilityInformation,
|
||||
id-InitiatingCondition-FailureIndication,
|
||||
|
|
@ -373,6 +379,8 @@ FROM XnAP-Containers
|
|||
id-RACHReportInformation,
|
||||
id-IABNodeIndication,
|
||||
id-UERadioCapabilityID,
|
||||
id-SCGIndicator,
|
||||
id-UESpecificDRX,
|
||||
|
||||
|
||||
|
||||
|
|
@ -655,7 +663,9 @@ RANPaging-IEs XNAP-PROTOCOL-IES ::= {
|
|||
{ ID id-PagingPriority CRITICALITY ignore TYPE PagingPriority PRESENCE optional }|
|
||||
{ ID id-AssistanceDataForRANPaging CRITICALITY ignore TYPE AssistanceDataForRANPaging PRESENCE optional }|
|
||||
{ ID id-UERadioCapabilityForPaging CRITICALITY ignore TYPE UERadioCapabilityForPaging PRESENCE optional }|
|
||||
{ ID id-ExtendedUEIdentityIndexValue CRITICALITY ignore TYPE ExtendedUEIdentityIndexValue PRESENCE optional },
|
||||
{ ID id-ExtendedUEIdentityIndexValue CRITICALITY ignore TYPE ExtendedUEIdentityIndexValue PRESENCE optional }|
|
||||
{ ID id-PagingeDRXInformation CRITICALITY ignore TYPE PagingeDRXInformation PRESENCE optional }|
|
||||
{ ID id-UESpecificDRX CRITICALITY ignore TYPE UESpecificDRX PRESENCE optional },
|
||||
...
|
||||
}
|
||||
|
||||
|
|
@ -747,7 +757,8 @@ XnUAddressIndication-IEs XNAP-PROTOCOL-IES ::= {
|
|||
{ ID id-newNG-RANnodeUEXnAPID CRITICALITY ignore TYPE NG-RANnodeUEXnAPID PRESENCE mandatory}|
|
||||
{ ID id-oldNG-RANnodeUEXnAPID CRITICALITY ignore TYPE NG-RANnodeUEXnAPID PRESENCE mandatory}|
|
||||
{ ID id-XnUAddressInfoperPDUSession-List CRITICALITY reject TYPE XnUAddressInfoperPDUSession-List PRESENCE mandatory}|
|
||||
{ ID id-CHO-MRDC-Indicator CRITICALITY reject TYPE CHO-MRDC-Indicator PRESENCE optional },
|
||||
{ ID id-CHO-MRDC-Indicator CRITICALITY reject TYPE CHO-MRDC-Indicator PRESENCE optional }|
|
||||
{ ID id-CHO-MRDC-EarlyDataForwarding CRITICALITY ignore TYPE CHO-MRDC-EarlyDataForwarding PRESENCE optional },
|
||||
...
|
||||
}
|
||||
|
||||
|
|
@ -1219,7 +1230,8 @@ SNodeModificationRequired-IEs XNAP-PROTOCOL-IES ::= {
|
|||
{ ID id-MR-DC-ResourceCoordinationInfo CRITICALITY ignore TYPE MR-DC-ResourceCoordinationInfo PRESENCE optional }|
|
||||
{ ID id-RRCConfigIndication CRITICALITY reject TYPE RRCConfigIndication PRESENCE optional }|
|
||||
{ ID id-AvailableFastMCGRecoveryViaSRB3 CRITICALITY ignore TYPE AvailableFastMCGRecoveryViaSRB3 PRESENCE optional }|
|
||||
{ ID id-ReleaseFastMCGRecoveryViaSRB3 CRITICALITY ignore TYPE ReleaseFastMCGRecoveryViaSRB3 PRESENCE optional },
|
||||
{ ID id-ReleaseFastMCGRecoveryViaSRB3 CRITICALITY ignore TYPE ReleaseFastMCGRecoveryViaSRB3 PRESENCE optional }|
|
||||
{ ID id-SCGIndicator CRITICALITY ignore TYPE SCGIndicator PRESENCE optional },
|
||||
...
|
||||
}
|
||||
PDUSessionToBeModifiedSNModRequired::= SEQUENCE (SIZE (1.. maxnoofPDUSessions)) OF PDUSessionToBeModifiedSNModRequired-Item
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 38.423 V16.5.0 (2021-04)
|
||||
-- 3GPP TS 38.423 V16.6.0 (2021-07)
|
||||
-- 9.3.3 Elementary Procedure Definitions
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* Ref:
|
||||
* 3GPP TS 38.423 V16.5.0 (2021-04)
|
||||
* 3GPP TS 38.423 V16.6.0 (2021-07)
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
|
|
|||
|
|
@ -1212,6 +1212,10 @@ id-UL-scheduling-PDCCH-CCE-usage ProtocolIE-ID
|
|||
id-SFN-Offset ProtocolIE-ID
|
||||
id-QoSMonitoringDisabled ProtocolIE-ID
|
||||
id-ExtendedUEIdentityIndexValue ProtocolIE-ID
|
||||
id-PagingeDRXInformation ProtocolIE-ID
|
||||
id-CHO-MRDC-EarlyDataForwarding ProtocolIE-ID
|
||||
id-SCGIndicator ProtocolIE-ID
|
||||
id-UESpecificDRX ProtocolIE-ID
|
||||
|
||||
#.REGISTER
|
||||
|
||||
|
|
@ -1390,6 +1394,10 @@ UERadioCapabilityID N xnap.ies id-UERadioCapabilit
|
|||
SNTriggered N xnap.ies id-SNTriggered
|
||||
CellAssistanceInfo-EUTRA N xnap.ies id-cellAssistanceInfo-EUTRA
|
||||
ExtendedUEIdentityIndexValue N xnap.ies id-ExtendedUEIdentityIndexValue
|
||||
PagingeDRXInformation N xnap.ies id-PagingeDRXInformation
|
||||
CHO-MRDC-EarlyDataForwarding N xnap.ies id-CHO-MRDC-EarlyDataForwarding
|
||||
SCGIndicator N xnap.ies id-SCGIndicator
|
||||
UESpecificDRX N xnap.ies id-UESpecificDRX
|
||||
|
||||
#XNAP-PROTOCOL-EXTENSION
|
||||
Additional-UL-NG-U-TNLatUPF-List N xnap.extension id-Additional-UL-NG-U-TNLatUPF-List
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* Ref:
|
||||
* 3GPP TS 38.423 V16.5.0 (2021-04)
|
||||
* 3GPP TS 38.423 V16.6.0 (2021-07)
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
|
@ -411,7 +411,11 @@ typedef enum _ProtocolIE_ID_enum {
|
|||
id_UL_scheduling_PDCCH_CCE_usage = 241,
|
||||
id_SFN_Offset = 242,
|
||||
id_QoSMonitoringDisabled = 243,
|
||||
id_ExtendedUEIdentityIndexValue = 244
|
||||
id_ExtendedUEIdentityIndexValue = 244,
|
||||
id_PagingeDRXInformation = 245,
|
||||
id_CHO_MRDC_EarlyDataForwarding = 246,
|
||||
id_SCGIndicator = 247,
|
||||
id_UESpecificDRX = 248
|
||||
} ProtocolIE_ID_enum;
|
||||
|
||||
typedef enum _GlobalNG_RANNode_ID_enum {
|
||||
|
|
@ -472,6 +476,7 @@ static int hf_xnap_CellAndCapacityAssistanceInfo_EUTRA_PDU = -1; /* CellAndCapa
|
|||
static int hf_xnap_CellAssistanceInfo_EUTRA_PDU = -1; /* CellAssistanceInfo_EUTRA */
|
||||
static int hf_xnap_CellMeasurementResult_PDU = -1; /* CellMeasurementResult */
|
||||
static int hf_xnap_CellToReport_PDU = -1; /* CellToReport */
|
||||
static int hf_xnap_CHO_MRDC_EarlyDataForwarding_PDU = -1; /* CHO_MRDC_EarlyDataForwarding */
|
||||
static int hf_xnap_CHO_MRDC_Indicator_PDU = -1; /* CHO_MRDC_Indicator */
|
||||
static int hf_xnap_CHOinformation_Req_PDU = -1; /* CHOinformation_Req */
|
||||
static int hf_xnap_CHOinformation_Ack_PDU = -1; /* CHOinformation_Ack */
|
||||
|
|
@ -543,6 +548,7 @@ static int hf_xnap_NRV2XServicesAuthorized_PDU = -1; /* NRV2XServicesAuthorized
|
|||
static int hf_xnap_NRUESidelinkAggregateMaximumBitRate_PDU = -1; /* NRUESidelinkAggregateMaximumBitRate */
|
||||
static int hf_xnap_OffsetOfNbiotChannelNumberToEARFCN_PDU = -1; /* OffsetOfNbiotChannelNumberToEARFCN */
|
||||
static int hf_xnap_PagingDRX_PDU = -1; /* PagingDRX */
|
||||
static int hf_xnap_PagingeDRXInformation_PDU = -1; /* PagingeDRXInformation */
|
||||
static int hf_xnap_PagingPriority_PDU = -1; /* PagingPriority */
|
||||
static int hf_xnap_PartialListIndicator_PDU = -1; /* PartialListIndicator */
|
||||
static int hf_xnap_PC5QoSParameters_PDU = -1; /* PC5QoSParameters */
|
||||
|
|
@ -576,6 +582,7 @@ static int hf_xnap_RRCConfigIndication_PDU = -1; /* RRCConfigIndication */
|
|||
static int hf_xnap_RRCResumeCause_PDU = -1; /* RRCResumeCause */
|
||||
static int hf_xnap_SecondarydataForwardingInfoFromTarget_List_PDU = -1; /* SecondarydataForwardingInfoFromTarget_List */
|
||||
static int hf_xnap_SCGConfigurationQuery_PDU = -1; /* SCGConfigurationQuery */
|
||||
static int hf_xnap_SCGIndicator_PDU = -1; /* SCGIndicator */
|
||||
static int hf_xnap_SecurityResult_PDU = -1; /* SecurityResult */
|
||||
static int hf_xnap_ServedCells_E_UTRA_PDU = -1; /* ServedCells_E_UTRA */
|
||||
static int hf_xnap_ServedCellsToUpdate_E_UTRA_PDU = -1; /* ServedCellsToUpdate_E_UTRA */
|
||||
|
|
@ -615,6 +622,7 @@ static int hf_xnap_UERadioCapabilityID_PDU = -1; /* UERadioCapabilityID */
|
|||
static int hf_xnap_UERANPagingIdentity_PDU = -1; /* UERANPagingIdentity */
|
||||
static int hf_xnap_UERLFReportContainer_PDU = -1; /* UERLFReportContainer */
|
||||
static int hf_xnap_UESecurityCapabilities_PDU = -1; /* UESecurityCapabilities */
|
||||
static int hf_xnap_UESpecificDRX_PDU = -1; /* UESpecificDRX */
|
||||
static int hf_xnap_ULForwardingProposal_PDU = -1; /* ULForwardingProposal */
|
||||
static int hf_xnap_UPTransportLayerInformation_PDU = -1; /* UPTransportLayerInformation */
|
||||
static int hf_xnap_UPTransportParameters_PDU = -1; /* UPTransportParameters */
|
||||
|
|
@ -1155,6 +1163,8 @@ static int hf_xnap_nRSCS = -1; /* NRSCS */
|
|||
static int hf_xnap_nRNRB = -1; /* NRNRB */
|
||||
static int hf_xnap_pER_Scalar = -1; /* PER_Scalar */
|
||||
static int hf_xnap_pER_Exponent = -1; /* PER_Exponent */
|
||||
static int hf_xnap_paging_eDRX_Cycle = -1; /* Paging_eDRX_Cycle */
|
||||
static int hf_xnap_paging_Time_Window = -1; /* Paging_Time_Window */
|
||||
static int hf_xnap_pc5QoSFlowList = -1; /* PC5QoSFlowList */
|
||||
static int hf_xnap_pc5LinkAggregateBitRates = -1; /* BitRate */
|
||||
static int hf_xnap_PC5QoSFlowList_item = -1; /* PC5QoSFlowItem */
|
||||
|
|
@ -1930,6 +1940,7 @@ static gint ett_xnap_NRTransmissionBandwidth = -1;
|
|||
static gint ett_xnap_NRV2XServicesAuthorized = -1;
|
||||
static gint ett_xnap_NRUESidelinkAggregateMaximumBitRate = -1;
|
||||
static gint ett_xnap_PacketErrorRate = -1;
|
||||
static gint ett_xnap_PagingeDRXInformation = -1;
|
||||
static gint ett_xnap_PC5QoSParameters = -1;
|
||||
static gint ett_xnap_PC5QoSFlowList = -1;
|
||||
static gint ett_xnap_PC5QoSFlowItem = -1;
|
||||
|
|
@ -2822,6 +2833,10 @@ static const value_string xnap_ProtocolIE_ID_vals[] = {
|
|||
{ id_SFN_Offset, "id-SFN-Offset" },
|
||||
{ id_QoSMonitoringDisabled, "id-QoSMonitoringDisabled" },
|
||||
{ id_ExtendedUEIdentityIndexValue, "id-ExtendedUEIdentityIndexValue" },
|
||||
{ id_PagingeDRXInformation, "id-PagingeDRXInformation" },
|
||||
{ id_CHO_MRDC_EarlyDataForwarding, "id-CHO-MRDC-EarlyDataForwarding" },
|
||||
{ id_SCGIndicator, "id-SCGIndicator" },
|
||||
{ id_UESpecificDRX, "id-UESpecificDRX" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
|
@ -5673,8 +5688,8 @@ dissect_xnap_SliceToReport_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
|
|||
|
||||
static const per_sequence_t CellToReport_Item_sequence[] = {
|
||||
{ &hf_xnap_cell_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_xnap_GlobalNG_RANCell_ID },
|
||||
{ &hf_xnap_sSBToReport_List, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_xnap_SSBToReport_List },
|
||||
{ &hf_xnap_sliceToReport_List, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_xnap_SliceToReport_List },
|
||||
{ &hf_xnap_sSBToReport_List, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_xnap_SSBToReport_List },
|
||||
{ &hf_xnap_sliceToReport_List, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_xnap_SliceToReport_List },
|
||||
{ &hf_xnap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_xnap_ProtocolExtensionContainer },
|
||||
{ NULL, 0, 0, NULL }
|
||||
};
|
||||
|
|
@ -5728,6 +5743,21 @@ dissect_xnap_Cell_Type_Choice(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
|
|||
}
|
||||
|
||||
|
||||
static const value_string xnap_CHO_MRDC_EarlyDataForwarding_vals[] = {
|
||||
{ 0, "stop" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
static int
|
||||
dissect_xnap_CHO_MRDC_EarlyDataForwarding(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
|
||||
1, NULL, TRUE, 0, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const value_string xnap_CHO_MRDC_Indicator_vals[] = {
|
||||
{ 0, "true" },
|
||||
{ 0, NULL }
|
||||
|
|
@ -11178,6 +11208,80 @@ dissect_xnap_PagingDRX(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
|
|||
}
|
||||
|
||||
|
||||
static const value_string xnap_Paging_eDRX_Cycle_vals[] = {
|
||||
{ 0, "hfhalf" },
|
||||
{ 1, "hf1" },
|
||||
{ 2, "hf2" },
|
||||
{ 3, "hf4" },
|
||||
{ 4, "hf6" },
|
||||
{ 5, "hf8" },
|
||||
{ 6, "hf10" },
|
||||
{ 7, "hf12" },
|
||||
{ 8, "hf14" },
|
||||
{ 9, "hf16" },
|
||||
{ 10, "hf32" },
|
||||
{ 11, "hf64" },
|
||||
{ 12, "hf128" },
|
||||
{ 13, "hf256" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
static int
|
||||
dissect_xnap_Paging_eDRX_Cycle(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,
|
||||
14, NULL, TRUE, 0, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const value_string xnap_Paging_Time_Window_vals[] = {
|
||||
{ 0, "s1" },
|
||||
{ 1, "s2" },
|
||||
{ 2, "s3" },
|
||||
{ 3, "s4" },
|
||||
{ 4, "s5" },
|
||||
{ 5, "s6" },
|
||||
{ 6, "s7" },
|
||||
{ 7, "s8" },
|
||||
{ 8, "s9" },
|
||||
{ 9, "s10" },
|
||||
{ 10, "s11" },
|
||||
{ 11, "s12" },
|
||||
{ 12, "s13" },
|
||||
{ 13, "s14" },
|
||||
{ 14, "s15" },
|
||||
{ 15, "s16" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
static int
|
||||
dissect_xnap_Paging_Time_Window(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);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const per_sequence_t PagingeDRXInformation_sequence[] = {
|
||||
{ &hf_xnap_paging_eDRX_Cycle, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_xnap_Paging_eDRX_Cycle },
|
||||
{ &hf_xnap_paging_Time_Window, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_xnap_Paging_Time_Window },
|
||||
{ &hf_xnap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_xnap_ProtocolExtensionContainer },
|
||||
{ NULL, 0, 0, NULL }
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_xnap_PagingeDRXInformation(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_xnap_PagingeDRXInformation, PagingeDRXInformation_sequence);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const value_string xnap_PagingPriority_vals[] = {
|
||||
{ 0, "priolevel1" },
|
||||
{ 1, "priolevel2" },
|
||||
|
|
@ -13947,6 +14051,21 @@ dissect_xnap_SCGConfigurationQuery(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
|
|||
}
|
||||
|
||||
|
||||
static const value_string xnap_SCGIndicator_vals[] = {
|
||||
{ 0, "released" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
static int
|
||||
dissect_xnap_SCGIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
|
||||
1, NULL, TRUE, 0, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const per_sequence_t ServedCellInformation_E_UTRA_perBPLMN_sequence[] = {
|
||||
{ &hf_xnap_plmn_id , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_xnap_PLMN_Identity },
|
||||
{ &hf_xnap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_xnap_ProtocolExtensionContainer },
|
||||
|
|
@ -15339,6 +15458,24 @@ dissect_xnap_UERANPagingIdentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
|
|||
}
|
||||
|
||||
|
||||
static const value_string xnap_UESpecificDRX_vals[] = {
|
||||
{ 0, "v32" },
|
||||
{ 1, "v64" },
|
||||
{ 2, "v128" },
|
||||
{ 3, "v256" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
static int
|
||||
dissect_xnap_UESpecificDRX(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 xnap_ULForwardingProposal_vals[] = {
|
||||
{ 0, "ul-forwarding-proposed" },
|
||||
{ 0, NULL }
|
||||
|
|
@ -18152,6 +18289,14 @@ static int dissect_CellToReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p
|
|||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_CHO_MRDC_EarlyDataForwarding_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
|
||||
offset = dissect_xnap_CHO_MRDC_EarlyDataForwarding(tvb, offset, &asn1_ctx, tree, hf_xnap_CHO_MRDC_EarlyDataForwarding_PDU);
|
||||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_CHO_MRDC_Indicator_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
|
@ -18720,6 +18865,14 @@ static int dissect_PagingDRX_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
|
|||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_PagingeDRXInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
|
||||
offset = dissect_xnap_PagingeDRXInformation(tvb, offset, &asn1_ctx, tree, hf_xnap_PagingeDRXInformation_PDU);
|
||||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_PagingPriority_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
|
@ -18984,6 +19137,14 @@ static int dissect_SCGConfigurationQuery_PDU(tvbuff_t *tvb _U_, packet_info *pin
|
|||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_SCGIndicator_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
|
||||
offset = dissect_xnap_SCGIndicator(tvb, offset, &asn1_ctx, tree, hf_xnap_SCGIndicator_PDU);
|
||||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_SecurityResult_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
|
@ -19296,6 +19457,14 @@ static int dissect_UESecurityCapabilities_PDU(tvbuff_t *tvb _U_, packet_info *pi
|
|||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_UESpecificDRX_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
|
||||
offset = dissect_xnap_UESpecificDRX(tvb, offset, &asn1_ctx, tree, hf_xnap_UESpecificDRX_PDU);
|
||||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_ULForwardingProposal_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
|
@ -20464,6 +20633,10 @@ void proto_register_xnap(void) {
|
|||
{ "CellToReport", "xnap.CellToReport",
|
||||
FT_UINT32, BASE_DEC, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_xnap_CHO_MRDC_EarlyDataForwarding_PDU,
|
||||
{ "CHO-MRDC-EarlyDataForwarding", "xnap.CHO_MRDC_EarlyDataForwarding",
|
||||
FT_UINT32, BASE_DEC, VALS(xnap_CHO_MRDC_EarlyDataForwarding_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_xnap_CHO_MRDC_Indicator_PDU,
|
||||
{ "CHO-MRDC-Indicator", "xnap.CHO_MRDC_Indicator",
|
||||
FT_UINT32, BASE_DEC, VALS(xnap_CHO_MRDC_Indicator_vals), 0,
|
||||
|
|
@ -20748,6 +20921,10 @@ void proto_register_xnap(void) {
|
|||
{ "PagingDRX", "xnap.PagingDRX",
|
||||
FT_UINT32, BASE_DEC, VALS(xnap_PagingDRX_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_xnap_PagingeDRXInformation_PDU,
|
||||
{ "PagingeDRXInformation", "xnap.PagingeDRXInformation_element",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_xnap_PagingPriority_PDU,
|
||||
{ "PagingPriority", "xnap.PagingPriority",
|
||||
FT_UINT32, BASE_DEC, VALS(xnap_PagingPriority_vals), 0,
|
||||
|
|
@ -20880,6 +21057,10 @@ void proto_register_xnap(void) {
|
|||
{ "SCGConfigurationQuery", "xnap.SCGConfigurationQuery",
|
||||
FT_UINT32, BASE_DEC, VALS(xnap_SCGConfigurationQuery_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_xnap_SCGIndicator_PDU,
|
||||
{ "SCGIndicator", "xnap.SCGIndicator",
|
||||
FT_UINT32, BASE_DEC, VALS(xnap_SCGIndicator_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_xnap_SecurityResult_PDU,
|
||||
{ "SecurityResult", "xnap.SecurityResult_element",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
|
|
@ -21036,6 +21217,10 @@ void proto_register_xnap(void) {
|
|||
{ "UESecurityCapabilities", "xnap.UESecurityCapabilities_element",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_xnap_UESpecificDRX_PDU,
|
||||
{ "UESpecificDRX", "xnap.UESpecificDRX",
|
||||
FT_UINT32, BASE_DEC, VALS(xnap_UESpecificDRX_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_xnap_ULForwardingProposal_PDU,
|
||||
{ "ULForwardingProposal", "xnap.ULForwardingProposal",
|
||||
FT_UINT32, BASE_DEC, VALS(xnap_ULForwardingProposal_vals), 0,
|
||||
|
|
@ -23196,6 +23381,14 @@ void proto_register_xnap(void) {
|
|||
{ "pER-Exponent", "xnap.pER_Exponent",
|
||||
FT_UINT32, BASE_DEC, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_xnap_paging_eDRX_Cycle,
|
||||
{ "paging-eDRX-Cycle", "xnap.paging_eDRX_Cycle",
|
||||
FT_UINT32, BASE_DEC, VALS(xnap_Paging_eDRX_Cycle_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_xnap_paging_Time_Window,
|
||||
{ "paging-Time-Window", "xnap.paging_Time_Window",
|
||||
FT_UINT32, BASE_DEC, VALS(xnap_Paging_Time_Window_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_xnap_pc5QoSFlowList,
|
||||
{ "pc5QoSFlowList", "xnap.pc5QoSFlowList",
|
||||
FT_UINT32, BASE_DEC, NULL, 0,
|
||||
|
|
@ -25472,6 +25665,7 @@ void proto_register_xnap(void) {
|
|||
&ett_xnap_NRV2XServicesAuthorized,
|
||||
&ett_xnap_NRUESidelinkAggregateMaximumBitRate,
|
||||
&ett_xnap_PacketErrorRate,
|
||||
&ett_xnap_PagingeDRXInformation,
|
||||
&ett_xnap_PC5QoSParameters,
|
||||
&ett_xnap_PC5QoSFlowList,
|
||||
&ett_xnap_PC5QoSFlowItem,
|
||||
|
|
@ -26071,6 +26265,10 @@ proto_reg_handoff_xnap(void)
|
|||
dissector_add_uint("xnap.ies", id_SNTriggered, create_dissector_handle(dissect_SNTriggered_PDU, proto_xnap));
|
||||
dissector_add_uint("xnap.ies", id_cellAssistanceInfo_EUTRA, create_dissector_handle(dissect_CellAssistanceInfo_EUTRA_PDU, proto_xnap));
|
||||
dissector_add_uint("xnap.ies", id_ExtendedUEIdentityIndexValue, create_dissector_handle(dissect_ExtendedUEIdentityIndexValue_PDU, proto_xnap));
|
||||
dissector_add_uint("xnap.ies", id_PagingeDRXInformation, create_dissector_handle(dissect_PagingeDRXInformation_PDU, proto_xnap));
|
||||
dissector_add_uint("xnap.ies", id_CHO_MRDC_EarlyDataForwarding, create_dissector_handle(dissect_CHO_MRDC_EarlyDataForwarding_PDU, proto_xnap));
|
||||
dissector_add_uint("xnap.ies", id_SCGIndicator, create_dissector_handle(dissect_SCGIndicator_PDU, proto_xnap));
|
||||
dissector_add_uint("xnap.ies", id_UESpecificDRX, create_dissector_handle(dissect_UESpecificDRX_PDU, proto_xnap));
|
||||
dissector_add_uint("xnap.extension", id_Additional_UL_NG_U_TNLatUPF_List, create_dissector_handle(dissect_Additional_UL_NG_U_TNLatUPF_List_PDU, proto_xnap));
|
||||
dissector_add_uint("xnap.extension", id_SecondarydataForwardingInfoFromTarget_List, create_dissector_handle(dissect_SecondarydataForwardingInfoFromTarget_List_PDU, proto_xnap));
|
||||
dissector_add_uint("xnap.extension", id_LastE_UTRANPLMNIdentity, create_dissector_handle(dissect_PLMN_Identity_PDU, proto_xnap));
|
||||
|
|
|
|||
Loading…
Reference in New Issue