XnAP: upgrade dissector to v16.8.0

This commit is contained in:
Pascal Quantin 2022-01-03 18:27:54 +01:00 committed by A Wireshark GitLab Utility
parent 345326697c
commit 4942262c18
9 changed files with 262 additions and 50 deletions

View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V16.7.0 (2021-10)
-- 3GPP TS 38.423 V16.8.0 (2021-12)
-- 9.3.6 Common definitions
-- **************************************************************
--

View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V16.7.0 (2021-10)
-- 3GPP TS 38.423 V16.8.0 (2021-12)
-- 9.3.7 Constant definitions
-- **************************************************************
--
@ -137,6 +137,7 @@ maxnoofAdditionalPDCPDuplicationTNL INTEGER ::= 2
maxnoofRLCDuplicationstate INTEGER ::= 3
maxnoofWLANName INTEGER ::= 4
maxnoofNonAnchorCarrierFreqConfig INTEGER ::= 15
maxnoofDataForwardingTunneltoE-UTRAN INTEGER ::= 256
-- **************************************************************
--
@ -396,5 +397,7 @@ id-SCGIndicator ProtocolIE-ID ::= 247
id-UESpecificDRX ProtocolIE-ID ::= 248
id-PDUSessionExpectedUEActivityBehaviour ProtocolIE-ID ::= 249
id-QoS-Mapping-Information ProtocolIE-ID ::= 250
id-AdditionLocationInformation ProtocolIE-ID ::= 251
id-dataForwardingInfoFromTargetE-UTRANnode ProtocolIE-ID ::= 252
END

View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V16.7.0 (2021-10)
-- 3GPP TS 38.423 V16.8.0 (2021-12)
-- 9.3.8 Container definitions
-- **************************************************************
--

