osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

X2AP: upgrade dissector to v17.1.0

This commit is contained in:
Pascal Quantin 2022-08-12 16:44:14 +02:00
parent a9ea071b83
commit 7d1f5939ae
13 changed files with 3319 additions and 716 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
epan/dissectors/asn1/s1ap/packet-s1ap-template.c
View File

@ -116,6 +116,11 @@ static int hf_s1ap_NRintegrityProtectionAlgorithms_Reserved = -1;
static int hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_streaming_service = -1;
static int hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_MTSI_service = -1;
static int hf_s1ap_UE_Application_Layer_Measurement_Capability_Reserved = -1;
static int hf_s1ap_rAT_RestrictionInformation_LEO = -1;
static int hf_s1ap_rAT_RestrictionInformation_MEO = -1;
static int hf_s1ap_rAT_RestrictionInformation_GEO = -1;
static int hf_s1ap_rAT_RestrictionInformation_OTHERSAT = -1;
static int hf_s1ap_rAT_RestrictionInformation_Reserved = -1;
#include "packet-s1ap-hf.c"
/* Initialize the subtree pointers */
@ -161,6 +166,7 @@ static int ett_s1ap_excludedCellsToAddModList = -1;
static int ett_s1ap_NB_IoT_RLF_Report_Container = -1;
static int ett_s1ap_MDT_ConfigurationNR = -1;
static int ett_s1ap_IntersystemSONConfigurationTransfer = -1;
static int ett_s1ap_rAT_RestrictionInformation = -1;
#include "packet-s1ap-ett.c"
static expert_field ei_s1ap_number_pages_le15 = EI_INIT;
@ -705,6 +711,26 @@ void proto_register_s1ap(void) {
{ "Reserved", "s1ap.UE_Application_Layer_Measurement_Capability.Reserved",
FT_UINT8, BASE_HEX, NULL, 0x3f,
NULL, HFILL }},
{ &hf_s1ap_rAT_RestrictionInformation_LEO,
{ "LEO", "s1ap.rAT_RestrictionInformation.LEO",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x80,
NULL, HFILL }},
{ &hf_s1ap_rAT_RestrictionInformation_MEO,
{ "MEO", "s1ap.rAT_RestrictionInformation.MEO",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x40,
NULL, HFILL }},
{ &hf_s1ap_rAT_RestrictionInformation_GEO,
{ "GEO", "s1ap.rAT_RestrictionInformation.GEO",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x20,
NULL, HFILL }},
{ &hf_s1ap_rAT_RestrictionInformation_OTHERSAT,
{ "OTHERSAT", "s1ap.rAT_RestrictionInformation.OTHERSAT",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x10,
NULL, HFILL }},
{ &hf_s1ap_rAT_RestrictionInformation_Reserved,
{ "Reserved", "s1ap.rAT_RestrictionInformation.Reserved",
FT_UINT8, BASE_HEX, NULL, 0x0f,
NULL, HFILL }},
#include "packet-s1ap-hfarr.c"
};
@ -752,6 +778,7 @@ void proto_register_s1ap(void) {
&ett_s1ap_NB_IoT_RLF_Report_Container,
&ett_s1ap_MDT_ConfigurationNR,
&ett_s1ap_IntersystemSONConfigurationTransfer,
&ett_s1ap_rAT_RestrictionInformation,
#include "packet-s1ap-ettarr.c"
};

18
epan/dissectors/asn1/s1ap/s1ap.cnf
View File

@ -30,6 +30,7 @@ ImmediateMDT_PDU
LastVisitedEUTRANCellInformation_PDU
LastVisitedGERANCellInformation_PDU
MDTMode_PDU
PSCellInformation_PDU
SourceeNB-ToTargeteNB-TransparentContainer_PDU
SONConfigurationTransfer_PDU
SONtransferApplicationIdentity_PDU
@ -50,6 +51,7 @@ ImmediateMDT
LastVisitedEUTRANCellInformation
LastVisitedGERANCellInformation
MDTMode
PSCellInformation
S1AP-PDU
SourceeNB-ToTargeteNB-TransparentContainer
SONConfigurationTransfer
@ -706,6 +708,22 @@ Threshold-RSRP DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(s1ap_Threshold_RSRP_fmt)
#.TYPE_ATTR
Threshold-RSRQ DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(s1ap_Threshold_RSRQ_fmt)
#.FN_BODY RAT-RestrictionsItem/rAT-RestrictionInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s
if(parameter_tvb){
static int * const fields[] = {
&hf_s1ap_rAT_RestrictionInformation_LEO,
&hf_s1ap_rAT_RestrictionInformation_MEO,
&hf_s1ap_rAT_RestrictionInformation_GEO,
&hf_s1ap_rAT_RestrictionInformation_OTHERSAT,
&hf_s1ap_rAT_RestrictionInformation_Reserved,
NULL
};
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_rAT_RestrictionInformation);
proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 1, fields, ENC_BIG_ENDIAN);
}
# 9.2.3.24 RIM Information
# Contains the BSSGP RIM PDU
#.FN_BODY RIMInformation VAL_PTR = &parameter_tvb

6
epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.423 V16.9.0 (2022-04)
-- 3GPP TS 36.423 V17.1.0 (2022-06)
-- 9.3.6 Common definitions
-- **************************************************************
--
@ -7,10 +7,10 @@
-- **************************************************************
X2AP-CommonDataTypes {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) x2ap (2) version1 (1) x2ap-CommonDataTypes (3) }
DEFINITIONS AUTOMATIC TAGS ::=
DEFINITIONS AUTOMATIC TAGS ::=
BEGIN

43
epan/dissectors/asn1/x2ap/X2AP-Constants.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.423 V16.9.0 (2022-04)
-- 3GPP TS 36.423 V17.1.0 (2022-06)
-- 9.3.7 Constant definitions
-- **************************************************************
--
@ -7,10 +7,10 @@
-- **************************************************************
X2AP-Constants {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) x2ap (2) version1 (1) x2ap-Constants (4) }
DEFINITIONS AUTOMATIC TAGS ::=
DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
@ -82,6 +82,9 @@ id-endcresourceStatusReporting ProcedureCode ::= 53
id-endcresourceStatusReportingInitiation ProcedureCode ::= 54
id-f1CTrafficTransfer ProcedureCode ::= 55
id-UERadioCapabilityIDMapping ProcedureCode ::= 56
id-accessAndMobilityIndication ProcedureCode ::= 57
id-MIMOPRBusageInformation ProcedureCode ::= 58
id-CPC-cancel ProcedureCode ::= 59
-- **************************************************************
--
@ -145,6 +148,16 @@ maxnoofSSBAreas INTEGER ::= 64
maxnoofNRSCSs INTEGER ::= 5
maxnoofNRPhysicalResourceBlocks INTEGER ::= 275
maxnoofNonAnchorCarrierFreqConfig INTEGER ::= 15
maxnoofRACHReports INTEGER ::= 64
maxnoofPSCellsPerSN INTEGER ::= 8
maxnoofPSCellsPerPrimaryCellinUEHistoryInfo INTEGER ::= 8
maxnoofReportedNRCellsPossiblyAggregated INTEGER ::= 16
maxnoofPSCellCandidates INTEGER ::= 8
maxnoofTargetSgNBs INTEGER ::= 8
maxnoofMTCItems INTEGER ::= 16
maxnoofCSIRSconfigurations INTEGER ::= 96
maxnoofCSIRSneighbourCells INTEGER ::= 16
maxnoofCSIRSneighbourCellsInMTC INTEGER ::= 16
-- **************************************************************
--
@ -571,5 +584,29 @@ id-DirectForwardingPathAvailability ProtocolIE-ID ::= 410
id-sourceNG-RAN-node-id ProtocolIE-ID ::= 411
id-SourceDLForwardingIPAddress ProtocolIE-ID ::= 412
id-SourceNodeDLForwardingIPAddress ProtocolIE-ID ::= 413
id-NRRACHReportInformation ProtocolIE-ID ::= 414
id-SCG-UE-HistoryInformation ProtocolIE-ID ::= 415
id-PSCellHistoryInformationRetrieve ProtocolIE-ID ::= 416
id-MeasurementResultforNRCellsPossiblyAggregated ProtocolIE-ID ::= 417
id-PSCell-UE-HistoryInformation ProtocolIE-ID ::= 418
id-PSCellChangeHistory ProtocolIE-ID ::= 419
id-CHOinformation-AddReq ProtocolIE-ID ::= 420
id-CHOinformation-ModReq ProtocolIE-ID ::= 421
id-SCGActivationStatus ProtocolIE-ID ::= 422
id-SCGActivationRequest ProtocolIE-ID ::= 423
id-CPAinformation-REQ ProtocolIE-ID ::= 424
id-CPAinformation-REQ-ACK ProtocolIE-ID ::= 425
id-CPAinformation-MOD ProtocolIE-ID ::= 426
id-CPAinformation-MOD-ACK ProtocolIE-ID ::= 427
id-CPACinformation-REQD ProtocolIE-ID ::= 428
id-CPCinformation-REQD ProtocolIE-ID ::= 429
id-CPCinformation-CONF ProtocolIE-ID ::= 430
id-CPCinformation-NOTIFY ProtocolIE-ID ::= 431
id-CPCupdate-MOD ProtocolIE-ID ::= 432
id-Additional-Measurement-Timing-Configuration-List ProtocolIE-ID ::= 433
id-ServedCellSpecificInfoReq-NR ProtocolIE-ID ::= 434
id-SecurityIndication ProtocolIE-ID ::= 435
id-SecurityResult ProtocolIE-ID ::= 436
id-RAT-Restrictions ProtocolIE-ID ::= 437
END

