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

F1AP: upgrade dissector to v16.4.0

This commit is contained in:
Pascal Quantin 2021-01-05 23:02:43 +01:00 committed by Wireshark GitLab Utility
parent d74bfc569e
commit 7ace905366
12 changed files with 814 additions and 584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/f1ap/F1AP-CommonDataTypes.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V16.3.1 (2020-10)
-- 3GPP TS 38.473 V16.4.0 (2021-01)
-- 9.4.6 Common Definitions
-- **************************************************************
--

13
epan/dissectors/asn1/f1ap/F1AP-Constants.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V16.3.1 (2020-10)
-- 3GPP TS 38.473 V16.4.0 (2021-01)
-- 9.4.7 Constant Definitions
-- **************************************************************
--
@ -553,7 +553,7 @@ id-SLDRBs-ModifiedConf-Item ProtocolIE-ID ::= 338
id-UEAssistanceInformationEUTRA ProtocolIE-ID ::= 339
id-PC5LinkAMBR ProtocolIE-ID ::= 340
id-SL-PHY-MAC-RLC-Config ProtocolIE-ID ::= 341
id-SL-ConfigDedicatedEUTRA ProtocolIE-ID ::= 342
id-SL-ConfigDedicatedEUTRA-Info ProtocolIE-ID ::= 342
id-AlternativeQoSParaSetList ProtocolIE-ID ::= 343
id-CurrentQoSParaSetIndex ProtocolIE-ID ::= 344
id-gNBCUMeasurementID ProtocolIE-ID ::= 345
@ -578,11 +578,9 @@ id-ExtendedPacketDelayBudget ProtocolIE-ID ::= 363
id-TSCTrafficCharacteristics ProtocolIE-ID ::= 364
id-ReportingRequestType ProtocolIE-ID ::= 365
id-TimeReferenceInformation ProtocolIE-ID ::= 366
-- WS modification: rename items to avoid conflict with ProcedureCode
-- id-ReferenceTimeInformationReport ProtocolIE-ID ::= 367
-- id-ReferenceTimeInformationReportingControl ProtocolIE-ID ::= 368
id-ReferenceTimeInformationReport-IE ProtocolIE-ID ::= 367
id-ReferenceTimeInformationReportingControl-IE ProtocolIE-ID ::= 368
-- WS extension
id-Unknown-367 ProtocolIE-ID ::= 367
id-Unknown-368 ProtocolIE-ID ::= 368
id-CNPacketDelayBudgetUplink ProtocolIE-ID ::= 369
id-AdditionalPDCPDuplicationTNL-List ProtocolIE-ID ::= 370
id-RLCDuplicationInformation ProtocolIE-ID ::= 371
@ -643,6 +641,7 @@ id-E-CID-ReportCharacteristics ProtocolIE-ID ::= 424
id-ConfiguredTACIndication ProtocolIE-ID ::= 425
id-Extended-GNB-DU-Name ProtocolIE-ID ::= 426
id-Extended-GNB-CU-Name ProtocolIE-ID ::= 427
id-F1CTransferPath ProtocolIE-ID ::= 428
END

2
epan/dissectors/asn1/f1ap/F1AP-Containers.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V16.3.1 (2020-10)
-- 3GPP TS 38.473 V16.4.0 (2021-01)
-- 9.4.8 Container Definitions
-- **************************************************************
--

