diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-09-26 15:21:51 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2018-09-26 14:05:09 +0000 |
commit | c785e16cdae05583fd15b6f857e80564a43094dc (patch) | |
tree | 83d931e3621452efd160dff5ecfdd58c284e8226 /epan/dissectors/asn1/x2ap | |
parent | 4e519c12a40974272cdc92d84f8dcb4142e4dbf1 (diff) |
X2AP: upgrade dissector to v15.3.0
Change-Id: Ia2d0778c56eab2bbcd38904e3393353eba1aad44
Reviewed-on: https://code.wireshark.org/review/29856
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/asn1/x2ap')
-rw-r--r-- | epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/x2ap/X2AP-Constants.asn | 71 | ||||
-rw-r--r-- | epan/dissectors/asn1/x2ap/X2AP-Containers.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/x2ap/X2AP-IEs.asn | 322 | ||||
-rw-r--r-- | epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn | 206 | ||||
-rw-r--r-- | epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn | 18 | ||||
-rw-r--r-- | epan/dissectors/asn1/x2ap/packet-x2ap-template.c | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/x2ap/x2ap.cnf | 54 |
8 files changed, 481 insertions, 196 deletions
diff --git a/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn b/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn index ad72c41b92..e1a4587222 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V15.2.0 (2018-06) +-- 3GPP TS 36.423 V15.3.0 (2018-09) -- 9.3.6 Common definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/x2ap/X2AP-Constants.asn b/epan/dissectors/asn1/x2ap/X2AP-Constants.asn index 5df29e378d..b8cd4f5b07 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-Constants.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-Constants.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V15.2.0 (2018-06) +-- 3GPP TS 36.423 V15.3.0 (2018-09) -- 9.3.7 Constant definitions -- ************************************************************** -- @@ -69,6 +69,7 @@ id-endcPartialReset ProcedureCode ::= 40 id-eUTRANRCellResourceCoordination ProcedureCode ::= 41 id-SgNBActivityNotification ProcedureCode ::= 42 id-endcX2Removal ProcedureCode ::= 43 +id-dataForwardingAddressIndication ProcedureCode ::= 44 -- ************************************************************** -- @@ -119,6 +120,8 @@ maxUEsinengNBDU INTEGER ::= 8192 maxnoofProtectedResourcePatterns INTEGER ::= 16 maxnoNRcellsSpectrumSharingWithE-UTRA INTEGER ::= 64 maxnoofNrCellBands INTEGER ::= 32 +maxnoofBluetoothName INTEGER ::= 4 +maxnoofWLANName INTEGER ::= 4 -- ************************************************************** -- @@ -332,7 +335,7 @@ id-extended-e-RAB-GuaranteedBitrateDL ProtocolIE-ID ::= 198 id-extended-e-RAB-GuaranteedBitrateUL ProtocolIE-ID ::= 199 id-extended-uEaggregateMaximumBitRateDownlink ProtocolIE-ID ::= 200 id-extended-uEaggregateMaximumBitRateUplink ProtocolIE-ID ::= 201 -id-NRrestriction ProtocolIE-ID ::= 202 +id-NRrestrictioninEPSasSecondaryRAT ProtocolIE-ID ::= 202 id-SgNBSecurityKey ProtocolIE-ID ::= 203 id-SgNBUEAggregateMaximumBitRate ProtocolIE-ID ::= 204 id-E-RABs-ToBeAdded-SgNBAddReqList ProtocolIE-ID ::= 205 @@ -341,34 +344,34 @@ id-SgNB-UE-X2AP-ID ProtocolIE-ID ::= 207 id-RequestedSplitSRBs ProtocolIE-ID ::= 208 id-E-RABs-ToBeAdded-SgNBAddReq-Item ProtocolIE-ID ::= 209 id-E-RABs-Admitted-ToBeAdded-SgNBAddReqAckList ProtocolIE-ID ::= 210 -id-SgNBtoMeNBContainer ProtocolIE-ID ::= 211 -id-AdmittedSplitSRBs ProtocolIE-ID ::= 212 -id-E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item ProtocolIE-ID ::= 213 -id-ResponseInformationSgNBReconfComp ProtocolIE-ID ::= 214 -id-UE-ContextInformation-SgNBModReq ProtocolIE-ID ::= 215 -id-E-RABs-ToBeAdded-SgNBModReq-Item ProtocolIE-ID ::= 216 -id-E-RABs-ToBeModified-SgNBModReq-Item ProtocolIE-ID ::= 217 -id-E-RABs-ToBeReleased-SgNBModReq-Item ProtocolIE-ID ::= 218 -id-E-RABs-Admitted-ToBeAdded-SgNBModAckList ProtocolIE-ID ::= 219 -id-E-RABs-Admitted-ToBeModified-SgNBModAckList ProtocolIE-ID ::= 220 -id-E-RABs-Admitted-ToBeReleased-SgNBModAckList ProtocolIE-ID ::= 221 -id-E-RABs-Admitted-ToBeAdded-SgNBModAck-Item ProtocolIE-ID ::= 222 -id-E-RABs-Admitted-ToBeModified-SgNBModAck-Item ProtocolIE-ID ::= 223 -id-E-RABs-Admitted-ToBeReleased-SgNBModAck-Item ProtocolIE-ID ::= 224 -id-E-RABs-ToBeReleased-SgNBModReqdList ProtocolIE-ID ::= 225 -id-E-RABs-ToBeModified-SgNBModReqdList ProtocolIE-ID ::= 226 +id-SgNBtoMeNBContainer ProtocolIE-ID ::= 211 +id-AdmittedSplitSRBs ProtocolIE-ID ::= 212 +id-E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item ProtocolIE-ID ::= 213 +id-ResponseInformationSgNBReconfComp ProtocolIE-ID ::= 214 +id-UE-ContextInformation-SgNBModReq ProtocolIE-ID ::= 215 +id-E-RABs-ToBeAdded-SgNBModReq-Item ProtocolIE-ID ::= 216 +id-E-RABs-ToBeModified-SgNBModReq-Item ProtocolIE-ID ::= 217 +id-E-RABs-ToBeReleased-SgNBModReq-Item ProtocolIE-ID ::= 218 +id-E-RABs-Admitted-ToBeAdded-SgNBModAckList ProtocolIE-ID ::= 219 +id-E-RABs-Admitted-ToBeModified-SgNBModAckList ProtocolIE-ID ::= 220 +id-E-RABs-Admitted-ToBeReleased-SgNBModAckList ProtocolIE-ID ::= 221 +id-E-RABs-Admitted-ToBeAdded-SgNBModAck-Item ProtocolIE-ID ::= 222 +id-E-RABs-Admitted-ToBeModified-SgNBModAck-Item ProtocolIE-ID ::= 223 +id-E-RABs-Admitted-ToBeReleased-SgNBModAck-Item ProtocolIE-ID ::= 224 +id-E-RABs-ToBeReleased-SgNBModReqdList ProtocolIE-ID ::= 225 +id-E-RABs-ToBeModified-SgNBModReqdList ProtocolIE-ID ::= 226 id-E-RABs-ToBeReleased-SgNBModReqd-Item ProtocolIE-ID ::= 227 id-E-RABs-ToBeModified-SgNBModReqd-Item ProtocolIE-ID ::= 228 -id-E-RABs-ToBeReleased-SgNBChaConfList ProtocolIE-ID ::= 229 -id-E-RABs-ToBeReleased-SgNBChaConf-Item ProtocolIE-ID ::= 230 -id-E-RABs-ToBeReleased-SgNBRelReqList ProtocolIE-ID ::= 231 -id-E-RABs-ToBeReleased-SgNBRelReq-Item ProtocolIE-ID ::= 232 -id-E-RABs-ToBeReleased-SgNBRelConfList ProtocolIE-ID ::= 233 -id-E-RABs-ToBeReleased-SgNBRelConf-Item ProtocolIE-ID ::= 234 -id-E-RABs-SubjectToSgNBCounterCheck-List ProtocolIE-ID ::= 235 -id-E-RABs-SubjectToSgNBCounterCheck-Item ProtocolIE-ID ::= 236 -id-RRCContainer ProtocolIE-ID ::= 237 -id-SRBType ProtocolIE-ID ::= 238 +id-E-RABs-ToBeReleased-SgNBChaConfList ProtocolIE-ID ::= 229 +id-E-RABs-ToBeReleased-SgNBChaConf-Item ProtocolIE-ID ::= 230 +id-E-RABs-ToBeReleased-SgNBRelReqList ProtocolIE-ID ::= 231 +id-E-RABs-ToBeReleased-SgNBRelReq-Item ProtocolIE-ID ::= 232 +id-E-RABs-ToBeReleased-SgNBRelConfList ProtocolIE-ID ::= 233 +id-E-RABs-ToBeReleased-SgNBRelConf-Item ProtocolIE-ID ::= 234 +id-E-RABs-SubjectToSgNBCounterCheck-List ProtocolIE-ID ::= 235 +id-E-RABs-SubjectToSgNBCounterCheck-Item ProtocolIE-ID ::= 236 +id-RRCContainer ProtocolIE-ID ::= 237 +id-SRBType ProtocolIE-ID ::= 238 id-Target-SgNB-ID ProtocolIE-ID ::= 239 id-HandoverRestrictionList ProtocolIE-ID ::= 240 id-SCGConfigurationQuery ProtocolIE-ID ::= 241 @@ -385,7 +388,7 @@ id-CellAssistanceInformation ProtocolIE-ID ::= 251 id-Globalen-gNB-ID ProtocolIE-ID ::= 252 id-ServedNRcellsENDCX2ManagementList ProtocolIE-ID ::= 253 id-UE-ContextReferenceAtSgNB ProtocolIE-ID ::= 254 -id-SecondaryRATUsageReport ProtocolIE-ID ::= 255 +id-SecondaryRATUsageReport ProtocolIE-ID ::= 255 id-ActivationID ProtocolIE-ID ::= 256 id-MeNBResourceCoordinationInformation ProtocolIE-ID ::= 257 id-SgNBResourceCoordinationInformation ProtocolIE-ID ::= 258 @@ -430,5 +433,15 @@ id-UEContextLevelUserPlaneActivity ProtocolIE-ID ::= 296 id-ERABActivityNotifyItemList ProtocolIE-ID ::= 297 id-InitiatingNodeType-EndcX2Removal ProtocolIE-ID ::= 298 id-RespondingNodeType-EndcX2Removal ProtocolIE-ID ::= 299 +id-RLC-Status ProtocolIE-ID ::= 300 +id-CNTypeRestrictions ProtocolIE-ID ::= 301 +id-pDCPSnLength ProtocolIE-ID ::= 302 +id-BluetoothMeasurementConfiguration ProtocolIE-ID ::= 303 +id-WLANMeasurementConfiguration ProtocolIE-ID ::= 304 +id-NRrestrictionin5GS ProtocolIE-ID ::= 305 +id-dL-Forwarding ProtocolIE-ID ::= 306 +id-E-RABs-DataForwardingAddress-List ProtocolIE-ID ::= 307 +id-E-RABs-DataForwardingAddress-Item ProtocolIE-ID ::= 308 +id-Subscription-Based-UE-DifferentiationInfo ProtocolIE-ID ::= 309 END diff --git a/epan/dissectors/asn1/x2ap/X2AP-Containers.asn b/epan/dissectors/asn1/x2ap/X2AP-Containers.asn index 958c96d453..d540dec779 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-Containers.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-Containers.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V15.2.0 (2018-06) +-- 3GPP TS 36.423 V15.3.0 (2018-09) -- 9.3.8 Container definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/x2ap/X2AP-IEs.asn b/epan/dissectors/asn1/x2ap/X2AP-IEs.asn index c4bfba62d8..5ae201be73 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-IEs.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-IEs.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V15.2.0 (2018-06) +-- 3GPP TS 36.423 V15.3.0 (2018-09) -- 9.3.5 Information Element definitions -- ************************************************************** -- @@ -36,7 +36,8 @@ IMPORTS id-M4Configuration, id-M5Configuration, id-MDT-Location-Info, - id-NRrestriction, + id-NRrestrictioninEPSasSecondaryRAT, + id-NRrestrictionin5GS, id-AdditionalSpecialSubframe-Info, id-UEID, id-enhancedRNTP, @@ -64,6 +65,9 @@ IMPORTS id-ProtectedEUTRAResourceIndication, id-NRS-NSSS-PowerOffset, id-NSSS-NumOccasionDifferentPrecoder, + id-CNTypeRestrictions, + id-BluetoothMeasurementConfiguration, + id-WLANMeasurementConfiguration, maxnoofBearers, @@ -104,7 +108,9 @@ IMPORTS maxUEsinengNBDU, maxnoofProtectedResourcePatterns, maxnoNRcellsSpectrumSharingWithE-UTRA, - maxnoofNrCellBands + maxnoofNrCellBands, + maxnoofBluetoothName, + maxnoofWLANName FROM X2AP-Constants @@ -134,7 +140,7 @@ ABSInformationFDD ::= SEQUENCE { abs-pattern-info BIT STRING (SIZE(40)), numberOfCellSpecificAntennaPorts ENUMERATED {one, two, four, ...}, measurement-subset BIT STRING (SIZE(40)), - iE-Extensions ProtocolExtensionContainer { { ABSInformationFDD-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ABSInformationFDD-ExtIEs} } OPTIONAL, ... } @@ -146,7 +152,7 @@ ABSInformationTDD ::= SEQUENCE { abs-pattern-info BIT STRING (SIZE(1..70, ...)), numberOfCellSpecificAntennaPorts ENUMERATED {one, two, four, ...}, measurement-subset BIT STRING (SIZE(1..70, ...)), - iE-Extensions ProtocolExtensionContainer { { ABSInformationTDD-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ABSInformationTDD-ExtIEs} } OPTIONAL, ... } @@ -171,7 +177,7 @@ AdditionalSpecialSubframe-Info ::= SEQUENCE { additionalspecialSubframePatterns AdditionalSpecialSubframePatterns, cyclicPrefixDL CyclicPrefixDL, cyclicPrefixUL CyclicPrefixUL, - iE-Extensions ProtocolExtensionContainer { { AdditionalSpecialSubframe-Info-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {AdditionalSpecialSubframe-Info-ExtIEs} } OPTIONAL, ... } @@ -197,7 +203,7 @@ AdditionalSpecialSubframeExtension-Info ::= SEQUENCE { additionalspecialSubframePatternsExtension AdditionalSpecialSubframePatternsExtension, cyclicPrefixDL CyclicPrefixDL, cyclicPrefixUL CyclicPrefixUL, - iE-Extensions ProtocolExtensionContainer { { AdditionalSpecialSubframeExtension-Info-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {AdditionalSpecialSubframeExtension-Info-ExtIEs} } OPTIONAL, ... } @@ -247,7 +253,7 @@ AreaScopeOfQMC ::= CHOICE { AS-SecurityInformation ::= SEQUENCE { key-eNodeB-star Key-eNodeB-Star, nextHopChainingCount NextHopChainingCount, - iE-Extensions ProtocolExtensionContainer { { AS-SecurityInformation-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {AS-SecurityInformation-ExtIEs} } OPTIONAL, ... } @@ -273,6 +279,23 @@ BenefitMetric ::= INTEGER (-101..100, ...) BitRate ::= INTEGER (0..10000000000) BroadcastPLMNs-Item ::= SEQUENCE (SIZE(1..maxnoofBPLMNs)) OF PLMN-Identity +BluetoothMeasurementConfiguration ::= SEQUENCE { + bluetoothMeasConfig BluetoothMeasConfig, + bluetoothMeasConfigNameList BluetoothMeasConfigNameList OPTIONAL, + bt-rssi ENUMERATED {true, ...} OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {BluetoothMeasurementConfiguration-ExtIEs} } OPTIONAL, + ... +} + +BluetoothMeasurementConfiguration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { + ... +} + +BluetoothMeasConfigNameList ::= SEQUENCE (SIZE(1..maxnoofBluetoothName)) OF BluetoothName + +BluetoothMeasConfig::= ENUMERATED {setup,...} + +BluetoothName ::= OCTET STRING (SIZE (1..248)) -- C @@ -398,7 +421,7 @@ CellIdListforQMC ::= SEQUENCE (SIZE(1..maxnoofCellIDforQMC)) OF ECGI CellReplacingInfo ::= SEQUENCE { replacingCellsList ReplacingCellsList, - iE-Extensions ProtocolExtensionContainer { { CellReplacingInfo-ExtIEs}} OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {CellReplacingInfo-ExtIEs}} OPTIONAL, ... } @@ -413,7 +436,7 @@ Cell-Size ::= ENUMERATED {verysmall, small, medium, large, ... } CellType ::= SEQUENCE { cell-Size Cell-Size, - iE-Extensions ProtocolExtensionContainer { { CellType-ExtIEs}} OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {CellType-ExtIEs}} OPTIONAL, ... } @@ -421,12 +444,25 @@ CellType-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { ... } +CNTypeRestrictions ::= SEQUENCE (SIZE(1.. maxnoofEPLMNsPlusOne)) OF CNTypeRestrictionsItem + +CNTypeRestrictionsItem ::= SEQUENCE { + plmn-Id PLMN-Identity, + cn-type ENUMERATED {fiveGC-forbidden, ...}, + iE-Extensions ProtocolExtensionContainer { {CNTypeRestrictionsItem-ExtIEs} } OPTIONAL, + ... +} + +CNTypeRestrictionsItem-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { + ... +} + CoMPHypothesisSet ::= SEQUENCE (SIZE(1..maxnoofCoMPCells)) OF CoMPHypothesisSetItem CoMPHypothesisSetItem ::= SEQUENCE { coMPCellID ECGI, coMPHypothesis BIT STRING (SIZE(6..4400, ...)), - iE-Extensions ProtocolExtensionContainer { { CoMPHypothesisSetItem-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {CoMPHypothesisSetItem-ExtIEs} } OPTIONAL, ... } @@ -437,7 +473,7 @@ CoMPHypothesisSetItem-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { CoMPInformation ::= SEQUENCE { coMPInformationItem CoMPInformationItem, coMPInformationStartTime CoMPInformationStartTime, - iE-Extensions ProtocolExtensionContainer { { CoMPInformation-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {CoMPInformation-ExtIEs} } OPTIONAL, ... } @@ -449,7 +485,7 @@ CoMPInformationItem ::= SEQUENCE (SIZE(1..maxnoofCoMPHypothesisSet)) OF SEQUENCE { coMPHypothesisSet CoMPHypothesisSet, benefitMetric BenefitMetric, - iE-Extensions ProtocolExtensionContainer { { CoMPInformationItem-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {CoMPInformationItem-ExtIEs} } OPTIONAL, ... } @@ -461,7 +497,7 @@ CoMPInformationStartTime ::= SEQUENCE (SIZE(0..1)) OF SEQUENCE { startSFN INTEGER (0..1023, ...), startSubframeNumber INTEGER (0..9, ...), - iE-Extensions ProtocolExtensionContainer { { CoMPInformationStartTime-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {CoMPInformationStartTime-ExtIEs} } OPTIONAL, ... } @@ -472,7 +508,7 @@ CoMPInformationStartTime-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { CompositeAvailableCapacity ::= SEQUENCE { cellCapacityClassValue CellCapacityClassValue OPTIONAL, capacityValue CapacityValue, - iE-Extensions ProtocolExtensionContainer { { CompositeAvailableCapacity-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {CompositeAvailableCapacity-ExtIEs} } OPTIONAL, ... } @@ -483,7 +519,7 @@ CompositeAvailableCapacity-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { CompositeAvailableCapacityGroup ::= SEQUENCE { dL-CompositeAvailableCapacity CompositeAvailableCapacity, uL-CompositeAvailableCapacity CompositeAvailableCapacity, - iE-Extensions ProtocolExtensionContainer { { CompositeAvailableCapacityGroup-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {CompositeAvailableCapacityGroup-ExtIEs} } OPTIONAL, ... } @@ -496,7 +532,7 @@ Correlation-ID ::= OCTET STRING (SIZE (4)) COUNTvalue ::= SEQUENCE { pDCP-SN PDCP-SN, hFN HFN, - iE-Extensions ProtocolExtensionContainer { { COUNTvalue-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {COUNTvalue-ExtIEs} } OPTIONAL, ... } @@ -507,7 +543,7 @@ COUNTvalue-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { COUNTValueExtended ::= SEQUENCE { pDCP-SNExtended PDCP-SNExtended, hFNModified HFNModified, - iE-Extensions ProtocolExtensionContainer { { COUNTValueExtended-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {COUNTValueExtended-ExtIEs} } OPTIONAL, ... } @@ -518,7 +554,7 @@ COUNTValueExtended-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { COUNTvaluePDCP-SNlength18 ::= SEQUENCE { pDCP-SNlength18 PDCP-SNlength18, hFNforPDCP-SNlength18 HFNforPDCP-SNlength18, - iE-Extensions ProtocolExtensionContainer { { COUNTvaluePDCP-SNlength18-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {COUNTvaluePDCP-SNlength18-ExtIEs} } OPTIONAL, ... } @@ -577,7 +613,7 @@ CSIReportList ::= SEQUENCE (SIZE(1..maxUEReport)) OF SEQUENCE { uEID UEID, cSIReportPerCSIProcess CSIReportPerCSIProcess, - iE-Extensions ProtocolExtensionContainer { { CSIReportList-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {CSIReportList-ExtIEs} } OPTIONAL, ... } @@ -589,7 +625,7 @@ CSIReportPerCSIProcess ::= SEQUENCE (SIZE(1.. maxCSIProcess)) OF SEQUENCE { cSIProcessConfigurationIndex INTEGER (1..7, ...), cSIReportPerCSIProcessItem CSIReportPerCSIProcessItem, - iE-Extensions ProtocolExtensionContainer { { CSIReportPerCSIProcess-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {CSIReportPerCSIProcess-ExtIEs} } OPTIONAL, ... } @@ -603,7 +639,7 @@ CSIReportPerCSIProcessItem ::= SEQUENCE (SIZE(1.. maxCSIReport)) OF widebandCQI WidebandCQI, subbandSize SubbandSize, subbandCQIList SubbandCQIList OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { CSIReportPerCSIProcessItem-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {CSIReportPerCSIProcessItem-ExtIEs} } OPTIONAL, ... } @@ -627,15 +663,20 @@ CyclicPrefixUL ::= ENUMERATED { -- D -DataTrafficResources ::= BIT STRING (SIZE(12..8800)) +DataTrafficResources ::= BIT STRING (SIZE(6..17600)) DataTrafficResourceIndication ::= SEQUENCE { activationSFN INTEGER (0..1023), sharedResourceType SharedResourceType, reservedSubframePattern ReservedSubframePattern OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {DataTrafficResourceIndication-ExtIEs} } OPTIONAL, ... } +DataTrafficResourceIndication-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { + ... +} + DeactivationIndication::= ENUMERATED { deactivated, ... @@ -663,7 +704,7 @@ DL-GBR-PRB-usage::= INTEGER (0..100) DL-non-GBR-PRB-usage::= INTEGER (0..100) -DLResourceBitmapULandDLSharing ::= DataTrafficResources +DLResourceBitmapULandDLSharing ::= DataTrafficResources DLResourcesULandDLSharing ::= CHOICE { unchanged NULL, @@ -715,8 +756,8 @@ ECGI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { EnhancedRNTP ::= SEQUENCE { enhancedRNTPBitmap BIT STRING (SIZE(12..8800, ...)), rNTP-High-Power-Threshold RNTP-Threshold, - enhancedRNTPStartTime EnhancedRNTPStartTime OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { EnhancedRNTP-ExtIEs} } OPTIONAL, + enhancedRNTPStartTime EnhancedRNTPStartTime OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {EnhancedRNTP-ExtIEs} } OPTIONAL, ... } @@ -727,7 +768,7 @@ EnhancedRNTP-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { EnhancedRNTPStartTime ::= SEQUENCE { startSFN INTEGER (0..1023, ...), startSubframeNumber INTEGER (0..9, ...), - iE-Extensions ProtocolExtensionContainer { { EnhancedRNTPStartTime-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {EnhancedRNTPStartTime-ExtIEs} } OPTIONAL, ... } @@ -749,7 +790,7 @@ EN-DC-ResourceConfiguration ::= SEQUENCE { pDCPatSgNB ENUMERATED {present, not-present, ...}, mCGresources ENUMERATED {present, not-present, ...}, sCGresources ENUMERATED {present, not-present, ...}, - iE-Extensions ProtocolExtensionContainer { { EN-DC-ResourceConfigurationExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {EN-DC-ResourceConfigurationExtIEs} } OPTIONAL, ... } @@ -760,7 +801,7 @@ EN-DC-ResourceConfigurationExtIEs X2AP-PROTOCOL-EXTENSION ::= { EPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMN-Identity -ERABActivityNotifyItemList ::= SEQUENCE (SIZE (1..maxnoofBearers)) OF ERABActivityNotifyItem +ERABActivityNotifyItemList ::= SEQUENCE (SIZE (0..maxnoofBearers)) OF ERABActivityNotifyItem ERABActivityNotifyItem ::= SEQUENCE { e-RAB-ID E-RAB-ID, @@ -779,7 +820,7 @@ E-RAB-Level-QoS-Parameters ::= SEQUENCE { qCI QCI, allocationAndRetentionPriority AllocationAndRetentionPriority, gbrQosInformation GBR-QosInformation OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { E-RAB-Level-QoS-Parameters-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {E-RAB-Level-QoS-Parameters-ExtIEs} } OPTIONAL, ... } @@ -820,7 +861,7 @@ E-RABUsageReport-Item ::= SEQUENCE { endTimeStamp OCTET STRING (SIZE(4)), usageCountUL INTEGER (0..18446744073709551615), usageCountDL INTEGER (0..18446744073709551615), - iE-Extensions ProtocolExtensionContainer { { E-RABUsageReport-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {E-RABUsageReport-Item-ExtIEs} } OPTIONAL, ... } @@ -846,7 +887,7 @@ EventType ::= ENUMERATED{ ExpectedUEBehaviour ::= SEQUENCE { expectedActivity ExpectedUEActivityBehaviour OPTIONAL, expectedHOInterval ExpectedHOInterval OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { ExpectedUEBehaviour-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ExpectedUEBehaviour-ExtIEs} } OPTIONAL, ... } @@ -858,7 +899,7 @@ ExpectedUEActivityBehaviour ::= SEQUENCE { expectedActivityPeriod ExpectedActivityPeriod OPTIONAL, expectedIdlePeriod ExpectedIdlePeriod OPTIONAL, sourceofUEActivityBehaviourInformation SourceOfUEActivityBehaviourInformation OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { ExpectedUEActivityBehaviour-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ExpectedUEActivityBehaviour-ExtIEs} } OPTIONAL, ... } @@ -878,7 +919,7 @@ ExpectedHOInterval ::= ENUMERATED { ExtendedULInterferenceOverloadInfo ::= SEQUENCE { associatedSubframes BIT STRING (SIZE (5)), extended-ul-InterferenceOverloadIndication UL-InterferenceOverloadIndication, - iE-Extensions ProtocolExtensionContainer { { ExtendedULInterferenceOverloadInfo-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ExtendedULInterferenceOverloadInfo-ExtIEs} } OPTIONAL, ... } @@ -979,7 +1020,7 @@ GBR-QosInformation ::= SEQUENCE { e-RAB-MaximumBitrateUL BitRate, e-RAB-GuaranteedBitrateDL BitRate, e-RAB-GuaranteedBitrateUL BitRate, - iE-Extensions ProtocolExtensionContainer { { GBR-QosInformation-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {GBR-QosInformation-ExtIEs} } OPTIONAL, ... } @@ -1079,7 +1120,9 @@ HandoverRestrictionList ::= SEQUENCE { } HandoverRestrictionList-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { - { ID id-NRrestriction CRITICALITY ignore EXTENSION NRrestriction PRESENCE optional}, + { ID id-NRrestrictioninEPSasSecondaryRAT CRITICALITY ignore EXTENSION NRrestrictioninEPSasSecondaryRAT PRESENCE optional}| + { ID id-CNTypeRestrictions CRITICALITY ignore EXTENSION CNTypeRestrictions PRESENCE optional}| + { ID id-NRrestrictionin5GS CRITICALITY ignore EXTENSION NRrestrictionin5GS PRESENCE optional}, ... } @@ -1092,7 +1135,7 @@ HFNforPDCP-SNlength18 ::= INTEGER (0..16383) HWLoadIndicator ::= SEQUENCE { dLHWLoadIndicator LoadIndicator, uLHWLoadIndicator LoadIndicator, - iE-Extensions ProtocolExtensionContainer { { HWLoadIndicator-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {HWLoadIndicator-ExtIEs} } OPTIONAL, ... } @@ -1127,14 +1170,15 @@ LastVisitedCell-Item ::= CHOICE { e-UTRAN-Cell LastVisitedEUTRANCellInformation, uTRAN-Cell LastVisitedUTRANCellInformation, gERAN-Cell LastVisitedGERANCellInformation, - ... + ..., + nG-RAN-Cell LastVisitedNGRANCellInformation } LastVisitedEUTRANCellInformation ::= SEQUENCE { global-Cell-ID ECGI, cellType CellType, time-UE-StayedInCell Time-UE-StayedInCell, - iE-Extensions ProtocolExtensionContainer { { LastVisitedEUTRANCellInformation-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {LastVisitedEUTRANCellInformation-ExtIEs} } OPTIONAL, ... } @@ -1150,9 +1194,11 @@ LastVisitedGERANCellInformation ::= CHOICE { ... } +LastVisitedNGRANCellInformation ::= OCTET STRING + LastVisitedUTRANCellInformation ::= OCTET STRING -LHN-ID ::= OCTET STRING(SIZE (32..256)) +LHN-ID ::= OCTET STRING(SIZE (32..256)) Links-to-log ::= ENUMERATED {uplink, downlink, both-uplink-and-downlink, ...} @@ -1180,7 +1226,7 @@ LocationReportingInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::={ M1PeriodicReporting ::= SEQUENCE { reportInterval ReportIntervalMDT, reportAmount ReportAmountMDT, - iE-Extensions ProtocolExtensionContainer { { M1PeriodicReporting-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {M1PeriodicReporting-ExtIEs} } OPTIONAL, ... } @@ -1197,7 +1243,7 @@ M1ReportingTrigger::= ENUMERATED{ M1ThresholdEventA2 ::= SEQUENCE { measurementThreshold MeasurementThresholdA2, - iE-Extensions ProtocolExtensionContainer { { M1ThresholdEventA2-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {M1ThresholdEventA2-ExtIEs} } OPTIONAL, ... } @@ -1207,7 +1253,7 @@ M1ThresholdEventA2-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { M3Configuration ::= SEQUENCE { m3period M3period, - iE-Extensions ProtocolExtensionContainer { { M3Configuration-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {M3Configuration-ExtIEs} } OPTIONAL, ... } @@ -1220,7 +1266,7 @@ M3period ::= ENUMERATED {ms100, ms1000, ms10000, ... } M4Configuration ::= SEQUENCE { m4period M4period, m4-links-to-log Links-to-log, - iE-Extensions ProtocolExtensionContainer { { M4Configuration-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {M4Configuration-ExtIEs} } OPTIONAL, ... } @@ -1234,7 +1280,7 @@ M4period ::= ENUMERATED {ms1024, ms2048, ms5120, ms10240, min1, ... } M5Configuration ::= SEQUENCE { m5period M5period, m5-links-to-log Links-to-log, - iE-Extensions ProtocolExtensionContainer { { M5Configuration-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {M5Configuration-ExtIEs} } OPTIONAL, ... } @@ -1249,7 +1295,7 @@ M6Configuration ::= SEQUENCE { m6delay-threshold M6delay-threshold OPTIONAL, -- This IE shall be present if the M6 Links to log IE is set to “uplink” or to “both-uplink-and-downlink” -- m6-links-to-log Links-to-log, - iE-Extensions ProtocolExtensionContainer { { M6Configuration-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {M6Configuration-ExtIEs} } OPTIONAL, ... } @@ -1264,7 +1310,7 @@ M6delay-threshold ::= ENUMERATED { ms30, ms40, ms50, ms60, ms70, ms80, ms90, ms1 M7Configuration ::= SEQUENCE { m7period M7period, m7-links-to-log Links-to-log, - iE-Extensions ProtocolExtensionContainer { { M7Configuration-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {M7Configuration-ExtIEs} } OPTIONAL, ... } @@ -1295,18 +1341,20 @@ MDT-Configuration ::= SEQUENCE { -- Included in case of event-triggered, or event-triggered periodic reporting for measurement M1 m1periodicReporting M1PeriodicReporting OPTIONAL, -- Included in case of periodic, or event-triggered periodic reporting for measurement M1 - iE-Extensions ProtocolExtensionContainer { { MDT-Configuration-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {MDT-Configuration-ExtIEs} } OPTIONAL, ... } MDT-Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { - {ID id-M3Configuration CRITICALITY ignore EXTENSION M3Configuration PRESENCE conditional}| - {ID id-M4Configuration CRITICALITY ignore EXTENSION M4Configuration PRESENCE conditional}| - {ID id-M5Configuration CRITICALITY ignore EXTENSION M5Configuration PRESENCE conditional}| - {ID id-MDT-Location-Info CRITICALITY ignore EXTENSION MDT-Location-Info PRESENCE optional}| - {ID id-SignallingBasedMDTPLMNList CRITICALITY ignore EXTENSION MDTPLMNList PRESENCE optional}| - {ID id-M6Configuration CRITICALITY ignore EXTENSION M6Configuration PRESENCE conditional}| - {ID id-M7Configuration CRITICALITY ignore EXTENSION M7Configuration PRESENCE conditional}, + {ID id-M3Configuration CRITICALITY ignore EXTENSION M3Configuration PRESENCE conditional}| + {ID id-M4Configuration CRITICALITY ignore EXTENSION M4Configuration PRESENCE conditional}| + {ID id-M5Configuration CRITICALITY ignore EXTENSION M5Configuration PRESENCE conditional}| + {ID id-MDT-Location-Info CRITICALITY ignore EXTENSION MDT-Location-Info PRESENCE optional}| + {ID id-SignallingBasedMDTPLMNList CRITICALITY ignore EXTENSION MDTPLMNList PRESENCE optional}| + {ID id-M6Configuration CRITICALITY ignore EXTENSION M6Configuration PRESENCE conditional}| + {ID id-M7Configuration CRITICALITY ignore EXTENSION M7Configuration PRESENCE conditional}| + { ID id-BluetoothMeasurementConfiguration CRITICALITY ignore EXTENSION BluetoothMeasurementConfiguration PRESENCE optional}| + { ID id-WLANMeasurementConfiguration CRITICALITY ignore EXTENSION WLANMeasurementConfiguration PRESENCE optional}, ... } @@ -1328,7 +1376,7 @@ MeNBResourceCoordinationInformation ::= SEQUENCE { eUTRA-Cell-ID ECGI, uLCoordinationInformation BIT STRING (SIZE(6..4400, ...)), dLCoordinationInformation BIT STRING (SIZE(6..4400, ...)) OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { MeNBResourceCoordinationInformationExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {MeNBResourceCoordinationInformationExtIEs} } OPTIONAL, ... } @@ -1336,7 +1384,7 @@ MeNBResourceCoordinationInformationExtIEs X2AP-PROTOCOL-EXTENSION ::= { ... } -MeNBtoSeNBContainer ::= OCTET STRING +MeNBtoSeNBContainer ::= OCTET STRING MME-Group-ID ::= OCTET STRING (SIZE (2)) @@ -1352,7 +1400,7 @@ MBSFN-Subframe-Info ::= SEQUENCE { radioframeAllocationPeriod RadioframeAllocationPeriod, radioframeAllocationOffset RadioframeAllocationOffset, subframeAllocation SubframeAllocation, - iE-Extensions ProtocolExtensionContainer { { MBSFN-Subframe-Info-ExtIEs } } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {MBSFN-Subframe-Info-ExtIEs} } OPTIONAL, ... } @@ -1376,7 +1424,7 @@ MultibandInfoList ::= SEQUENCE (SIZE(1..maxnoofBands)) OF BandInfo BandInfo ::= SEQUENCE { freqBandIndicator FreqBandIndicator, - iE-Extensions ProtocolExtensionContainer { { BandInfo-ExtIEs } } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {BandInfo-ExtIEs} } OPTIONAL, ... } @@ -1464,8 +1512,13 @@ NRCGI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { NRPCI ::= INTEGER (0..1007) -NRrestriction ::= ENUMERATED { - nRrestricted, +NRrestrictioninEPSasSecondaryRAT ::= ENUMERATED { + nRrestrictedinEPSasSecondaryRAT, + ... +} + +NRrestrictionin5GS ::= ENUMERATED { + nRrestrictedin5GS, ... } @@ -1475,7 +1528,7 @@ NRintegrityProtectionAlgorithms ::= BIT STRING (SIZE (16,...)) NR-TxBW ::= SEQUENCE { nRSCS NRSCS, nRNRB NRNRB, - iE-Extensions ProtocolExtensionContainer { { NR-TxBW-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {NR-TxBW-ExtIEs} } OPTIONAL, ... } @@ -1494,7 +1547,7 @@ FiveGS-TAC ::= OCTET STRING (SIZE (3)) NRUESecurityCapabilities ::= SEQUENCE { nRencryptionAlgorithms NRencryptionAlgorithms, nRintegrityProtectionAlgorithms NRintegrityProtectionAlgorithms, - iE-Extensions ProtocolExtensionContainer { { NRUESecurityCapabilities-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {NRUESecurityCapabilities-ExtIEs} } OPTIONAL, ... } @@ -1557,6 +1610,8 @@ PDCP-SNExtended ::= INTEGER (0..32767) PDCP-SNlength18 ::= INTEGER (0..262143) +PDCPSnLength ::= ENUMERATED {twelve-bits,eighteen-bits,...} + PCI ::= INTEGER (0..503, ...) PLMN-Identity ::= OCTET STRING (SIZE(3)) @@ -1568,7 +1623,7 @@ PRACH-Configuration ::= SEQUENCE { zeroCorrelationIndex INTEGER (0..15), highSpeedFlag BOOLEAN, prach-FreqOffset INTEGER (0..94), - prach-ConfigIndex INTEGER (0..63) OPTIONAL, -- present for TDD -- + prach-ConfigIndex INTEGER (0..63) OPTIONAL, -- present for TDD -- iE-Extensions ProtocolExtensionContainer { {PRACH-Configuration-ExtIEs} } OPTIONAL, ... } @@ -1637,13 +1692,23 @@ ProtectedEUTRAResourceIndication::= SEQUENCE { protectedResourceList ProtectedResourceList, mBSFNControlRegionLength INTEGER (0..3) OPTIONAL, pDCCHRegionLength INTEGER (1..3) OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ProtectedEUTRAResourceIndication-ExtIEs} } OPTIONAL, ... } +ProtectedEUTRAResourceIndication-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { + ... +} -- Rapporteur: missing extension -- + ProtectedFootprintTimePattern ::= SEQUENCE { - protectedFootprintTimePeriodicity INTEGER (1..80, ...), + protectedFootprintTimePeriodicity INTEGER (1..320, ...), protectedFootprintStartTime INTEGER (1..20, ...), + iE-Extensions ProtocolExtensionContainer { {ProtectedFootprintTimePattern-ExtIEs} } OPTIONAL, + ... +} + +ProtectedFootprintTimePattern-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { ... } @@ -1654,6 +1719,11 @@ ProtectedResourceList-Item ::= SEQUENCE { intraPRBProtectedResourceFootprint BIT STRING (SIZE(84, ...)), protectedFootprintFrequencyPattern BIT STRING (SIZE(6..110, ...)), protectedFootprintTimePattern ProtectedFootprintTimePattern, + iE-Extensions ProtocolExtensionContainer { {ProtectedResourceList-Item-ExtIEs} } OPTIONAL, + ... +} + +ProtectedResourceList-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { ... } @@ -1700,6 +1770,11 @@ ReceiveStatusOfULPDCPSDUsExtended ::= BIT STRING (SIZE(1..16384)) ReceiveStatusOfULPDCPSDUsPDCP-SNlength18 ::= BIT STRING (SIZE(1..131072)) +Reestablishment-Indication ::= ENUMERATED { + reestablished, + ... +} + Registration-Request ::= ENUMERATED { start, stop, @@ -1715,7 +1790,7 @@ RelativeNarrowbandTxPower ::= SEQUENCE { numberOfCellSpecificAntennaPorts ENUMERATED {one, two, four, ...}, p-B INTEGER (0..3,...), pDCCH-InterferenceImpact INTEGER (0..4,...), - iE-Extensions ProtocolExtensionContainer { { RelativeNarrowbandTxPower-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {RelativeNarrowbandTxPower-ExtIEs} } OPTIONAL, ... } @@ -1761,8 +1836,13 @@ ReportIntervalMDT ::= ENUMERATED {ms120, ms240, ms480, ms640, ms1024, ms2048, ms ReservedSubframePattern ::= SEQUENCE{ subframeType SubframeType, - reservedSubframePattern BIT STRING (SIZE(10..40)), + reservedSubframePattern BIT STRING (SIZE(10..160)), mBSFNControlRegionLength INTEGER (0..3), + iE-Extensions ProtocolExtensionContainer { {ReservedSubframePattern-ExtIEs} } OPTIONAL, + ... +} + +ReservedSubframePattern-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { ... } @@ -1781,7 +1861,20 @@ ResumeID ::= CHOICE { RLCMode ::= ENUMERATED { rlc-am, - rlc-um + rlc-um-bidirectional, + rlc-um-unidirectional-ul, + rlc-um-unidirectional-dl, + ... +} + +RLC-Status ::= SEQUENCE { + reestablishment-Indication Reestablishment-Indication, + iE-Extensions ProtocolExtensionContainer { {RLC-Status-ExtIEs} } OPTIONAL, + ... +} + +RLC-Status-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { + ... } RNTP-Threshold ::= ENUMERATED { @@ -1826,7 +1919,7 @@ RSRPMeasurementResult ::= SEQUENCE (SIZE(1..maxCellReport)) OF SEQUENCE { rSRPCellID ECGI, rSRPMeasured INTEGER (0..97, ...), - iE-Extensions ProtocolExtensionContainer { { RSRPMeasurementResult-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {RSRPMeasurementResult-ExtIEs} } OPTIONAL, ... } @@ -1837,7 +1930,7 @@ RSRPMeasurementResult-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { RSRPMRList ::= SEQUENCE (SIZE(1..maxUEReport)) OF SEQUENCE { rSRPMeasurementResult RSRPMeasurementResult, - iE-Extensions ProtocolExtensionContainer { { RSRPMRList-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {RSRPMRList-ExtIEs} } OPTIONAL, ... } @@ -1853,7 +1946,7 @@ RRCContainer ::= OCTET STRING S1TNLLoadIndicator ::= SEQUENCE { dLS1TNLLoadIndicator LoadIndicator, uLS1TNLLoadIndicator LoadIndicator, - iE-Extensions ProtocolExtensionContainer { { S1TNLLoadIndicator-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {S1TNLLoadIndicator-ExtIEs} } OPTIONAL, ... } @@ -1874,7 +1967,7 @@ SecondaryRATUsageReport-Item ::= SEQUENCE { e-RAB-ID E-RAB-ID, secondaryRATType ENUMERATED {nr, ...}, e-RABUsageReportList E-RABUsageReportList, - iE-Extensions ProtocolExtensionContainer { { SecondaryRATUsageReport-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {SecondaryRATUsageReport-Item-ExtIEs} } OPTIONAL, ... } @@ -1931,7 +2024,7 @@ SgNBResourceCoordinationInformation ::= SEQUENCE { nR-CGI NRCGI, uLCoordinationInformation BIT STRING (SIZE(6..4400, ...)), dLCoordinationInformation BIT STRING (SIZE(6..4400, ...)) OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { SgNBResourceCoordinationInformationExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {SgNBResourceCoordinationInformationExtIEs} } OPTIONAL, ... } @@ -1972,7 +2065,7 @@ SpecialSubframe-Info ::= SEQUENCE { specialSubframePatterns SpecialSubframePatterns, cyclicPrefixDL CyclicPrefixDL, cyclicPrefixUL CyclicPrefixUL, - iE-Extensions ProtocolExtensionContainer { { SpecialSubframe-Info-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {SpecialSubframe-Info-ExtIEs} } OPTIONAL, ... } @@ -1998,7 +2091,34 @@ SpectrumSharingGroupID ::= INTEGER (1..maxCellineNB) SubbandCQI ::= SEQUENCE { subbandCQICodeword0 SubbandCQICodeword0, subbandCQICodeword1 SubbandCQICodeword1 OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { SubbandCQI-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {SubbandCQI-ExtIEs} } OPTIONAL, + ... +} + +Subscription-Based-UE-DifferentiationInfo ::= SEQUENCE { + periodicCommunicationIndicator ENUMERATED {periodically, ondemand, ...} OPTIONAL, + periodicTime INTEGER (1..3600, ...) OPTIONAL, + scheduledCommunicationTime ScheduledCommunicationTime OPTIONAL, + stationaryIndication ENUMERATED {stationary, mobile, ...} OPTIONAL, + trafficProfile ENUMERATED {single-packet, dual-packets, multiple-packets, ...} OPTIONAL, + batteryIndication ENUMERATED {battery-powered, battery-powered-not-rechargeable-or-replaceable, not-battery-powered, ...} OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { Subscription-Based-UE-DifferentiationInfo-ExtIEs} } OPTIONAL, + ... +} + +Subscription-Based-UE-DifferentiationInfo-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { + ... +} + +ScheduledCommunicationTime ::= SEQUENCE { + dayofWeek BIT STRING (SIZE(7)) OPTIONAL, + timeofDayStart INTEGER (0..86399, ...) OPTIONAL, + timeofDayEnd INTEGER (0..86399, ...) OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { ScheduledCommunicationTime-ExtIEs}} OPTIONAL, + ... +} + +ScheduledCommunicationTime-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { ... } @@ -2030,7 +2150,7 @@ SubbandCQIList ::= SEQUENCE (SIZE(1.. maxSubband)) OF SubbandCQIItem SubbandCQIItem ::= SEQUENCE { subbandCQI SubbandCQI, subbandIndex INTEGER (0..27,...), - iE-Extensions ProtocolExtensionContainer { { SubbandCQIItem-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {SubbandCQIItem-ExtIEs} } OPTIONAL, ... } @@ -2078,13 +2198,14 @@ SCGConfigurationQuery ::= ENUMERATED {true,...} SULInformation ::= SEQUENCE { sUL-ARFCN INTEGER (0.. 3279165), sUL-TxBW NR-TxBW, - iE-Extensions ProtocolExtensionContainer { { SULInformation-ExtIEs } } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {SULInformation-ExtIEs} } OPTIONAL, ... } SupportedSULFreqBandItem ::= SEQUENCE { freqBandIndicatorNr INTEGER (1..1024,...), + iE-Extensions ProtocolExtensionContainer { {SupportedSULFreqBandItem-ExtIEs} } OPTIONAL, ... } @@ -2125,7 +2246,7 @@ TAIListforMDT ::= SEQUENCE (SIZE(1..maxnoofTAforMDT)) OF TAI-Item TAI-Item ::= SEQUENCE { tAC TAC, pLMN-Identity PLMN-Identity, - iE-Extensions ProtocolExtensionContainer { { TAI-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {TAI-Item-ExtIEs} } OPTIONAL, ... } @@ -2308,7 +2429,7 @@ UE-RLF-Report-Container-for-extended-bands ::= OCTET STRING UESecurityCapabilities ::= SEQUENCE { encryptionAlgorithms EncryptionAlgorithms, integrityProtectionAlgorithms IntegrityProtectionAlgorithms, - iE-Extensions ProtocolExtensionContainer { { UESecurityCapabilities-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {UESecurityCapabilities-ExtIEs} } OPTIONAL, ... } @@ -2332,7 +2453,7 @@ UEsToBeResetList-Item::= SEQUENCE { meNB-ID UE-X2AP-ID, meNB-ID-ext UE-X2AP-ID-Extension OPTIONAL, sgNB-ID SgNB-UE-X2AP-ID OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { UEsToBeResetList-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {UEsToBeResetList-Item-ExtIEs} } OPTIONAL, ... } @@ -2343,12 +2464,17 @@ UEsToBeResetList-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { ULandDLSharing ::= SEQUENCE{ uLResourcesULandDLSharing ULResourcesULandDLSharing, dLResourcesULandDLSharing DLResourcesULandDLSharing, + iE-Extensions ProtocolExtensionContainer { {ULandDLSharing-ExtIEs} } OPTIONAL, + ... +} + +ULandDLSharing-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { ... } ULConfiguration::= SEQUENCE { uL-PDCP UL-UE-Configuration, - iE-Extensions ProtocolExtensionContainer { { ULConfiguration-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ULConfiguration-ExtIEs} } OPTIONAL, ... } @@ -2365,7 +2491,7 @@ UL-HighInterferenceIndicationInfo ::= SEQUENCE (SIZE(1..maxCellineNB)) OF UL-Hig UL-HighInterferenceIndicationInfo-Item ::= SEQUENCE { target-Cell-ID ECGI, ul-interferenceindication UL-HighInterferenceIndication, - iE-Extensions ProtocolExtensionContainer { { UL-HighInterferenceIndicationInfo-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {UL-HighInterferenceIndicationInfo-Item-ExtIEs} } OPTIONAL, ... } @@ -2388,10 +2514,15 @@ UL-non-GBR-PRB-usage::= INTEGER (0..100) ULOnlySharing ::= SEQUENCE{ uLResourceBitmapULOnlySharing DataTrafficResources, + iE-Extensions ProtocolExtensionContainer { {ULOnlySharing-ExtIEs} } OPTIONAL, + ... +} + +ULOnlySharing-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { ... } -ULResourceBitmapULandDLSharing ::= DataTrafficResources +ULResourceBitmapULandDLSharing ::= DataTrafficResources ULResourcesULandDLSharing ::= CHOICE { @@ -2412,7 +2543,7 @@ UsableABSInformation ::= CHOICE { UsableABSInformationFDD ::= SEQUENCE { usable-abs-pattern-info BIT STRING (SIZE(40)), - iE-Extensions ProtocolExtensionContainer { { UsableABSInformationFDD-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {UsableABSInformationFDD-ExtIEs} } OPTIONAL, ... } @@ -2422,7 +2553,7 @@ UsableABSInformationFDD-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { UsableABSInformationTDD ::= SEQUENCE { usaable-abs-pattern-info BIT STRING (SIZE(1..70, ...)), - iE-Extensions ProtocolExtensionContainer { { UsableABSInformationTDD-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {UsableABSInformationTDD-ExtIEs} } OPTIONAL, ... } @@ -2463,7 +2594,7 @@ PedestrianUE ::= ENUMERATED { WidebandCQI ::= SEQUENCE { widebandCQICodeword0 INTEGER (0..15, ...), widebandCQICodeword1 WidebandCQICodeword1 OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { WidebandCQI-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {WidebandCQI-ExtIEs} } OPTIONAL, ... } @@ -2477,6 +2608,25 @@ WidebandCQICodeword1::= CHOICE { ... } +WLANMeasurementConfiguration ::= SEQUENCE { + wlanMeasConfig WLANMeasConfig, + wlanMeasConfigNameList WLANMeasConfigNameList OPTIONAL, + wlan-rssi ENUMERATED {true, ...} OPTIONAL, + wlan-rtt ENUMERATED {true, ...} OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {WLANMeasurementConfiguration-ExtIEs} } OPTIONAL, + ... +} + +WLANMeasurementConfiguration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { + ... +} + +WLANMeasConfigNameList ::= SEQUENCE (SIZE(1..maxnoofWLANName)) OF WLANName + +WLANMeasConfig::= ENUMERATED {setup,...} + +WLANName ::= OCTET STRING (SIZE (1..32)) + WTID ::= CHOICE { wTID-Type1 WTID-Type1, wTID-Type2 WTID-Long-Type2, diff --git a/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn b/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn index b987c82281..404d2611e8 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V15.2.0 (2018-06) +-- 3GPP TS 36.423 V15.3.0 (2018-09) -- 9.3.4 PDU Definitions -- ************************************************************** -- @@ -63,6 +63,7 @@ IMPORTS Registration-Request, RelativeNarrowbandTxPower, RadioResourceStatus, + RLC-Status, RRCConnReestabIndicator, RRCConnSetupIndicator, UE-RLF-Report-Container, @@ -164,7 +165,9 @@ IMPORTS RRC-Config-Ind, SGNB-Addition-Trigger-Ind, UserPlaneTrafficActivityReport, - ERABActivityNotifyItemList + ERABActivityNotifyItemList, + PDCPSnLength, + Subscription-Based-UE-DifferentiationInfo FROM X2AP-IEs @@ -214,6 +217,7 @@ FROM X2AP-Containers id-Old-eNB-UE-X2AP-ID, id-Registration-Request, id-ReportingPeriodicity, + id-RLC-Status, id-ServedCells, id-ServedCellsToActivate, id-ServedCellsToAdd, @@ -426,6 +430,11 @@ FROM X2AP-Containers id-MeNBCell-ID, id-InitiatingNodeType-EndcX2Removal, id-RespondingNodeType-EndcX2Removal, + id-pDCPSnLength, + id-dL-Forwarding, + id-E-RABs-DataForwardingAddress-List, + id-E-RABs-DataForwardingAddress-Item, + id-Subscription-Based-UE-DifferentiationInfo, maxCellineNB, @@ -477,7 +486,8 @@ HandoverRequest-IEs X2AP-PROTOCOL-IES ::= { { ID id-UE-ContextReferenceAtWT CRITICALITY ignore TYPE UE-ContextReferenceAtWT PRESENCE optional}| { ID id-NRUESecurityCapabilities CRITICALITY ignore TYPE NRUESecurityCapabilities PRESENCE optional}| { ID id-UE-ContextReferenceAtSgNB CRITICALITY ignore TYPE UE-ContextReferenceAtSgNB PRESENCE optional}| - { ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional}, + { ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional}| + { ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional}, ... } @@ -669,7 +679,7 @@ SNStatusTransfer-IEs X2AP-PROTOCOL-IES ::= { ... } -E-RABs-SubjectToStatusTransfer-List ::= SEQUENCE (SIZE (1..maxnoofBearers)) OF ProtocolIE-Single-Container { { E-RABs-SubjectToStatusTransfer-ItemIEs} } +E-RABs-SubjectToStatusTransfer-List ::= SEQUENCE (SIZE (1..maxnoofBearers)) OF ProtocolIE-Single-Container { {E-RABs-SubjectToStatusTransfer-ItemIEs} } E-RABs-SubjectToStatusTransfer-ItemIEs X2AP-PROTOCOL-IES ::= { { ID id-E-RABs-SubjectToStatusTransfer-Item CRITICALITY ignore TYPE E-RABs-SubjectToStatusTransfer-Item PRESENCE mandatory } @@ -923,7 +933,7 @@ ServedCellsToModify-Item::= SEQUENCE { old-ecgi ECGI, servedCellInfo ServedCell-Information, neighbour-Info Neighbour-Information OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { ServedCellsToModify-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ServedCellsToModify-Item-ExtIEs} } OPTIONAL, ... } @@ -1046,7 +1056,7 @@ ResourceStatusResponse-IEs X2AP-PROTOCOL-IES ::= { } -MeasurementInitiationResult-List ::= SEQUENCE (SIZE (1..maxCellineNB)) OF ProtocolIE-Single-Container { { MeasurementInitiationResult-ItemIEs} } +MeasurementInitiationResult-List ::= SEQUENCE (SIZE (1..maxCellineNB)) OF ProtocolIE-Single-Container { {MeasurementInitiationResult-ItemIEs} } MeasurementInitiationResult-ItemIEs X2AP-PROTOCOL-IES ::= { { ID id-MeasurementInitiationResult-Item CRITICALITY ignore TYPE MeasurementInitiationResult-Item PRESENCE mandatory} @@ -1055,7 +1065,7 @@ MeasurementInitiationResult-ItemIEs X2AP-PROTOCOL-IES ::= { MeasurementInitiationResult-Item ::= SEQUENCE { cell-ID ECGI, measurementFailureCause-List MeasurementFailureCause-List OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { MeasurementInitiationResult-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {MeasurementInitiationResult-Item-ExtIEs} } OPTIONAL, ... } @@ -1063,7 +1073,7 @@ MeasurementInitiationResult-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { ... } -MeasurementFailureCause-List ::= SEQUENCE (SIZE (1..maxFailedMeasObjects)) OF ProtocolIE-Single-Container { { MeasurementFailureCause-ItemIEs} } +MeasurementFailureCause-List ::= SEQUENCE (SIZE (1..maxFailedMeasObjects)) OF ProtocolIE-Single-Container { {MeasurementFailureCause-ItemIEs} } MeasurementFailureCause-ItemIEs X2AP-PROTOCOL-IES ::= { { ID id-MeasurementFailureCause-Item CRITICALITY ignore TYPE MeasurementFailureCause-Item PRESENCE mandatory} @@ -1072,7 +1082,7 @@ MeasurementFailureCause-ItemIEs X2AP-PROTOCOL-IES ::= { MeasurementFailureCause-Item ::= SEQUENCE { measurementFailedReportCharacteristics ReportCharacteristics, cause Cause, - iE-Extensions ProtocolExtensionContainer { { MeasurementFailureCause-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {MeasurementFailureCause-Item-ExtIEs} } OPTIONAL, ... } @@ -1109,7 +1119,7 @@ CompleteFailureCauseInformation-ItemIEs X2AP-PROTOCOL-IES ::= { CompleteFailureCauseInformation-Item ::= SEQUENCE { cell-ID ECGI, measurementFailureCause-List MeasurementFailureCause-List, - iE-Extensions ProtocolExtensionContainer { { CompleteFailureCauseInformation-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {CompleteFailureCauseInformation-Item-ExtIEs} } OPTIONAL, ... } @@ -1278,7 +1288,7 @@ ServedCellsToActivate::= SEQUENCE (SIZE (1..maxCellineNB)) OF ServedCellsToActiv ServedCellsToActivate-Item::= SEQUENCE { ecgi ECGI, - iE-Extensions ProtocolExtensionContainer { { ServedCellsToActivate-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ServedCellsToActivate-Item-ExtIEs} } OPTIONAL, ... } @@ -1307,7 +1317,7 @@ ActivatedCellList ::= SEQUENCE (SIZE (1..maxCellineNB)) OF ActivatedCellList-Ite ActivatedCellList-Item::= SEQUENCE { ecgi ECGI, - iE-Extensions ProtocolExtensionContainer { { ActivatedCellList-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ActivatedCellList-Item-ExtIEs} } OPTIONAL, ... } @@ -1368,7 +1378,7 @@ X2APMessageTransfer-IEs X2AP-PROTOCOL-IES ::= { RNL-Header ::= SEQUENCE { source-GlobalENB-ID GlobalENB-ID, target-GlobalENB-ID GlobalENB-ID OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { RNL-Header-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {RNL-Header-Item-ExtIEs} } OPTIONAL, ... } @@ -1407,7 +1417,7 @@ SeNBAdditionRequest-IEs X2AP-PROTOCOL-IES ::= { ... } -E-RABs-ToBeAdded-List ::= SEQUENCE (SIZE(1..maxnoofBearers)) OF ProtocolIE-Single-Container { { E-RABs-ToBeAdded-ItemIEs} } +E-RABs-ToBeAdded-List ::= SEQUENCE (SIZE(1..maxnoofBearers)) OF ProtocolIE-Single-Container { {E-RABs-ToBeAdded-ItemIEs} } E-RABs-ToBeAdded-ItemIEs X2AP-PROTOCOL-IES ::= { { ID id-E-RABs-ToBeAdded-Item CRITICALITY reject TYPE E-RABs-ToBeAdded-Item PRESENCE mandatory}, @@ -1569,7 +1579,7 @@ ResponseInformationSeNBReconfComp-SuccessItemExtIEs X2AP-PROTOCOL-EXTENSION ::= ResponseInformationSeNBReconfComp-RejectByMeNBItem ::= SEQUENCE { cause Cause, meNBtoSeNBContainer MeNBtoSeNBContainer OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { ResponseInformationSeNBReconfComp-RejectByMeNBItemExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ResponseInformationSeNBReconfComp-RejectByMeNBItemExtIEs} } OPTIONAL, ... } @@ -1609,7 +1619,7 @@ UE-ContextInformationSeNBModReq ::= SEQUENCE { e-RABs-ToBeAdded E-RABs-ToBeAdded-List-ModReq OPTIONAL, e-RABs-ToBeModified E-RABs-ToBeModified-List-ModReq OPTIONAL, e-RABs-ToBeReleased E-RABs-ToBeReleased-List-ModReq OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { UE-ContextInformationSeNBModReqExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {UE-ContextInformationSeNBModReqExtIEs} } OPTIONAL, ... } @@ -2109,8 +2119,8 @@ SeNBCounterCheckRequest ::= SEQUENCE { } SeNBCounterCheckRequest-IEs X2AP-PROTOCOL-IES ::= { - { ID id-MeNB-UE-X2AP-ID CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}| - { ID id-SeNB-UE-X2AP-ID CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}| + { ID id-MeNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory}| + { ID id-SeNB-UE-X2AP-ID CRITICALITY reject TYPE UE-X2AP-ID PRESENCE mandatory}| { ID id-E-RABs-SubjectToCounterCheck-List CRITICALITY ignore TYPE E-RABs-SubjectToCounterCheck-List PRESENCE mandatory}| { ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY ignore TYPE UE-X2AP-ID-Extension PRESENCE optional}| { ID id-SeNB-UE-X2AP-ID-Extension CRITICALITY ignore TYPE UE-X2AP-ID-Extension PRESENCE optional}, @@ -2238,7 +2248,8 @@ RetrieveUEContextResponse-IEs X2AP-PROTOCOL-IES ::= { { ID id-ProSeAuthorized CRITICALITY ignore TYPE ProSeAuthorized PRESENCE optional}| { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}| { ID id-V2XServicesAuthorized CRITICALITY ignore TYPE V2XServicesAuthorized PRESENCE optional}| - { ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional}, + { ID id-AerialUEsubscriptionInformation CRITICALITY ignore TYPE AerialUEsubscriptionInformation PRESENCE optional}| + { ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional}, ... } @@ -2279,7 +2290,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-uL-GTPtunnelEndpoint CRITICALITY reject EXTENSION GTPtunnelEndpoint PRESENCE mandatory}| + { ID id-dL-Forwarding CRITICALITY ignore EXTENSION DL-Forwarding PRESENCE optional }, ... } @@ -2360,7 +2372,7 @@ E-RABs-ToBeAdded-SgNBAddReq-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= { E-RABs-ToBeAdded-SgNBAddReq-Item-SgNBPDCPpresent ::= SEQUENCE { full-E-RAB-Level-QoS-Parameters E-RAB-Level-QoS-Parameters, max-MCG-admit-E-RAB-Level-QoS-Parameters GBR-QosInformation OPTIONAL, --- This IE shall be present if MCG resource and SCG resources IEs in the the EN-DC Resource Configuration IE are set to “present” and GBR QoS Information IE is present in Full E-RAB Level QoS Parameters IE -- +-- This IE shall be present if MCG resource and SCG resources IEs in the the EN-DC Resource Configuration IE are set to “present” and GBR QoS Information IE is present in Full E-RAB Level QoS Parameters IE -- dL-Forwarding DL-Forwarding OPTIONAL, meNB-DL-GTP-TEIDatMCG GTPtunnelEndpoint OPTIONAL, -- This IE shall be present if MCG resource IE in the the EN-DC Resource Configuration IE is set to “present” -- @@ -2385,6 +2397,7 @@ E-RABs-ToBeAdded-SgNBAddReq-Item-SgNBPDCPnotpresent ::= SEQUENCE { } E-RABs-ToBeAdded-SgNBAddReq-Item-SgNBPDCPnotpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= { + { ID id-pDCPSnLength CRITICALITY ignore EXTENSION PDCPSnLength PRESENCE optional}, ... } @@ -2452,6 +2465,7 @@ E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item-SgNBPDCPpresent ::= SEQUENCE { } E-RABs-Admitted-ToBeAdded-SgNBAddReqAck-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= { + { ID id-pDCPSnLength CRITICALITY ignore EXTENSION PDCPSnLength PRESENCE optional}, ... } @@ -2552,7 +2566,7 @@ SgNBModificationRequest-IEs X2AP-PROTOCOL-IES ::= { { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}| { ID id-SelectedPLMN CRITICALITY ignore TYPE PLMN-Identity PRESENCE optional}| { ID id-HandoverRestrictionList CRITICALITY ignore TYPE HandoverRestrictionList PRESENCE optional}| - { ID id-SCGConfigurationQuery CRITICALITY ignore TYPE SCGConfigurationQuery PRESENCE optional}| + { ID id-SCGConfigurationQuery CRITICALITY ignore TYPE SCGConfigurationQuery PRESENCE optional}| { ID id-UE-ContextInformation-SgNBModReq CRITICALITY reject TYPE UE-ContextInformation-SgNBModReq PRESENCE optional}| { ID id-MeNBtoSgNBContainer CRITICALITY ignore TYPE MeNBtoSgNBContainer PRESENCE optional}| { ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}| @@ -2605,7 +2619,7 @@ E-RABs-ToBeAdded-SgNBModReq-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= { E-RABs-ToBeAdded-SgNBModReq-Item-SgNBPDCPpresent ::= SEQUENCE { full-E-RAB-Level-QoS-Parameters E-RAB-Level-QoS-Parameters, max-MN-admit-E-RAB-Level-QoS-Parameters GBR-QosInformation OPTIONAL, --- This IE shall be present if MCG resource and SCG resources IEs in the the EN-DC Resource Configuration IE are set to “present” and GBR QoS Information IE is present in Full E-RAB Level QoS Parameters IE -- +-- This IE shall be present if MCG resource and SCG resources IEs in the the EN-DC Resource Configuration IE are set to “present” and GBR QoS Information IE is present in Full E-RAB Level QoS Parameters IE -- dL-Forwarding DL-Forwarding OPTIONAL, meNB-DL-GTP-TEIDatMCG GTPtunnelEndpoint OPTIONAL, -- This IE shall be present if MCG resource IE in the the EN-DC Resource Configuration IE is set to “present” -- @@ -2630,6 +2644,7 @@ E-RABs-ToBeAdded-SgNBModReq-Item-SgNBPDCPnotpresent ::= SEQUENCE { } E-RABs-ToBeAdded-SgNBModReq-Item-SgNBPDCPnotpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= { + { ID id-pDCPSnLength CRITICALITY ignore EXTENSION PDCPSnLength PRESENCE optional}, ... } @@ -2660,7 +2675,7 @@ E-RABs-ToBeModified-SgNBModReq-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= { E-RABs-ToBeModified-SgNBModReq-Item-SgNBPDCPpresent ::= SEQUENCE { full-E-RAB-Level-QoS-Parameters E-RAB-Level-QoS-Parameters OPTIONAL, - max-MN-admit-E-RAB-Level-QoS-Parameters E-RAB-Level-QoS-Parameters OPTIONAL, + max-MN-admit-E-RAB-Level-QoS-Parameters GBR-QosInformation OPTIONAL, meNB-DL-GTP-TEIDatMCG GTPtunnelEndpoint OPTIONAL, s1-UL-GTPtunnelEndpoint GTPtunnelEndpoint OPTIONAL, iE-Extensions ProtocolExtensionContainer { {E-RABs-ToBeModified-SgNBModReq-Item-SgNBPDCPpresentExtIEs} } OPTIONAL, @@ -2668,6 +2683,7 @@ E-RABs-ToBeModified-SgNBModReq-Item-SgNBPDCPpresent ::= SEQUENCE { } E-RABs-ToBeModified-SgNBModReq-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= { + { ID id-RLC-Status CRITICALITY ignore EXTENSION RLC-Status PRESENCE optional }, ... } @@ -2680,6 +2696,7 @@ E-RABs-ToBeModified-SgNBModReq-Item-SgNBPDCPnotpresent ::= SEQUENCE { } E-RABs-ToBeModified-SgNBModReq-Item-SgNBPDCPnotpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= { + { ID id-pDCPSnLength CRITICALITY ignore EXTENSION PDCPSnLength PRESENCE optional}, ... } @@ -2751,7 +2768,8 @@ SgNBModificationRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= { { ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY ignore TYPE UE-X2AP-ID-Extension PRESENCE optional}| { ID id-SgNBResourceCoordinationInformation CRITICALITY ignore TYPE SgNBResourceCoordinationInformation PRESENCE optional}| { ID id-AdmittedSplitSRBs CRITICALITY ignore TYPE SplitSRBs PRESENCE optional}| - { ID id-AdmittedSplitSRBsrelease CRITICALITY ignore TYPE SplitSRBs PRESENCE optional}, + { ID id-AdmittedSplitSRBsrelease CRITICALITY ignore TYPE SplitSRBs PRESENCE optional}| + { ID id-RRCConfigIndication CRITICALITY reject TYPE RRC-Config-Ind PRESENCE optional}, ... } @@ -2794,6 +2812,7 @@ E-RABs-Admitted-ToBeAdded-SgNBModAck-Item-SgNBPDCPpresent ::= SEQUENCE { } E-RABs-Admitted-ToBeAdded-SgNBModAck-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= { + { ID id-pDCPSnLength CRITICALITY ignore EXTENSION PDCPSnLength PRESENCE optional}, ... } @@ -2840,6 +2859,7 @@ E-RABs-Admitted-ToBeModified-SgNBModAck-Item-SgNBPDCPpresent ::= SEQUENCE { } E-RABs-Admitted-ToBeModified-SgNBModAck-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= { + { ID id-pDCPSnLength CRITICALITY ignore EXTENSION PDCPSnLength PRESENCE optional}, ... } @@ -2928,14 +2948,15 @@ SgNBModificationRequired ::= SEQUENCE { SgNBModificationRequired-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-SgNB-UE-X2AP-ID CRITICALITY reject TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}| { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}| - { ID id-PDCPChangeIndication CRITICALITY ignore TYPE PDCPChangeIndication PRESENCE optional}| + { ID id-PDCPChangeIndication CRITICALITY ignore TYPE PDCPChangeIndication PRESENCE optional}| { ID id-E-RABs-ToBeReleased-SgNBModReqdList CRITICALITY ignore TYPE E-RABs-ToBeReleased-SgNBModReqdList PRESENCE optional}| - { ID id-SgNBtoMeNBContainer CRITICALITY ignore TYPE SgNBtoMeNBContainer PRESENCE optional}| + { ID id-SgNBtoMeNBContainer CRITICALITY ignore TYPE SgNBtoMeNBContainer PRESENCE optional}| { ID id-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}| { 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-SgNBResourceCoordinationInformation CRITICALITY ignore TYPE SgNBResourceCoordinationInformation PRESENCE optional}| + { ID id-RRCConfigIndication CRITICALITY reject TYPE RRC-Config-Ind PRESENCE optional}, ... } @@ -2991,6 +3012,7 @@ E-RABs-ToBeModified-SgNBModReqd-Item-SgNBPDCPpresent ::= SEQUENCE { } E-RABs-ToBeModified-SgNBModReqd-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= { + { ID id-pDCPSnLength CRITICALITY ignore EXTENSION PDCPSnLength PRESENCE optional}, ... } @@ -3002,6 +3024,7 @@ E-RABs-ToBeModified-SgNBModReqd-Item-SgNBPDCPnotpresent ::= SEQUENCE { } E-RABs-ToBeModified-SgNBModReqd-Item-SgNBPDCPnotpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= { + { ID id-RLC-Status CRITICALITY ignore EXTENSION RLC-Status PRESENCE optional }, ... } @@ -3068,6 +3091,7 @@ E-RABs-AdmittedToBeModified-SgNBModConf-Item-SgNBPDCPnotpresent ::= SEQUENCE { } E-RABs-AdmittedToBeModified-SgNBModConf-Item-SgNBPDCPnotpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= { + { ID id-pDCPSnLength CRITICALITY ignore EXTENSION PDCPSnLength PRESENCE optional}, ... } @@ -3170,8 +3194,8 @@ SgNBReleaseRequestAcknowledge ::= SEQUENCE { } SgNBReleaseRequestAcknowledge-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 CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}| + { 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}, ... @@ -3189,8 +3213,8 @@ SgNBReleaseRequestReject ::= SEQUENCE { } SgNBReleaseRequestReject-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 CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}| + { ID id-SgNB-UE-X2AP-ID CRITICALITY ignore TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}| { ID id-Cause CRITICALITY ignore TYPE Cause 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}, @@ -3329,11 +3353,11 @@ SgNBChangeRequired ::= SEQUENCE { } SgNBChangeRequired-IEs X2AP-PROTOCOL-IES ::= { - { ID id-MeNB-UE-X2AP-ID CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}| - { ID id-SgNB-UE-X2AP-ID CRITICALITY ignore TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}| - { ID id-Target-SgNB-ID CRITICALITY ignore TYPE GNB-ID PRESENCE mandatory}| + { 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 ignore TYPE SgNBtoMeNBContainer PRESENCE optional}| + { 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}, ... } @@ -3437,7 +3461,7 @@ SgNBChangeRefuse-IEs X2AP-PROTOCOL-IES ::= { { ID id-SgNB-UE-X2AP-ID CRITICALITY ignore TYPE SgNB-UE-X2AP-ID PRESENCE mandatory}| { ID id-Cause CRITICALITY ignore TYPE Cause 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-MeNB-UE-X2AP-ID-Extension CRITICALITY reject TYPE UE-X2AP-ID-Extension PRESENCE optional}, ... } @@ -3472,7 +3496,7 @@ ENB-ENDCX2SetupReqIEs X2AP-PROTOCOL-IES ::= { ServedEUTRAcellsENDCX2ManagementList ::= SEQUENCE (SIZE (1.. maxCellineNB)) OF SEQUENCE { servedEUTRACellInfo ServedCell-Information, nrNeighbourInfo NRNeighbour-Information OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { ServedEUTRAcellsENDCX2Management-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ServedEUTRAcellsENDCX2Management-ExtIEs} } OPTIONAL, ... } @@ -3489,7 +3513,7 @@ En-gNB-ENDCX2SetupReqIEs X2AP-PROTOCOL-IES ::= { ServedNRcellsENDCX2ManagementList ::= SEQUENCE (SIZE (1.. maxCellinengNB)) OF SEQUENCE { servedNRCellInfo ServedNRCell-Information, nRNeighbourInfo NRNeighbour-Information OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { En-gNBServedCells-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {En-gNBServedCells-ExtIEs} } OPTIONAL, ... } @@ -3500,7 +3524,7 @@ En-gNBServedCells-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { ServedNRCell-Information ::= SEQUENCE { nrpCI NRPCI, nrCellID NRCGI, - fiveGS-TAC FiveGS-TAC, + fiveGS-TAC FiveGS-TAC OPTIONAL, configured-TAC TAC OPTIONAL, broadcastPLMNs BroadcastPLMNs-Item, nrModeInfo CHOICE { @@ -3509,7 +3533,7 @@ ServedNRCell-Information ::= SEQUENCE { ... }, measurementTimingConfiguration OCTET STRING, - iE-Extensions ProtocolExtensionContainer { { ServedNRCell-Information-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ServedNRCell-Information-ExtIEs} } OPTIONAL, ... } @@ -3522,7 +3546,7 @@ FDD-InfoServedNRCell-Information ::= SEQUENCE { dl-NRFreqInfo NRFreqInfo, ul-NR-TxBW NR-TxBW, dl-NR-TxBW NR-TxBW, - iE-Extensions ProtocolExtensionContainer { { FDD-InfoServedNRCell-Information-ExtIEs } } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {FDD-InfoServedNRCell-Information-ExtIEs} } OPTIONAL, ... } @@ -3533,7 +3557,7 @@ FDD-InfoServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { FDD-InfoNeighbourServedNRCell-Information ::= SEQUENCE { ul-NRFreqInfo NRFreqInfo, dl-NRFreqInfo NRFreqInfo, - iE-Extensions ProtocolExtensionContainer { { FDD-InfoNeighbourServedNRCell-Information-ExtIEs } } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {FDD-InfoNeighbourServedNRCell-Information-ExtIEs} } OPTIONAL, ... } @@ -3544,7 +3568,7 @@ FDD-InfoNeighbourServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { TDD-InfoServedNRCell-Information ::= SEQUENCE { nRFreqInfo NRFreqInfo, nR-TxBW NR-TxBW, - iE-Extensions ProtocolExtensionContainer { { TDD-InfoServedNRCell-Information-ExtIEs } } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {TDD-InfoServedNRCell-Information-ExtIEs} } OPTIONAL, ... } @@ -3554,7 +3578,7 @@ TDD-InfoServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { TDD-InfoNeighbourServedNRCell-Information ::= SEQUENCE { nRFreqInfo NRFreqInfo, - iE-Extensions ProtocolExtensionContainer { { TDD-InfoNeighbourServedNRCell-Information-ExtIEs } } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {TDD-InfoNeighbourServedNRCell-Information-ExtIEs} } OPTIONAL, ... } @@ -3566,7 +3590,7 @@ NRNeighbour-Information ::= SEQUENCE (SIZE (1.. maxofNRNeighbours))OF SEQUENCE { nrpCI NRPCI, nrCellID NRCGI, nrFreqInfo NRFreqInfo, - fiveGS-TAC FiveGS-TAC, + fiveGS-TAC FiveGS-TAC OPTIONAL, configured-TAC TAC OPTIONAL, measurementTimingConfiguration OCTET STRING, nRNeighbourModeInfo CHOICE { @@ -3574,7 +3598,7 @@ NRNeighbour-Information ::= SEQUENCE (SIZE (1.. maxofNRNeighbours))OF SEQUENCE { tdd TDD-InfoNeighbourServedNRCell-Information, ... }, - iE-Extensions ProtocolExtensionContainer { { NRNeighbour-Information-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {NRNeighbour-Information-ExtIEs} } OPTIONAL, ... } @@ -3584,7 +3608,7 @@ NRNeighbour-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { CellAssistanceInformation ::= CHOICE { limited-list Limited-list, - full-list ENUMERATED {allServedNRcells, ...}, + full-list ENUMERATED {allServedNRcells, ...}, ... } @@ -3647,7 +3671,8 @@ ENDCX2SetupFailure ::= SEQUENCE { ENDCX2SetupFailure-IEs X2AP-PROTOCOL-IES ::= { { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory} | - { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }, + { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional } | + { ID id-TimeToWait CRITICALITY ignore TYPE TimeToWait PRESENCE optional }, ... } @@ -3685,7 +3710,7 @@ ServedEUTRAcellsToModifyListENDCConfUpd ::= SEQUENCE (SIZE (1.. maxCellineNB)) O old-ECGI ECGI, servedEUTRACellInfo ServedCell-Information, nrNeighbourInfo NRNeighbour-Information OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { ServedEUTRAcellsToModifyListENDCConfUpd-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ServedEUTRAcellsToModifyListENDCConfUpd-ExtIEs} } OPTIONAL, ... } @@ -3710,7 +3735,7 @@ ServedNRCellsToModify-Item::= SEQUENCE { servedNRCellInformation ServedNRCell-Information, nrNeighbourInformation NRNeighbour-Information OPTIONAL, nrDeactivationIndication DeactivationIndication OPTIONAL, - iE-Extensions ProtocolExtensionContainer { { ServedNRCellsToModify-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ServedNRCellsToModify-Item-ExtIEs} } OPTIONAL, ... } @@ -3745,7 +3770,7 @@ RespondingNodeType-EndcConfigUpdate::= CHOICE { ENB-ENDCConfigUpdateAckIEs X2AP-PROTOCOL-IES ::= { - ... + ... } En-gNB-ENDCConfigUpdateAckIEs X2AP-PROTOCOL-IES ::= { @@ -3767,7 +3792,8 @@ ENDCConfigurationUpdateFailure ::= SEQUENCE { ENDCConfigurationUpdateFailure-IEs X2AP-PROTOCOL-IES ::= { { ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}| - { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}, + { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }| + { ID id-TimeToWait CRITICALITY ignore TYPE TimeToWait PRESENCE optional }, ... } @@ -3793,7 +3819,7 @@ ServedNRCellsToActivate::= SEQUENCE (SIZE (1.. maxCellinengNB)) OF ServedNRCells ServedNRCellsToActivate-Item::= SEQUENCE { nrCellID NRCGI, - iE-Extensions ProtocolExtensionContainer { { ServedNRCellsToActivate-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ServedNRCellsToActivate-Item-ExtIEs} } OPTIONAL, ... } @@ -3823,7 +3849,7 @@ ActivatedNRCellList ::= SEQUENCE (SIZE (1.. maxCellinengNB)) OF ActivatedNRCellL ActivatedNRCellList-Item::= SEQUENCE { nrCellID NRCGI, - iE-Extensions ProtocolExtensionContainer { { ActivatedNRCellList-Item-ExtIEs} } OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {ActivatedNRCellList-Item-ExtIEs} } OPTIONAL, ... } @@ -3939,18 +3965,18 @@ InitiatingNodeType-EutranrCellResourceCoordination ::= CHOICE { ENB-EUTRA-NRCellResourceCoordinationReqIEs X2AP-PROTOCOL-IES ::= { - { ID id-DataTrafficResourceIndication CRITICALITY reject TYPE DataTrafficResourceIndication PRESENCE mandatory}| - { ID id-SpectrumSharingGroupID CRITICALITY reject TYPE SpectrumSharingGroupID PRESENCE mandatory}| - { ID id-ListofEUTRACellsinEUTRACoordinationReq CRITICALITY reject TYPE ListofEUTRACellsinEUTRACoordinationReq PRESENCE mandatory }, + { ID id-DataTrafficResourceIndication CRITICALITY reject TYPE DataTrafficResourceIndication PRESENCE mandatory}| + { ID id-SpectrumSharingGroupID CRITICALITY reject TYPE SpectrumSharingGroupID PRESENCE mandatory}| + { ID id-ListofEUTRACellsinEUTRACoordinationReq CRITICALITY reject TYPE ListofEUTRACellsinEUTRACoordinationReq PRESENCE mandatory}, ... } En-gNB-EUTRA-NRCellResourceCoordinationReqIEs X2AP-PROTOCOL-IES ::= { - { ID id-DataTrafficResourceIndication CRITICALITY reject TYPE DataTrafficResourceIndication PRESENCE mandatory}| - { ID id-ListofEUTRACellsinNRCoordinationReq CRITICALITY reject TYPE ListofEUTRACellsinNRCoordinationReq PRESENCE mandatory }| - { ID id-SpectrumSharingGroupID CRITICALITY reject TYPE SpectrumSharingGroupID PRESENCE mandatory}| - { ID id-ListofNRCellsinNRCoordinationReq CRITICALITY reject TYPE ListofNRCellsinNRCoordinationReq PRESENCE mandatory }, + { ID id-DataTrafficResourceIndication CRITICALITY reject TYPE DataTrafficResourceIndication PRESENCE mandatory}| + { ID id-ListofEUTRACellsinNRCoordinationReq CRITICALITY reject TYPE ListofEUTRACellsinNRCoordinationReq PRESENCE mandatory }| + { ID id-SpectrumSharingGroupID CRITICALITY reject TYPE SpectrumSharingGroupID PRESENCE mandatory}| + { ID id-ListofNRCellsinNRCoordinationReq CRITICALITY reject TYPE ListofNRCellsinNRCoordinationReq PRESENCE mandatory}, ... } @@ -3983,24 +4009,24 @@ RespondingNodeType-EutranrCellResourceCoordination ::= CHOICE { ENB-EUTRA-NRCellResourceCoordinationReqAckIEs X2AP-PROTOCOL-IES ::= { - { ID id-DataTrafficResourceIndication CRITICALITY reject TYPE DataTrafficResourceIndication PRESENCE mandatory}| - { ID id-SpectrumSharingGroupID CRITICALITY reject TYPE SpectrumSharingGroupID PRESENCE mandatory}| - { ID id-ListofEUTRACellsinEUTRACoordinationResp CRITICALITY reject TYPE ListofEUTRACellsinEUTRACoordinationResp PRESENCE mandatory }, + { ID id-DataTrafficResourceIndication CRITICALITY reject TYPE DataTrafficResourceIndication PRESENCE mandatory}| + { ID id-SpectrumSharingGroupID CRITICALITY reject TYPE SpectrumSharingGroupID PRESENCE mandatory}| + { ID id-ListofEUTRACellsinEUTRACoordinationResp CRITICALITY reject TYPE ListofEUTRACellsinEUTRACoordinationResp PRESENCE mandatory}, ... } En-gNB-EUTRA-NRCellResourceCoordinationReqAckIEs X2AP-PROTOCOL-IES ::= { - { ID id-DataTrafficResourceIndication CRITICALITY reject TYPE DataTrafficResourceIndication PRESENCE mandatory}| - { ID id-SpectrumSharingGroupID CRITICALITY reject TYPE SpectrumSharingGroupID PRESENCE mandatory}| - { ID id-ListofNRCellsinNRCoordinationResp CRITICALITY reject TYPE ListofNRCellsinNRCoordinationResp PRESENCE mandatory }, + { ID id-DataTrafficResourceIndication CRITICALITY reject TYPE DataTrafficResourceIndication PRESENCE mandatory}| + { ID id-SpectrumSharingGroupID CRITICALITY reject TYPE SpectrumSharingGroupID PRESENCE mandatory}| + { ID id-ListofNRCellsinNRCoordinationResp CRITICALITY reject TYPE ListofNRCellsinNRCoordinationResp PRESENCE mandatory}, ... } -ListofEUTRACellsinEUTRACoordinationResp ::= SEQUENCE (SIZE (1..maxCellineNB)) OF ECGI -ListofNRCellsinNRCoordinationResp ::= SEQUENCE (SIZE (1..maxnoNRcellsSpectrumSharingWithE-UTRA)) OF NRCGI +ListofEUTRACellsinEUTRACoordinationResp ::= SEQUENCE (SIZE (0..maxCellineNB)) OF ECGI +ListofNRCellsinNRCoordinationResp ::= SEQUENCE (SIZE (0..maxnoNRcellsSpectrumSharingWithE-UTRA)) OF NRCGI -- ************************************************************** -- @@ -4083,4 +4109,42 @@ ENDCX2RemovalFailure-IEs X2AP-PROTOCOL-IES ::= { ... } +-- ************************************************************** +-- +-- DATA FORWARDING ADDRESS INDICATION +-- +-- ************************************************************** + +DataForwardingAddressIndication ::= SEQUENCE { + protocolIEs ProtocolIE-Container {{DataForwardingAddressIndication-IEs}}, + ... +} + +DataForwardingAddressIndication-IEs X2AP-PROTOCOL-IES ::= { + { ID id-New-eNB-UE-X2AP-ID-Extension CRITICALITY ignore TYPE UE-X2AP-ID-Extension PRESENCE optional }| + { ID id-Old-eNB-UE-X2AP-ID CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}| + { ID id-Old-eNB-UE-X2AP-ID-Extension CRITICALITY ignore TYPE UE-X2AP-ID-Extension PRESENCE optional }| + { ID id-E-RABs-DataForwardingAddress-List CRITICALITY ignore TYPE E-RABs-DataForwardingAddress-List PRESENCE mandatory}, + ... +} + +E-RABs-DataForwardingAddress-List ::= SEQUENCE (SIZE(1..maxnoofBearers)) OF ProtocolIE-Single-Container { {E-RABs-DataForwardingAddress-ItemIEs} } + +E-RABs-DataForwardingAddress-ItemIEs X2AP-PROTOCOL-IES ::= { + { ID id-E-RABs-DataForwardingAddress-Item CRITICALITY ignore TYPE E-RABs-DataForwardingAddress-Item PRESENCE mandatory}, + ... +} + +E-RABs-DataForwardingAddress-Item ::= SEQUENCE { + e-RAB-ID E-RAB-ID, + dl-GTPtunnelEndpoint GTPtunnelEndpoint, + iE-Extensions ProtocolExtensionContainer { {E-RABs-DataForwardingAddress-ItemExtIEs} } OPTIONAL, + ... +} + +E-RABs-DataForwardingAddress-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= { + ... +} + + END diff --git a/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn b/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn index 0efcb2b507..3940bf242c 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V15.2.0 (2018-06) +-- 3GPP TS 36.423 V15.3.0 (2018-09) -- 9.3.3 Elementary Procedure Definitions -- ************************************************************** -- @@ -114,7 +114,8 @@ FROM X2AP-CommonDataTypes SgNBActivityNotification, ENDCX2RemovalRequest, ENDCX2RemovalResponse, - ENDCX2RemovalFailure + ENDCX2RemovalFailure, + DataForwardingAddressIndication FROM X2AP-PDU-Contents @@ -164,7 +165,8 @@ FROM X2AP-PDU-Contents id-endcPartialReset, id-eUTRANRCellResourceCoordination, id-SgNBActivityNotification, - id-endcX2Removal + id-endcX2Removal, + id-dataForwardingAddressIndication FROM X2AP-Constants; @@ -281,8 +283,8 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-2 X2AP-ELEMENTARY-PROCEDURE ::= { sgNBCounterCheck | rRCTransfer | secondaryRATDataUsageReport | - sgNBActivityNotification -, + sgNBActivityNotification | + dataForwardingAddressIndication, ... } @@ -606,4 +608,10 @@ endcX2Removal X2AP-ELEMENTARY-PROCEDURE ::= { CRITICALITY reject } +dataForwardingAddressIndication X2AP-ELEMENTARY-PROCEDURE ::= { + INITIATING MESSAGE DataForwardingAddressIndication + PROCEDURE CODE id-dataForwardingAddressIndication + CRITICALITY ignore +} + END diff --git a/epan/dissectors/asn1/x2ap/packet-x2ap-template.c b/epan/dissectors/asn1/x2ap/packet-x2ap-template.c index f7d57b06c9..7de5603294 100644 --- a/epan/dissectors/asn1/x2ap/packet-x2ap-template.c +++ b/epan/dissectors/asn1/x2ap/packet-x2ap-template.c @@ -12,7 +12,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later * * Ref: - * 3GPP TS 36.423 V15.2.0 (2018-06) + * 3GPP TS 36.423 V15.3.0 (2018-09) */ #include "config.h" diff --git a/epan/dissectors/asn1/x2ap/x2ap.cnf b/epan/dissectors/asn1/x2ap/x2ap.cnf index 9f7c84bc4d..de5293dc8d 100644 --- a/epan/dissectors/asn1/x2ap/x2ap.cnf +++ b/epan/dissectors/asn1/x2ap/x2ap.cnf @@ -612,6 +612,31 @@ Packet-LossRate DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(x2ap_Packet_LossRate_fmt #.FN_FTR ReservedSubframePattern/mBSFNControlRegionLength proto_item_append_text(actx->created_item, " REs"); +#.TYPE_ATTR +BluetoothName TYPE=FT_STRING DISPLAY = STR_UNICODE +#.FN_BODY BluetoothName VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, -1, ENC_UTF_8|ENC_NA); +#.END + +#.TYPE_ATTR +WLANName TYPE=FT_STRING DISPLAY = STR_UNICODE +#.FN_BODY WLANName VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, -1, ENC_UTF_8|ENC_NA); +#.END + +#.TYPE_ATTR +Subscription-Based-UE-DifferentiationInfo/periodicTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds + +#.TYPE_ATTR +ScheduledCommunicationTime/timeofDayStart DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds + +#.TYPE_ATTR +ScheduledCommunicationTime/timeofDayEnd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds + #.END #.FN_HDR HandoverRequest @@ -792,6 +817,8 @@ Packet-LossRate DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(x2ap_Packet_LossRate_fmt col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2RemovalResponse"); #.FN_HDR ENDCX2RemovalFailure col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCX2RemovalFailure"); +#.FN_HDR DataForwardingAddressIndication + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DataForwardingAddressIndication"); #.ASSIGN_VALUE_TO_TYPE # X2AP does not have constants assigned to types, they are pure INTEGER # ProcedureCode @@ -840,6 +867,7 @@ id-endcPartialReset ProcedureCode id-eUTRANRCellResourceCoordination ProcedureCode id-SgNBActivityNotification ProcedureCode id-endcX2Removal ProcedureCode +id-dataForwardingAddressIndication ProcedureCode # ProtocolIE-ID @@ -1036,7 +1064,7 @@ id-extended-e-RAB-GuaranteedBitrateDL ProtocolIE-ID id-extended-e-RAB-GuaranteedBitrateUL ProtocolIE-ID id-extended-uEaggregateMaximumBitRateDownlink ProtocolIE-ID id-extended-uEaggregateMaximumBitRateUplink ProtocolIE-ID -id-NRrestriction ProtocolIE-ID +id-NRrestrictioninEPSasSecondaryRAT ProtocolIE-ID id-SgNBSecurityKey ProtocolIE-ID id-SgNBUEAggregateMaximumBitRate ProtocolIE-ID id-E-RABs-ToBeAdded-SgNBAddReqList ProtocolIE-ID @@ -1134,6 +1162,16 @@ id-UEContextLevelUserPlaneActivity ProtocolIE-ID id-ERABActivityNotifyItemList ProtocolIE-ID id-InitiatingNodeType-EndcX2Removal ProtocolIE-ID id-RespondingNodeType-EndcX2Removal ProtocolIE-ID +id-RLC-Status ProtocolIE-ID +id-CNTypeRestrictions ProtocolIE-ID +id-pDCPSnLength ProtocolIE-ID +id-BluetoothMeasurementConfiguration ProtocolIE-ID +id-WLANMeasurementConfiguration ProtocolIE-ID +id-NRrestrictionin5GS ProtocolIE-ID +id-dL-Forwarding ProtocolIE-ID +id-E-RABs-DataForwardingAddress-List ProtocolIE-ID +id-E-RABs-DataForwardingAddress-Item ProtocolIE-ID +id-Subscription-Based-UE-DifferentiationInfo ProtocolIE-ID #.REGISTER @@ -1355,6 +1393,9 @@ UserPlaneTrafficActivityReport N x2ap.ies id-UEContextLevelUserPlaneActivity ERABActivityNotifyItemList N x2ap.ies id-ERABActivityNotifyItemList InitiatingNodeType-EndcX2Removal N x2ap.ies id-InitiatingNodeType-EndcX2Removal RespondingNodeType-EndcX2Removal N x2ap.ies id-RespondingNodeType-EndcX2Removal +E-RABs-DataForwardingAddress-List N x2ap.ies id-E-RABs-DataForwardingAddress-List +E-RABs-DataForwardingAddress-Item N x2ap.ies id-E-RABs-DataForwardingAddress-Item +Subscription-Based-UE-DifferentiationInfo N x2ap.ies id-Subscription-Based-UE-DifferentiationInfo #X2AP-PROTOCOL-EXTENSION Number-of-Antennaports N x2ap.extension id-Number-of-Antennaports @@ -1420,7 +1461,7 @@ ExtendedBitRate N x2ap.extension id-extended-e-RAB-GuaranteedBitrateDL ExtendedBitRate N x2ap.extension id-extended-e-RAB-GuaranteedBitrateUL ExtendedBitRate N x2ap.extension id-extended-uEaggregateMaximumBitRateDownlink ExtendedBitRate N x2ap.extension id-extended-uEaggregateMaximumBitRateUplink -NRrestriction N x2ap.extension id-NRrestriction +NRrestrictioninEPSasSecondaryRAT N x2ap.extension id-NRrestrictioninEPSasSecondaryRAT Packet-LossRate N x2ap.extension id-DownlinkPacketLossRate Packet-LossRate N x2ap.extension id-UplinkPacketLossRate SubscriberProfileIDforRFP N x2ap.extension id-SubscriberProfileIDforRFP @@ -1428,6 +1469,13 @@ ServiceType N x2ap.extension id-serviceType NRS-NSSS-PowerOffset N x2ap.extension id-NRS-NSSS-PowerOffset NSSS-NumOccasionDifferentPrecoder N x2ap.extension id-NSSS-NumOccasionDifferentPrecoder ProtectedEUTRAResourceIndication N x2ap.extension id-ProtectedEUTRAResourceIndication +RLC-Status N x2ap.extension id-RLC-Status +CNTypeRestrictions N x2ap.extension id-CNTypeRestrictions +PDCPSnLength N x2ap.extension id-pDCPSnLength +BluetoothMeasurementConfiguration N x2ap.extension id-BluetoothMeasurementConfiguration +WLANMeasurementConfiguration N x2ap.extension id-WLANMeasurementConfiguration +NRrestrictionin5GS N x2ap.extension id-NRrestrictionin5GS +DL-Forwarding N x2ap.extension id-dL-Forwarding # X2AP-PDU-Descriptions.asn Interface Elementary Procedures #X2AP-ELEMENTARY-PROCEDURE @@ -1563,4 +1611,6 @@ SgNBActivityNotification N x2ap.proc.imsg id-SgNBActivityNotification ENDCX2RemovalRequest N x2ap.proc.imsg id-endcX2Removal ENDCX2RemovalResponse N x2ap.proc.sout id-endcX2Removal ENDCX2RemovalFailure N x2ap.proc.uout id-endcX2Removal + +DataForwardingAddressIndication N x2ap.proc.imsg id-dataForwardingAddressIndication #.END |