18
epan/dissectors/asn1/x2ap/X2AP-Containers.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.423 V16.9.0 (2022-04)
-- 3GPP TS 36.423 V17.1.0 (2022-06)
-- 9.3.8 Container definitions
-- **************************************************************
--
@ -7,10 +7,10 @@
-- **************************************************************
X2AP-Containers {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) x2ap (2) version1 (1) x2ap-Containers (5) }
DEFINITIONS AUTOMATIC TAGS ::=
DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
@ -27,7 +27,7 @@ IMPORTS
Criticality,
Presence,
PrivateIE-ID,
ProtocolIE-ID
ProtocolIE-ID
FROM X2AP-CommonDataTypes;
-- **************************************************************
@ -116,11 +116,11 @@ WITH SYNTAX {
--
-- **************************************************************
ProtocolIE-Container {X2AP-PROTOCOL-IES : IEsSetParam} ::=
ProtocolIE-Container {X2AP-PROTOCOL-IES : IEsSetParam} ::=
SEQUENCE (SIZE (0..maxProtocolIEs)) OF
ProtocolIE-Field {{IEsSetParam}}
ProtocolIE-Single-Container {X2AP-PROTOCOL-IES : IEsSetParam} ::=
ProtocolIE-Single-Container {X2AP-PROTOCOL-IES : IEsSetParam} ::=
ProtocolIE-Field {{IEsSetParam}}
ProtocolIE-Field {X2AP-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
@ -135,7 +135,7 @@ ProtocolIE-Field {X2AP-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
--
-- **************************************************************
ProtocolIE-ContainerPair {X2AP-PROTOCOL-IES-PAIR : IEsSetParam} ::=
ProtocolIE-ContainerPair {X2AP-PROTOCOL-IES-PAIR : IEsSetParam} ::=
SEQUENCE (SIZE (0..maxProtocolIEs)) OF
ProtocolIE-FieldPair {{IEsSetParam}}
@ -167,7 +167,7 @@ ProtocolIE-ContainerPairList {INTEGER : lowerBound, INTEGER : upperBound, X2AP-P
--
-- **************************************************************
ProtocolExtensionContainer {X2AP-PROTOCOL-EXTENSION : ExtensionSetParam} ::=
ProtocolExtensionContainer {X2AP-PROTOCOL-EXTENSION : ExtensionSetParam} ::=
SEQUENCE (SIZE (1..maxProtocolExtensions)) OF
ProtocolExtensionField {{ExtensionSetParam}}
@ -183,7 +183,7 @@ ProtocolExtensionField {X2AP-PROTOCOL-EXTENSION : ExtensionSetParam} ::= SEQUENC
--
-- **************************************************************
PrivateIE-Container {X2AP-PRIVATE-IES : IEsSetParam} ::=
PrivateIE-Container {X2AP-PRIVATE-IES : IEsSetParam} ::=
SEQUENCE (SIZE (1..maxPrivateIEs)) OF
PrivateIE-Field {{IEsSetParam}}

431
epan/dissectors/asn1/x2ap/X2AP-IEs.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.423 V16.9.0 (2022-04)
-- 3GPP TS 36.423 V17.1.0 (2022-06)
-- 9.3.5 Information Element definitions
-- **************************************************************
--
@ -87,6 +87,15 @@ IMPORTS
id-TraceCollectionEntityURI,
id-SFN-Offset,
id-AdditionLocationInformation,
id-SSB-PositionsInBurst,
id-NRCellPRACHConfig,
id-ULCarrierList,
id-TDDULDLConfigurationCommonNR,
id-MIMOPRBusageInformation,
id-Additional-Measurement-Timing-Configuration-List,
id-ServedCellSpecificInfoReq-NR,
id-RAT-Restrictions,
id-PSCell-UE-HistoryInformation,
maxnoofBearers,
maxCellineNB,
@ -139,7 +148,18 @@ IMPORTS
maxnoofSSBAreas,
maxnoofNRSCSs,
maxnoofNRPhysicalResourceBlocks,
maxnoofNonAnchorCarrierFreqConfig
maxnoofNonAnchorCarrierFreqConfig,
maxnoofRACHReports,
maxnoofPSCellsPerSN,
maxnoofPSCellsPerPrimaryCellinUEHistoryInfo,
maxnoofReportedNRCellsPossiblyAggregated,
maxnoofPSCellCandidates,
maxnoofTargetSgNBs,
maxnoofMTCItems,
maxnoofCSIRSconfigurations,
maxnoofCSIRSneighbourCells,
maxnoofCSIRSneighbourCellsInMTC,
maxCellinengNB
FROM X2AP-Constants
@ -203,6 +223,60 @@ ABS-Status-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
ActivationID ::= INTEGER (0..255)
Additional-Measurement-Timing-Configuration-List ::= SEQUENCE (SIZE(1.. maxnoofMTCItems)) OF Additional-Measurement-Timing-Configuration-Item
Additional-Measurement-Timing-Configuration-Item ::= SEQUENCE {
additionalMeasurementTimingConfiguration INTEGER(0..16),
csi-RS-MTC-Configuration-List CSI-RS-MTC-Configuration-List,
iE-Extensions ProtocolExtensionContainer { { Additional-Measurement-Timing-Configuration-Item-ExtIEs} } OPTIONAL,
...
}
Additional-Measurement-Timing-Configuration-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CSI-RS-MTC-Configuration-List ::= SEQUENCE (SIZE(1.. maxnoofCSIRSconfigurations)) OF CSI-RS-MTC-Configuration-Item
CSI-RS-MTC-Configuration-Item ::= SEQUENCE {
csi-RS-Index INTEGER(0..95),
csi-RS-Status ENUMERATED {activated,deactivated, ...},
csi-RS-Neighbour-List CSI-RS-Neighbour-List OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { CSI-RS-MTC-Configuration-Item-ExtIEs} } OPTIONAL,
...
}
CSI-RS-MTC-Configuration-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CSI-RS-Neighbour-List ::= SEQUENCE (SIZE(1.. maxnoofCSIRSneighbourCells)) OF CSI-RS-Neighbour-Item
CSI-RS-Neighbour-Item ::= SEQUENCE {
nr-cgi NRCGI,
csi-RS-MTC-Neighbour-List CSI-RS-MTC-Neighbour-List OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { CSI-RS-Neighbour-Item-ExtIEs} } OPTIONAL,
...
}
CSI-RS-Neighbour-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CSI-RS-MTC-Neighbour-List ::= SEQUENCE (SIZE(1.. maxnoofCSIRSneighbourCellsInMTC)) OF CSI-RS-MTC-Neighbour-Item
CSI-RS-MTC-Neighbour-Item ::= SEQUENCE {
csi-RS-Index INTEGER(0..95),
iE-Extensions ProtocolExtensionContainer { { CSI-RS-MTC-Neighbour-Item-ExtIEs} } OPTIONAL,
...
}
CSI-RS-MTC-Neighbour-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
AdditionLocationInformation ::= ENUMERATED {
includePSCell,
...
@ -457,7 +531,10 @@ CauseRadioNetwork ::= ENUMERATED {
ue-power-saving,
insufficient-ue-capabilities,
normal-release,
unknown-E-UTRAN-Node-Measurement-ID
unknown-E-UTRAN-Node-Measurement-ID,
sCG-activation-deactivation-failure,
sCG-deactivation-failure-due-to-data-transmission,
up-integrity-protection-not-possible
}
@ -521,6 +598,176 @@ CellType-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CPACcandidatePSCells-list ::= SEQUENCE (SIZE(1..maxnoofPSCellCandidates)) OF CPACcandidatePSCells-item
CPACcandidatePSCells-item ::= SEQUENCE {
pscell-id NRCGI,
iE-Extensions ProtocolExtensionContainer { {CPACcandidatePSCells-item-ExtIEs}} OPTIONAL,
...
}
CPACcandidatePSCells-item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CPCindicator ::= ENUMERATED {cpc-initiation, cpc-modification, cpc-cancel, ...}
CPCdataforwarding ::= ENUMERATED {cpc-triggered, early-data-transmission-stop, ...}
CPAinformation-REQ ::= SEQUENCE {
max-no-of-pscells INTEGER (1..maxnoofPSCellCandidates),
estimatedArrivalProbability CHO-Probability OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {CPAinformation-REQ-ExtIEs} } OPTIONAL,
...
}
CPAinformation-REQ-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CPAinformation-REQ-ACK ::= SEQUENCE {
candidate-pscells CPACcandidatePSCells-list,
iE-Extensions ProtocolExtensionContainer { {CPAinformation-REQ-ACK-ExtIEs} } OPTIONAL,
...
}
CPAinformation-REQ-ACK-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CPCinformation-REQD ::= SEQUENCE {
cpc-target-sgnb-list CPC-target-SgNB-reqd-list,
iE-Extensions ProtocolExtensionContainer { {CPCinformation-REQD-ExtIEs} } OPTIONAL,
...
}
CPCinformation-REQD-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CPC-target-SgNB-reqd-list ::= SEQUENCE (SIZE(1..maxnoofTargetSgNBs)) OF CPC-target-SgNB-reqd-item
CPC-target-SgNB-reqd-item ::= SEQUENCE {
target-SgNB-ID GlobalGNB-ID,
cpc-indicator CPCindicator,
max-no-of-pscells INTEGER (1..maxnoofPSCellCandidates),
estimatedArrivalProbability CHO-Probability OPTIONAL,
sgNBtoMeNBContainer SgNBtoMeNBContainer,
iE-Extensions ProtocolExtensionContainer { {CPC-target-SgNB-reqd-item-ExtIEs} } OPTIONAL,
...
}
CPC-target-SgNB-reqd-item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CPCinformation-CONF ::= SEQUENCE {
cpc-target-sgnb-list CPC-target-SgNB-conf-list,
iE-Extensions ProtocolExtensionContainer { {CPCinformation-CONF-ExtIEs} } OPTIONAL,
...
}
CPCinformation-CONF-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CPC-target-SgNB-conf-list ::= SEQUENCE (SIZE(1..maxnoofTargetSgNBs)) OF CPC-target-SgNB-conf-item
CPC-target-SgNB-conf-item ::= SEQUENCE {
target-SgNB-ID GlobalGNB-ID,
candidate-pscells CPACcandidatePSCells-list,
iE-Extensions ProtocolExtensionContainer { {CPC-target-SgNB-conf-item-ExtIEs} } OPTIONAL,
...
}
CPC-target-SgNB-conf-item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CPCinformation-NOTIFY ::= SEQUENCE {
cpc-indicator CPCdataforwarding,
iE-Extensions ProtocolExtensionContainer { {CPCinformation-NOTIFY-ExtIEs} } OPTIONAL,
...
}
CPCinformation-NOTIFY-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CPAinformation-MOD ::= SEQUENCE {
max-no-of-pscells INTEGER (1..maxnoofPSCellCandidates) OPTIONAL,
estimatedArrivalProbability CHO-Probability OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {CPAinformation-MOD-ExtIEs} } OPTIONAL,
...
}
CPAinformation-MOD-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CPCupdate-MOD ::= SEQUENCE {
cpc-target-sgnb-list CPC-target-SgNB-mod-list,
iE-Extensions ProtocolExtensionContainer { {CPCupdate-MOD-ExtIEs} } OPTIONAL,
...
}
CPCupdate-MOD-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CPC-target-SgNB-mod-list ::= SEQUENCE (SIZE(1..maxnoofTargetSgNBs)) OF CPC-target-SgNB-mod-item
CPC-target-SgNB-mod-item ::= SEQUENCE {
target-SgNB-ID GlobalGNB-ID,
candidate-pscells CPACcandidatePSCells-list,
iE-Extensions ProtocolExtensionContainer { {CPC-target-SgNB-mod-item-ExtIEs} } OPTIONAL,
...
}
CPC-target-SgNB-mod-item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CPAinformation-MOD-ACK ::= SEQUENCE {
candidate-pscells CPACcandidatePSCells-list,
iE-Extensions ProtocolExtensionContainer { {CPAinformation-MOD-ACK-ExtIEs} } OPTIONAL,
...
}
CPAinformation-MOD-ACK-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CPACinformation-REQD ::= SEQUENCE {
candidate-pscells CPACcandidatePSCells-list,
iE-Extensions ProtocolExtensionContainer { { CPACinformation-REQD-ExtIEs} } OPTIONAL,
...
}
CPACinformation-REQD-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CHO-DC-EarlyDataForwarding ::= ENUMERATED {stop, ...}
CHO-DC-Indicator ::= ENUMERATED {true, ...}
@ -782,6 +1029,32 @@ CandidateCellsToBeCancelledList ::= SEQUENCE (SIZE (1..maxnoofCellsinCHO)) OF EC
CHO-Probability ::= INTEGER (1..100)
CHOinformation-AddReq ::= SEQUENCE {
source-eNB-ID GlobalENB-ID,
source-eNB-UE-X2AP-ID UE-X2AP-ID,
source-eNB-UE-X2AP-ID-Ext UE-X2AP-ID-Extension OPTIONAL,
cHO-EstimatedArrivalProbability CHO-Probability OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { CHOinformation-AddReq-ExtIEs} } OPTIONAL,
...
}
CHOinformation-AddReq-ExtIEs X2AP-PROTOCOL-EXTENSION ::={
...
}
CHOinformation-ModReq ::= SEQUENCE {
conditionalReconfig ENUMERATED {intra-mn-cho, ...},
cHO-EstimatedArrivalProbability CHO-Probability OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { CHOinformation-ModReq-ExtIEs} } OPTIONAL,
...
}
CHOinformation-ModReq-ExtIEs X2AP-PROTOCOL-EXTENSION ::={
...
}
CSI-RSTransmissionIndication ::= ENUMERATED {
activated,
deactivated,
@ -852,8 +1125,12 @@ DL-Forwarding ::= ENUMERATED {
DL-GBR-PRB-usage::= INTEGER (0..100)
DL-GBR-PRB-usage-for-MIMO::= INTEGER (0..100)
DL-non-GBR-PRB-usage::= INTEGER (0..100)
DL-non-GBR-PRB-usage-for-MIMO::= INTEGER (0..100)
DLResourceBitmapULandDLSharing ::= DataTrafficResources
DLResourcesULandDLSharing ::= CHOICE {
@ -866,6 +1143,8 @@ DL-scheduling-PDCCH-CCE-usage::= INTEGER (0..100)
DL-Total-PRB-usage::= INTEGER (0..100)
DL-Total-PRB-usage-for-MIMO::= INTEGER (0..100)
DRB-ID ::= INTEGER (1..32)
DuplicationActivation::= ENUMERATED {active, inactive, ...}
@ -1162,6 +1441,7 @@ FDD-InfoNeighbourServedNRCell-Information ::= SEQUENCE {
}
FDD-InfoNeighbourServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-ULCarrierList CRITICALITY ignore EXTENSION NRCarrierList PRESENCE optional },
...
}
@ -1371,7 +1651,8 @@ HandoverRestrictionList-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-CNTypeRestrictions CRITICALITY ignore EXTENSION CNTypeRestrictions PRESENCE optional}|
{ ID id-NRrestrictionin5GS CRITICALITY ignore EXTENSION NRrestrictionin5GS PRESENCE optional}|
{ ID id-LastNG-RANPLMNIdentity CRITICALITY ignore EXTENSION PLMN-Identity PRESENCE optional}|
{ ID id-UnlicensedSpectrumRestriction CRITICALITY ignore EXTENSION UnlicensedSpectrumRestriction PRESENCE optional},
{ ID id-UnlicensedSpectrumRestriction CRITICALITY ignore EXTENSION UnlicensedSpectrumRestriction PRESENCE optional}|
{ ID id-RAT-Restrictions CRITICALITY ignore EXTENSION RAT-Restrictions PRESENCE optional},
...
}
@ -1405,6 +1686,19 @@ IMSvoiceEPSfallbackfrom5G ::= ENUMERATED {
IntegrityProtectionAlgorithms ::= BIT STRING (SIZE (16, ...))
IntegrityProtectionIndication ::= ENUMERATED {
required,
preferred,
notneeded,
...
}
IntegrityProtectionResult ::= ENUMERATED {
performed,
notperformed,
...
}
IntendedTDD-DL-ULConfiguration-NR ::= OCTET STRING
InterfaceInstanceIndication ::= INTEGER (0..255, ...)
@ -1425,6 +1719,8 @@ Key-eNodeB-Star ::= BIT STRING (SIZE(256))
-- L
LastVisitedPSCell-Item ::= OCTET STRING
LAC ::= OCTET STRING (SIZE (2)) --(EXCEPT ('0000'H|'FFFE'H))
LastVisitedCell-Item ::= CHOICE {
@ -1446,7 +1742,8 @@ LastVisitedEUTRANCellInformation ::= SEQUENCE {
LastVisitedEUTRANCellInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-- Extension for Rel-11 to support enhanced granularity for time UE stayed in cell --
{ ID id-Time-UE-StayedInCell-EnhancedGranularity CRITICALITY ignore EXTENSION Time-UE-StayedInCell-EnhancedGranularity PRESENCE optional}|
{ ID id-HO-cause CRITICALITY ignore EXTENSION Cause PRESENCE optional},
{ ID id-HO-cause CRITICALITY ignore EXTENSION Cause PRESENCE optional}|
{ ID id-PSCell-UE-HistoryInformation CRITICALITY ignore EXTENSION PSCell-UE-HistoryInformation PRESENCE optional},
...
}
@ -1874,6 +2171,21 @@ NRCGI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
NRRACHReportContainer ::= OCTET STRING
NRRACHReportInformation ::= SEQUENCE (SIZE(1.. maxnoofRACHReports)) OF NRRACHReportList-Item
NRRACHReportList-Item ::= SEQUENCE {
nRRACHReport NRRACHReportContainer,
uEAssitantIdentifier SgNB-UE-X2AP-ID OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { NRRACHReportList-Item-ExtIEs} } OPTIONAL,
...
}
NRRACHReportList-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
NRNeighbour-Information ::= SEQUENCE (SIZE (1.. maxofNRNeighbours))OF SEQUENCE {
nrpCI NRPCI,
nrCellID NRCGI,
@ -1890,7 +2202,10 @@ NRNeighbour-Information ::= SEQUENCE (SIZE (1.. maxofNRNeighbours))OF SEQUENCE {
}
NRNeighbour-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ID id-CSI-RSTransmissionIndication CRITICALITY ignore EXTENSION CSI-RSTransmissionIndication PRESENCE optional},
{ID id-CSI-RSTransmissionIndication CRITICALITY ignore EXTENSION CSI-RSTransmissionIndication PRESENCE optional}|
{ID id-SSB-PositionsInBurst CRITICALITY ignore EXTENSION SSB-PositionsInBurst PRESENCE optional}|
{ID id-NRCellPRACHConfig CRITICALITY ignore EXTENSION NRCellPRACHConfig PRESENCE optional}|
{ID id-Additional-Measurement-Timing-Configuration-List CRITICALITY ignore EXTENSION Additional-Measurement-Timing-Configuration-List PRESENCE optional },
...
}
@ -1970,6 +2285,19 @@ NRrestrictioninEPSasSecondaryRAT ::= ENUMERATED {
...
}
MeasurementResultforNRCellsPossiblyAggregated ::= SEQUENCE (SIZE(1.. maxnoofReportedNRCellsPossiblyAggregated)) OF MeasurementResultforNRCellsPossiblyAggregated-Item
MeasurementResultforNRCellsPossiblyAggregated-Item ::= SEQUENCE {
cellID NRCGI,
nrCompositeAvailableCapacityGroup NRCompositeAvailableCapacityGroup OPTIONAL,
iE-Extension ProtocolExtensionContainer { { MeasurementResultforNRCellsPossiblyAggregated-Item-ExtIEs} } OPTIONAL,
...
}
MeasurementResultforNRCellsPossiblyAggregated-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
NRRadioResourceStatus ::= SEQUENCE {
ssbAreaRadioResourceStatus-List SSBAreaRadioResourceStatus-List,
iE-Extensions ProtocolExtensionContainer { {NRRadioResourceStatus-ExtIEs} } OPTIONAL,
@ -1977,9 +2305,24 @@ NRRadioResourceStatus ::= SEQUENCE {
}
NRRadioResourceStatus-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-MIMOPRBusageInformation CRITICALITY ignore EXTENSION MIMOPRBusageInformation PRESENCE optional },
...
}
MIMOPRBusageInformation ::= SEQUENCE {
dl-GBR-PRB-usage-for-MIMO DL-GBR-PRB-usage-for-MIMO,
ul-GBR-PRB-usage-for-MIMO UL-GBR-PRB-usage-for-MIMO,
dl-non-GBR-PRB-usage-for-MIMO DL-non-GBR-PRB-usage-for-MIMO,
ul-non-GBR-PRB-usage-for-MIMO UL-non-GBR-PRB-usage-for-MIMO,
dl-Total-PRB-usage-for-MIMO DL-Total-PRB-usage-for-MIMO,
ul-Total-PRB-usage-for-MIMO UL-Total-PRB-usage-for-MIMO,
iE-Extensions ProtocolExtensionContainer { { MIMOPRBusageInformation-ExtIEs} } OPTIONAL,
...
}
MIMOPRBusageInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
NRrestrictionin5GS ::= ENUMERATED {
nRrestrictedin5GS,
@ -2270,6 +2613,13 @@ PrivacyIndicator ::= ENUMERATED {
...
}
PSCellHistoryInformationRetrieve ::= ENUMERATED {query, ...}
PSCell-UE-HistoryInformation ::= SEQUENCE (SIZE(1.. maxnoofPSCellsPerPrimaryCellinUEHistoryInfo)) OF LastVisitedPSCell-Item
PSCellChangeHistory ::= ENUMERATED {reportingFullHistory,...}
-- Q
QCI ::= INTEGER (0..255)
@ -2321,6 +2671,19 @@ Range ::= ENUMERATED {m50, m80, m180, m200, m350, m400, m500, m700, m1000, ...}
RAN-UE-NGAP-ID ::= INTEGER (0..4294967295)
RAT-Restrictions ::= SEQUENCE (SIZE(1..maxnoofEPLMNsPlusOne)) OF RAT-RestrictionsItem
RAT-RestrictionsItem ::= SEQUENCE {
pLMN-Identity PLMN-Identity,
rAT-RestrictionInformation BIT STRING (SIZE(8, ...)),
iE-Extensions ProtocolExtensionContainer { { RAT-RestrictionsItem-ExtIEs} } OPTIONAL,
...
}
RAT-RestrictionsItem-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
ReceiveStatusofULPDCPSDUs ::= BIT STRING (SIZE(4096))
ReceiveStatusOfULPDCPSDUsExtended ::= BIT STRING (SIZE(1..16384))
@ -2527,8 +2890,17 @@ S1TNLLoadIndicator-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
SCGActivationStatus ::= ENUMERATED {scg-activated, scg-deactivated, ...}
SCGActivationRequest ::= ENUMERATED {activate-scg, deactivate-scg, ...}
SCGChangeIndication ::= ENUMERATED {pDCPCountWrapAround, pSCellChange, other, ...}
SCG-UE-HistoryInformation ::= SEQUENCE (SIZE(1.. maxnoofPSCellsPerSN)) OF LastVisitedPSCell-Item
SecondaryRATUsageReportList ::= SEQUENCE (SIZE(1..maxnoofBearers)) OF ProtocolIE-Single-Container {{SecondaryRATUsageReport-ItemIEs}}
SecondaryRATUsageReport-ItemIEs X2AP-PROTOCOL-IES ::= {
@ -2548,6 +2920,26 @@ SecondaryRATUsageReport-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
SecurityIndication ::= SEQUENCE {
integrityProtectionIndication IntegrityProtectionIndication,
iE-Extensions ProtocolExtensionContainer { { SecurityIndication-ExtIEs } } OPTIONAL,
...
}
SecurityIndication-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
SecurityResult ::= SEQUENCE {
integrityProtectionResult IntegrityProtectionResult,
iE-Extensions ProtocolExtensionContainer { {SecurityResult-ExtIEs} } OPTIONAL,
...
}
SecurityResult-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
SeNBSecurityKey ::= BIT STRING (SIZE(256))
SeNBtoMeNBContainer ::= OCTET STRING
@ -2561,7 +2953,8 @@ ServedCells ::= SEQUENCE (SIZE (1.. maxCellineNB)) OF SEQUENCE {
}
ServedCell-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-NRNeighbourInfoToAdd CRITICALITY ignore EXTENSION NRNeighbour-Information PRESENCE optional },
{ ID id-NRNeighbourInfoToAdd CRITICALITY ignore EXTENSION NRNeighbour-Information PRESENCE optional }|
{ ID id-ServedCellSpecificInfoReq-NR CRITICALITY ignore EXTENSION ServedCellSpecificInfoReq-NR PRESENCE optional },
...
}
@ -2591,6 +2984,20 @@ ServedCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
ServedCellSpecificInfoReq-NR ::= SEQUENCE (SIZE(1.. maxCellinengNB)) OF ServedCellSpecificInfoReq-NR-Item
ServedCellSpecificInfoReq-NR-Item ::= SEQUENCE {
nRCGI NRCGI,
additionalMTCListRequestIndicator ENUMERATED {additionalMTCListRequested, ...} OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { ServedCellSpecificInfoReq-NR-Item-ExtIEs} } OPTIONAL,
...
}
ServedCellSpecificInfoReq-NR-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
ServiceType ::= ENUMERATED{
qMC-for-streaming-service,
qMC-for-MTSI-service,
@ -2959,7 +3366,9 @@ TDD-InfoNeighbourServedNRCell-Information ::= SEQUENCE {
}
TDD-InfoNeighbourServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ID id-IntendedTDD-DL-ULConfiguration-NR CRITICALITY ignore EXTENSION IntendedTDD-DL-ULConfiguration-NR PRESENCE optional},
{ID id-IntendedTDD-DL-ULConfiguration-NR CRITICALITY ignore EXTENSION IntendedTDD-DL-ULConfiguration-NR PRESENCE optional}|
{ID id-TDDULDLConfigurationCommonNR CRITICALITY ignore EXTENSION TDDULDLConfigurationCommonNR PRESENCE optional}|
{ID id-CarrierList CRITICALITY ignore EXTENSION NRCarrierList PRESENCE optional},
...
}
@ -3282,6 +3691,8 @@ UL-UE-Configuration::= ENUMERATED { no-data, shared, only, ... }
UL-GBR-PRB-usage::= INTEGER (0..100)
UL-GBR-PRB-usage-for-MIMO::= INTEGER (0..100)
UL-HighInterferenceIndicationInfo ::= SEQUENCE (SIZE(1..maxCellineNB)) OF UL-HighInterferenceIndicationInfo-Item
UL-HighInterferenceIndicationInfo-Item ::= SEQUENCE {
@ -3308,6 +3719,8 @@ UL-InterferenceOverloadIndication-Item ::= ENUMERATED {
UL-non-GBR-PRB-usage::= INTEGER (0..100)
UL-non-GBR-PRB-usage-for-MIMO::= INTEGER (0..100)
ULOnlySharing ::= SEQUENCE{
uLResourceBitmapULOnlySharing DataTrafficResources,
iE-Extensions ProtocolExtensionContainer { {ULOnlySharing-ExtIEs} } OPTIONAL,
@ -3331,6 +3744,8 @@ UL-scheduling-PDCCH-CCE-usage::= INTEGER (0..100)
UL-Total-PRB-usage::= INTEGER (0..100)
UL-Total-PRB-usage-for-MIMO::= INTEGER (0..100)
UnlicensedSpectrumRestriction ::= ENUMERATED {
unlicensed-restricted,
...

201
epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.423 V16.9.0 (2022-04)
-- 3GPP TS 36.423 V17.1.0 (2022-06)
-- 9.3.4 PDU Definitions
-- **************************************************************
--
@ -203,6 +203,8 @@ IMPORTS
RAN-UE-NGAP-ID,
CHOinformation-REQ,
CHOinformation-ACK,
CHOinformation-AddReq,
CHOinformation-ModReq,
DAPSRequestInfo,
DAPSResponseInfo,
CandidateCellsToBeCancelledList,
@ -235,7 +237,30 @@ IMPORTS
SFN-Offset,
IMSvoiceEPSfallbackfrom5G,
Global-RAN-NODE-ID,
DirectForwardingPathAvailability
DirectForwardingPathAvailability,
NRRACHReportInformation,
SCG-UE-HistoryInformation,
PSCellHistoryInformationRetrieve,
PSCell-UE-HistoryInformation,
PSCellChangeHistory,
MeasurementResultforNRCellsPossiblyAggregated,
SCGActivationStatus,
SCGActivationRequest,
CPAinformation-REQ,
CPAinformation-REQ-ACK,
CPAinformation-MOD,
CPAinformation-MOD-ACK,
CPACinformation-REQD,
CPCinformation-REQD,
CPCinformation-CONF,
CPCinformation-NOTIFY,
CPCupdate-MOD,
Additional-Measurement-Timing-Configuration-List,
ServedCellSpecificInfoReq-NR,
SecurityIndication,
SecurityResult,
TraceCollectionEntityIPAddress
@ -559,6 +584,8 @@ FROM X2AP-Containers
id-UEContextReferenceatSourceNGRAN,
id-CHOinformation-REQ,
id-CHOinformation-ACK,
id-CHOinformation-AddReq,
id-CHOinformation-ModReq,
id-DAPSRequestInfo,
id-RequestedTargetCellID,
id-CandidateCellsToBeCancelledList,
@ -594,6 +621,26 @@ FROM X2AP-Containers
id-sourceNG-RAN-node-id,
id-SourceDLForwardingIPAddress,
id-SourceNodeDLForwardingIPAddress,
id-NRRACHReportInformation,
id-SCG-UE-HistoryInformation,
id-PSCellHistoryInformationRetrieve,
id-MeasurementResultforNRCellsPossiblyAggregated,
id-PSCellChangeHistory,
id-SCGActivationStatus,
id-SCGActivationRequest,
id-CPAinformation-REQ,
id-CPAinformation-REQ-ACK,
id-CPAinformation-MOD,
id-CPAinformation-MOD-ACK,
id-CPACinformation-REQD,
id-CPCinformation-REQD,
id-CPCinformation-CONF,
id-CPCinformation-NOTIFY,
id-CPCupdate-MOD,
id-Additional-Measurement-Timing-Configuration-List,
id-ServedCellSpecificInfoReq-NR,
id-SecurityIndication,
id-SecurityResult,
maxCellineNB,
maxnoofBearers,
maxnoofPDCP-SN,
@ -698,7 +745,8 @@ E-RABs-ToBeSetup-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-BearerType CRITICALITY reject EXTENSION BearerType PRESENCE optional}|
{ ID id-DAPSRequestInfo CRITICALITY ignore EXTENSION DAPSRequestInfo PRESENCE optional}|
{ ID id-Ethernet-Type CRITICALITY ignore EXTENSION Ethernet-Type PRESENCE optional}|
{ ID id-SourceDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional},
{ ID id-SourceDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional}|
{ ID id-SecurityIndication CRITICALITY reject EXTENSION SecurityIndication PRESENCE optional},
...
}
@ -1438,7 +1486,8 @@ CellMeasurementResult-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-ABS-Status CRITICALITY ignore EXTENSION ABS-Status PRESENCE optional}|
{ ID id-RSRPMRList CRITICALITY ignore EXTENSION RSRPMRList PRESENCE optional}|
{ ID id-CSIReportList CRITICALITY ignore EXTENSION CSIReportList PRESENCE optional}|
{ ID id-CellReportingIndicator CRITICALITY ignore EXTENSION CellReportingIndicator PRESENCE optional},
{ ID id-CellReportingIndicator CRITICALITY ignore EXTENSION CellReportingIndicator PRESENCE optional}|
{ ID id-MeasurementResultforNRCellsPossiblyAggregated CRITICALITY ignore EXTENSION MeasurementResultforNRCellsPossiblyAggregated PRESENCE optional},
...
}
@ -1783,8 +1832,7 @@ E-RABs-Admitted-ToBeAdded-Item-SCG-Bearer ::= SEQUENCE {
}
E-RABs-Admitted-ToBeAdded-Item-SCG-BearerExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-SourceDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional}|
{ ID id-SourceNodeDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional},
{ ID id-SourceDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional},
...
}
@ -1934,7 +1982,8 @@ E-RABs-ToBeAdded-ModReqItem-SCG-BearerExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-Correlation-ID CRITICALITY ignore EXTENSION Correlation-ID PRESENCE optional}|
{ ID id-SIPTO-Correlation-ID CRITICALITY ignore EXTENSION Correlation-ID PRESENCE optional}|
{ ID id-BearerType CRITICALITY ignore EXTENSION BearerType PRESENCE optional}|
{ ID id-Ethernet-Type CRITICALITY ignore EXTENSION Ethernet-Type PRESENCE optional},
{ ID id-Ethernet-Type CRITICALITY ignore EXTENSION Ethernet-Type PRESENCE optional}|
{ ID id-SourceDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional},
...
}
@ -1947,6 +1996,7 @@ E-RABs-ToBeAdded-ModReqItem-Split-Bearer ::= SEQUENCE {
}
E-RABs-ToBeAdded-ModReqItem-Split-BearerExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-SourceDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional},
...
}
@ -2071,6 +2121,7 @@ E-RABs-Admitted-ToBeAdded-ModAckItem-SCG-Bearer ::= SEQUENCE {
}
E-RABs-Admitted-ToBeAdded-ModAckItem-SCG-BearerExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-SourceDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional},
...
}
@ -2082,6 +2133,7 @@ E-RABs-Admitted-ToBeAdded-ModAckItem-Split-Bearer ::= SEQUENCE {
}
E-RABs-Admitted-ToBeAdded-ModAckItem-Split-BearerExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-SourceDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional},
...
}
E-RABs-Admitted-ToBeModified-ModAckList ::= SEQUENCE (SIZE (1..maxnoofBearers)) OF ProtocolIE-Single-Container { {E-RABs-Admitted-ToBeModified-ModAckItemIEs} }
@ -2585,7 +2637,8 @@ E-RABs-ToBeSetupRetrieve-Item ::= SEQUENCE {
E-RABs-ToBeSetupRetrieve-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-uL-GTPtunnelEndpoint CRITICALITY reject EXTENSION GTPtunnelEndpoint PRESENCE mandatory}|
{ ID id-dL-Forwarding CRITICALITY ignore EXTENSION DL-Forwarding PRESENCE optional}|
{ ID id-Ethernet-Type CRITICALITY ignore EXTENSION Ethernet-Type PRESENCE optional},
{ ID id-Ethernet-Type CRITICALITY ignore EXTENSION Ethernet-Type PRESENCE optional}|
{ ID id-SecurityIndication CRITICALITY reject EXTENSION SecurityIndication PRESENCE optional},
...
}
@ -2647,7 +2700,13 @@ SgNBAdditionRequest-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-ManagementBasedMDTPLMNList CRITICALITY ignore TYPE MDTPLMNList PRESENCE optional }|
{ ID id-UERadioCapabilityID CRITICALITY reject TYPE UERadioCapabilityID PRESENCE optional}|
{ ID id-IABNodeIndication CRITICALITY reject TYPE IABNodeIndication PRESENCE optional}|
{ ID id-sourceNG-RAN-node-id CRITICALITY ignore TYPE Global-RAN-NODE-ID PRESENCE optional},
{ ID id-sourceNG-RAN-node-id CRITICALITY ignore TYPE Global-RAN-NODE-ID PRESENCE optional}|
{ ID id-UE-HistoryInformation CRITICALITY ignore TYPE UE-HistoryInformation PRESENCE optional}|
{ ID id-UE-HistoryInformationFromTheUE CRITICALITY ignore TYPE UE-HistoryInformationFromTheUE PRESENCE optional}|
{ ID id-PSCellChangeHistory CRITICALITY ignore TYPE PSCellChangeHistory PRESENCE optional}|
{ ID id-CHOinformation-AddReq CRITICALITY reject TYPE CHOinformation-AddReq PRESENCE optional}|
{ ID id-SCGActivationRequest CRITICALITY ignore TYPE SCGActivationRequest PRESENCE optional}|
{ ID id-CPAinformation-REQ CRITICALITY reject TYPE CPAinformation-REQ PRESENCE optional},
...
}
@ -2688,10 +2747,12 @@ E-RABs-ToBeAdded-SgNBAddReq-Item-SgNBPDCPpresent ::= SEQUENCE {
}
E-RABs-ToBeAdded-SgNBAddReq-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-RLCMode-transferred CRITICALITY ignore EXTENSION RLCMode PRESENCE optional}|
{ ID id-BearerType CRITICALITY ignore EXTENSION BearerType PRESENCE optional}|
{ ID id-Ethernet-Type CRITICALITY ignore EXTENSION Ethernet-Type PRESENCE optional}|
{ ID id-SourceDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional},
{ ID id-RLCMode-transferred CRITICALITY ignore EXTENSION RLCMode PRESENCE optional}|
{ ID id-BearerType CRITICALITY ignore EXTENSION BearerType PRESENCE optional}|
{ ID id-Ethernet-Type CRITICALITY ignore EXTENSION Ethernet-Type PRESENCE optional}|
{ ID id-SourceDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional}|
{ ID id-SecurityIndication CRITICALITY reject EXTENSION SecurityIndication PRESENCE optional}|
{ ID id-SourceNodeDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional},
...
}
@ -2737,7 +2798,9 @@ SgNBAdditionRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-RRCConfigIndication CRITICALITY reject TYPE RRC-Config-Ind PRESENCE optional}|
{ ID id-LocationInformationSgNB CRITICALITY ignore TYPE LocationInformationSgNB PRESENCE optional}|
{ ID id-AvailableFastMCGRecoveryViaSRB3 CRITICALITY ignore TYPE AvailableFastMCGRecoveryViaSRB3 PRESENCE optional }|
{ ID id-DirectForwardingPathAvailability CRITICALITY ignore TYPE DirectForwardingPathAvailability PRESENCE optional },
{ ID id-DirectForwardingPathAvailability CRITICALITY ignore TYPE DirectForwardingPathAvailability PRESENCE optional }|
{ ID id-SCGActivationStatus CRITICALITY ignore TYPE SCGActivationStatus PRESENCE optional}|
{ ID id-CPAinformation-REQ-ACK CRITICALITY ignore TYPE CPAinformation-REQ-ACK PRESENCE optional},
...
}
@ -2782,7 +2845,8 @@ E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item-SgNBPDCPpresent ::= SEQUENCE {
E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-uLpDCPSnLength CRITICALITY ignore EXTENSION PDCPSnLength PRESENCE optional}|
{ ID id-dLPDCPSnLength CRITICALITY ignore EXTENSION PDCPSnLength PRESENCE optional}|
{ ID id-SourceDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional},
{ ID id-SourceDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional}|
{ ID id-SecurityResult CRITICALITY ignore EXTENSION SecurityResult PRESENCE optional},
...
}
@ -2897,7 +2961,13 @@ SgNBModificationRequest-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-RequestedFastMCGRecoveryViaSRB3 CRITICALITY ignore TYPE RequestedFastMCGRecoveryViaSRB3 PRESENCE optional}|
{ ID id-RequestedFastMCGRecoveryViaSRB3Release CRITICALITY ignore TYPE RequestedFastMCGRecoveryViaSRB3Release PRESENCE optional}|
{ ID id-SNtriggered CRITICALITY ignore TYPE SNtriggered PRESENCE optional}|
{ ID id-IABNodeIndication CRITICALITY reject TYPE IABNodeIndication PRESENCE optional},
{ ID id-IABNodeIndication CRITICALITY reject TYPE IABNodeIndication PRESENCE optional}|
{ ID id-PSCellHistoryInformationRetrieve CRITICALITY ignore TYPE PSCellHistoryInformationRetrieve PRESENCE optional}|
{ ID id-UE-HistoryInformationFromTheUE CRITICALITY ignore TYPE UE-HistoryInformationFromTheUE PRESENCE optional}|
{ ID id-CHOinformation-ModReq CRITICALITY ignore TYPE CHOinformation-ModReq PRESENCE optional}|
{ ID id-SCGActivationRequest CRITICALITY ignore TYPE SCGActivationRequest PRESENCE optional}|
{ ID id-CPAinformation-MOD CRITICALITY ignore TYPE CPAinformation-MOD PRESENCE optional}|
{ ID id-CPCupdate-MOD CRITICALITY ignore TYPE CPCupdate-MOD PRESENCE optional},
...
}
@ -2958,7 +3028,9 @@ E-RABs-ToBeAdded-SgNBModReq-Item-SgNBPDCPpresent ::= SEQUENCE {
E-RABs-ToBeAdded-SgNBModReq-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-RLCMode-transferred CRITICALITY ignore EXTENSION RLCMode PRESENCE optional}|
{ ID id-BearerType CRITICALITY ignore EXTENSION BearerType PRESENCE optional}|
{ ID id-Ethernet-Type CRITICALITY ignore EXTENSION Ethernet-Type PRESENCE optional},
{ ID id-Ethernet-Type CRITICALITY ignore EXTENSION Ethernet-Type PRESENCE optional}|
{ ID id-SecurityIndication CRITICALITY reject EXTENSION SecurityIndication PRESENCE optional}|
{ ID id-SourceDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional},
...
}
@ -3106,7 +3178,10 @@ SgNBModificationRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-RRCConfigIndication CRITICALITY reject TYPE RRC-Config-Ind PRESENCE optional}|
{ ID id-LocationInformationSgNB CRITICALITY ignore TYPE LocationInformationSgNB 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-SCG-UE-HistoryInformation CRITICALITY ignore TYPE SCG-UE-HistoryInformation PRESENCE optional}|
{ ID id-SCGActivationStatus CRITICALITY ignore TYPE SCGActivationStatus PRESENCE optional}|
{ ID id-CPAinformation-MOD-ACK CRITICALITY reject TYPE CPAinformation-MOD-ACK PRESENCE optional},
...
}
@ -3150,7 +3225,9 @@ E-RABs-Admitted-ToBeAdded-SgNBModAck-Item-SgNBPDCPpresent ::= SEQUENCE {
E-RABs-Admitted-ToBeAdded-SgNBModAck-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-uLpDCPSnLength CRITICALITY ignore EXTENSION PDCPSnLength PRESENCE optional}|
{ ID id-dLPDCPSnLength CRITICALITY ignore EXTENSION PDCPSnLength PRESENCE optional},
{ ID id-dLPDCPSnLength CRITICALITY ignore EXTENSION PDCPSnLength PRESENCE optional}|
{ ID id-SecurityResult CRITICALITY ignore EXTENSION SecurityResult PRESENCE optional}|
{ ID id-SourceDLForwardingIPAddress CRITICALITY ignore EXTENSION TransportLayerAddress PRESENCE optional},
...
}
@ -3299,7 +3376,10 @@ SgNBModificationRequired-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-E-RABs-ToBeModified-SgNBModReqdList CRITICALITY ignore TYPE E-RABs-ToBeModified-SgNBModReqdList PRESENCE optional}|
{ ID id-SgNBResourceCoordinationInformation CRITICALITY ignore TYPE SgNBResourceCoordinationInformation PRESENCE optional}|
{ ID id-RRCConfigIndication CRITICALITY reject TYPE RRC-Config-Ind PRESENCE optional}|
{ ID id-LocationInformationSgNB CRITICALITY ignore TYPE LocationInformationSgNB PRESENCE optional},
{ ID id-LocationInformationSgNB CRITICALITY ignore TYPE LocationInformationSgNB PRESENCE optional}|
{ ID id-SCG-UE-HistoryInformation CRITICALITY ignore TYPE SCG-UE-HistoryInformation PRESENCE optional}|
{ ID id-SCGActivationRequest CRITICALITY ignore TYPE SCGActivationRequest PRESENCE optional}|
{ ID id-CPACinformation-REQD CRITICALITY ignore TYPE CPACinformation-REQD PRESENCE optional},
...
}
@ -3547,7 +3627,8 @@ SgNBReleaseRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-SgNB-UE-X2AP-ID CRITICALITY ignore TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional }|
{ ID id-E-RABs-Admitted-ToBeReleased-SgNBRelReqAckList CRITICALITY ignore TYPE E-RABs-Admitted-ToBeReleased-SgNBRelReqAckList PRESENCE optional },
{ ID id-E-RABs-Admitted-ToBeReleased-SgNBRelReqAckList CRITICALITY ignore TYPE E-RABs-Admitted-ToBeReleased-SgNBRelReqAckList PRESENCE optional }|
{ ID id-SCG-UE-HistoryInformation CRITICALITY ignore TYPE SCG-UE-HistoryInformation PRESENCE optional},
...
}
@ -3607,7 +3688,8 @@ SgNBReleaseRequired-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional }|
{ ID id-E-RABs-ToBeReleased-SgNBRelReqdList CRITICALITY ignore TYPE E-RABs-ToBeReleased-SgNBRelReqdList PRESENCE optional }|
{ ID id-SgNBtoMeNBContainer CRITICALITY ignore TYPE SgNBtoMeNBContainer PRESENCE optional },
{ ID id-SgNBtoMeNBContainer CRITICALITY ignore TYPE SgNBtoMeNBContainer PRESENCE optional }|
{ ID id-SCG-UE-HistoryInformation CRITICALITY ignore TYPE SCG-UE-HistoryInformation PRESENCE optional},
...
}
@ -3742,12 +3824,30 @@ SgNBChangeRequired ::= SEQUENCE {
}
SgNBChangeRequired-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-MeNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory}|
{ ID id-SgNB-UE-X2AP-ID CRITICALITY reject TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}|
{ ID id-Target-SgNB-ID CRITICALITY reject TYPE GlobalGNB-ID PRESENCE mandatory}|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
{ ID id-SgNBtoMeNBContainer CRITICALITY reject TYPE SgNBtoMeNBContainer PRESENCE optional}|
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional},
{ ID id-MeNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory}|
{ ID id-SgNB-UE-X2AP-ID CRITICALITY reject TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}|
{ ID id-Target-SgNB-ID CRITICALITY reject TYPE GlobalGNB-ID PRESENCE mandatory}|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
{ ID id-SgNBtoMeNBContainer CRITICALITY reject TYPE SgNBtoMeNBContainer PRESENCE optional}|
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}|
{ ID id-SCG-UE-HistoryInformation CRITICALITY ignore TYPE SCG-UE-HistoryInformation PRESENCE optional}|
{ ID id-CPCinformation-REQD CRITICALITY reject TYPE CPCinformation-REQD PRESENCE optional},
...
}
-- **************************************************************
--
-- ACCESS AND MOBILITY INDICATION
--
-- **************************************************************
AccessAndMobilityIndication ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{ AccessAndMobilityIndication-IEs}},
...
}
AccessAndMobilityIndication-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-NRRACHReportInformation CRITICALITY ignore TYPE NRRACHReportInformation PRESENCE optional},
...
}
@ -3767,7 +3867,9 @@ SgNBChangeConfirm-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-SgNB-UE-X2AP-ID CRITICALITY ignore TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}|
{ ID id-E-RABs-ToBeReleased-SgNBChaConfList CRITICALITY ignore TYPE E-RABs-ToBeReleased-SgNBChaConfList PRESENCE optional}|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}|
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY ignore TYPE UE-X2AP-ID-Extension PRESENCE optional},
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY ignore TYPE UE-X2AP-ID-Extension PRESENCE optional}|
{ ID id-CPCinformation-CONF CRITICALITY ignore TYPE CPCinformation-CONF PRESENCE optional}|
{ ID id-MeNBtoSgNBContainer CRITICALITY ignore TYPE MeNBtoSgNBContainer PRESENCE optional},
...
}
@ -3915,6 +4017,7 @@ ServedNRcellsENDCX2ManagementList ::= SEQUENCE (SIZE (1.. maxCellinengNB)) OF SE
}
En-gNBServedCells-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-ServedCellSpecificInfoReq-NR CRITICALITY ignore EXTENSION ServedCellSpecificInfoReq-NR PRESENCE optional },
...
}
@ -3940,7 +4043,8 @@ ServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-SSB-PositionsInBurst CRITICALITY ignore EXTENSION SSB-PositionsInBurst PRESENCE optional}|
{ ID id-NRCellPRACHConfig CRITICALITY ignore EXTENSION NRCellPRACHConfig PRESENCE optional}|
{ ID id-CSI-RSTransmissionIndication CRITICALITY ignore EXTENSION CSI-RSTransmissionIndication PRESENCE optional}|
{ ID id-SFN-Offset CRITICALITY ignore EXTENSION SFN-Offset PRESENCE optional},
{ ID id-SFN-Offset CRITICALITY ignore EXTENSION SFN-Offset PRESENCE optional}|
{ ID id-Additional-Measurement-Timing-Configuration-List CRITICALITY ignore EXTENSION Additional-Measurement-Timing-Configuration-List PRESENCE optional },
...
}
@ -4711,7 +4815,8 @@ DataForwardingAddressIndication-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-E-RABs-DataForwardingAddress-List CRITICALITY ignore TYPE E-RABs-DataForwardingAddress-List PRESENCE mandatory}|
{ ID id-CHO-DC-Indicator CRITICALITY reject TYPE CHO-DC-Indicator PRESENCE optional}|
{ ID id-CHO-DC-EarlyDataForwarding CRITICALITY ignore TYPE CHO-DC-EarlyDataForwarding PRESENCE optional}|
{ ID id-SgNB-UE-X2AP-ID CRITICALITY ignore TYPE SgNB-UE-X2AP-ID PRESENCE optional},
{ ID id-SgNB-UE-X2AP-ID CRITICALITY ignore TYPE SgNB-UE-X2AP-ID PRESENCE optional}|
{ ID id-CPCinformation-NOTIFY CRITICALITY reject TYPE CPCinformation-NOTIFY PRESENCE optional},
...
}
@ -4818,12 +4923,12 @@ CellTrafficTrace ::= SEQUENCE {
}
CellTrafficTraceIEs X2AP-PROTOCOL-IES ::= {
{ ID id-MeNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory }|
{ ID id-SgNB-UE-X2AP-ID CRITICALITY reject TYPE SgNB-UE-X2AP-ID PRESENCE mandatory }|
{ ID id-EUTRANTraceID CRITICALITY ignore TYPE EUTRANTraceID PRESENCE mandatory }|
{ ID id-TraceCollectionEntityIPAddress CRITICALITY ignore TYPE TransportLayerAddress PRESENCE mandatory }|
{ ID id-PrivacyIndicator CRITICALITY ignore TYPE PrivacyIndicator PRESENCE optional }|
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional},
{ ID id-MeNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory }|
{ ID id-SgNB-UE-X2AP-ID CRITICALITY reject TYPE SgNB-UE-X2AP-ID PRESENCE mandatory }|
{ ID id-EUTRANTraceID CRITICALITY ignore TYPE EUTRANTraceID PRESENCE mandatory }|
{ ID id-TraceCollectionEntityIPAddress CRITICALITY ignore TYPE TraceCollectionEntityIPAddress PRESENCE mandatory }|
{ ID id-PrivacyIndicator CRITICALITY ignore TYPE PrivacyIndicator PRESENCE optional }|
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional},
...
}
@ -4880,4 +4985,26 @@ UERadioCapabilityIDMappingResponseIEs X2AP-PROTOCOL-IES ::= {
...
}
-- **************************************************************
--
-- CONDITIONAL PSCELL CHANGE CANCEL
--
-- **************************************************************
CPC-cancel ::= SEQUENCE {
protocolIEs ProtocolIE-Container {{CPC-cancel-IEs}},
...
}
CPC-cancel-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-MeNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory}|
{ ID id-SgNB-UE-X2AP-ID CRITICALITY reject TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}|
{ ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE optional}|
{ ID id-Target-SgNB-ID CRITICALITY reject TYPE GlobalGNB-ID PRESENCE mandatory},
...
}
END

44
epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.423 V16.9.0 (2022-04)
-- 3GPP TS 36.423 V17.1.0 (2022-06)
-- 9.3.3 Elementary Procedure Definitions
-- **************************************************************
--
@ -7,10 +7,10 @@
-- **************************************************************
X2AP-PDU-Descriptions {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
eps-Access (21) modules (3) x2ap (2) version1 (1) x2ap-PDU-Descriptions (0) }
DEFINITIONS AUTOMATIC TAGS ::=
DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
@ -45,7 +45,7 @@ FROM X2AP-CommonDataTypes
ResourceStatusFailure,
ResourceStatusRequest,
ResourceStatusResponse,
ResourceStatusUpdate,
ResourceStatusUpdate,
RLFIndication,
SNStatusTransfer,
UEContextRelease,
@ -130,7 +130,9 @@ FROM X2AP-CommonDataTypes
CellTrafficTrace,
F1CTrafficTransfer,
UERadioCapabilityIDMappingRequest,
UERadioCapabilityIDMappingResponse
UERadioCapabilityIDMappingResponse,
AccessAndMobilityIndication,
CPC-cancel
@ -140,16 +142,16 @@ FROM X2AP-PDU-Contents
id-cellActivation,
id-eNBConfigurationUpdate,
id-errorIndication,
id-handoverCancel,
id-handoverCancel,
id-handoverReport,
id-handoverPreparation,
id-loadIndication,
id-privateMessage,
id-reset,
id-resourceStatusReporting,
id-resourceStatusReportingInitiation,
id-resourceStatusReportingInitiation,
id-rLFIndication,
id-snStatusTransfer,
id-uEContextRelease,
@ -195,7 +197,9 @@ FROM X2AP-PDU-Contents
id-endcresourceStatusReportingInitiation,
id-cellTrafficTrace,
id-f1CTrafficTransfer,
id-UERadioCapabilityIDMapping
id-UERadioCapabilityIDMapping,
id-accessAndMobilityIndication,
id-CPC-cancel
@ -327,7 +331,9 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-2 X2AP-ELEMENTARY-PROCEDURE ::= {
conditionalHandoverCancel |
endcresourceStatusReporting |
cellTrafficTrace |
f1CTrafficTransfer ,
f1CTrafficTransfer |
accessAndMobilityIndication |
cPC-cancel ,
...
}
@ -552,7 +558,7 @@ sgNBinitiatedSgNBModification X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SgNBModificationRequired
SUCCESSFUL OUTCOME SgNBModificationConfirm
UNSUCCESSFUL OUTCOME SgNBModificationRefuse
PROCEDURE CODE id-sgNBinitiatedSgNBModification
PROCEDURE CODE id-sgNBinitiatedSgNBModification
CRITICALITY reject
}
@ -732,4 +738,18 @@ uERadioCapabilityIDMapping X2AP-ELEMENTARY-PROCEDURE ::= {
CRITICALITY reject
}
accessAndMobilityIndication X2AP-ELEMENTARY-PROCEDURE ::={
INITIATING MESSAGE AccessAndMobilityIndication
PROCEDURE CODE id-accessAndMobilityIndication
CRITICALITY ignore
}
cPC-cancel X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE CPC-cancel
PROCEDURE CODE id-CPC-cancel
CRITICALITY ignore
}
END

33
epan/dissectors/asn1/x2ap/packet-x2ap-template.c
View File

@ -12,7 +12,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref:
* 3GPP TS 36.423 V16.9.0 (2022-04)
* 3GPP TS 36.423 V17.1.0 (2022-06)
*/
#include "config.h"
@ -125,6 +125,11 @@ static int hf_x2ap_ReportCharacteristics_ENDC_Reserved = -1;
static int hf_x2ap_Registration_Request_ENDC_PDU = -1;
static int hf_x2ap_ReportingPeriodicity_ENDC_PDU = -1;
static int hf_x2ap_ReportCharacteristics_ENDC_PDU = -1;
static int hf_x2ap_rAT_RestrictionInformation_LEO = -1;
static int hf_x2ap_rAT_RestrictionInformation_MEO = -1;
static int hf_x2ap_rAT_RestrictionInformation_GEO = -1;
static int hf_x2ap_rAT_RestrictionInformation_OTHERSAT = -1;
static int hf_x2ap_rAT_RestrictionInformation_Reserved = -1;
#include "packet-x2ap-hf.c"
/* Initialize the subtree pointers */
@ -176,6 +181,9 @@ static int ett_x2ap_MDT_ConfigurationNR = -1;
static int ett_x2ap_NRCellPRACHConfig = -1;
static int ett_x2ap_IntendedTDD_DL_ULConfiguration_NR = -1;
static int ett_x2ap_UERadioCapability = -1;
static int ett_x2ap_LastVisitedPSCell_Item = -1;
static int ett_x2ap_NRRACHReportContainer = -1;
static int ett_x2ap_rAT_RestrictionInformation = -1;
#include "packet-x2ap-ett.c"
/* Forward declarations */
@ -640,6 +648,26 @@ void proto_register_x2ap(void) {
{ "ReportCharacteristics-ENDC", "x2ap.ReportCharacteristics_ENDC",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_x2ap_rAT_RestrictionInformation_LEO,
{ "LEO", "x2ap.rAT_RestrictionInformation.LEO",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x80,
NULL, HFILL }},
{ &hf_x2ap_rAT_RestrictionInformation_MEO,
{ "MEO", "x2ap.rAT_RestrictionInformation.MEO",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x40,
NULL, HFILL }},
{ &hf_x2ap_rAT_RestrictionInformation_GEO,
{ "GEO", "x2ap.rAT_RestrictionInformation.GEO",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x20,
NULL, HFILL }},
{ &hf_x2ap_rAT_RestrictionInformation_OTHERSAT,
{ "OTHERSAT", "x2ap.rAT_RestrictionInformation.OTHERSAT",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x10,
NULL, HFILL }},
{ &hf_x2ap_rAT_RestrictionInformation_Reserved,
{ "Reserved", "x2ap.rAT_RestrictionInformation.Reserved",
FT_UINT8, BASE_HEX, NULL, 0x0f,
NULL, HFILL }},
#include "packet-x2ap-hfarr.c"
};
@ -693,6 +721,9 @@ void proto_register_x2ap(void) {
&ett_x2ap_NRCellPRACHConfig,
&ett_x2ap_IntendedTDD_DL_ULConfiguration_NR,
&ett_x2ap_UERadioCapability,
&ett_x2ap_LastVisitedPSCell_Item,
&ett_x2ap_NRRACHReportContainer,
&ett_x2ap_rAT_RestrictionInformation,
#include "packet-x2ap-ettarr.c"
};