View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V16.7.0 (2021-10)
-- 3GPP TS 38.423 V16.8.0 (2021-12)
-- 9.3.5 Information Element definitions
-- **************************************************************
--
@ -89,6 +89,9 @@ IMPORTS
id-UL-scheduling-PDCCH-CCE-usage,
id-SFN-Offset,
id-QoS-Mapping-Information,
id-AdditionLocationInformation,
id-dataForwardingInfoFromTargetE-UTRANnode,
id-Cause,
maxEARFCN,
maxnoofAllowedAreas,
maxnoofAMFRegions,
@ -153,7 +156,8 @@ IMPORTS
maxnoofSensorName,
maxnoofNeighPCIforMDT,
maxnoofFreqforMDT,
maxnoofNonAnchorCarrierFreqConfig
maxnoofNonAnchorCarrierFreqConfig,
maxnoofDataForwardingTunneltoE-UTRAN
FROM XnAP-Constants
@ -173,6 +177,11 @@ FROM XnAP-Containers;
-- A
AdditionLocationInformation ::= ENUMERATED {
includePSCell,
...
}
Additional-PDCP-Duplication-TNL-List ::= SEQUENCE (SIZE(1..maxnoofAdditionalPDCPDuplicationTNL)) OF Additional-PDCP-Duplication-TNL-Item
Additional-PDCP-Duplication-TNL-Item ::= SEQUENCE {
additional-PDCP-Duplication-UP-TNL-Information UPTransportLayerInformation,
@ -483,7 +492,7 @@ CapacityValue ::= INTEGER (0..100)
CapacityValueInfo ::= SEQUENCE {
capacityValue CapacityValue,
ssbAreaCapacityValueList SSBAreaCapacityValue-List OPTIONAL,
iE-Extension ProtocolExtensionContainer { {CapacityValueInfo-ExtIEs} } OPTIONAL,
iE-Extension ProtocolExtensionContainer { {CapacityValueInfo-ExtIEs} } OPTIONAL,
...
}
@ -679,12 +688,12 @@ CellMeasurementResult ::= SEQUENCE (SIZE(1..maxnoofCellsinNG-RANnode)) OF CellMe
CellMeasurementResult-Item ::= SEQUENCE {
cell-ID GlobalNG-RANCell-ID,
radioResourceStatus RadioResourceStatus OPTIONAL,
tNLCapacityIndicator TNLCapacityIndicator OPTIONAL,
compositeAvailableCapacityGroup CompositeAvailableCapacityGroup OPTIONAL,
sliceAvailableCapacity SliceAvailableCapacity OPTIONAL,
numberofActiveUEs NumberofActiveUEs OPTIONAL,
rRCConnections RRCConnections OPTIONAL,
radioResourceStatus RadioResourceStatus OPTIONAL,
tNLCapacityIndicator TNLCapacityIndicator OPTIONAL,
compositeAvailableCapacityGroup CompositeAvailableCapacityGroup OPTIONAL,
sliceAvailableCapacity SliceAvailableCapacity OPTIONAL,
numberofActiveUEs NumberofActiveUEs OPTIONAL,
rRCConnections RRCConnections OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { CellMeasurementResult-Item-ExtIEs} } OPTIONAL,
...
}
@ -699,8 +708,8 @@ CellToReport ::= SEQUENCE (SIZE(1..maxnoofCellsinNG-RANnode)) OF CellToReport-It
CellToReport-Item ::= SEQUENCE {
cell-ID GlobalNG-RANCell-ID,
sSBToReport-List SSBToReport-List OPTIONAL,
sliceToReport-List SliceToReport-List OPTIONAL,
sSBToReport-List SSBToReport-List OPTIONAL,
sliceToReport-List SliceToReport-List OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { CellToReport-Item-ExtIEs} } OPTIONAL,
...
}
@ -902,12 +911,47 @@ XnUAddressInfoperPDUSession-Item ::= SEQUENCE {
XnUAddressInfoperPDUSession-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
{ ID id-SecondarydataForwardingInfoFromTarget-List CRITICALITY ignore EXTENSION SecondarydataForwardingInfoFromTarget-List PRESENCE optional}|
{ ID id-DRB-IDs-takenintouse CRITICALITY reject EXTENSION DRB-List PRESENCE optional},
{ ID id-DRB-IDs-takenintouse CRITICALITY reject EXTENSION DRB-List PRESENCE optional}|
{ ID id-dataForwardingInfoFromTargetE-UTRANnode CRITICALITY ignore EXTENSION DataForwardingInfoFromTargetE-UTRANnode PRESENCE optional},
...
}
DataForwardingAccepted ::= ENUMERATED {data-forwarding-accepted, ...}
DataForwardingInfoFromTargetE-UTRANnode ::= SEQUENCE {
dataForwardingInfoFromTargetE-UTRANnode-List DataForwardingInfoFromTargetE-UTRANnode-List,
iE-Extension ProtocolExtensionContainer { { DataForwardingInfoFromTargetE-UTRANnode-ExtIEs} } OPTIONAL,
...
}
DataForwardingInfoFromTargetE-UTRANnode-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
DataForwardingInfoFromTargetE-UTRANnode-List ::= SEQUENCE (SIZE(1.. maxnoofDataForwardingTunneltoE-UTRAN)) OF DataForwardingInfoFromTargetE-UTRANnode-Item
DataForwardingInfoFromTargetE-UTRANnode-Item ::= SEQUENCE {
dlForwardingUPTNLInformation UPTransportLayerInformation,
qosFlowsToBeForwarded-List QoSFlowsToBeForwarded-List,
iE-Extension ProtocolExtensionContainer { { DataForwardingInfoFromTargetE-UTRANnode-Item-ExtIEs} } OPTIONAL,
...
}
DataForwardingInfoFromTargetE-UTRANnode-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
QoSFlowsToBeForwarded-List ::= SEQUENCE (SIZE(1..maxnoofQoSFlows)) OF QoSFlowsToBeForwarded-Item
QoSFlowsToBeForwarded-Item ::= SEQUENCE {
qosFlowIdentifier QoSFlowIdentifier,
iE-Extension ProtocolExtensionContainer { { QoSFlowsToBeForwarded-Item-ExtIEs} } OPTIONAL,
...
}
QoSFlowsToBeForwarded-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
}
DataForwardingInfoFromTargetNGRANnode ::= SEQUENCE {
qosFlowsAcceptedForDataForwarding-List QoSFLowsAcceptedToBeForwarded-List,
@ -1722,6 +1766,7 @@ LocationReportingInformation ::= SEQUENCE {
}
LocationReportingInformation-ExtIEs XNAP-PROTOCOL-EXTENSION ::={
{ ID id-AdditionLocationInformation CRITICALITY ignore EXTENSION AdditionLocationInformation PRESENCE optional},
...
}
@ -2392,8 +2437,8 @@ UL-scheduling-PDCCH-CCE-usage ::= INTEGER (0.. 100)
TNLCapacityIndicator ::= SEQUENCE {
dLTNLOfferedCapacity OfferedCapacity,
dLTNLAvailableCapacity AvailableCapacity,
uLTNLOfferedCapacity OfferedCapacity,
dLTNLAvailableCapacity AvailableCapacity,
uLTNLOfferedCapacity OfferedCapacity,
uLTNLAvailableCapacity AvailableCapacity,
iE-Extensions ProtocolExtensionContainer { { TNLCapacityIndicator-ExtIEs} } OPTIONAL,
...
@ -2693,7 +2738,7 @@ NonGBRResources-Offered ::= ENUMERATED {true, ...}
NRV2XServicesAuthorized ::= SEQUENCE {
vehicleUE VehicleUE OPTIONAL,
pedestrianUE PedestrianUE OPTIONAL,
pedestrianUE PedestrianUE OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {NRV2XServicesAuthorized-ExtIEs} } OPTIONAL,
...
}
@ -2957,7 +3002,8 @@ PDUSession-List-withDataForwardingRequest-Item ::= SEQUENCE {
}
PDUSession-List-withDataForwardingRequest-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
...
{ID id-Cause CRITICALITY ignore EXTENSION Cause PRESENCE optional},
...
}
@ -3938,10 +3984,10 @@ QoSFlowwithCause-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
}
QoS-Mapping-Information ::= SEQUENCE {
dscp BIT STRING (SIZE(6)) OPTIONAL,
flow-label BIT STRING (SIZE(20)) OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {QoS-Mapping-Information-ExtIEs} } OPTIONAL,
...
dscp BIT STRING (SIZE(6)) OPTIONAL,
flow-label BIT STRING (SIZE(20)) OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {QoS-Mapping-Information-ExtIEs} } OPTIONAL,
...
}
QoS-Mapping-Information-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
@ -4126,7 +4172,7 @@ ReportCharacteristics ::= BIT STRING(SIZE(32))
ReportingPeriodicity ::= ENUMERATED {
half-thousand-ms,
one-thousand-ms,
one-thousand-ms,
two-thousand-ms,
five-thousand-ms,
ten-thousand-ms,
@ -4840,8 +4886,8 @@ S-NSSAI-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
}
SNTriggered ::=ENUMERATED{
true,
...
true,
...
}
SpecialSubframeInfo-E-UTRA ::= SEQUENCE {
@ -4885,8 +4931,8 @@ SplitSRBsTypes ::= ENUMERATED {srb1, srb2, srb1and2, ...}
SSBAreaCapacityValue-List ::= SEQUENCE (SIZE(1..maxnoofSSBAreas)) OF SSBAreaCapacityValue-List-Item
SSBAreaCapacityValue-List-Item ::= SEQUENCE {
sSBIndex INTEGER(0..63),
ssbAreaCapacityValue INTEGER (0..100),
sSBIndex INTEGER(0..63),
ssbAreaCapacityValue INTEGER (0..100),
iE-Extensions ProtocolExtensionContainer { { SSBAreaCapacityValue-List-Item-ExtIEs} } OPTIONAL,
...
}
@ -4901,9 +4947,9 @@ SSBAreaRadioResourceStatus-List ::= SEQUENCE (SIZE(1..maxnoofSSBAreas)) OF SSBAr
SSBAreaRadioResourceStatus-List-Item ::= SEQUENCE {
sSBIndex INTEGER(0..63),
ssb-Area-DL-GBR-PRB-usage DL-GBR-PRB-usage,
ssb-Area-UL-GBR-PRB-usage UL-GBR-PRB-usage,
ssb-Area-dL-non-GBR-PRB-usage DL-non-GBR-PRB-usage,
ssb-Area-DL-GBR-PRB-usage DL-GBR-PRB-usage,
ssb-Area-UL-GBR-PRB-usage UL-GBR-PRB-usage,
ssb-Area-dL-non-GBR-PRB-usage DL-non-GBR-PRB-usage,
ssb-Area-uL-non-GBR-PRB-usage UL-non-GBR-PRB-usage,
ssb-Area-dL-Total-PRB-usage DL-Total-PRB-usage,
ssb-Area-uL-Total-PRB-usage UL-Total-PRB-usage,

View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V16.7.0 (2021-10)
-- 3GPP TS 38.423 V16.8.0 (2021-12)
-- 9.3.4 PDU Definitions
-- **************************************************************
--
@ -414,8 +414,8 @@ HandoverRequest-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-UEHistoryInformation CRITICALITY ignore TYPE UEHistoryInformation PRESENCE mandatory}|
{ ID id-UEContextRefAtSN-HORequest CRITICALITY ignore TYPE UEContextRefAtSN-HORequest PRESENCE optional }|
{ ID id-CHOinformation-Req CRITICALITY reject TYPE CHOinformation-Req PRESENCE optional }|
{ ID id-NRV2XServicesAuthorized CRITICALITY ignore TYPE NRV2XServicesAuthorized PRESENCE optional }|
{ ID id-LTEV2XServicesAuthorized CRITICALITY ignore TYPE LTEV2XServicesAuthorized PRESENCE optional }|
{ ID id-NRV2XServicesAuthorized CRITICALITY ignore TYPE NRV2XServicesAuthorized PRESENCE optional }|
{ ID id-LTEV2XServicesAuthorized CRITICALITY ignore TYPE LTEV2XServicesAuthorized PRESENCE optional }|
{ ID id-PC5QoSParameters CRITICALITY ignore TYPE PC5QoSParameters PRESENCE optional }|
{ ID id-MobilityInformation CRITICALITY ignore TYPE MobilityInformation PRESENCE optional}|
{ ID id-UEHistoryInformationFromTheUE CRITICALITY ignore TYPE UEHistoryInformationFromTheUE PRESENCE optional }|
@ -711,8 +711,8 @@ RetrieveUEContextResponse-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-MaskedIMEISV CRITICALITY ignore TYPE MaskedIMEISV PRESENCE optional }|
{ ID id-LocationReportingInformation CRITICALITY ignore TYPE LocationReportingInformation PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
{ ID id-NRV2XServicesAuthorized CRITICALITY ignore TYPE NRV2XServicesAuthorized PRESENCE optional}|
{ ID id-LTEV2XServicesAuthorized CRITICALITY ignore TYPE LTEV2XServicesAuthorized PRESENCE optional}|
{ ID id-NRV2XServicesAuthorized CRITICALITY ignore TYPE NRV2XServicesAuthorized PRESENCE optional}|
{ ID id-LTEV2XServicesAuthorized CRITICALITY ignore TYPE LTEV2XServicesAuthorized PRESENCE optional}|
{ ID id-PC5QoSParameters CRITICALITY ignore TYPE PC5QoSParameters PRESENCE optional }|
{ ID id-UEHistoryInformation CRITICALITY ignore TYPE UEHistoryInformation PRESENCE optional}|
{ ID id-UEHistoryInformationFromTheUE CRITICALITY ignore TYPE UEHistoryInformationFromTheUE PRESENCE optional }|
@ -2421,7 +2421,7 @@ ResourceStatusUpdate ::= SEQUENCE {
ResourceStatusUpdate-IEs XNAP-PROTOCOL-IES ::= {
{ ID id-NGRAN-Node1-Measurement-ID CRITICALITY reject TYPE Measurement-ID PRESENCE mandatory}|
{ ID id-NGRAN-Node2-Measurement-ID CRITICALITY reject TYPE Measurement-ID PRESENCE mandatory}|
{ ID id-CellMeasurementResult CRITICALITY ignore TYPE CellMeasurementResult PRESENCE mandatory},
{ ID id-CellMeasurementResult CRITICALITY ignore TYPE CellMeasurementResult PRESENCE mandatory},
...
}

View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.423 V16.7.0 (2021-10)
-- 3GPP TS 38.423 V16.8.0 (2021-12)
-- 9.3.3 Elementary Procedure Definitions
-- **************************************************************
--
@ -527,7 +527,7 @@ mobilitySettingsChange XNAP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE MobilityChangeRequest
SUCCESSFUL OUTCOME MobilityChangeAcknowledge
UNSUCCESSFUL OUTCOME MobilityChangeFailure
PROCEDURE CODE id-mobilitySettingsChange
PROCEDURE CODE id-mobilitySettingsChange
CRITICALITY reject
}

View File

@ -1,7 +1,7 @@
/* packet-xnap.c
* Routines for dissecting NG-RAN Xn application protocol (XnAP)
* 3GPP TS 38.423 packet dissection
* Copyright 2018-2021, Pascal Quantin <pascal@wireshark.org>
* Copyright 2018-2022, Pascal Quantin <pascal@wireshark.org>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -10,7 +10,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref:
* 3GPP TS 38.423 V16.7.0 (2021-10)
* 3GPP TS 38.423 V16.8.0 (2021-12)
*/
#include "config.h"

View File

@ -1,6 +1,6 @@
# xnap.cnf
# xnap conformation file
# Copyright 2018-2021 Pascal Quantin
# Copyright 2018-2022 Pascal Quantin
#.OPT
PER
@ -1218,6 +1218,8 @@ id-SCGIndicator ProtocolIE-ID
id-UESpecificDRX ProtocolIE-ID
id-PDUSessionExpectedUEActivityBehaviour ProtocolIE-ID
id-QoS-Mapping-Information ProtocolIE-ID
id-AdditionLocationInformation ProtocolIE-ID
id-dataForwardingInfoFromTargetE-UTRANnode ProtocolIE-ID
#.REGISTER
@ -1477,6 +1479,9 @@ SFN-Offset N xnap.extension id-SFN-Offset
QoSMonitoringDisabled N xnap.extension id-QoSMonitoringDisabled
ExpectedUEActivityBehaviour N xnap.extension id-PDUSessionExpectedUEActivityBehaviour
QoS-Mapping-Information N xnap.extension id-QoS-Mapping-Information
Cause N xnap.extension id-Cause
AdditionLocationInformation N xnap.extension id-AdditionLocationInformation
DataForwardingInfoFromTargetE-UTRANnode N xnap.extension id-dataForwardingInfoFromTargetE-UTRANnode
#XNAP-ELEMENTARY-PROCEDURE
HandoverRequest N xnap.proc.imsg id-handoverPreparation

View File

@ -9,7 +9,7 @@
/* packet-xnap.c
* Routines for dissecting NG-RAN Xn application protocol (XnAP)
* 3GPP TS 38.423 packet dissection
* Copyright 2018-2021, Pascal Quantin <pascal@wireshark.org>
* Copyright 2018-2022, Pascal Quantin <pascal@wireshark.org>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -18,7 +18,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref:
* 3GPP TS 38.423 V16.7.0 (2021-10)
* 3GPP TS 38.423 V16.8.0 (2021-12)
*/
#include "config.h"
@ -124,6 +124,7 @@
#define maxnoofRLCDuplicationstate 3
#define maxnoofWLANName 4
#define maxnoofNonAnchorCarrierFreqConfig 15
#define maxnoofDataForwardingTunneltoE_UTRAN 256
typedef enum _ProcedureCode_enum {
id_handoverPreparation = 0,
@ -417,7 +418,9 @@ typedef enum _ProtocolIE_ID_enum {
id_SCGIndicator = 247,
id_UESpecificDRX = 248,
id_PDUSessionExpectedUEActivityBehaviour = 249,
id_QoS_Mapping_Information = 250
id_QoS_Mapping_Information = 250,
id_AdditionLocationInformation = 251,
id_dataForwardingInfoFromTargetE_UTRANnode = 252
} ProtocolIE_ID_enum;
typedef enum _GlobalNG_RANNode_ID_enum {
@ -462,6 +465,7 @@ static int hf_xnap_ReportCharacteristics_Reserved = -1;
/*--- Included file: packet-xnap-hf.c ---*/
#line 1 "./asn1/xnap/packet-xnap-hf.c"
static int hf_xnap_AdditionLocationInformation_PDU = -1; /* AdditionLocationInformation */
static int hf_xnap_Additional_PDCP_Duplication_TNL_List_PDU = -1; /* Additional_PDCP_Duplication_TNL_List */
static int hf_xnap_Additional_UL_NG_U_TNLatUPF_List_PDU = -1; /* Additional_UL_NG_U_TNLatUPF_List */
static int hf_xnap_ActivationIDforCellActivation_PDU = -1; /* ActivationIDforCellActivation */
@ -487,6 +491,7 @@ static int hf_xnap_CriticalityDiagnostics_PDU = -1; /* CriticalityDiagnostics *
static int hf_xnap_C_RNTI_PDU = -1; /* C_RNTI */
static int hf_xnap_CSI_RSTransmissionIndication_PDU = -1; /* CSI_RSTransmissionIndication */
static int hf_xnap_XnUAddressInfoperPDUSession_List_PDU = -1; /* XnUAddressInfoperPDUSession_List */
static int hf_xnap_DataForwardingInfoFromTargetE_UTRANnode_PDU = -1; /* DataForwardingInfoFromTargetE_UTRANnode */
static int hf_xnap_DAPSRequestInfo_PDU = -1; /* DAPSRequestInfo */
static int hf_xnap_DAPSResponseInfo_List_PDU = -1; /* DAPSResponseInfo_List */
static int hf_xnap_DesiredActNotificationLevel_PDU = -1; /* DesiredActNotificationLevel */
@ -875,12 +880,17 @@ static int hf_xnap_XnUAddressInfoperPDUSession_List_item = -1; /* XnUAddressInf
static int hf_xnap_pduSession_ID = -1; /* PDUSession_ID */
static int hf_xnap_dataForwardingInfoFromTargetNGRANnode = -1; /* DataForwardingInfoFromTargetNGRANnode */
static int hf_xnap_pduSessionResourceSetupCompleteInfo_SNterm = -1; /* PDUSessionResourceBearerSetupCompleteInfo_SNterminated */
static int hf_xnap_dataForwardingInfoFromTargetE_UTRANnode_List = -1; /* DataForwardingInfoFromTargetE_UTRANnode_List */
static int hf_xnap_DataForwardingInfoFromTargetE_UTRANnode_List_item = -1; /* DataForwardingInfoFromTargetE_UTRANnode_Item */
static int hf_xnap_dlForwardingUPTNLInformation = -1; /* UPTransportLayerInformation */
static int hf_xnap_qosFlowsToBeForwarded_List = -1; /* QoSFlowsToBeForwarded_List */
static int hf_xnap_QoSFlowsToBeForwarded_List_item = -1; /* QoSFlowsToBeForwarded_Item */
static int hf_xnap_qosFlowIdentifier = -1; /* QoSFlowIdentifier */
static int hf_xnap_qosFlowsAcceptedForDataForwarding_List = -1; /* QoSFLowsAcceptedToBeForwarded_List */
static int hf_xnap_pduSessionLevelDLDataForwardingInfo = -1; /* UPTransportLayerInformation */
static int hf_xnap_pduSessionLevelULDataForwardingInfo = -1; /* UPTransportLayerInformation */
static int hf_xnap_dataForwardingResponseDRBItemList = -1; /* DataForwardingResponseDRBItemList */
static int hf_xnap_QoSFLowsAcceptedToBeForwarded_List_item = -1; /* QoSFLowsAcceptedToBeForwarded_Item */
static int hf_xnap_qosFlowIdentifier = -1; /* QoSFlowIdentifier */
static int hf_xnap_qosFlowsToBeForwarded = -1; /* QoSFLowsToBeForwarded_List */
static int hf_xnap_sourceDRBtoQoSFlowMapping = -1; /* DRBToQoSFlowMapping_List */
static int hf_xnap_QoSFLowsToBeForwarded_List_item = -1; /* QoSFLowsToBeForwarded_Item */
@ -1791,6 +1801,11 @@ static gint ett_xnap_CriticalityDiagnostics_IE_List = -1;
static gint ett_xnap_CriticalityDiagnostics_IE_List_item = -1;
static gint ett_xnap_XnUAddressInfoperPDUSession_List = -1;
static gint ett_xnap_XnUAddressInfoperPDUSession_Item = -1;
static gint ett_xnap_DataForwardingInfoFromTargetE_UTRANnode = -1;
static gint ett_xnap_DataForwardingInfoFromTargetE_UTRANnode_List = -1;
static gint ett_xnap_DataForwardingInfoFromTargetE_UTRANnode_Item = -1;
static gint ett_xnap_QoSFlowsToBeForwarded_List = -1;
static gint ett_xnap_QoSFlowsToBeForwarded_Item = -1;
static gint ett_xnap_DataForwardingInfoFromTargetNGRANnode = -1;
static gint ett_xnap_QoSFLowsAcceptedToBeForwarded_List = -1;
static gint ett_xnap_QoSFLowsAcceptedToBeForwarded_Item = -1;
@ -2846,6 +2861,8 @@ static const value_string xnap_ProtocolIE_ID_vals[] = {
{ id_UESpecificDRX, "id-UESpecificDRX" },
{ id_PDUSessionExpectedUEActivityBehaviour, "id-PDUSessionExpectedUEActivityBehaviour" },
{ id_QoS_Mapping_Information, "id-QoS-Mapping-Information" },
{ id_AdditionLocationInformation, "id-AdditionLocationInformation" },
{ id_dataForwardingInfoFromTargetE_UTRANnode, "id-dataForwardingInfoFromTargetE-UTRANnode" },
{ 0, NULL }
};
@ -3013,6 +3030,21 @@ dissect_xnap_PrivateIE_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
}
static const value_string xnap_AdditionLocationInformation_vals[] = {
{ 0, "includePSCell" },
{ 0, NULL }
};
static int
dissect_xnap_AdditionLocationInformation(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_xnap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@ -6332,6 +6364,80 @@ dissect_xnap_XnUAddressInfoperPDUSession_List(tvbuff_t *tvb _U_, int offset _U_,
}
static const per_sequence_t QoSFlowsToBeForwarded_Item_sequence[] = {
{ &hf_xnap_qosFlowIdentifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_xnap_QoSFlowIdentifier },
{ &hf_xnap_iE_Extension , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_xnap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
static int
dissect_xnap_QoSFlowsToBeForwarded_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_xnap_QoSFlowsToBeForwarded_Item, QoSFlowsToBeForwarded_Item_sequence);
return offset;
}
static const per_sequence_t QoSFlowsToBeForwarded_List_sequence_of[1] = {
{ &hf_xnap_QoSFlowsToBeForwarded_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_xnap_QoSFlowsToBeForwarded_Item },
};
static int
dissect_xnap_QoSFlowsToBeForwarded_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_xnap_QoSFlowsToBeForwarded_List, QoSFlowsToBeForwarded_List_sequence_of,
1, maxnoofQoSFlows, FALSE);
return offset;
}
static const per_sequence_t DataForwardingInfoFromTargetE_UTRANnode_Item_sequence[] = {
{ &hf_xnap_dlForwardingUPTNLInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_xnap_UPTransportLayerInformation },
{ &hf_xnap_qosFlowsToBeForwarded_List, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_xnap_QoSFlowsToBeForwarded_List },
{ &hf_xnap_iE_Extension , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_xnap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
static int
dissect_xnap_DataForwardingInfoFromTargetE_UTRANnode_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_xnap_DataForwardingInfoFromTargetE_UTRANnode_Item, DataForwardingInfoFromTargetE_UTRANnode_Item_sequence);
return offset;
}
static const per_sequence_t DataForwardingInfoFromTargetE_UTRANnode_List_sequence_of[1] = {
{ &hf_xnap_DataForwardingInfoFromTargetE_UTRANnode_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_xnap_DataForwardingInfoFromTargetE_UTRANnode_Item },
};
static int
dissect_xnap_DataForwardingInfoFromTargetE_UTRANnode_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_xnap_DataForwardingInfoFromTargetE_UTRANnode_List, DataForwardingInfoFromTargetE_UTRANnode_List_sequence_of,
1, maxnoofDataForwardingTunneltoE_UTRAN, FALSE);
return offset;
}
static const per_sequence_t DataForwardingInfoFromTargetE_UTRANnode_sequence[] = {
{ &hf_xnap_dataForwardingInfoFromTargetE_UTRANnode_List, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_xnap_DataForwardingInfoFromTargetE_UTRANnode_List },
{ &hf_xnap_iE_Extension , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_xnap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
static int
dissect_xnap_DataForwardingInfoFromTargetE_UTRANnode(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_DataForwardingInfoFromTargetE_UTRANnode, DataForwardingInfoFromTargetE_UTRANnode_sequence);
return offset;
}
static const value_string xnap_DLForwarding_vals[] = {
{ 0, "dl-forwarding-proposed" },
{ 0, NULL }
@ -18186,6 +18292,14 @@ dissect_xnap_XnAP_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
/*--- PDUs ---*/
static int dissect_AdditionLocationInformation_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_AdditionLocationInformation(tvb, offset, &asn1_ctx, tree, hf_xnap_AdditionLocationInformation_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_Additional_PDCP_Duplication_TNL_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@ -18386,6 +18500,14 @@ static int dissect_XnUAddressInfoperPDUSession_List_PDU(tvbuff_t *tvb _U_, packe
offset += 7; offset >>= 3;
return offset;
}
static int dissect_DataForwardingInfoFromTargetE_UTRANnode_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_DataForwardingInfoFromTargetE_UTRANnode(tvb, offset, &asn1_ctx, tree, hf_xnap_DataForwardingInfoFromTargetE_UTRANnode_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_DAPSRequestInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@ -20610,6 +20732,10 @@ void proto_register_xnap(void) {
/*--- Included file: packet-xnap-hfarr.c ---*/
#line 1 "./asn1/xnap/packet-xnap-hfarr.c"
{ &hf_xnap_AdditionLocationInformation_PDU,
{ "AdditionLocationInformation", "xnap.AdditionLocationInformation",
FT_UINT32, BASE_DEC, VALS(xnap_AdditionLocationInformation_vals), 0,
NULL, HFILL }},
{ &hf_xnap_Additional_PDCP_Duplication_TNL_List_PDU,
{ "Additional-PDCP-Duplication-TNL-List", "xnap.Additional_PDCP_Duplication_TNL_List",
FT_UINT32, BASE_DEC, NULL, 0,
@ -20710,6 +20836,10 @@ void proto_register_xnap(void) {
{ "XnUAddressInfoperPDUSession-List", "xnap.XnUAddressInfoperPDUSession_List",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_xnap_DataForwardingInfoFromTargetE_UTRANnode_PDU,
{ "DataForwardingInfoFromTargetE-UTRANnode", "xnap.DataForwardingInfoFromTargetE_UTRANnode_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_xnap_DAPSRequestInfo_PDU,
{ "DAPSRequestInfo", "xnap.DAPSRequestInfo_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -22262,6 +22392,30 @@ void proto_register_xnap(void) {
{ "pduSessionResourceSetupCompleteInfo-SNterm", "xnap.pduSessionResourceSetupCompleteInfo_SNterm_element",
FT_NONE, BASE_NONE, NULL, 0,
"PDUSessionResourceBearerSetupCompleteInfo_SNterminated", HFILL }},
{ &hf_xnap_dataForwardingInfoFromTargetE_UTRANnode_List,
{ "dataForwardingInfoFromTargetE-UTRANnode-List", "xnap.dataForwardingInfoFromTargetE_UTRANnode_List",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_xnap_DataForwardingInfoFromTargetE_UTRANnode_List_item,
{ "DataForwardingInfoFromTargetE-UTRANnode-Item", "xnap.DataForwardingInfoFromTargetE_UTRANnode_Item_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_xnap_dlForwardingUPTNLInformation,
{ "dlForwardingUPTNLInformation", "xnap.dlForwardingUPTNLInformation",
FT_UINT32, BASE_DEC, VALS(xnap_UPTransportLayerInformation_vals), 0,
"UPTransportLayerInformation", HFILL }},
{ &hf_xnap_qosFlowsToBeForwarded_List,
{ "qosFlowsToBeForwarded-List", "xnap.qosFlowsToBeForwarded_List",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_xnap_QoSFlowsToBeForwarded_List_item,
{ "QoSFlowsToBeForwarded-Item", "xnap.QoSFlowsToBeForwarded_Item_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_xnap_qosFlowIdentifier,
{ "qosFlowIdentifier", "xnap.qosFlowIdentifier",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_xnap_qosFlowsAcceptedForDataForwarding_List,
{ "qosFlowsAcceptedForDataForwarding-List", "xnap.qosFlowsAcceptedForDataForwarding_List",
FT_UINT32, BASE_DEC, NULL, 0,
@ -22282,10 +22436,6 @@ void proto_register_xnap(void) {
{ "QoSFLowsAcceptedToBeForwarded-Item", "xnap.QoSFLowsAcceptedToBeForwarded_Item_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_xnap_qosFlowIdentifier,
{ "qosFlowIdentifier", "xnap.qosFlowIdentifier",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_xnap_qosFlowsToBeForwarded,
{ "qosFlowsToBeForwarded", "xnap.qosFlowsToBeForwarded",
FT_UINT32, BASE_DEC, NULL, 0,
@ -25567,6 +25717,11 @@ void proto_register_xnap(void) {
&ett_xnap_CriticalityDiagnostics_IE_List_item,
&ett_xnap_XnUAddressInfoperPDUSession_List,
&ett_xnap_XnUAddressInfoperPDUSession_Item,
&ett_xnap_DataForwardingInfoFromTargetE_UTRANnode,
&ett_xnap_DataForwardingInfoFromTargetE_UTRANnode_List,
&ett_xnap_DataForwardingInfoFromTargetE_UTRANnode_Item,
&ett_xnap_QoSFlowsToBeForwarded_List,
&ett_xnap_QoSFlowsToBeForwarded_Item,
&ett_xnap_DataForwardingInfoFromTargetNGRANnode,
&ett_xnap_QoSFLowsAcceptedToBeForwarded_List,
&ett_xnap_QoSFLowsAcceptedToBeForwarded_Item,
@ -26402,6 +26557,9 @@ proto_reg_handoff_xnap(void)
dissector_add_uint("xnap.extension", id_QoSMonitoringDisabled, create_dissector_handle(dissect_QoSMonitoringDisabled_PDU, proto_xnap));
dissector_add_uint("xnap.extension", id_PDUSessionExpectedUEActivityBehaviour, create_dissector_handle(dissect_ExpectedUEActivityBehaviour_PDU, proto_xnap));
dissector_add_uint("xnap.extension", id_QoS_Mapping_Information, create_dissector_handle(dissect_QoS_Mapping_Information_PDU, proto_xnap));
dissector_add_uint("xnap.extension", id_Cause, create_dissector_handle(dissect_Cause_PDU, proto_xnap));
dissector_add_uint("xnap.extension", id_AdditionLocationInformation, create_dissector_handle(dissect_AdditionLocationInformation_PDU, proto_xnap));
dissector_add_uint("xnap.extension", id_dataForwardingInfoFromTargetE_UTRANnode, create_dissector_handle(dissect_DataForwardingInfoFromTargetE_UTRANnode_PDU, proto_xnap));
dissector_add_uint("xnap.proc.imsg", id_handoverPreparation, create_dissector_handle(dissect_HandoverRequest_PDU, proto_xnap));
dissector_add_uint("xnap.proc.sout", id_handoverPreparation, create_dissector_handle(dissect_HandoverRequestAcknowledge_PDU, proto_xnap));
dissector_add_uint("xnap.proc.uout", id_handoverPreparation, create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_xnap));