X2AP: upgrade dissector to v15.0.0

Change-Id: Ib2e01a19f5b4f37fcee7bdf3b2ed231c5606162a
Reviewed-on: https://code.wireshark.org/review/25357
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Pascal Quantin 2018-01-17 23:34:00 +01:00 committed by Anders Broman
parent 6efce7db7c
commit be958a7116
9 changed files with 8664 additions and 410 deletions

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.423 V14.3.0 (2017-06)
-- 3GPP TS 36.423 V15.0.0 (2017-12)
-- 9.3.6 Common definitions
-- **************************************************************
--

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.423 V14.3.0 (2017-06)
-- 3GPP TS 36.423 V15.0.0 (2017-12)
-- 9.3.7 Constant definitions
-- **************************************************************
--
@ -52,6 +52,19 @@ id-meNBinitiatedSeNBRelease ProcedureCode ::= 23
id-seNBinitiatedSeNBRelease ProcedureCode ::= 24
id-seNBCounterCheck ProcedureCode ::= 25
id-retrieveUEContext ProcedureCode ::= 26
id-sgNBAdditionPreparation ProcedureCode ::= 27
id-sgNBReconfigurationCompletion ProcedureCode ::= 28
id-meNBinitiatedSgNBModificationPreparation ProcedureCode ::= 29
id-sgNBinitiatedSgNBModification ProcedureCode ::= 30
id-meNBinitiatedSgNBRelease ProcedureCode ::= 31
id-sgNBinitiatedSgNBRelease ProcedureCode ::= 32
id-sgNBCounterCheck ProcedureCode ::= 33
id-sgNBChange ProcedureCode ::= 34
id-rRCTransfer ProcedureCode ::= 35
id-endcX2Setup ProcedureCode ::= 36
id-endcConfigurationUpdate ProcedureCode ::= 37
id-secondaryRATDataUsageReport ProcedureCode ::= 38
id-endcCellActivation ProcedureCode ::= 39
-- **************************************************************
@ -92,6 +105,13 @@ maxnoofPA INTEGER ::= 3
maxCSIProcess INTEGER ::= 4
maxCSIReport INTEGER ::= 2
maxSubband INTEGER ::= 14
maxofNRNeighbours INTEGER ::= 1024
maxCellinengNB INTEGER ::= 16384
-- maxnoofNRCarriers INTEGER ::= 32
maxnooftimeperiods INTEGER ::= 2
maxnoofCellIDforQMC INTEGER ::= 32
maxnoofTAforQMC INTEGER ::= 8
maxnoofPLMNforQMC INTEGER ::= 16
-- **************************************************************
--
@ -108,7 +128,7 @@ id-Cause ProtocolIE-ID ::= 5
id-CellInformation ProtocolIE-ID ::= 6
id-CellInformation-Item ProtocolIE-ID ::= 7
--WS extension
id-Unknown-8 ProtocolIE-ID ::= 8
id-Unknown-8 ProtocolIE-ID ::= 8
id-New-eNB-UE-X2AP-ID ProtocolIE-ID ::= 9
id-Old-eNB-UE-X2AP-ID ProtocolIE-ID ::= 10
id-TargetCell-ID ProtocolIE-ID ::= 11
@ -174,7 +194,7 @@ id-CSG-Id ProtocolIE-ID ::= 70
id-CSGMembershipStatus ProtocolIE-ID ::= 71
id-MDTConfiguration ProtocolIE-ID ::= 72
--WS extension
id-Unknown-73 ProtocolIE-ID ::= 73
id-Unknown-73 ProtocolIE-ID ::= 73
id-ManagementBasedMDTallowed ProtocolIE-ID ::= 74
id-RRCConnSetupIndicator ProtocolIE-ID ::= 75
id-NeighbourTAC ProtocolIE-ID ::= 76
@ -246,7 +266,7 @@ id-E-RABs-SubjectToCounterCheck-List ProtocolIE-ID ::= 141
id-E-RABs-SubjectToCounterCheckItem ProtocolIE-ID ::= 142
id-CoverageModificationList ProtocolIE-ID ::= 143
--WS extension
id-Unknown-144 ProtocolIE-ID ::= 144
id-Unknown-144 ProtocolIE-ID ::= 144
id-ReportingPeriodicityCSIR ProtocolIE-ID ::= 145
id-CSIReportList ProtocolIE-ID ::= 146
id-UEID ProtocolIE-ID ::= 147
@ -288,5 +308,89 @@ id-UE-ContextReferenceAtWT ProtocolIE-ID ::= 182
id-WT-UE-ContextKeptIndicator ProtocolIE-ID ::= 183
id-UESidelinkAggregateMaximumBitRate ProtocolIE-ID ::= 184
id-uL-GTPtunnelEndpoint ProtocolIE-ID ::= 185
--WS extension
id-Unknown-186 ProtocolIE-ID ::= 186
id-Unknown-187 ProtocolIE-ID ::= 187
id-Unknown-188 ProtocolIE-ID ::= 188
id-Unknown-189 ProtocolIE-ID ::= 189
id-Unknown-190 ProtocolIE-ID ::= 190
id-Unknown-191 ProtocolIE-ID ::= 191
id-Unknown-192 ProtocolIE-ID ::= 192
id-DL-scheduling-PDCCH-CCE-usage ProtocolIE-ID ::= 193
id-UL-scheduling-PDCCH-CCE-usage ProtocolIE-ID ::= 194
id-UEAppLayerMeasConfig ProtocolIE-ID ::= 195
id-extended-e-RAB-MaximumBitrateDL ProtocolIE-ID ::= 196
id-extended-e-RAB-MaximumBitrateUL ProtocolIE-ID ::= 197
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-SgNBSecurityKey ProtocolIE-ID ::= 203
id-SgNBUEAggregateMaximumBitRate ProtocolIE-ID ::= 204
id-E-RABs-ToBeAdded-SgNBAddReqList ProtocolIE-ID ::= 205
id-MeNBtoSgNBContainer ProtocolIE-ID ::= 206
id-SgNB-UE-X2AP-ID ProtocolIE-ID ::= 207
id-RequestedMCGSplitSRBs ProtocolIE-ID ::= 208
id-E-RABs-ToBeAdded-SgNBAddReq-Item ProtocolIE-ID ::= 209
id-E-RABs-Admitted-ToBeAdded-SgNBAddResList ProtocolIE-ID ::= 210
id-SgNBtoMeNBContainer ProtocolIE-ID ::= 211
id-AdmittedMCGSplitSRBs ProtocolIE-ID ::= 212
id-E-RABs-Admitted-ToBeAdded-SgNBAddRes-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-Target-SgNB-ID ProtocolIE-ID ::= 239
id-HandoverRestrictionList ProtocolIE-ID ::= 240
id-SCGConfigurationQuery ProtocolIE-ID ::= 241
id-MCGSplitSRB ProtocolIE-ID ::= 242
id-UENRMeasurement ProtocolIE-ID ::= 243
id-InitiatingNodeType-EndcX2Setup ProtocolIE-ID ::= 244
id-InitiatingNodeType-EndcConfigUpdate ProtocolIE-ID ::= 245
id-RespondingNodeType-EndcX2Setup ProtocolIE-ID ::= 246
id-RespondingNodeType-EndcConfigUpdate ProtocolIE-ID ::= 247
id-NRUESecurityCapabilities ProtocolIE-ID ::= 248
id-PDCPChangeIndication ProtocolIE-ID ::= 249
id-ServedEUTRAcellsENDCX2ManagementList ProtocolIE-ID ::= 250
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-ActivationID ProtocolIE-ID ::= 256
id-MeNBResourceCoordinationInformation ProtocolIE-ID ::= 257
id-SgNBResourceCoordinationInformation ProtocolIE-ID ::= 258
id-ServedEUTRAcellsToModifyListENDCConfUpd ProtocolIE-ID ::= 259
id-ServedEUTRAcellsToDeleteListENDCConfUpd ProtocolIE-ID ::= 260
id-ServedNRcellsToModifyListENDCConfUpd ProtocolIE-ID ::= 261
id-ServedNRcellsToDeleteListENDCConfUpd ProtocolIE-ID ::= 262
id-E-RABUsageReport-Item ProtocolIE-ID ::= 263
id-Old-SgNB-UE-X2AP-ID ProtocolIE-ID ::= 264
id-SecondaryRATUsageReportList ProtocolIE-ID ::= 265
id-SecondaryRATUsageReport-Item ProtocolIE-ID ::= 266
id-ServedNRCellsToActivate ProtocolIE-ID ::= 267
id-ActivatedNRCellList ProtocolIE-ID ::= 268
END

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.423 V14.3.0 (2017-06)
-- 3GPP TS 36.423 V15.0.0 (2017-12)
-- 9.3.8 Container definitions
-- **************************************************************
--

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.423 V14.3.0 (2017-06)
-- 3GPP TS 36.423 V15.0.0 (2017-12)
-- 9.3.5 Information Element definitions
-- **************************************************************
--
@ -36,6 +36,7 @@ IMPORTS
id-M4Configuration,
id-M5Configuration,
id-MDT-Location-Info,
id-NRrestriction,
id-AdditionalSpecialSubframe-Info,
id-UEID,
id-enhancedRNTP,
@ -46,6 +47,18 @@ IMPORTS
id-OffsetOfNbiotChannelNumberToUL-EARFCN,
id-AdditionalSpecialSubframeExtension-Info,
id-BandwidthReducedSI,
id-extended-e-RAB-MaximumBitrateDL,
id-extended-e-RAB-MaximumBitrateUL,
id-extended-e-RAB-GuaranteedBitrateDL,
id-extended-e-RAB-GuaranteedBitrateUL,
id-extended-uEaggregateMaximumBitRateDownlink,
id-extended-uEaggregateMaximumBitRateUplink,
id-E-RABUsageReport-Item,
id-SecondaryRATUsageReport-Item,
id-UEAppLayerMeasConfig,
id-DL-scheduling-PDCCH-CCE-usage,
id-UL-scheduling-PDCCH-CCE-usage,
maxnoofBearers,
maxCellineNB,
maxEARFCN,
@ -76,7 +89,11 @@ IMPORTS
maxnoofPA,
maxCSIProcess,
maxCSIReport,
maxSubband
maxSubband,
maxnooftimeperiods,
maxnoofCellIDforQMC,
maxnoofTAforQMC,
maxnoofPLMNforQMC
FROM X2AP-Constants
@ -137,6 +154,8 @@ ABS-Status-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
ActivationID ::= INTEGER (0..255)
AdditionalSpecialSubframe-Info ::= SEQUENCE {
additionalspecialSubframePatterns AdditionalSpecialSubframePatterns,
cyclicPrefixDL CyclicPrefixDL,
@ -200,6 +219,14 @@ AreaScopeOfMDT ::= CHOICE {
tAIBased TAIBasedMDT
}
AreaScopeOfQMC ::= CHOICE {
cellBased CellBasedQMC,
tABased TABasedQMC,
tAIBased TAIBasedQMC,
pLMNAreaBased PLMNAreaBasedQMC,
...
}
AS-SecurityInformation ::= SEQUENCE {
key-eNodeB-star Key-eNodeB-Star,
nextHopChainingCount NextHopChainingCount,
@ -329,12 +356,24 @@ CellBasedMDT-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CellBasedQMC::= SEQUENCE {
cellIdListforQMC CellIdListforQMC,
iE-Extensions ProtocolExtensionContainer { {CellBasedQMC-ExtIEs} } OPTIONAL,
...
}
CellBasedQMC-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
CellCapacityClassValue ::= INTEGER (1..100, ...)
CellDeploymentStatusIndicator ::= ENUMERATED {pre-change-notification, ...}
CellIdListforMDT ::= SEQUENCE (SIZE(1..maxnoofCellIDforMDT)) OF ECGI
CellIdListforQMC ::= SEQUENCE (SIZE(1..maxnoofCellIDforQMC)) OF ECGI
CellReplacingInfo ::= SEQUENCE {
replacingCellsList ReplacingCellsList,
iE-Extensions ProtocolExtensionContainer { { CellReplacingInfo-ExtIEs}} OPTIONAL,
@ -570,6 +609,17 @@ DeactivationIndication::= ENUMERATED {
...
}
DeliveryStatus ::= SEQUENCE {
highestSuccessDeliveredPDCPSN INTEGER (0..4095),
iE-Extensions ProtocolExtensionContainer { {DeliveryStatus-ExtIEs} } OPTIONAL,
...
}
DeliveryStatus-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
DL-ABS-status::= INTEGER (0..100)
DL-Forwarding ::= ENUMERATED {
@ -581,6 +631,8 @@ DL-GBR-PRB-usage::= INTEGER (0..100)
DL-non-GBR-PRB-usage::= INTEGER (0..100)
DL-scheduling-PDCCH-CCE-usage::= INTEGER (0..100)
DL-Total-PRB-usage::= INTEGER (0..100)
DynamicDLTransmissionInformation ::= CHOICE {
@ -651,6 +703,19 @@ ENB-ID ::= CHOICE {
EncryptionAlgorithms ::= BIT STRING (SIZE (16, ...))
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,
...
}
EN-DC-ResourceConfigurationExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
EPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMN-Identity
E-RAB-ID ::= INTEGER (0..15, ...)
@ -685,6 +750,26 @@ E-RAB-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
E-RABUsageReportList ::= SEQUENCE (SIZE(1..maxnooftimeperiods)) OF ProtocolIE-Single-Container { {E-RABUsageReport-ItemIEs} }
E-RABUsageReport-ItemIEs X2AP-PROTOCOL-IES ::= {
{ ID id-E-RABUsageReport-Item CRITICALITY ignore TYPE E-RABUsageReport-Item PRESENCE mandatory },
...
}
E-RABUsageReport-Item ::= SEQUENCE {
startTimeStamp OCTET STRING (SIZE(4)),
endTimeStamp OCTET STRING (SIZE(4)),
usageCountUL INTEGER,
usageCountDL INTEGER,
iE-Extensions ProtocolExtensionContainer { { E-RABUsageReport-Item-ExtIEs} } OPTIONAL,
...
}
E-RABUsageReport-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
EUTRA-Mode-Info ::= CHOICE {
fDD FDD-Info,
tDD TDD-Info,
@ -743,6 +828,8 @@ ExtendedULInterferenceOverloadInfo-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
ExtendedBitRate ::= INTEGER (10000000001..4000000000000,...)
-- F
FDD-Info ::= SEQUENCE {
@ -825,6 +912,11 @@ GBR-QosInformation ::= SEQUENCE {
}
GBR-QosInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-- Extension for maximum bitrate > 10Gbps --
{ ID id-extended-e-RAB-MaximumBitrateDL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
{ ID id-extended-e-RAB-MaximumBitrateUL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
{ ID id-extended-e-RAB-GuaranteedBitrateDL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
{ ID id-extended-e-RAB-GuaranteedBitrateUL CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional},
...
}
@ -839,6 +931,17 @@ GlobalENB-ID-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
GlobalGNB-ID ::= SEQUENCE {
pLMN-Identity PLMN-Identity,
gNB-ID GNB-ID,
iE-Extensions ProtocolExtensionContainer { {GlobalGNB-ID-ExtIEs} } OPTIONAL,
...
}
GlobalGNB-ID-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
GTPtunnelEndpoint ::= SEQUENCE {
transportLayerAddress TransportLayerAddress,
gTP-TEID GTP-TEI,
@ -879,7 +982,10 @@ GUMMEI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
GNB-ID ::= CHOICE {
gNB-ID BIT STRING (SIZE (22..32)),
...
}
-- H
@ -901,6 +1007,7 @@ HandoverRestrictionList ::= SEQUENCE {
}
HandoverRestrictionList-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-NRrestriction CRITICALITY ignore EXTENSION NRrestriction PRESENCE optional},
...
}
@ -1145,6 +1252,18 @@ MeasurementThresholdA2 ::= CHOICE {
...
}
MeNBResourceCoordinationInformation ::= SEQUENCE {
eUTRA-Cell-ID ECGI,
uLCoordinationInformation BIT STRING (SIZE(6..4400, ...)),
dLCoordinationInformation BIT STRING (SIZE(6..4400, ...)),
iE-Extensions ProtocolExtensionContainer { { MeNBResourceCoordinationInformationExtIEs} } OPTIONAL,
...
}
MeNBResourceCoordinationInformationExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
MeNBtoSeNBContainer ::= OCTET STRING
MME-Group-ID ::= OCTET STRING (SIZE (2))
@ -1193,6 +1312,32 @@ BandInfo-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
MeNBtoSgNBContainer ::= OCTET STRING
MCGSplitSRBs ::= ENUMERATED {srb1, srb2, srb1and2, ...}
MCGSplitSRB ::= SEQUENCE {
rrcContainer RRCContainer OPTIONAL,
srbType SRBType,
deliveryStatus DeliveryStatus OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {MCGSplitSRB-ExtIEs} } OPTIONAL,
...
}
MCGSplitSRB-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
UENRMeasurement ::= SEQUENCE {
uENRMeasurements RRCContainer,
iE-Extensions ProtocolExtensionContainer { {UENRMeasurement-ExtIEs} } OPTIONAL,
...
}
UENRMeasurement-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
-- N
Neighbour-Information ::= SEQUENCE (SIZE (0..maxnoofNeighbours)) OF SEQUENCE {
@ -1218,6 +1363,44 @@ Number-of-Antennaports ::= ENUMERATED {
...
}
NRARFCN ::= INTEGER (0..65535) -- This IE may be refined.
NR-TxBW ::= INTEGER (0..65535) -- This IE may be refined.
NRCellIdentifier ::= BIT STRING (SIZE (36))
NRCGI ::= SEQUENCE {
pLMN-Identity PLMN-Identity,
nRcellIdentifier NRCellIdentifier,
iE-Extensions ProtocolExtensionContainer { {NRCGI-ExtIEs} } OPTIONAL,
...
}
NRCGI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
NRPCI ::= INTEGER (0..1007,...)
NRrestriction ::= ENUMERATED {
nRrestricted,
...
}
NRencryptionAlgorithms ::= BIT STRING (SIZE (16,...))
NRintegrityProtectionAlgorithms ::= BIT STRING (SIZE (16,...))
NRUESecurityCapabilities ::= SEQUENCE {
nRencryptionAlgorithms NRencryptionAlgorithms,
nRintegrityProtectionAlgorithms NRintegrityProtectionAlgorithms,
iE-Extensions ProtocolExtensionContainer { { NRUESecurityCapabilities-ExtIEs} } OPTIONAL,
...
}
NRUESecurityCapabilities-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
-- O
OffsetOfNbiotChannelNumberToEARFCN ::= ENUMERATED {
@ -1261,6 +1444,8 @@ PA-Values ::= ENUMERATED {
...
}
PDCPChangeIndication ::= ENUMERATED {s-KgNB-update-required, pDCP-data-recovery-required,...}
PDCP-SN ::= INTEGER (0..4095)
PDCP-SNExtended ::= INTEGER (0..32767)
@ -1283,6 +1468,19 @@ PRACH-Configuration ::= SEQUENCE {
...
}
PLMNAreaBasedQMC ::= SEQUENCE {
plmnListforQMC PLMNListforQMC,
iE-Extensions ProtocolExtensionContainer { {PLMNAreaBasedQMC-ExtIEs} } OPTIONAL,
...
}
PLMNAreaBasedQMC-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
PLMNListforQMC ::= SEQUENCE (SIZE(1..maxnoofPLMNforQMC)) OF PLMN-Identity
PRACH-Configuration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
@ -1360,6 +1558,9 @@ RadioResourceStatus ::= SEQUENCE {
}
RadioResourceStatus-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ID id-DL-scheduling-PDCCH-CCE-usage CRITICALITY ignore EXTENSION DL-scheduling-PDCCH-CCE-usage PRESENCE optional}|
{ID id-UL-scheduling-PDCCH-CCE-usage CRITICALITY ignore EXTENSION UL-scheduling-PDCCH-CCE-usage PRESENCE optional},
...
}
@ -1434,6 +1635,11 @@ ResumeID ::= CHOICE {
...
}
RLCMode ::= ENUMERATED {
rlc-am,
rlc-um
}
RNTP-Threshold ::= ENUMERATED {
minusInfinity,
minusEleven,
@ -1490,6 +1696,8 @@ RSRPMRList-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
RRCContainer ::= OCTET STRING
-- S
S1TNLLoadIndicator ::= SEQUENCE {
@ -1505,6 +1713,25 @@ S1TNLLoadIndicator-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
SCGChangeIndication ::= ENUMERATED {pDCPCountWrapAround, pSCellChange, other, ...}
SecondaryRATUsageReportList ::= SEQUENCE (SIZE(1..maxnoofBearers)) OF ProtocolIE-Single-Container {{SecondaryRATUsageReport-ItemIEs}}
SecondaryRATUsageReport-ItemIEs X2AP-PROTOCOL-IES ::= {
{ ID id-SecondaryRATUsageReport-Item CRITICALITY reject TYPE SecondaryRATUsageReport-Item PRESENCE mandatory},
...
}
SecondaryRATUsageReport-Item ::= SEQUENCE {
e-RAB-ID E-RAB-ID,
secondaryRATType ENUMERATED {nr, ...},
e-RABUsageReportList E-RABUsageReportList,
iE-Extensions ProtocolExtensionContainer { { SecondaryRATUsageReport-Item-ExtIEs} } OPTIONAL,
...
}
SecondaryRATUsageReport-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
SeNBSecurityKey ::= BIT STRING (SIZE(256))
SeNBtoMeNBContainer ::= OCTET STRING
@ -1543,6 +1770,20 @@ ServedCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
SgNBResourceCoordinationInformation ::= SEQUENCE {
nR-CGI NRCGI,
uLCoordinationInformation BIT STRING (SIZE(6..4400, ...)),
dLCoordinationInformation BIT STRING (SIZE(6..4400, ...)),
iE-Extensions ProtocolExtensionContainer { { SgNBResourceCoordinationInformationExtIEs} } OPTIONAL,
...
}
SgNBResourceCoordinationInformationExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
SgNB-UE-X2AP-ID ::= INTEGER (0..4294967295)
SIPTOBearerDeactivationIndication ::= ENUMERATED {
true,
...
@ -1652,6 +1893,12 @@ SubframeAssignment ::= ENUMERATED {
...
}
SgNBSecurityKey ::= BIT STRING (SIZE(256))
SgNBtoMeNBContainer ::= OCTET STRING
SRBType ::= ENUMERATED {srb1, srb2, ...}
SCGConfigurationQuery ::= ENUMERATED {true,...}
-- T
@ -1692,6 +1939,30 @@ TAI-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
TAListforMDT ::= SEQUENCE (SIZE(1..maxnoofTAforMDT)) OF TAC
TABasedQMC ::= SEQUENCE {
tAListforQMC TAListforQMC,
iE-Extensions ProtocolExtensionContainer { {TABasedQMC-ExtIEs} } OPTIONAL,
...
}
TABasedQMC-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
TAListforQMC ::= SEQUENCE (SIZE(1..maxnoofTAforQMC)) OF TAC
TAIBasedQMC ::= SEQUENCE {
tAIListforQMC TAIListforQMC,
iE-Extensions ProtocolExtensionContainer { {TAIBasedQMC-ExtIEs} } OPTIONAL,
...
}
TAIBasedQMC-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
TAIListforQMC ::= SEQUENCE (SIZE(1..maxnoofTAforQMC)) OF TAI-Item
TargetCellInUTRAN ::= OCTET STRING -- This IE is to be encoded according to the UTRAN Cell ID in the Last Visited UTRAN Cell Information IE in TS 25.413 [24]
TargeteNBtoSource-eNBTransparentContainer ::= OCTET STRING
@ -1739,7 +2010,8 @@ traceCollectionEntityIPAddress TraceCollectionEntityIPAddress,
}
TraceActivation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-MDTConfiguration CRITICALITY ignore EXTENSION MDT-Configuration PRESENCE optional},
{ ID id-MDTConfiguration CRITICALITY ignore EXTENSION MDT-Configuration PRESENCE optional}|
{ ID id-UEAppLayerMeasConfig CRITICALITY ignore EXTENSION UEAppLayerMeasConfig PRESENCE optional},
...
}
@ -1796,6 +2068,19 @@ UEAggregateMaximumBitRate ::= SEQUENCE {
}
UEAggregate-MaximumBitrate-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
{ ID id-extended-uEaggregateMaximumBitRateDownlink CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional}|
{ ID id-extended-uEaggregateMaximumBitRateUplink CRITICALITY ignore EXTENSION ExtendedBitRate PRESENCE optional},
...
}
UEAppLayerMeasConfig ::= SEQUENCE {
containerForAppLayerMeasConfig OCTET STRING (SIZE(1..1000)),
areaScopeOfQMC AreaScopeOfQMC,
iE-Extensions ProtocolExtensionContainer { {UEAppLayerMeasConfig-ExtIEs} } OPTIONAL,
...
}
UEAppLayerMeasConfig-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
@ -1844,6 +2129,18 @@ UE-Sidelink-Aggregate-MaximumBitRate-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
ULConfiguration::= SEQUENCE {
uL-PDCP UL-UE-Configuration,
iE-Extensions ProtocolExtensionContainer { { ULConfiguration-ExtIEs} } OPTIONAL,
...
}
ULConfiguration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
...
}
UL-UE-Configuration::= ENUMERATED { no-data, shared, only, ... }
UL-GBR-PRB-usage::= INTEGER (0..100)
UL-HighInterferenceIndicationInfo ::= SEQUENCE (SIZE(1..maxCellineNB)) OF UL-HighInterferenceIndicationInfo-Item
@ -1872,6 +2169,8 @@ UL-InterferenceOverloadIndication-Item ::= ENUMERATED {
UL-non-GBR-PRB-usage::= INTEGER (0..100)
UL-scheduling-PDCCH-CCE-usage::= INTEGER (0..100)
UL-Total-PRB-usage::= INTEGER (0..100)
UsableABSInformation ::= CHOICE {

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.423 V14.3.0 (2017-06)
-- 3GPP TS 36.423 V15.0.0 (2017-12)
-- 9.3.3 Elementary Procedure Definitions
-- **************************************************************
--
@ -76,7 +76,37 @@ FROM X2AP-CommonDataTypes
X2RemovalResponse,
RetrieveUEContextRequest,
RetrieveUEContextResponse,
RetrieveUEContextFailure
RetrieveUEContextFailure,
SgNBAdditionRequest,
SgNBAdditionRequestAcknowledge,
SgNBAdditionRequestReject,
SgNBReconfigurationComplete,
SgNBModificationRequest,
SgNBModificationRequestAcknowledge,
SgNBModificationRequestReject,
SgNBModificationRequired,
SgNBModificationConfirm,
SgNBModificationRefuse,
SgNBReleaseRequest,
SgNBReleaseRequestAcknowledge,
SgNBReleaseRequestReject,
SgNBReleaseRequired,
SgNBReleaseConfirm,
SgNBCounterCheckRequest,
SgNBChangeRequired,
SgNBChangeConfirm,
SgNBChangeRefuse,
RRCTransfer,
ENDCX2SetupRequest,
ENDCX2SetupResponse,
ENDCX2SetupFailure,
ENDCConfigurationUpdate,
ENDCConfigurationUpdateAcknowledge,
ENDCConfigurationUpdateFailure,
SecondaryRATDataUsageReport,
ENDCCellActivationRequest,
ENDCCellActivationResponse,
ENDCCellActivationFailure
FROM X2AP-PDU-Contents
@ -108,7 +138,20 @@ FROM X2AP-PDU-Contents
id-seNBinitiatedSeNBRelease,
id-seNBCounterCheck,
id-x2Removal,
id-retrieveUEContext
id-retrieveUEContext,
id-sgNBAdditionPreparation,
id-sgNBReconfigurationCompletion,
id-meNBinitiatedSgNBModificationPreparation,
id-sgNBinitiatedSgNBModification,
id-meNBinitiatedSgNBRelease,
id-sgNBinitiatedSgNBRelease,
id-sgNBChange,
id-sgNBCounterCheck,
id-rRCTransfer,
id-endcX2Setup,
id-endcConfigurationUpdate,
id-secondaryRATDataUsageReport,
id-endcCellActivation
FROM X2AP-Constants;
@ -189,7 +232,16 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-1 X2AP-ELEMENTARY-PROCEDURE ::= {
seNBinitiatedSeNBModification |
seNBinitiatedSeNBRelease |
x2Removal |
retrieveUEContext,
retrieveUEContext |
sgNBAdditionPreparation |
meNBinitiatedSgNBModificationPreparation |
sgNBinitiatedSgNBModification |
meNBinitiatedSgNBRelease |
sgNBinitiatedSgNBRelease |
sgNBChange |
endcX2Setup |
endcConfigurationUpdate |
endcCellActivation ,
...
}
@ -207,7 +259,11 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-2 X2AP-ELEMENTARY-PROCEDURE ::= {
x2APMessageTransfer |
seNBReconfigurationCompletion |
meNBinitiatedSeNBRelease |
seNBCounterCheck,
seNBCounterCheck |
sgNBReconfigurationCompletion |
sgNBCounterCheck |
rRCTransfer |
secondaryRATDataUsageReport ,
...
}
@ -406,4 +462,100 @@ retrieveUEContext X2AP-ELEMENTARY-PROCEDURE ::= {
CRITICALITY reject
}
sgNBAdditionPreparation X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SgNBAdditionRequest
SUCCESSFUL OUTCOME SgNBAdditionRequestAcknowledge
UNSUCCESSFUL OUTCOME SgNBAdditionRequestReject
PROCEDURE CODE id-sgNBAdditionPreparation
CRITICALITY reject
}
sgNBReconfigurationCompletion X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SgNBReconfigurationComplete
PROCEDURE CODE id-sgNBReconfigurationCompletion
CRITICALITY ignore
}
meNBinitiatedSgNBModificationPreparation X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SgNBModificationRequest
SUCCESSFUL OUTCOME SgNBModificationRequestAcknowledge
UNSUCCESSFUL OUTCOME SgNBModificationRequestReject
PROCEDURE CODE id-meNBinitiatedSgNBModificationPreparation
CRITICALITY reject
}
sgNBinitiatedSgNBModification X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SgNBModificationRequired
SUCCESSFUL OUTCOME SgNBModificationConfirm
UNSUCCESSFUL OUTCOME SgNBModificationRefuse
PROCEDURE CODE id-sgNBinitiatedSgNBModification
CRITICALITY reject
}
meNBinitiatedSgNBRelease X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SgNBReleaseRequest
SUCCESSFUL OUTCOME SgNBReleaseRequestAcknowledge
UNSUCCESSFUL OUTCOME SgNBReleaseRequestReject
PROCEDURE CODE id-meNBinitiatedSgNBRelease
CRITICALITY ignore
}
sgNBinitiatedSgNBRelease X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SgNBReleaseRequired
SUCCESSFUL OUTCOME SgNBReleaseConfirm
PROCEDURE CODE id-sgNBinitiatedSgNBRelease
CRITICALITY reject
}
sgNBCounterCheck X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SgNBCounterCheckRequest
PROCEDURE CODE id-sgNBCounterCheck
CRITICALITY reject
}
sgNBChange X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SgNBChangeRequired
SUCCESSFUL OUTCOME SgNBChangeConfirm
UNSUCCESSFUL OUTCOME SgNBChangeRefuse
PROCEDURE CODE id-sgNBChange
CRITICALITY reject
}
rRCTransfer X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE RRCTransfer
PROCEDURE CODE id-rRCTransfer
CRITICALITY reject
}
endcX2Setup X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE ENDCX2SetupRequest
SUCCESSFUL OUTCOME ENDCX2SetupResponse
UNSUCCESSFUL OUTCOME ENDCX2SetupFailure
PROCEDURE CODE id-endcX2Setup
CRITICALITY reject
}
endcConfigurationUpdate X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE ENDCConfigurationUpdate
SUCCESSFUL OUTCOME ENDCConfigurationUpdateAcknowledge
UNSUCCESSFUL OUTCOME ENDCConfigurationUpdateFailure
PROCEDURE CODE id-endcConfigurationUpdate
CRITICALITY reject
}
secondaryRATDataUsageReport X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE SecondaryRATDataUsageReport
PROCEDURE CODE id-secondaryRATDataUsageReport
CRITICALITY reject
}
endcCellActivation X2AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE ENDCCellActivationRequest
SUCCESSFUL OUTCOME ENDCCellActivationResponse
UNSUCCESSFUL OUTCOME ENDCCellActivationFailure
PROCEDURE CODE id-endcCellActivation
CRITICALITY reject
}
END