110
epan/dissectors/asn1/x2ap/x2ap.cnf
View File

@ -9,6 +9,12 @@ ALIGNED
#.OMIT_ASSIGNMENT
# Get rid of unused code warnings
Presence
ProtocolIE-FieldPair
ProtocolIE-ContainerList
ProtocolIE-ContainerPair
ProtocolIE-ContainerPairList
SourceDLForwardingIPAddress
#.END
#.PDU
@ -55,15 +61,6 @@ ProtocolIE-Field/value protocolIE_Field_value
SuccessfulOutcome/value successfulOutcome_value
PrivateIE-Field/value privateIE_Field_value
#.OMIT_ASSIGNMENT
Presence
ProtocolIE-FieldPair
ProtocolIE-ContainerList
ProtocolIE-ContainerPair
ProtocolIE-ContainerPairList
SourceDLForwardingIPAddress
#.END
#.FN_BODY ProtocolIE-ID VAL_PTR = &x2ap_data->protocol_ie_id
struct x2ap_private_data *x2ap_data = x2ap_get_private_data(actx->pinfo);
%(DEFAULT_BODY)s
@ -166,6 +163,22 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_UE_HistoryInformationFromTheUE);
dissect_lte_rrc_VisitedCellInfoList_r12_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
#.FN_BODY RAT-RestrictionsItem/rAT-RestrictionInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s
if(parameter_tvb){
static int * const fields[] = {
&hf_x2ap_rAT_RestrictionInformation_LEO,
&hf_x2ap_rAT_RestrictionInformation_MEO,
&hf_x2ap_rAT_RestrictionInformation_GEO,
&hf_x2ap_rAT_RestrictionInformation_OTHERSAT,
&hf_x2ap_rAT_RestrictionInformation_Reserved,
NULL
};
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_rAT_RestrictionInformation);
proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 1, fields, ENC_BIG_ENDIAN);
}
#.FN_BODY ReportCharacteristics VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
%(DEFAULT_BODY)s
@ -349,6 +362,15 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 1, fields, ENC_BIG_ENDIAN);
}
#.FN_BODY LastVisitedPSCell-Item VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (parameter_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_LastVisitedPSCell_Item);
dissect_s1ap_PSCellInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY TraceCollectionEntityIPAddress VAL_PTR = &parameter_tvb LEN_PTR = &len
tvbuff_t *parameter_tvb = NULL;
proto_tree *subtree;
@ -879,6 +901,15 @@ ScheduledCommunicationTime/timeofDayEnd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRING
dissect_f1ap_NRPRACHConfig_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY NRRACHReportContainer VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (parameter_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_NRRACHReportContainer);
dissect_nr_rrc_RA_ReportList_r16_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY IntendedTDD-DL-ULConfiguration-NR VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb = NULL;
proto_tree *subtree;
@ -1108,6 +1139,10 @@ ScheduledCommunicationTime/timeofDayEnd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRING
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityIDMappingRequest");
#.FN_HDR UERadioCapabilityIDMappingResponse
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityIDMappingResponse");
#.FN_HDR AccessAndMobilityIndication
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AccessAndMobilityIndication");
#.FN_HDR CPC-cancel
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CPC-cancel");
#.ASSIGN_VALUE_TO_TYPE # X2AP does not have constants assigned to types, they are pure INTEGER
# ProcedureCode
@ -1169,6 +1204,10 @@ id-endcresourceStatusReporting ProcedureCode
id-endcresourceStatusReportingInitiation ProcedureCode
id-f1CTrafficTransfer ProcedureCode
id-UERadioCapabilityIDMapping ProcedureCode
id-accessAndMobilityIndication ProcedureCode
id-MIMOPRBusageInformation ProcedureCode
id-CPC-cancel ProcedureCode
# ProtocolIE-ID
@ -1575,6 +1614,30 @@ id-DirectForwardingPathAvailability ProtocolIE-ID
id-sourceNG-RAN-node-id ProtocolIE-ID
id-SourceDLForwardingIPAddress ProtocolIE-ID
id-SourceNodeDLForwardingIPAddress ProtocolIE-ID
id-NRRACHReportInformation ProtocolIE-ID
id-SCG-UE-HistoryInformation ProtocolIE-ID
id-PSCellHistoryInformationRetrieve ProtocolIE-ID
id-MeasurementResultforNRCellsPossiblyAggregated ProtocolIE-ID
id-PSCell-UE-HistoryInformation ProtocolIE-ID
id-PSCellChangeHistory ProtocolIE-ID
id-CHOinformation-AddReq ProtocolIE-ID
id-CHOinformation-ModReq ProtocolIE-ID
id-SCGActivationStatus ProtocolIE-ID
id-SCGActivationRequest ProtocolIE-ID
id-CPAinformation-REQ ProtocolIE-ID
id-CPAinformation-REQ-ACK ProtocolIE-ID
id-CPAinformation-MOD ProtocolIE-ID
id-CPAinformation-MOD-ACK ProtocolIE-ID
id-CPACinformation-REQD ProtocolIE-ID
id-CPCinformation-REQD ProtocolIE-ID
id-CPCinformation-CONF ProtocolIE-ID
id-CPCinformation-NOTIFY ProtocolIE-ID
id-CPCupdate-MOD ProtocolIE-ID
id-Additional-Measurement-Timing-Configuration-List ProtocolIE-ID
id-ServedCellSpecificInfoReq-NR ProtocolIE-ID
id-SecurityIndication ProtocolIE-ID
id-SecurityResult ProtocolIE-ID
id-RAT-Restrictions ProtocolIE-ID
#.REGISTER
@ -1859,6 +1922,23 @@ CellToReport-E-UTRA-ENDC-Item N x2ap.ies id-CellToReport-E-UTRA-ENDC-Item
CHO-DC-EarlyDataForwarding N x2ap.ies id-CHO-DC-EarlyDataForwarding
DirectForwardingPathAvailability N x2ap.ies id-DirectForwardingPathAvailability
Global-RAN-NODE-ID N x2ap.ies id-sourceNG-RAN-node-id
NRRACHReportInformation N x2ap.ies id-NRRACHReportInformation
SCG-UE-HistoryInformation N x2ap.ies id-SCG-UE-HistoryInformation
PSCellHistoryInformationRetrieve N x2ap.ies id-PSCellHistoryInformationRetrieve
PSCellChangeHistory N x2ap.ies id-PSCellChangeHistory
CHOinformation-AddReq N x2ap.ies id-CHOinformation-AddReq
CHOinformation-ModReq N x2ap.ies id-CHOinformation-ModReq
SCGActivationStatus N x2ap.ies id-SCGActivationStatus
SCGActivationRequest N x2ap.ies id-SCGActivationRequest
CPAinformation-REQ N x2ap.ies id-CPAinformation-REQ
CPAinformation-REQ-ACK N x2ap.ies id-CPAinformation-REQ-ACK
CPAinformation-MOD N x2ap.ies id-CPAinformation-MOD
CPAinformation-MOD-ACK N x2ap.ies id-CPAinformation-MOD-ACK
CPACinformation-REQD N x2ap.ies id-CPACinformation-REQD
CPCinformation-REQD N x2ap.ies id-CPCinformation-REQD
CPCinformation-CONF N x2ap.ies id-CPCinformation-CONF
CPCinformation-NOTIFY N x2ap.ies id-CPCinformation-NOTIFY
CPCupdate-MOD N x2ap.ies id-CPCupdate-MOD
#X2AP-PROTOCOL-EXTENSION
Number-of-Antennaports N x2ap.extension id-Number-of-Antennaports
@ -1984,6 +2064,14 @@ IMSvoiceEPSfallbackfrom5G N x2ap.extension id-IMSvoiceEPSfallbackfrom5G
AdditionLocationInformation N x2ap.extension id-AdditionLocationInformation
TransportLayerAddress N x2ap.extension id-SourceDLForwardingIPAddress
TransportLayerAddress N x2ap.extension id-SourceNodeDLForwardingIPAddress
MeasurementResultforNRCellsPossiblyAggregated N x2ap.extension id-MeasurementResultforNRCellsPossiblyAggregated
PSCell-UE-HistoryInformation N x2ap.extension id-PSCell-UE-HistoryInformation
Additional-Measurement-Timing-Configuration-List N x2ap.extension id-Additional-Measurement-Timing-Configuration-List
ServedCellSpecificInfoReq-NR N x2ap.extension id-ServedCellSpecificInfoReq-NR
SecurityIndication N x2ap.extension id-SecurityIndication
SecurityResult N x2ap.extension id-SecurityResult
RAT-Restrictions N x2ap.extension id-RAT-Restrictions
MIMOPRBusageInformation N x2ap.extension id-MIMOPRBusageInformation
# X2AP-PDU-Descriptions.asn Interface Elementary Procedures
#X2AP-ELEMENTARY-PROCEDURE
@ -2148,4 +2236,8 @@ F1CTrafficTransfer N x2ap.proc.imsg id-f1CTrafficTransfer
UERadioCapabilityIDMappingRequest N x2ap.proc.imsg id-UERadioCapabilityIDMapping
UERadioCapabilityIDMappingResponse N x2ap.proc.sout id-UERadioCapabilityIDMapping
AccessAndMobilityIndication N x2ap.proc.imsg id-accessAndMobilityIndication
CPC-cancel N x2ap.proc.imsg id-CPC-cancel
#.END

474
epan/dissectors/packet-s1ap.c
View File

File diff suppressed because it is too large Load Diff

1
epan/dissectors/packet-s1ap.h
View File

@ -54,6 +54,7 @@ int dissect_s1ap_ImmediateMDT_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
int dissect_s1ap_LastVisitedEUTRANCellInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_s1ap_LastVisitedGERANCellInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_s1ap_MDTMode_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_s1ap_PSCellInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_s1ap_SONConfigurationTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_s1ap_SourceeNB_ToTargeteNB_TransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_s1ap_TargeteNB_ToSourceeNB_TransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);

2629
epan/dissectors/packet-x2ap.c
View File

File diff suppressed because it is too large Load Diff