194
epan/dissectors/asn1/f1ap/F1AP-IEs.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V16.3.1 (2020-10)
-- 3GPP TS 38.473 V16.4.0 (2021-01)
-- 9.4.5 Information Element Definitions
-- **************************************************************
--
@ -74,7 +74,7 @@ IMPORTS
id-SIB14-message,
id-UEAssistanceInformationEUTRA,
id-SL-PHY-MAC-RLC-Config,
id-SL-ConfigDedicatedEUTRA,
id-SL-ConfigDedicatedEUTRA-Info,
id-AlternativeQoSParaSetList,
id-CurrentQoSParaSetIndex,
id-CarrierList,
@ -102,6 +102,7 @@ IMPORTS
id-ExtendedTAISliceSupportList,
id-E-CID-MeasurementQuantities-Item,
id-ConfiguredTACIndication,
id-NRCGI,
maxNRARFCN,
maxnoofErrors,
maxnoofBPLMNs,
@ -136,7 +137,6 @@ IMPORTS
maxnoofQoSParaSets,
maxnoofPC5QoSFlows,
maxnoofSSBAreas,
maxnoofBPLMNsNR,
maxnoofNRSCSs,
maxnoofPhysicalResourceBlocks,
maxnoofPhysicalResourceBlocks-1,
@ -149,8 +149,6 @@ IMPORTS
maxnoofMDTPLMNs,
maxnoofCAGsupported,
maxnoofNIDsupported,
maxnoofNRSCSs,
maxnoofPhysicalResourceBlocks,
maxnoofExtSliceItems,
maxnoofPosMeas,
maxnoofTRPInfoTypes,
@ -359,7 +357,7 @@ AngleMeasurementQuality-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
AperiodicSRSResourceTriggerList ::= SEQUENCE (SIZE(1..maxnoofSRSTriggerStates)) OF AperiodicSRSResourceTrigger
AperiodicSRSResourceTrigger ::= INTEGER (0..3, ...)
AperiodicSRSResourceTrigger ::= INTEGER (1..3)
Associated-SCell-Item ::= SEQUENCE {
sCell-ID NRCGI,
@ -766,7 +764,9 @@ CauseRadioNetwork ::= ENUMERATED {
report-characteristics-empty,
existing-measurement-ID,
measurement-temporarily-not-available,
measurement-not-supported-for-the-object
measurement-not-supported-for-the-object,
unknown-bh-address,
unknown-bap-routing-id
}
@ -1170,7 +1170,7 @@ DLPRSResourceCoordinates-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
}
DLPRSResourceSetARP ::= SEQUENCE {
dl-PRSResourceSetID INTEGER (0..7),
dl-PRSResourceSetID PRS-Resource-Set-ID,
dL-PRSResourceSetARPLocation DL-PRSResourceSetARPLocation,
listofDL-PRSResourceARP SEQUENCE (SIZE(1.. maxnoofPRS-ResourcesPerSet)) OF DLPRSResourceARP,
iE-Extensions ProtocolExtensionContainer { { DLPRSResourceSetARP-ExtIEs } } OPTIONAL
@ -1193,7 +1193,7 @@ DL-PRSResourceSetARPLocation-ExtIEs F1AP-PROTOCOL-IES ::= {
DLPRSResourceARP ::= SEQUENCE {
dl-PRSResourceID INTEGER (0..63),
dl-PRSResourceID PRS-Resource-ID,
dL-PRSResourceARPLocation DL-PRSResourceARPLocation,
iE-Extensions ProtocolExtensionContainer { { DLPRSResourceARP-ExtIEs } } OPTIONAL
}
@ -1306,7 +1306,8 @@ DRBs-Modified-Item ::= SEQUENCE {
DRBs-Modified-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-RLC-Status CRITICALITY ignore EXTENSION RLC-Status PRESENCE optional }|
{ ID id-AdditionalPDCPDuplicationTNL-List CRITICALITY ignore EXTENSION AdditionalPDCPDuplicationTNL-List PRESENCE optional },
{ ID id-AdditionalPDCPDuplicationTNL-List CRITICALITY ignore EXTENSION AdditionalPDCPDuplicationTNL-List PRESENCE optional }|
{ ID id-CurrentQoSParaSetIndex CRITICALITY ignore EXTENSION QoSParaSetIndex PRESENCE optional },
...
}
@ -1367,7 +1368,8 @@ DRBs-Setup-Item ::= SEQUENCE {
DRBs-Setup-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-AdditionalPDCPDuplicationTNL-List CRITICALITY ignore EXTENSION AdditionalPDCPDuplicationTNL-List PRESENCE optional }|
{ ID id-RLCDuplicationInformation CRITICALITY ignore EXTENSION RLCDuplicationInformation PRESENCE optional}, ...
{ ID id-CurrentQoSParaSetIndex CRITICALITY ignore EXTENSION QoSParaSetIndex PRESENCE optional },
...
}
DRBs-SetupMod-Item ::= SEQUENCE {
@ -1379,7 +1381,8 @@ DRBs-SetupMod-Item ::= SEQUENCE {
}
DRBs-SetupMod-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-AdditionalPDCPDuplicationTNL-List CRITICALITY ignore EXTENSION AdditionalPDCPDuplicationTNL-List PRESENCE optional },
{ ID id-AdditionalPDCPDuplicationTNL-List CRITICALITY ignore EXTENSION AdditionalPDCPDuplicationTNL-List PRESENCE optional }|
{ ID id-CurrentQoSParaSetIndex CRITICALITY ignore EXTENSION QoSParaSetIndex PRESENCE optional },
...
}
@ -1432,7 +1435,8 @@ DRBs-ToBeSetup-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-DC-Based-Duplication-Activation CRITICALITY reject EXTENSION DuplicationActivation PRESENCE optional }|
{ ID id-DLPDCPSNLength CRITICALITY ignore EXTENSION PDCPSNLength PRESENCE mandatory }|
{ ID id-ULPDCPSNLength CRITICALITY ignore EXTENSION PDCPSNLength PRESENCE optional }|
{ ID id-AdditionalPDCPDuplicationTNL-List CRITICALITY ignore EXTENSION AdditionalPDCPDuplicationTNL-List PRESENCE optional },
{ ID id-AdditionalPDCPDuplicationTNL-List CRITICALITY ignore EXTENSION AdditionalPDCPDuplicationTNL-List PRESENCE optional }|
{ ID id-RLCDuplicationInformation CRITICALITY ignore EXTENSION RLCDuplicationInformation PRESENCE optional},
...
}
@ -1546,7 +1550,7 @@ DUtoCURRCInformation-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-Ph-InfoMCG CRITICALITY ignore EXTENSION Ph-InfoMCG PRESENCE optional }|
{ ID id-MeasGapSharingConfig CRITICALITY ignore EXTENSION MeasGapSharingConfig PRESENCE optional }|
{ ID id-SL-PHY-MAC-RLC-Config CRITICALITY ignore EXTENSION SL-PHY-MAC-RLC-Config PRESENCE optional }|
{ ID id-SL-ConfigDedicatedEUTRA CRITICALITY ignore EXTENSION SL-ConfigDedicatedEUTRA PRESENCE optional }|
{ ID id-SL-ConfigDedicatedEUTRA-Info CRITICALITY ignore EXTENSION SL-ConfigDedicatedEUTRA-Info PRESENCE optional }|
{ ID id-RequestedP-MaxFR2 CRITICALITY ignore EXTENSION RequestedP-MaxFR2 PRESENCE optional },
...
}
@ -1598,22 +1602,6 @@ DynamicPQIDescriptor-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
-- E
E-CID-MeasurementPeriodicity ::= ENUMERATED {
ms120,
ms240,
ms480,
ms640,
ms1024,
ms2048,
ms5120,
ms10240,
min1,
min6,
min12,
min30,
min60,
...
}
E-CID-MeasurementQuantities ::= SEQUENCE (SIZE (1.. maxnoofMeasE-CID)) OF ProtocolIE-SingleContainer { {E-CID-MeasurementQuantities-ItemIEs} }
@ -1631,7 +1619,7 @@ E-CID-MeasurementQuantitiesValue-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
}
E-CID-MeasurementQuantitiesValue ::= ENUMERATED {
cell-Portion,
default,
angleOfArrivalNR,
...
}
@ -1758,8 +1746,6 @@ EUTRA-Coex-FDD-Info ::= SEQUENCE {
}
EUTRA-Coex-FDD-Info-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-ULCarrierList CRITICALITY ignore EXTENSION NRCarrierList PRESENCE optional }|
{ ID id-DLCarrierList CRITICALITY ignore EXTENSION NRCarrierList PRESENCE optional },
...
}
@ -1918,6 +1904,18 @@ ExtendedPacketDelayBudget ::= INTEGER (1..65535, ...)
-- F
F1CPathNSA ::= ENUMERATED {lte, nr, both}
F1CTransferPath ::= SEQUENCE {
f1CPathNSA F1CPathNSA,
iE-Extensions ProtocolExtensionContainer { { F1CTransferPath-ExtIEs} } OPTIONAL,
...
}
F1CTransferPath-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
FDD-Info ::= SEQUENCE {
uL-NRFreqInfo NRFreqInfo,
dL-NRFreqInfo NRFreqInfo,
@ -1928,6 +1926,8 @@ FDD-Info ::= SEQUENCE {
}
FDD-Info-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-ULCarrierList CRITICALITY ignore EXTENSION NRCarrierList PRESENCE optional }|
{ ID id-DLCarrierList CRITICALITY ignore EXTENSION NRCarrierList PRESENCE optional },
...
}
@ -2532,15 +2532,27 @@ L839Info-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
LCID ::= INTEGER (1..32, ...)
LCS-to-GCS-TranslationAoA::= SEQUENCE {
alpha INTEGER (0..3599),
beta INTEGER (0..3599),
gamma INTEGER (0..3599),
iE-Extensions ProtocolExtensionContainer { { LCS-to-GCS-TranslationAoA-ExtIEs} } OPTIONAL,
...
}
LCS-to-GCS-TranslationAoA-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
LCStoGCSTranslationList ::= SEQUENCE (SIZE (1.. maxnooflcs-gcs-translation)) OF LCStoGCSTranslation
LCStoGCSTranslation ::= SEQUENCE {
alpha INTEGER (0..359),
alpha-fine INTEGER (0..9),
alpha-fine INTEGER (0..9) OPTIONAL,
beta INTEGER (0..359),
beta-fine INTEGER (0..9),
beta-fine INTEGER (0..9) OPTIONAL,
gamma INTEGER (0..359),
gamma-fine INTEGER (0..9),
gamma-fine INTEGER (0..9) OPTIONAL,
iE-Extensions ProtocolExtensionContainer { {LCStoGCSTranslation-ExtIEs} } OPTIONAL
}
@ -2791,7 +2803,7 @@ NR-CGI-List-For-Restart-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
NR-PRSBeamInformation ::= SEQUENCE {
nR-PRSBeamInformationList NR-PRSBeamInformationList,
lCStoGCSTranslationList LCStoGCSTranslationList,
lCStoGCSTranslationList LCStoGCSTranslationList OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { NR-PRSBeamInformation-ExtIEs } } OPTIONAL
}
@ -2802,7 +2814,7 @@ NR-PRSBeamInformation-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
NR-PRSBeamInformationList ::= SEQUENCE (SIZE(1.. maxnoofPRS-ResourceSets)) OF NR-PRSBeamInformationItem
NR-PRSBeamInformationItem ::= SEQUENCE {
pRSResourceSetID INTEGER (0..7),
pRSResourceSetID PRS-Resource-Set-ID,
pRSAngleList PRSAngleList,
iE-Extensions ProtocolExtensionContainer { { NR-PRSBeamInformationItem-ExtIEs } } OPTIONAL
}
@ -3023,7 +3035,7 @@ NRUESidelinkAggregateMaximumBitrate-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
NZP-CSI-RS-ResourceID::= INTEGER (0..191, ...)
NZP-CSI-RS-ResourceID::= INTEGER (0..191)
-- O
@ -3082,12 +3094,12 @@ PagingPriority ::= ENUMERATED { priolevel1, priolevel2, priolevel3, priolevel4,
RelativePathDelay ::= CHOICE {
k0 INTEGER (0..16351,...),
k1 INTEGER (0..8176,...),
k2 INTEGER (0..4088,...),
k3 INTEGER (0..2044,...),
k4 INTEGER (0..1022,...),
k5 INTEGER (0..511,...),
k0 INTEGER (0..16351),
k1 INTEGER (0..8176),
k2 INTEGER (0..4088),
k3 INTEGER (0..2044),
k4 INTEGER (0..1022),
k5 INTEGER (0..511),
choice-extension ProtocolIE-SingleContainer { { RelativePathDelay-ExtIEs } }
}
@ -3198,8 +3210,8 @@ PosBroadcast ::= ENUMERATED {
PositioningBroadcastCells ::= SEQUENCE (SIZE (1..maxnoBcastCell)) OF NRCGI
PosMeasurementPeriodicity ::= ENUMERATED
{ms120, ms240, ms480, ms640, ms1024, ms2048, ms5120, ms10240, min1, min6, min12, min30, min60, ...}
MeasurementPeriodicity ::= ENUMERATED
{ms120, ms240, ms480, ms640, ms1024, ms2048, ms5120, ms10240, min1, min6, min12, min30, ..., ms20480, ms40960}
PosMeasurementQuantities ::= SEQUENCE (SIZE(1.. maxnoofPosMeas)) OF PosMeasurementQuantities-Item
@ -3237,6 +3249,7 @@ PosMeasurementResultList-Item ::= SEQUENCE {
}
PosMeasurementResultList-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-NRCGI CRITICALITY ignore EXTENSION NRCGI PRESENCE optional },
...
}
@ -3367,9 +3380,9 @@ PRSConfiguration-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
}
PRSInformationPos ::= SEQUENCE {
pRS-IDPos INTEGER(0..255) OPTIONAL,
pRS-IDPos INTEGER(0..255),
pRS-Resource-Set-IDPos INTEGER(0..7),
pRS-Resource-IDPos INTEGER(0..63),
pRS-Resource-IDPos INTEGER(0..63) OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { PRSInformationPos-ExtIEs} } OPTIONAL
}
@ -3436,11 +3449,11 @@ PRS-Resource-ID ::= INTEGER (0..63)
PRSResource-List::= SEQUENCE (SIZE (1..maxnoofPRSresources)) OF PRSResource-Item
PRSResource-Item ::= SEQUENCE {
pRSResourceID INTEGER(0..63),
sequenceID INTEGER(0..4095,...),
rEOffset INTEGER(0..11),
resourceSlotOffset INTEGER(0..511,...),
resourceSymbolOffset INTEGER(0..12,...),
pRSResourceID PRS-Resource-ID,
sequenceID INTEGER(0..4095),
rEOffset INTEGER(0..11,...),
resourceSlotOffset INTEGER(0..511),
resourceSymbolOffset INTEGER(0..12),
qCLInfo PRSResource-QCLInfo OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { PRSResource-Item-ExtIEs} } OPTIONAL
}
@ -3449,23 +3462,33 @@ PRSResource-Item-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
PRSResource-QCLInfo ::= SEQUENCE {
qCLSourceSSBIndex INTEGER(0..63) OPTIONAL,
qCLSourcePRSInfo PRSResource-QCLSourcePRSInfo OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { PRSResource-QCLInfo-ExtIEs} } OPTIONAL,
...
PRSResource-QCLInfo ::= CHOICE {
qCLSourceSSB PRSResource-QCLSourceSSB,
qCLSourcePRS PRSResource-QCLSourcePRS,
choice-extension ProtocolIE-SingleContainer { { PRSResource-QCLInfo-ExtIEs } }
}
PRSResource-QCLInfo-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
PRSResource-QCLInfo-ExtIEs F1AP-PROTOCOL-IES ::= {
...
}
PRSResource-QCLSourcePRSInfo ::= SEQUENCE {
qCLSourcePRSResourceSetID INTEGER(0..7),
qCLSourcePRSResourceID INTEGER(0..63) OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { PRSResource-QCLSourcePRSInfo-ExtIEs} } OPTIONAL
PRSResource-QCLSourceSSB ::= SEQUENCE {
pCI-NR INTEGER(0..1007),
sSB-Index SSB-Index OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { PRSResource-QCLSourceSSB-ExtIEs} } OPTIONAL,
...
}
PRSResource-QCLSourcePRSInfo-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
PRSResource-QCLSourceSSB-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
PRSResource-QCLSourcePRS ::= SEQUENCE {
qCLSourcePRSResourceSetID PRS-Resource-Set-ID,
qCLSourcePRSResourceID PRS-Resource-ID OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { PRSResource-QCLSourcePRS-ExtIEs} } OPTIONAL
}
PRSResource-QCLSourcePRS-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
@ -3707,6 +3730,7 @@ Requested-PDCCH-BlindDetectionSCG ::= OCTET STRING
RequestedSRSTransmissionCharacteristics ::= SEQUENCE {
numberOfTransmissions INTEGER (0..500, ...) OPTIONAL,
-- The IE shall be present if the Resource Type IE is set to “periodic” --
resourceType ENUMERATED {periodic, semi-persistent, aperiodic,...},
bandwidthSRS BandwidthSRS,
sRSResourceSetList SRSResourceSetList OPTIONAL,
@ -3776,7 +3800,7 @@ ResourceSetTypeSemi-persistent-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
ResourceSetTypeAperiodic ::= SEQUENCE {
sRSResourceTrigger-List INTEGER(1..3),
slotoffset INTEGER(1..32),
slotoffset INTEGER(0..32),
iE-Extensions ProtocolExtensionContainer { { ResourceSetTypeAperiodic-ExtIEs} } OPTIONAL
}
@ -3849,7 +3873,7 @@ ResourceTypePos-ExtIEs F1AP-PROTOCOL-IES ::= {
}
ResourceTypePeriodicPos ::= SEQUENCE {
periodicity ENUMERATED{slot1, slot2, slot4, slot5, slot8, slot10, slot16, slot20, slot32, slot40, slot64, slot80, slot160, slot320, slot640, slot1280, slot2560, slot5120, slot10240, slot20480, slot40960, slot81920, ...},
periodicity ENUMERATED{slot1, slot2, slot4, slot5, slot8, slot10, slot16, slot20, slot32, slot40, slot64, slot80, slot160, slot320, slot640, slot1280, slot2560, slot5120, slot10240, slot40960, slot81920, ...},
offset INTEGER(0..81919, ...),
iE-Extensions ProtocolExtensionContainer { { ResourceTypePeriodicPos-ExtIEs} } OPTIONAL
}
@ -3859,7 +3883,7 @@ ResourceTypePeriodicPos-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
}
ResourceTypeSemi-persistentPos ::= SEQUENCE {
periodicity ENUMERATED{slot1, slot2, slot4, slot5, slot8, slot10, slot16, slot20, slot32, slot40, slot64, slot80, slot160, slot320, slot640, slot1280, slot2560, slot5120, slot10240, slot20480, slot40960, slot81920, ...},
periodicity ENUMERATED{slot1, slot2, slot4, slot5, slot8, slot10, slot16, slot20, slot32, slot40, slot64, slot80, slot160, slot320, slot640, slot1280, slot2560, slot5120, slot10240, slot40960, slot81920, ...},
offset INTEGER(0..81919, ...),
iE-Extensions ProtocolExtensionContainer { { ResourceTypeSemi-persistentPos-ExtIEs} } OPTIONAL
}
@ -3869,7 +3893,7 @@ ResourceTypeSemi-persistentPos-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
}
ResourceTypeAperiodicPos ::= SEQUENCE {
slotOffset INTEGER (1..32),
slotOffset INTEGER (0..32),
iE-Extensions ProtocolExtensionContainer { { ResourceTypeAperiodicPos-ExtIEs} } OPTIONAL
}
@ -4045,7 +4069,7 @@ SCellIndex ::=INTEGER (1..31, ...)
SCS-SpecificCarrier ::= SEQUENCE {
offsetToCarrier INTEGER (0..2199,...),
subcarrierSpacing ENUMERATED {kHz15, kHz30, kHz60, kHz120,...},
carrierBandwidth INTEGER (0..275,...),
carrierBandwidth INTEGER (1..275,...),
iE-Extensions ProtocolExtensionContainer { { SCS-SpecificCarrier-ExtIEs } } OPTIONAL
}
@ -4345,7 +4369,7 @@ SLDRBs-ToBeSetupMod-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
SL-PHY-MAC-RLC-Config ::= OCTET STRING
SL-ConfigDedicatedEUTRA ::= OCTET STRING
SL-ConfigDedicatedEUTRA-Info ::= OCTET STRING
SliceAvailableCapacity ::= SEQUENCE {
sliceAvailableCapacityList SliceAvailableCapacityList,
@ -4470,7 +4494,7 @@ SpatialRelationforResourceIDItem-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
}
SpatialRelationPos ::= CHOICE {
sSBPos SSBPos,
sSBPos SSB,
pRSInformationPos PRSInformationPos,
choice-extension ProtocolIE-SingleContainer {{ SpatialInformationPos-ExtIEs }}
}
@ -4585,7 +4609,7 @@ SRBs-ToBeSetupMod-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
SRSCarrier-List ::= SEQUENCE (SIZE(1.. maxnoSRS-Carriers)) OF SRSCarrier-List-Item
SRSCarrier-List-Item ::= SEQUENCE {
pointA INTEGER (0..3279165,...),
pointA INTEGER (0..3279165),
uplinkChannelBW-PerSCS-List UplinkChannelBW-PerSCS-List,
activeULBWP ActiveULBWP,
pci NRPCI,
@ -4617,7 +4641,7 @@ SRSConfiguration-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
SRSPosResourceID ::= INTEGER (0..63, ...)
SRSPosResourceID ::= INTEGER (0..63)
SRSResource::= SEQUENCE {
sRSResourceID SRSResourceID,
@ -4633,7 +4657,6 @@ SRSResource::= SEQUENCE {
b-hop INTEGER (0..3),
groupOrSequenceHopping ENUMERATED { neither, groupHopping, sequenceHopping },
resourceType ResourceType,
slotOffset INTEGER (0..2559),
sequenceId INTEGER (0..1023),
iE-Extensions ProtocolExtensionContainer { { SRSResource-ExtIEs } } OPTIONAL
}
@ -4642,7 +4665,7 @@ SRSResource-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
SRSResourceID ::= INTEGER (0..63, ...)
SRSResourceID ::= INTEGER (0..63)
SRSResourceID-List::= SEQUENCE (SIZE (1..maxnoSRS-ResourcePerSet)) OF SRSResourceID
@ -4709,16 +4732,6 @@ SSB-freqInfo ::= INTEGER (0..maxNRARFCN)
SSB-Index ::= INTEGER(0..63)
SSBPos ::= SEQUENCE {
pCI-NR NRPCI OPTIONAL,
ssb-index SSB-Index,
iE-Extensions ProtocolExtensionContainer { {SSBPos-ExtIEs} } OPTIONAL
}
SSBPos-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
SSB-subcarrierSpacing ::= ENUMERATED {kHz15, kHz30, kHz120, kHz240, spare3, spare2, spare1, ...}
SSB-transmissionPeriodicity ::= ENUMERATED {sf10, sf20, sf40, sf80, sf160, sf320, sf640, ...}
@ -5176,6 +5189,7 @@ TRP-MeasurementRequestItem ::= SEQUENCE {
}
TRP-MeasurementRequestItem-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-NRCGI CRITICALITY ignore EXTENSION NRCGI PRESENCE optional },
...
}
@ -5361,9 +5375,9 @@ UEIdentityIndexValueChoice-ExtIEs F1AP-PROTOCOL-IES ::= {
}
UL-AoA ::= SEQUENCE {
azimuthAoA INTEGER (0..3599),
zenithAoA INTEGER (0..1799) OPTIONAL,
angleCoordinateSystem ENUMERATED {lCS, gCS} OPTIONAL,
azimuthAoA INTEGER (0..3599),
zenithAoA INTEGER (0..1799) OPTIONAL,
lCS-to-GCS-TranslationAoA LCS-to-GCS-TranslationAoA OPTIONAL,
iE-extensions ProtocolExtensionContainer { { UL-AoA-ExtIEs } }
}
@ -5425,7 +5439,7 @@ UL-RTOA-MeasurementItem-ExtIEs F1AP-PROTOCOL-IES ::= {
...
}
UL-SRS-RSRP ::= INTEGER (0..127)
UL-SRS-RSRP ::= INTEGER (0..126)
ULUEConfiguration ::= ENUMERATED {no-data, shared, only, ...}

97
epan/dissectors/asn1/f1ap/F1AP-PDU-Contents.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V16.3.1 (2020-10)
-- 3GPP TS 38.473 V16.4.0 (2021-01)
-- 9.4.4 PDU Definitions
-- **************************************************************
--
@ -236,7 +236,6 @@ IMPORTS
PosAssistanceInformationFailureList,
PosMeasurementQuantities,
PosMeasurementResultList,
PosMeasurementPeriodicity,
PosReportCharacteristics,
TRPInformationTypeItem,
TRPInformationItem,
@ -248,7 +247,7 @@ IMPORTS
SRSConfiguration,
TRPList,
E-CID-MeasurementQuantities,
E-CID-MeasurementPeriodicity,
MeasurementPeriodicity,
E-CID-MeasurementResult,
Cell-Portion-ID,
LMF-UE-MeasurementID,
@ -261,7 +260,8 @@ IMPORTS
MeasurementBeamInfoRequest,
E-CID-ReportCharacteristics,
Extended-GNB-CU-Name,
Extended-GNB-DU-Name
Extended-GNB-DU-Name,
F1CTransferPath
@ -607,7 +607,7 @@ FROM F1AP-Containers
id-TRP-MeasurementRequestList,
id-MeasurementBeamInfoRequest,
id-E-CID-ReportCharacteristics,
id-F1CTransferPath,
maxCellingNBDU,
maxnoofCandidateSpCells,
maxnoofDRBs,
@ -1170,7 +1170,8 @@ UEContextSetupRequestIEs F1AP-PROTOCOL-IES ::= {
{ ID id-SLDRBs-ToBeSetup-List CRITICALITY reject TYPE SLDRBs-ToBeSetup-List PRESENCE optional }|
{ ID id-ConditionalInterDUMobilityInformation CRITICALITY reject TYPE ConditionalInterDUMobilityInformation PRESENCE optional}|
{ ID id-ManagementBasedMDTPLMNList CRITICALITY ignore TYPE MDTPLMNList PRESENCE optional }|
{ ID id-ServingNID CRITICALITY reject TYPE NID PRESENCE optional },
{ ID id-ServingNID CRITICALITY reject TYPE NID PRESENCE optional }|
{ ID id-F1CTransferPath CRITICALITY reject TYPE F1CTransferPath PRESENCE optional },
...
}
@ -1471,7 +1472,8 @@ UEContextModificationRequestIEs F1AP-PROTOCOL-IES ::= {
{ ID id-SLDRBs-ToBeSetupMod-List CRITICALITY reject TYPE SLDRBs-ToBeSetupMod-List PRESENCE optional }|
{ ID id-SLDRBs-ToBeModified-List CRITICALITY reject TYPE SLDRBs-ToBeModified-List PRESENCE optional }|
{ ID id-SLDRBs-ToBeReleased-List CRITICALITY reject TYPE SLDRBs-ToBeReleased-List PRESENCE optional }|
{ ID id-ConditionalIntraDUMobilityInformation CRITICALITY reject TYPE ConditionalIntraDUMobilityInformation PRESENCE optional},
{ ID id-ConditionalIntraDUMobilityInformation CRITICALITY reject TYPE ConditionalIntraDUMobilityInformation PRESENCE optional}|
{ ID id-F1CTransferPath CRITICALITY reject TYPE F1CTransferPath PRESENCE optional },
...
}
@ -2582,6 +2584,24 @@ BAPMappingConfigurationAcknowledge-IEs F1AP-PROTOCOL-IES ::= {
...
}
-- **************************************************************
--
-- BAP MAPPING CONFIGURATION FAILURE
--
-- **************************************************************
BAPMappingConfigurationFailure ::= SEQUENCE {
protocolIEs ProtocolIE-Container { { BAPMappingConfigurationFailureIEs} },
...
}
BAPMappingConfigurationFailureIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
{ ID id-TimeToWait CRITICALITY ignore TYPE TimeToWait PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
-- **************************************************************
@ -2630,6 +2650,26 @@ GNBDUResourceConfigurationAcknowledgeIEs F1AP-PROTOCOL-IES ::= {
...
}
-- **************************************************************
--
-- GNB-DU RESOURCE CONFIGURATION FAILURE
--
-- **************************************************************
GNBDUResourceConfigurationFailure ::= SEQUENCE {
protocolIEs ProtocolIE-Container { { GNBDUResourceConfigurationFailureIEs} },
...
}
GNBDUResourceConfigurationFailureIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
{ ID id-TimeToWait CRITICALITY ignore TYPE TimeToWait PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
-- **************************************************************
--
-- IAB TNL Address Allocation ELEMENTARY PROCEDURE
@ -2692,6 +2732,25 @@ IAB-Allocated-TNL-Address-List-ItemIEs F1AP-PROTOCOL-IES::= {
...
}
-- **************************************************************
--
-- IAB TNL ADDRESS FAILURE
--
-- **************************************************************
IABTNLAddressFailure ::= SEQUENCE {
protocolIEs ProtocolIE-Container { { IABTNLAddressFailureIEs} },
...
}
IABTNLAddressFailureIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
{ ID id-TimeToWait CRITICALITY ignore TYPE TimeToWait PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
-- **************************************************************
--
-- IAB UP Configuration Update ELEMENTARY PROCEDURE
@ -3027,7 +3086,7 @@ PositioningMeasurementRequestIEs F1AP-PROTOCOL-IES ::= {
{ ID id-RAN-MeasurementID CRITICALITY reject TYPE RAN-MeasurementID PRESENCE mandatory}|
{ ID id-TRP-MeasurementRequestList CRITICALITY reject TYPE TRP-MeasurementRequestList PRESENCE mandatory}|
{ ID id-PosReportCharacteristics CRITICALITY reject TYPE PosReportCharacteristics PRESENCE mandatory}|
{ ID id-PosMeasurementPeriodicity CRITICALITY reject TYPE PosMeasurementPeriodicity PRESENCE conditional }|
{ ID id-PosMeasurementPeriodicity CRITICALITY reject TYPE MeasurementPeriodicity PRESENCE conditional }|
-- The above IE shall be present if the PosReportCharacteristics IE is set to “periodic” --
{ ID id-PosMeasurementQuantities CRITICALITY reject TYPE PosMeasurementQuantities PRESENCE mandatory}|
{ ID id-SFNInitialisationTime CRITICALITY ignore TYPE SFNInitialisationTime PRESENCE optional }|
@ -3502,7 +3561,7 @@ E-CIDMeasurementInitiationRequest-IEs F1AP-PROTOCOL-IES ::= {
{ ID id-LMF-UE-MeasurementID CRITICALITY reject TYPE LMF-UE-MeasurementID PRESENCE mandatory }|
{ ID id-RAN-UE-MeasurementID CRITICALITY reject TYPE RAN-UE-MeasurementID PRESENCE mandatory }|
{ ID id-E-CID-ReportCharacteristics CRITICALITY reject TYPE E-CID-ReportCharacteristics PRESENCE mandatory }|
{ ID id-E-CID-MeasurementPeriodicity CRITICALITY reject TYPE E-CID-MeasurementPeriodicity PRESENCE conditional }|
{ ID id-E-CID-MeasurementPeriodicity CRITICALITY reject TYPE MeasurementPeriodicity PRESENCE conditional }|
-- The above IE shall be present if the E-CID-ReportCharacteristics IE is set to “periodic” –-
{ ID id-E-CID-MeasurementQuantities CRITICALITY reject TYPE E-CID-MeasurementQuantities PRESENCE mandatory},
...
@ -3520,8 +3579,8 @@ E-CIDMeasurementInitiationResponse ::= SEQUENCE {
}
E-CIDMeasurementInitiationResponse-IEs F1AP-PROTOCOL-IES ::= {
{ ID id-gNB-CU-UE-F1AP-ID CRITICALITY ignore TYPE GNB-CU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-DU-UE-F1AP-ID CRITICALITY ignore TYPE GNB-DU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-CU-UE-F1AP-ID CRITICALITY reject TYPE GNB-CU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-DU-UE-F1AP-ID CRITICALITY reject TYPE GNB-DU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-LMF-UE-MeasurementID CRITICALITY reject TYPE LMF-UE-MeasurementID PRESENCE mandatory }|
{ ID id-RAN-UE-MeasurementID CRITICALITY reject TYPE RAN-UE-MeasurementID PRESENCE mandatory }|
{ ID id-E-CID-MeasurementResult CRITICALITY ignore TYPE E-CID-MeasurementResult PRESENCE optional}|
@ -3543,8 +3602,8 @@ E-CIDMeasurementInitiationFailure ::= SEQUENCE {
E-CIDMeasurementInitiationFailure-IEs F1AP-PROTOCOL-IES ::= {
{ ID id-gNB-CU-UE-F1AP-ID CRITICALITY ignore TYPE GNB-CU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-DU-UE-F1AP-ID CRITICALITY ignore TYPE GNB-DU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-CU-UE-F1AP-ID CRITICALITY reject TYPE GNB-CU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-DU-UE-F1AP-ID CRITICALITY reject TYPE GNB-DU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-LMF-UE-MeasurementID CRITICALITY reject TYPE LMF-UE-MeasurementID PRESENCE mandatory }|
{ ID id-RAN-UE-MeasurementID CRITICALITY reject TYPE RAN-UE-MeasurementID PRESENCE mandatory }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
@ -3571,8 +3630,8 @@ E-CIDMeasurementFailureIndication ::= SEQUENCE {
E-CIDMeasurementFailureIndication-IEs F1AP-PROTOCOL-IES ::= {
{ ID id-gNB-CU-UE-F1AP-ID CRITICALITY ignore TYPE GNB-CU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-DU-UE-F1AP-ID CRITICALITY ignore TYPE GNB-DU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-CU-UE-F1AP-ID CRITICALITY reject TYPE GNB-CU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-DU-UE-F1AP-ID CRITICALITY reject TYPE GNB-DU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-LMF-UE-MeasurementID CRITICALITY reject TYPE LMF-UE-MeasurementID PRESENCE mandatory }|
{ ID id-RAN-UE-MeasurementID CRITICALITY reject TYPE RAN-UE-MeasurementID PRESENCE mandatory }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory},
@ -3598,8 +3657,8 @@ E-CIDMeasurementReport ::= SEQUENCE {
E-CIDMeasurementReport-IEs F1AP-PROTOCOL-IES ::= {
{ ID id-gNB-CU-UE-F1AP-ID CRITICALITY ignore TYPE GNB-CU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-DU-UE-F1AP-ID CRITICALITY ignore TYPE GNB-DU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-CU-UE-F1AP-ID CRITICALITY reject TYPE GNB-CU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-DU-UE-F1AP-ID CRITICALITY reject TYPE GNB-DU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-LMF-UE-MeasurementID CRITICALITY reject TYPE LMF-UE-MeasurementID PRESENCE mandatory }|
{ ID id-RAN-UE-MeasurementID CRITICALITY reject TYPE RAN-UE-MeasurementID PRESENCE mandatory }|
{ ID id-E-CID-MeasurementResult CRITICALITY ignore TYPE E-CID-MeasurementResult PRESENCE mandatory }|
@ -3628,8 +3687,8 @@ E-CIDMeasurementTerminationCommand ::= SEQUENCE {
E-CIDMeasurementTerminationCommand-IEs F1AP-PROTOCOL-IES ::= {
{ ID id-gNB-CU-UE-F1AP-ID CRITICALITY ignore TYPE GNB-CU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-DU-UE-F1AP-ID CRITICALITY ignore TYPE GNB-DU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-CU-UE-F1AP-ID CRITICALITY reject TYPE GNB-CU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-gNB-DU-UE-F1AP-ID CRITICALITY reject TYPE GNB-DU-UE-F1AP-ID PRESENCE mandatory }|
{ ID id-LMF-UE-MeasurementID CRITICALITY reject TYPE LMF-UE-MeasurementID PRESENCE mandatory }|
{ ID id-RAN-UE-MeasurementID CRITICALITY reject TYPE RAN-UE-MeasurementID PRESENCE mandatory },
...

8
epan/dissectors/asn1/f1ap/F1AP-PDU-Descriptions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V16.3.1 (2020-10)
-- 3GPP TS 38.473 V16.4.0 (2021-01)
-- 9.4.3 Elementary Procedure Definitions
-- **************************************************************
--
@ -77,10 +77,13 @@ FROM F1AP-CommonDataTypes
CUDURadioInformationTransfer,
BAPMappingConfiguration,
BAPMappingConfigurationAcknowledge,
BAPMappingConfigurationFailure,
GNBDUResourceConfiguration,
GNBDUResourceConfigurationAcknowledge,
GNBDUResourceConfigurationFailure,
IABTNLAddressRequest,
IABTNLAddressResponse,
IABTNLAddressFailure,
IABUPConfigurationUpdateRequest,
IABUPConfigurationUpdateResponse,
IABUPConfigurationUpdateFailure,
@ -544,6 +547,7 @@ cUDURadioInformationTransfer F1AP-ELEMENTARY-PROCEDURE ::= {
bAPMappingConfiguration F1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE BAPMappingConfiguration
SUCCESSFUL OUTCOME BAPMappingConfigurationAcknowledge
UNSUCCESSFUL OUTCOME BAPMappingConfigurationFailure
PROCEDURE CODE id-BAPMappingConfiguration
CRITICALITY reject
}
@ -551,6 +555,7 @@ bAPMappingConfiguration F1AP-ELEMENTARY-PROCEDURE ::= {
gNBDUResourceConfiguration F1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE GNBDUResourceConfiguration
SUCCESSFUL OUTCOME GNBDUResourceConfigurationAcknowledge
UNSUCCESSFUL OUTCOME GNBDUResourceConfigurationFailure
PROCEDURE CODE id-GNBDUResourceConfiguration
CRITICALITY reject
}
@ -558,6 +563,7 @@ gNBDUResourceConfiguration F1AP-ELEMENTARY-PROCEDURE ::= {
iABTNLAddressAllocation F1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE IABTNLAddressRequest
SUCCESSFUL OUTCOME IABTNLAddressResponse
UNSUCCESSFUL OUTCOME IABTNLAddressFailure
PROCEDURE CODE id-IABTNLAddressAllocation
CRITICALITY reject
}

31
epan/dissectors/asn1/f1ap/f1ap.cnf
View File

@ -501,7 +501,7 @@ id-SLDRBs-ModifiedConf-Item ProtocolIE-ID
id-UEAssistanceInformationEUTRA ProtocolIE-ID
id-PC5LinkAMBR ProtocolIE-ID
id-SL-PHY-MAC-RLC-Config ProtocolIE-ID
id-SL-ConfigDedicatedEUTRA ProtocolIE-ID
id-SL-ConfigDedicatedEUTRA-Info ProtocolIE-ID
id-AlternativeQoSParaSetList ProtocolIE-ID
id-CurrentQoSParaSetIndex ProtocolIE-ID
id-gNBCUMeasurementID ProtocolIE-ID
@ -526,8 +526,6 @@ id-ExtendedPacketDelayBudget ProtocolIE-ID
id-TSCTrafficCharacteristics ProtocolIE-ID
id-ReportingRequestType ProtocolIE-ID
id-TimeReferenceInformation ProtocolIE-ID
id-ReferenceTimeInformationReport-IE ProtocolIE-ID
id-ReferenceTimeInformationReportingControl-IE ProtocolIE-ID
id-CNPacketDelayBudgetUplink ProtocolIE-ID
id-AdditionalPDCPDuplicationTNL-List ProtocolIE-ID
id-RLCDuplicationInformation ProtocolIE-ID
@ -586,6 +584,7 @@ id-E-CID-ReportCharacteristics ProtocolIE-ID
id-ConfiguredTACIndication ProtocolIE-ID
id-Extended-GNB-DU-Name ProtocolIE-ID
id-Extended-GNB-CU-Name ProtocolIE-ID
id-F1CTransferPath ProtocolIE-ID
#.END
#.REGISTER
@ -899,14 +898,14 @@ AbortTransmission N f1ap.ies id-AbortTransmissio
PositioningBroadcastCells N f1ap.ies id-PositioningBroadcastCells
SRSConfiguration N f1ap.ies id-SRSConfiguration
PosReportCharacteristics N f1ap.ies id-PosReportCharacteristics
PosMeasurementPeriodicity N f1ap.ies id-PosMeasurementPeriodicity
MeasurementPeriodicity N f1ap.ies id-PosMeasurementPeriodicity
TRPList N f1ap.ies id-TRPList
RAN-MeasurementID N f1ap.ies id-RAN-MeasurementID
LMF-UE-MeasurementID N f1ap.ies id-LMF-UE-MeasurementID
RAN-UE-MeasurementID N f1ap.ies id-RAN-UE-MeasurementID
E-CID-MeasurementQuantities N f1ap.ies id-E-CID-MeasurementQuantities
E-CID-MeasurementQuantities-Item N f1ap.ies id-E-CID-MeasurementQuantities-Item
E-CID-MeasurementPeriodicity N f1ap.ies id-E-CID-MeasurementPeriodicity
MeasurementPeriodicity N f1ap.ies id-E-CID-MeasurementPeriodicity
E-CID-MeasurementResult N f1ap.ies id-E-CID-MeasurementResult
Cell-Portion-ID N f1ap.ies id-Cell-Portion-ID
SFNInitialisationTime N f1ap.ies id-SFNInitialisationTime
@ -917,6 +916,7 @@ MeasurementBeamInfoRequest N f1ap.ies id-MeasurementBeamI
E-CID-ReportCharacteristics N f1ap.ies id-E-CID-ReportCharacteristics
Extended-GNB-DU-Name N f1ap.ies id-Extended-GNB-DU-Name
Extended-GNB-CU-Name N f1ap.ies id-Extended-GNB-CU-Name
F1CTransferPath N f1ap.ies id-F1CTransferPath
#F1AP-PROTOCOL-EXTENSION
GNB-CUSystemInformation N f1ap.extension id-gNB-CUSystemInformation
@ -979,7 +979,7 @@ SIB13-message N f1ap.extension id-SIB13-mess
SIB14-message N f1ap.extension id-SIB14-message
UEAssistanceInformationEUTRA N f1ap.extension id-UEAssistanceInformationEUTRA
SL-PHY-MAC-RLC-Config N f1ap.extension id-SL-PHY-MAC-RLC-Config
SL-ConfigDedicatedEUTRA N f1ap.extension id-SL-ConfigDedicatedEUTRA
SL-ConfigDedicatedEUTRA-Info N f1ap.extension id-SL-ConfigDedicatedEUTRA-Info
AlternativeQoSParaSetList N f1ap.extension id-AlternativeQoSParaSetList
QoSParaSetNotifyIndex N f1ap.extension id-CurrentQoSParaSetIndex
NRCarrierList N f1ap.extension id-CarrierList
@ -1005,6 +1005,7 @@ SIB10-message N f1ap.extension id-SIB10-mess
NRCarrierList N f1ap.extension id-DLCarrierList
ExtendedSliceSupportList N f1ap.extension id-ExtendedTAISliceSupportList
ConfiguredTACIndication N f1ap.extension id-ConfiguredTACIndication
NRCGI N f1ap.extension id-NRCGI
#F1AP-ELEMENTARY-PROCEDURE
Reset N f1ap.proc.imsg id-Reset
@ -1090,12 +1091,15 @@ CUDURadioInformationTransfer N f1ap.proc.imsg id-CUDURadioInformatio
BAPMappingConfiguration N f1ap.proc.imsg id-BAPMappingConfiguration
BAPMappingConfigurationAcknowledge N f1ap.proc.sout id-BAPMappingConfiguration
BAPMappingConfigurationFailure N f1ap.proc.uout id-BAPMappingConfiguration
GNBDUResourceConfiguration N f1ap.proc.imsg id-GNBDUResourceConfiguration
GNBDUResourceConfigurationAcknowledge N f1ap.proc.sout id-GNBDUResourceConfiguration
GNBDUResourceConfigurationFailure N f1ap.proc.uout id-GNBDUResourceConfiguration
IABTNLAddressRequest N f1ap.proc.imsg id-IABTNLAddressAllocation
IABTNLAddressResponse N f1ap.proc.sout id-IABTNLAddressAllocation
IABTNLAddressFailure N f1ap.proc.uout id-IABTNLAddressAllocation
IABUPConfigurationUpdateRequest N f1ap.proc.imsg id-IABUPConfigurationUpdate
IABUPConfigurationUpdateResponse N f1ap.proc.sout id-IABUPConfigurationUpdate
@ -1887,13 +1891,13 @@ Periodicity DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_microseconds
dissect_nr_rrc_SL_PHY_MAC_RLC_Config_r16_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY SL-ConfigDedicatedEUTRA VAL_PTR = &param_tvb
#.FN_BODY SL-ConfigDedicatedEUTRA-Info VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (param_tvb && lte_rrc_conn_reconf_handle) {
subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_SL_ConfigDedicatedEUTRA);
call_dissector(lte_rrc_conn_reconf_handle, param_tvb, actx->pinfo, subtree);
subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_SL_ConfigDedicatedEUTRA_Info);
dissect_nr_rrc_SL_ConfigDedicatedEUTRA_Info_r16_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY TDD-UL-DLConfigCommonNR VAL_PTR = &param_tvb
@ -2043,18 +2047,27 @@ Periodicity DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_microseconds
#.FN_HDR BAPMappingConfigurationAcknowledge
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "BAPMappingConfigurationAcknowledge");
#.END
#.FN_HDR BAPMappingConfigurationFailure
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "BAPMappingConfigurationFailure");
#.END
#.FN_HDR GNBDUResourceConfiguration
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUResourceConfiguration");
#.END
#.FN_HDR GNBDUResourceConfigurationAcknowledge
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUResourceConfigurationAcknowledge");
#.END
#.FN_HDR GNBDUResourceConfigurationFailure
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUResourceConfigurationFailure");
#.END
#.FN_HDR IABTNLAddressRequest
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "IABTNLAddressRequest");
#.END
#.FN_HDR IABTNLAddressResponse
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "IABTNLAddressResponse");
#.END
#.FN_HDR IABTNLAddressFailure
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "IABTNLAddressFailure");
#.END
#.FN_HDR IABUPConfigurationUpdateRequest
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "IABUPConfigurationUpdateRequest");
#.END

6
epan/dissectors/asn1/f1ap/packet-f1ap-template.c
View File

@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* References: 3GPP TS 38.473 V16.3.1 (2020-07)
* References: 3GPP TS 38.473 V16.4.0 (2021-01)
*/
#include "config.h"
@ -120,7 +120,7 @@ static gint ett_f1ap_SIB12_message = -1;
static gint ett_f1ap_SIB13_message = -1;
static gint ett_f1ap_SIB14_message = -1;
static gint ett_f1ap_SL_PHY_MAC_RLC_Config = -1;
static gint ett_f1ap_SL_ConfigDedicatedEUTRA = -1;
static gint ett_f1ap_SL_ConfigDedicatedEUTRA_Info = -1;
static gint ett_f1ap_TDD_UL_DLConfigCommonNR = -1;
static gint ett_f1ap_UEAssistanceInformationEUTRA = -1;
static gint ett_f1ap_PosAssistance_Information = -1;
@ -451,7 +451,7 @@ void proto_register_f1ap(void) {
&ett_f1ap_SIB13_message,
&ett_f1ap_SIB14_message,
&ett_f1ap_SL_PHY_MAC_RLC_Config,
&ett_f1ap_SL_ConfigDedicatedEUTRA,
&ett_f1ap_SL_ConfigDedicatedEUTRA_Info,
&ett_f1ap_TDD_UL_DLConfigCommonNR,
&ett_f1ap_UEAssistanceInformationEUTRA,
&ett_f1ap_PosAssistance_Information,

2
epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
View File

@ -101,6 +101,7 @@ SIB13-r16_PDU
SIB14-r16_PDU
SidelinkParametersNR-r16_PDU
SidelinkUEInformationNR-r16_PDU
SL-ConfigDedicatedEUTRA-Info-r16_PDU
SL-PHY-MAC-RLC-Config-r16_PDU
TDD-UL-DL-ConfigCommon_PDU
UE-CapabilityRAT-ContainerList_PDU
@ -154,6 +155,7 @@ SCCH-Message @scch
SchedulingRequestResourceConfig
SidelinkParametersNR-r16
SidelinkUEInformationNR-r16
SL-ConfigDedicatedEUTRA-Info-r16
SL-PHY-MAC-RLC-Config-r16
SIB1
SIB2

1027
epan/dissectors/packet-f1ap.c
View File

File diff suppressed because it is too large Load Diff

15
epan/dissectors/packet-nr-rrc.c
View File

@ -393,6 +393,7 @@ static int hf_nr_rrc_UL_CCCH1_Message_PDU = -1; /* UL_CCCH1_Message */
static int hf_nr_rrc_nr_rrc_UL_DCCH_Message_PDU = -1; /* UL_DCCH_Message */
static int hf_nr_rrc_nr_rrc_MIB_PDU = -1; /* MIB */
static int hf_nr_rrc_nr_rrc_RRCReconfiguration_PDU = -1; /* RRCReconfiguration */
static int hf_nr_rrc_nr_rrc_SL_ConfigDedicatedEUTRA_Info_r16_PDU = -1; /* SL_ConfigDedicatedEUTRA_Info_r16 */
static int hf_nr_rrc_nr_rrc_RRCReconfigurationComplete_PDU = -1; /* RRCReconfigurationComplete */
static int hf_nr_rrc_nr_rrc_SIB1_PDU = -1; /* SIB1 */
static int hf_nr_rrc_nr_rrc_SidelinkUEInformationNR_r16_PDU = -1; /* SidelinkUEInformationNR_r16 */
@ -86249,6 +86250,16 @@ int dissect_nr_rrc_RRCReconfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_SL_ConfigDedicatedEUTRA_Info_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
offset = dissect_nr_rrc_SL_ConfigDedicatedEUTRA_Info_r16(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_nr_rrc_SL_ConfigDedicatedEUTRA_Info_r16_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_RRCReconfigurationComplete_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
@ -86889,6 +86900,10 @@ proto_register_nr_rrc(void) {
{ "RRCReconfiguration", "nr-rrc.RRCReconfiguration_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_SL_ConfigDedicatedEUTRA_Info_r16_PDU,
{ "SL-ConfigDedicatedEUTRA-Info-r16", "nr-rrc.SL_ConfigDedicatedEUTRA_Info_r16_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_RRCReconfigurationComplete_PDU,
{ "RRCReconfigurationComplete", "nr-rrc.RRCReconfigurationComplete_element",
FT_NONE, BASE_NONE, NULL, 0,

1
epan/dissectors/packet-nr-rrc.h
View File

@ -37,6 +37,7 @@ int dissect_nr_rrc_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info *
int dissect_nr_rrc_UL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_MIB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_RRCReconfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_SL_ConfigDedicatedEUTRA_Info_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_RRCReconfigurationComplete_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_SIB1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_SidelinkUEInformationNR_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);