View File

@ -3,7 +3,7 @@
* X2 Application Protocol (X2AP);
* 3GPP TS 36.423 packet dissection
* Copyright 2007-2014, Anders Broman <anders.broman@ericsson.com>
* Copyright 2016, Pascal Quantin <pacal.quantin@gmail.com>
* Copyright 2016-2018, Pascal Quantin <pascal.quantin@gmail.com>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -24,7 +24,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Ref:
* 3GPP TS 36.423 V14.3.0 (2017-06)
* 3GPP TS 36.423 V15.0.0 (2017-12)
*/
#include "config.h"
@ -39,6 +39,8 @@
#include "packet-per.h"
#include "packet-e212.h"
#include "packet-lte-rrc.h"
#include "packet-nr-rrc.h"
#include "packet-ntp.h"
#ifdef _MSC_VER
/* disable: "warning C4146: unary minus operator applied to unsigned type, result still unsigned" */
@ -111,6 +113,14 @@ static int hf_x2ap_MDT_transmissionModes_tm6 = -1;
static int hf_x2ap_MDT_transmissionModes_tm8 = -1;
static int hf_x2ap_MDT_transmissionModes_tm9 = -1;
static int hf_x2ap_MDT_transmissionModes_tm10 = -1;
static int hf_x2ap_NRencryptionAlgorithms_NEA1 = -1;
static int hf_x2ap_NRencryptionAlgorithms_NEA2 = -1;
static int hf_x2ap_NRencryptionAlgorithms_NEA3 = -1;
static int hf_x2ap_NRencryptionAlgorithms_Reserved = -1;
static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA1 = -1;
static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA2 = -1;
static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA3 = -1;
static int hf_x2ap_NRintegrityProtectionAlgorithms_Reserved = -1;
#include "packet-x2ap-hf.c"
/* Initialize the subtree pointers */
@ -135,11 +145,24 @@ static int ett_x2ap_MeasurementsToActivate = -1;
static int ett_x2ap_MDT_Location_Info = -1;
static int ett_x2ap_transmissionModes = -1;
static int ett_x2ap_X2AP_Message = -1;
static int ett_x2ap_MeNBtoSgNBContainer = -1;
static int ett_x2ap_SgNBtoMeNBContainer = -1;
static int ett_x2ap_RRCContainer = -1;
static int ett_x2ap_NRencryptionAlgorithms = -1;
static int ett_x2ap_NRintegrityProtectionAlgorithms = -1;
#include "packet-x2ap-ett.c"
typedef enum {
RRC_CONTAINER_TYPE_UNKNOWN,
RRC_CONTAINER_TYPE_PDCP_C_PDU,
RRC_CONTAINER_TYPE_NR_UE_MEAS_REPORT
} rrc_container_type_e;
struct x2ap_private_data {
guint32 procedure_code;
guint32 protocol_ie_id;
guint32 triggering_message;
rrc_container_type_e rrc_container_type;
};
enum {
@ -497,6 +520,38 @@ void proto_register_x2ap(void) {
{ "TM10", "x2ap.MDT_Location_Info.transmissionModes.tm10",
FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x01,
NULL, HFILL }},
{ &hf_x2ap_NRencryptionAlgorithms_NEA1,
{ "128-NEA1", "x2ap.NRencryptionAlgorithms.NEA1",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x8000,
NULL, HFILL }},
{ &hf_x2ap_NRencryptionAlgorithms_NEA2,
{ "128-NEA2", "x2ap.NRencryptionAlgorithms.NEA2",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x4000,
NULL, HFILL }},
{ &hf_x2ap_NRencryptionAlgorithms_NEA3,
{ "128-NEA3", "x2ap.NRencryptionAlgorithms.NEA3",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x2000,
NULL, HFILL }},
{ &hf_x2ap_NRencryptionAlgorithms_Reserved,
{ "Reserved", "x2ap.NRencryptionAlgorithms.Reserved",
FT_UINT16, BASE_HEX, NULL, 0x1fff,
NULL, HFILL }},
{ &hf_x2ap_NRintegrityProtectionAlgorithms_NIA1,
{ "128-NIA1", "x2ap.NRintegrityProtectionAlgorithms.NIA1",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x8000,
NULL, HFILL }},
{ &hf_x2ap_NRintegrityProtectionAlgorithms_NIA2,
{ "128-NIA2", "x2ap.NRintegrityProtectionAlgorithms.NIA2",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x4000,
NULL, HFILL }},
{ &hf_x2ap_NRintegrityProtectionAlgorithms_NIA3,
{ "128-NIA3", "x2ap.NRintegrityProtectionAlgorithms.NIA3",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x2000,
NULL, HFILL }},
{ &hf_x2ap_NRintegrityProtectionAlgorithms_Reserved,
{ "Reserved", "x2ap.NRintegrityProtectionAlgorithms.Reserved",
FT_UINT16, BASE_HEX, NULL, 0x1fff,
NULL, HFILL }},
#include "packet-x2ap-hfarr.c"
};
@ -523,6 +578,11 @@ void proto_register_x2ap(void) {
&ett_x2ap_MDT_Location_Info,
&ett_x2ap_transmissionModes,
&ett_x2ap_X2AP_Message,
&ett_x2ap_MeNBtoSgNBContainer,
&ett_x2ap_SgNBtoMeNBContainer,
&ett_x2ap_RRCContainer,
&ett_x2ap_NRencryptionAlgorithms,
&ett_x2ap_NRintegrityProtectionAlgorithms,
#include "packet-x2ap-ettarr.c"
};
@ -544,7 +604,7 @@ void proto_register_x2ap(void) {
x2ap_proc_sout_dissector_table = register_dissector_table("x2ap.proc.sout", "X2AP-ELEMENTARY-PROCEDURE SuccessfulOutcome", proto_x2ap, FT_UINT32, BASE_DEC);
x2ap_proc_uout_dissector_table = register_dissector_table("x2ap.proc.uout", "X2AP-ELEMENTARY-PROCEDURE UnsuccessfulOutcome", proto_x2ap, FT_UINT32, BASE_DEC);
/* Register configuration options for ports */
/* Register configuration1 options for ports */
x2ap_module = prefs_register_protocol(proto_x2ap, proto_reg_handoff_x2ap);
prefs_register_uint_preference(x2ap_module, "sctp.port",

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff