osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

F1AP: upgrade dissector to v15.5.0 

Change-Id: Id5ebdfc1c7351ab234020dbb51dabbadc65d8fbd
Reviewed-on: https://code.wireshark.org/review/32826
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Pascal Quantin 2019-04-11 15:54:41 +02:00
parent 1795d6f201
commit 3e2cad0cb5
12 changed files with 1064 additions and 141 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 V15.4.1 (2019-01)
-- 3GPP TS 38.473 V15.5.0 (2019-03)
-- 9.4.6 Common Definitions
-- **************************************************************
--

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V15.4.1 (2019-01)
-- 3GPP TS 38.473 V15.5.0 (2019-03)
-- 9.4.7 Constant Definitions
-- **************************************************************
--
@ -184,7 +184,7 @@ id-SRBs-ToBeSetupMod-Item ProtocolIE-ID ::= 75
id-SRBs-ToBeSetupMod-List ProtocolIE-ID ::= 76
id-TimeToWait ProtocolIE-ID ::= 77
id-TransactionID ProtocolIE-ID ::= 78
id-TransmissionStopIndicator ProtocolIE-ID ::= 79
id-TransmissionActionIndicator ProtocolIE-ID ::= 79
id-UE-associatedLogicalF1-ConnectionItem ProtocolIE-ID ::= 80
id-UE-associatedLogicalF1-ConnectionListResAck ProtocolIE-ID ::= 81
id-gNB-CU-Name ProtocolIE-ID ::= 82
@ -311,6 +311,21 @@ id-ExtendedAvailablePLMN-List ProtocolIE-ID ::= 197
id-Associated-SCell-List ProtocolIE-ID ::= 198
id-latest-RRC-Version-Enhanced ProtocolIE-ID ::= 199
id-Associated-SCell-Item ProtocolIE-ID ::= 200
id-Cell-Direction ProtocolIE-ID ::= 201
id-SRBs-Setup-List ProtocolIE-ID ::= 202
id-SRBs-Setup-Item ProtocolIE-ID ::= 203
id-SRBs-SetupMod-List ProtocolIE-ID ::= 204
id-SRBs-SetupMod-Item ProtocolIE-ID ::= 205
id-SRBs-Modified-List ProtocolIE-ID ::= 206
id-SRBs-Modified-Item ProtocolIE-ID ::= 207
id-Ph-InfoSCG ProtocolIE-ID ::= 208
id-RequestedBandCombinationIndex ProtocolIE-ID ::= 209
id-RequestedFeatureSetEntryIndex ProtocolIE-ID ::= 210
id-RequestedP-MaxFR2 ProtocolIE-ID ::= 211
id-DRX-Config ProtocolIE-ID ::= 212
id-IgnoreResourceCoordinationContainer ProtocolIE-ID ::= 213
id-UEAssistanceInformation ProtocolIE-ID ::= 214
id-NeedforGap ProtocolIE-ID ::= 215
id-PagingOrigin ProtocolIE-ID ::= 216
END

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V15.4.1 (2019-01)
-- 3GPP TS 38.473 V15.5.0 (2019-03)
-- 9.4.8 Container Definitions
-- **************************************************************
--

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V15.4.1 (2019-01)
-- 3GPP TS 38.473 V15.5.0 (2019-03)
-- 9.4.5 Information Element Definitions
-- **************************************************************
--
@ -20,6 +20,7 @@ IMPORTS
id-TAISliceSupportList,
id-RANAC,
id-BearerTypeChange,
id-Cell-Direction,
id-CellGroupConfig,
id-AvailablePLMNList,
id-PDUSessionID,
@ -40,7 +41,13 @@ IMPORTS
id-DRX-LongCycleStartOffset,
id-SelectedBandCombinationIndex,
id-SelectedFeatureSetEntryIndex,
id-Ph-InfoSCG,
id-latest-RRC-Version-Enhanced,
id-RequestedBandCombinationIndex,
id-RequestedFeatureSetEntryIndex,
id-RequestedP-MaxFR2,
id-DRX-Config,
id-UEAssistanceInformation,
maxNRARFCN,
maxnoofErrors,
maxnoofBPLMNs,
@ -188,7 +195,9 @@ CauseRadioNetwork ::= ENUMERATED {
cell-not-available,
rl-failure-others,
ue-rejection,
resources-not-available-for-the-slice
resources-not-available-for-the-slice,
amf-initiated-abnormal-release,
release-due-to-pre-emption
}
CauseTransport ::= ENUMERATED {
@ -199,6 +208,8 @@ CauseTransport ::= ENUMERATED {
CellGroupConfig ::= OCTET STRING
Cell-Direction ::= ENUMERATED {dl-only, ul-only}
Cells-Failed-to-be-Activated-List-Item ::= SEQUENCE {
nRCGI NRCGI,
cause Cause,
@ -360,9 +371,10 @@ CUtoDURRCInformation ::= SEQUENCE {
}
CUtoDURRCInformation-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-HandoverPreparationInformation CRITICALITY ignore EXTENSION HandoverPreparationInformation PRESENCE optional }|
{ ID id-CellGroupConfig CRITICALITY ignore EXTENSION CellGroupConfig PRESENCE optional }|
{ ID id-MeasurementTimingConfiguration CRITICALITY ignore EXTENSION MeasurementTimingConfiguration PRESENCE optional },
{ ID id-HandoverPreparationInformation CRITICALITY ignore EXTENSION HandoverPreparationInformation PRESENCE optional }|
{ ID id-CellGroupConfig CRITICALITY ignore EXTENSION CellGroupConfig PRESENCE optional }|
{ ID id-MeasurementTimingConfiguration CRITICALITY ignore EXTENSION MeasurementTimingConfiguration PRESENCE optional }|
{ ID id-UEAssistanceInformation CRITICALITY ignore EXTENSION UEAssistanceInformation PRESENCE optional },
...
}
@ -617,6 +629,8 @@ DRXCycle-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
DRX-Config ::= OCTET STRING
DRXConfigurationIndicator ::= ENUMERATED{ release, ...}
DRX-LongCycleStartOffset ::= INTEGER (0..10239)
@ -633,8 +647,13 @@ DUtoCURRCInformation ::= SEQUENCE {
DUtoCURRCInformation-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-DRX-LongCycleStartOffset CRITICALITY ignore EXTENSION DRX-LongCycleStartOffset PRESENCE optional }|
{ ID id-SelectedBandCombinationIndex CRITICALITY ignore EXTENSION SelectedBandCombinationIndex PRESENCE optional }|
{ ID id-SelectedFeatureSetEntryIndex CRITICALITY ignore EXTENSION SelectedFeatureSetEntryIndex PRESENCE optional },
{ ID id-SelectedBandCombinationIndex CRITICALITY ignore EXTENSION SelectedBandCombinationIndex PRESENCE optional }|
{ ID id-SelectedFeatureSetEntryIndex CRITICALITY ignore EXTENSION SelectedFeatureSetEntryIndex PRESENCE optional }|
{ ID id-Ph-InfoSCG CRITICALITY ignore EXTENSION Ph-InfoSCG PRESENCE optional }|
{ ID id-RequestedBandCombinationIndex CRITICALITY ignore EXTENSION RequestedBandCombinationIndex PRESENCE optional }|
{ ID id-RequestedFeatureSetEntryIndex CRITICALITY ignore EXTENSION RequestedFeatureSetEntryIndex PRESENCE optional }|
{ ID id-RequestedP-MaxFR2 CRITICALITY ignore EXTENSION RequestedP-MaxFR2 PRESENCE optional }|
{ ID id-DRX-Config CRITICALITY ignore EXTENSION DRX-Config PRESENCE optional },
...
}
@ -1051,6 +1070,7 @@ GTPTunnel-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
HandoverPreparationInformation ::= OCTET STRING
-- I
IgnoreResourceCoordinationContainer ::= ENUMERATED { true,...}
InactivityMonitoringRequest ::= ENUMERATED { true,...}
InactivityMonitoringResponse ::= ENUMERATED { not-supported,...}
@ -1083,6 +1103,8 @@ MeasurementTimingConfiguration ::= OCTET STRING
-- N
NeedforGap::= ENUMERATED {true, ...}
NGRANAllocationAndRetentionPriority ::= SEQUENCE {
priorityLevel PriorityLevel,
pre-emptionCapability Pre-emptionCapability,
@ -1216,6 +1238,8 @@ PagingIdentity-ExtIEs F1AP-PROTOCOL-IES::= {
...
}
PagingOrigin ::= ENUMERATED { non-3gpp, ...}
PagingPriority ::= ENUMERATED { priolevel1, priolevel2, priolevel3, priolevel4, priolevel5, priolevel6, priolevel7, priolevel8,...}
PDCP-SN ::= INTEGER (0..4095)
@ -1224,6 +1248,8 @@ PDCPSNLength ::= ENUMERATED { twelve-bits,eighteen-bits,...}
PDUSessionID ::= INTEGER (0..255)
Ph-InfoSCG ::= OCTET STRING
PLMN-Identity ::= OCTET STRING (SIZE(3))
Pre-emptionCapability ::= ENUMERATED {
@ -1354,6 +1380,12 @@ Reestablishment-Indication ::= ENUMERATED {
...
}
RequestedBandCombinationIndex ::= OCTET STRING
RequestedFeatureSetEntryIndex ::= OCTET STRING
RequestedP-MaxFR2 ::= OCTET STRING
RequestType ::= ENUMERATED {offer, execution, ...}
ResourceCoordinationEUTRACellInfo ::= SEQUENCE {
@ -1423,7 +1455,11 @@ RRCDeliveryStatus-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
RRCDeliveryStatusRequest ::= ENUMERATED {true, ...}
RRCReconfigurationCompleteIndicator ::= ENUMERATED {true, ...}
RRCReconfigurationCompleteIndicator ::= ENUMERATED {
true,
...,
failure
}
RRC-Version ::= SEQUENCE {
latest-RRC-Version BIT STRING (SIZE(3)),
@ -1527,7 +1563,8 @@ Served-Cell-Information ::= SEQUENCE {
Served-Cell-Information-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-RANAC CRITICALITY ignore EXTENSION RANAC PRESENCE optional }|
{ ID id-ExtendedServedPLMNs-List CRITICALITY ignore EXTENSION ExtendedServedPLMNs-List PRESENCE optional },
{ ID id-ExtendedServedPLMNs-List CRITICALITY ignore EXTENSION ExtendedServedPLMNs-List PRESENCE optional }|
{ ID id-Cell-Direction CRITICALITY ignore EXTENSION Cell-Direction PRESENCE optional },
...
}
@ -1670,6 +1707,16 @@ SRBs-FailedToBeSetupMod-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
SRBs-Modified-Item ::= SEQUENCE {
sRBID SRBID,
lCID LCID,
iE-Extensions ProtocolExtensionContainer { { SRBs-Modified-ItemExtIEs } } OPTIONAL,
...
}
SRBs-Modified-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
SRBs-Required-ToBeReleased-Item ::= SEQUENCE {
sRBID SRBID,
@ -1681,6 +1728,28 @@ SRBs-Required-ToBeReleased-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
SRBs-Setup-Item ::= SEQUENCE {
sRBID SRBID,
lCID LCID,
iE-Extensions ProtocolExtensionContainer { { SRBs-Setup-ItemExtIEs } } OPTIONAL,
...
}
SRBs-Setup-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
SRBs-SetupMod-Item ::= SEQUENCE {
sRBID SRBID,
lCID LCID,
iE-Extensions ProtocolExtensionContainer { { SRBs-SetupMod-ItemExtIEs } } OPTIONAL,
...
}
SRBs-SetupMod-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
SRBs-ToBeReleased-Item ::= SEQUENCE {
sRBID SRBID,
iE-Extensions ProtocolExtensionContainer { { SRBs-ToBeReleased-ItemExtIEs } } OPTIONAL,
@ -1780,7 +1849,7 @@ Transmission-Bandwidth-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
TransmissionStopIndicator ::= ENUMERATED {stop, ..., restart }
TransmissionActionIndicator ::= ENUMERATED {stop, ..., restart }
TypeOfError ::= ENUMERATED {
not-understood,
@ -1797,6 +1866,8 @@ UE-associatedLogicalF1-ConnectionItem ::= SEQUENCE {
...
}
UEAssistanceInformation ::= OCTET STRING
UE-associatedLogicalF1-ConnectionItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V15.4.1 (2019-01)
-- 3GPP TS 38.473 V15.5.0 (2019-03)
-- 9.4.4 PDU Definitions
-- **************************************************************
--
@ -89,9 +89,12 @@ IMPORTS
SRBs-ToBeReleased-Item,
SRBs-ToBeSetup-Item,
SRBs-ToBeSetupMod-Item,
SRBs-Modified-Item,
SRBs-Setup-Item,
SRBs-SetupMod-Item,
TimeToWait,
TransactionID,
TransmissionStopIndicator,
TransmissionActionIndicator,
UE-associatedLogicalF1-ConnectionItem,
DUtoCURRCContainer,
PagingCell-Item,
@ -130,10 +133,13 @@ IMPORTS
RRC-Version,
GNBDUOverloadInformation,
RRCDeliveryStatusRequest,
NeedforGap,
RRCDeliveryStatus,
ResourceCoordinationTransferInformation,
Dedicated-SIDelivery-NeededUE-Item,
Associated-SCell-Item
Associated-SCell-Item,
IgnoreResourceCoordinationContainer,
PagingOrigin
FROM F1AP-IEs
@ -249,9 +255,15 @@ FROM F1AP-Containers
id-SRBs-ToBeSetup-List,
id-SRBs-ToBeSetupMod-Item,
id-SRBs-ToBeSetupMod-List,
id-SRBs-Modified-Item,
id-SRBs-Modified-List,
id-SRBs-Setup-Item,
id-SRBs-Setup-List,
id-SRBs-SetupMod-Item,
id-SRBs-SetupMod-List,
id-TimeToWait,
id-TransactionID,
id-TransmissionStopIndicator,
id-TransmissionActionIndicator,
id-UE-associatedLogicalF1-ConnectionItem,
id-UE-associatedLogicalF1-ConnectionListResAck,
id-DUtoCURRCContainer,
@ -306,6 +318,7 @@ FROM F1AP-Containers
id-GNB-CU-RRC-Version,
id-GNB-DU-RRC-Version,
id-GNBDUOverloadInformation,
id-NeedforGap,
id-RRCDeliveryStatusRequest,
id-RRCDeliveryStatus,
id-Dedicated-SIDelivery-NeededUE-List,
@ -313,6 +326,8 @@ FROM F1AP-Containers
id-ResourceCoordinationTransferInformation,
id-Associated-SCell-List,
id-Associated-SCell-Item,
id-IgnoreResourceCoordinationContainer,
id-PagingOrigin,
maxCellingNBDU,
maxnoofCandidateSpCells,
maxnoofDRBs,
@ -537,7 +552,8 @@ GNBDUConfigurationUpdateIEs F1AP-PROTOCOL-IES ::= {
{ ID id-Served-Cells-To-Modify-List CRITICALITY reject TYPE Served-Cells-To-Modify-List PRESENCE optional }|
{ ID id-Served-Cells-To-Delete-List CRITICALITY reject TYPE Served-Cells-To-Delete-List PRESENCE optional }|
{ ID id-Cells-Status-List CRITICALITY reject TYPE Cells-Status-List PRESENCE optional }|
{ ID id-Dedicated-SIDelivery-NeededUE-List CRITICALITY ignore TYPE Dedicated-SIDelivery-NeededUE-List PRESENCE optional },
{ ID id-Dedicated-SIDelivery-NeededUE-List CRITICALITY ignore TYPE Dedicated-SIDelivery-NeededUE-List PRESENCE optional }|
{ ID id-gNB-DU-ID CRITICALITY reject TYPE GNB-DU-ID PRESENCE optional },
...
}
@ -588,7 +604,8 @@ GNBDUConfigurationUpdateAcknowledge ::= SEQUENCE {
GNBDUConfigurationUpdateAcknowledgeIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
{ ID id-Cells-to-be-Activated-List CRITICALITY reject TYPE Cells-to-be-Activated-List PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
{ ID id-Cells-to-be-Deactivated-List CRITICALITY reject TYPE Cells-to-be-Deactivated-List PRESENCE optional },
...
}
@ -756,7 +773,8 @@ GNBDUResourceCoordinationRequest ::= SEQUENCE {
GNBDUResourceCoordinationRequest-IEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
{ ID id-RequestType CRITICALITY reject TYPE RequestType PRESENCE mandatory }|
{ ID id-EUTRA-NR-CellResourceCoordinationReq-Container CRITICALITY reject TYPE EUTRA-NR-CellResourceCoordinationReq-Container PRESENCE mandatory},
{ ID id-EUTRA-NR-CellResourceCoordinationReq-Container CRITICALITY reject TYPE EUTRA-NR-CellResourceCoordinationReq-Container PRESENCE mandatory}|
{ ID id-IgnoreResourceCoordinationContainer CRITICALITY reject TYPE IgnoreResourceCoordinationContainer PRESENCE optional },
...
}
@ -873,20 +891,29 @@ UEContextSetupResponseIEs F1AP-PROTOCOL-IES ::= {
{ ID id-DRBs-FailedToBeSetup-List CRITICALITY ignore TYPE DRBs-FailedToBeSetup-List PRESENCE optional }|
{ ID id-SCell-FailedtoSetup-List CRITICALITY ignore TYPE SCell-FailedtoSetup-List PRESENCE optional }|
{ ID id-InactivityMonitoringResponse CRITICALITY reject TYPE InactivityMonitoringResponse PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
{ ID id-SRBs-Setup-List CRITICALITY ignore TYPE SRBs-Setup-List PRESENCE optional },
...
}
DRBs-Setup-List ::= SEQUENCE (SIZE(1..maxnoofDRBs)) OF ProtocolIE-SingleContainer { { DRBs-Setup-ItemIEs} }
SRBs-FailedToBeSetup-List ::= SEQUENCE (SIZE(1..maxnoofSRBs)) OF ProtocolIE-SingleContainer { { SRBs-FailedToBeSetup-ItemIEs} }
DRBs-FailedToBeSetup-List ::= SEQUENCE (SIZE(1..maxnoofDRBs)) OF ProtocolIE-SingleContainer { { DRBs-FailedToBeSetup-ItemIEs} }
SCell-FailedtoSetup-List ::= SEQUENCE (SIZE(1..maxnoofSCells)) OF ProtocolIE-SingleContainer { { SCell-FailedtoSetup-ItemIEs} }
SRBs-Setup-List ::= SEQUENCE (SIZE(1..maxnoofSRBs)) OF ProtocolIE-SingleContainer { { SRBs-Setup-ItemIEs} }
DRBs-Setup-ItemIEs F1AP-PROTOCOL-IES ::= {
{ ID id-DRBs-Setup-Item CRITICALITY ignore TYPE DRBs-Setup-Item PRESENCE mandatory},
...
}
SRBs-Setup-ItemIEs F1AP-PROTOCOL-IES ::= {
{ ID id-SRBs-Setup-Item CRITICALITY ignore TYPE SRBs-Setup-Item PRESENCE mandatory},
...
}
SRBs-FailedToBeSetup-ItemIEs F1AP-PROTOCOL-IES ::= {
{ ID id-SRBs-FailedToBeSetup-Item CRITICALITY ignore TYPE SRBs-FailedToBeSetup-Item PRESENCE mandatory},
...
@ -1028,7 +1055,7 @@ UEContextModificationRequestIEs F1AP-PROTOCOL-IES ::= {
{ ID id-SpCellULConfigured CRITICALITY ignore TYPE CellULConfigured PRESENCE optional }|
{ ID id-DRXCycle CRITICALITY ignore TYPE DRXCycle PRESENCE optional }|
{ ID id-CUtoDURRCInformation CRITICALITY reject TYPE CUtoDURRCInformation PRESENCE optional }|
{ ID id-TransmissionStopIndicator CRITICALITY ignore TYPE TransmissionStopIndicator PRESENCE optional }|
{ ID id-TransmissionActionIndicator CRITICALITY ignore TYPE TransmissionActionIndicator PRESENCE optional }|
{ ID id-ResourceCoordinationTransferContainer CRITICALITY ignore TYPE ResourceCoordinationTransferContainer PRESENCE optional }|
{ ID id-RRCReconfigurationCompleteIndicator CRITICALITY ignore TYPE RRCReconfigurationCompleteIndicator PRESENCE optional }|
{ ID id-RRCContainer CRITICALITY reject TYPE RRCContainer PRESENCE optional }|
@ -1049,7 +1076,8 @@ UEContextModificationRequestIEs F1AP-PROTOCOL-IES ::= {
{ ID id-ExecuteDuplication CRITICALITY ignore TYPE ExecuteDuplication PRESENCE optional}|
{ ID id-RRCDeliveryStatusRequest CRITICALITY ignore TYPE RRCDeliveryStatusRequest PRESENCE optional }|
{ ID id-ResourceCoordinationTransferInformation CRITICALITY ignore TYPE ResourceCoordinationTransferInformation PRESENCE optional }|
{ ID id-ServingCellMO CRITICALITY ignore TYPE ServingCellMO PRESENCE optional },
{ ID id-ServingCellMO CRITICALITY ignore TYPE ServingCellMO PRESENCE optional }|
{ ID id-NeedforGap CRITICALITY ignore TYPE NeedforGap PRESENCE optional },
...
}
@ -1126,13 +1154,17 @@ UEContextModificationResponseIEs F1AP-PROTOCOL-IES ::= {
{ ID id-InactivityMonitoringResponse CRITICALITY reject TYPE InactivityMonitoringResponse PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
{ ID id-C-RNTI CRITICALITY ignore TYPE C-RNTI PRESENCE optional }|
{ ID id-Associated-SCell-List CRITICALITY ignore TYPE Associated-SCell-List PRESENCE optional },
{ ID id-Associated-SCell-List CRITICALITY ignore TYPE Associated-SCell-List PRESENCE optional }|
{ ID id-SRBs-SetupMod-List CRITICALITY ignore TYPE SRBs-SetupMod-List PRESENCE optional }|
{ ID id-SRBs-Modified-List CRITICALITY ignore TYPE SRBs-Modified-List PRESENCE optional },
...
}
DRBs-SetupMod-List ::= SEQUENCE (SIZE(1..maxnoofDRBs)) OF ProtocolIE-SingleContainer { { DRBs-SetupMod-ItemIEs} }
DRBs-Modified-List::= SEQUENCE (SIZE(1..maxnoofDRBs)) OF ProtocolIE-SingleContainer { { DRBs-Modified-ItemIEs } }
DRBs-Modified-List::= SEQUENCE (SIZE(1..maxnoofDRBs)) OF ProtocolIE-SingleContainer { { DRBs-Modified-ItemIEs } }
SRBs-SetupMod-List ::= SEQUENCE (SIZE(1..maxnoofSRBs)) OF ProtocolIE-SingleContainer { { SRBs-SetupMod-ItemIEs} }
SRBs-Modified-List ::= SEQUENCE (SIZE(1..maxnoofSRBs)) OF ProtocolIE-SingleContainer { { SRBs-Modified-ItemIEs } }
DRBs-FailedToBeModified-List ::= SEQUENCE (SIZE(1..maxnoofDRBs)) OF ProtocolIE-SingleContainer { { DRBs-FailedToBeModified-ItemIEs} }
SRBs-FailedToBeSetupMod-List ::= SEQUENCE (SIZE(1..maxnoofSRBs)) OF ProtocolIE-SingleContainer { { SRBs-FailedToBeSetupMod-ItemIEs} }
DRBs-FailedToBeSetupMod-List ::= SEQUENCE (SIZE(1..maxnoofDRBs)) OF ProtocolIE-SingleContainer { { DRBs-FailedToBeSetupMod-ItemIEs} }
@ -1151,6 +1183,17 @@ DRBs-Modified-ItemIEs F1AP-PROTOCOL-IES ::= {
...
}
SRBs-SetupMod-ItemIEs F1AP-PROTOCOL-IES ::= {
{ ID id-SRBs-SetupMod-Item CRITICALITY ignore TYPE SRBs-SetupMod-Item PRESENCE mandatory},
...
}
SRBs-Modified-ItemIEs F1AP-PROTOCOL-IES ::= {
{ ID id-SRBs-Modified-Item CRITICALITY ignore TYPE SRBs-Modified-Item PRESENCE mandatory},
...
}
SRBs-FailedToBeSetupMod-ItemIEs F1AP-PROTOCOL-IES ::= {
{ ID id-SRBs-FailedToBeSetupMod-Item CRITICALITY ignore TYPE SRBs-FailedToBeSetupMod-Item PRESENCE mandatory},
...
@ -1279,6 +1322,25 @@ DRBs-ModifiedConf-ItemIEs F1AP-PROTOCOL-IES ::= {
...
}
-- **************************************************************
--
-- UE CONTEXT MODIFICATION REFUSE
--
-- **************************************************************
UEContextModificationRefuse::= SEQUENCE {
protocolIEs ProtocolIE-Container { { UEContextModificationRefuseIEs} },
...
}
UEContextModificationRefuseIEs F1AP-PROTOCOL-IES ::= {
{ 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-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
...
}
-- **************************************************************
@ -1452,7 +1514,8 @@ InitialULRRCMessageTransferIEs F1AP-PROTOCOL-IES ::= {
{ ID id-C-RNTI CRITICALITY reject TYPE C-RNTI PRESENCE mandatory }|
{ ID id-RRCContainer CRITICALITY reject TYPE RRCContainer PRESENCE mandatory }|
{ ID id-DUtoCURRCContainer CRITICALITY reject TYPE DUtoCURRCContainer PRESENCE optional }|
{ ID id-SULAccessIndication CRITICALITY ignore TYPE SULAccessIndication PRESENCE optional },
{ ID id-SULAccessIndication CRITICALITY ignore TYPE SULAccessIndication PRESENCE optional }|
{ ID id-TransactionID CRITICALITY ignore TYPE TransactionID PRESENCE mandatory },
...
}
@ -1574,7 +1637,8 @@ PagingIEs F1AP-PROTOCOL-IES ::= {
{ ID id-PagingIdentity CRITICALITY reject TYPE PagingIdentity PRESENCE mandatory }|
{ ID id-PagingDRX CRITICALITY ignore TYPE PagingDRX PRESENCE optional }|
{ ID id-PagingPriority CRITICALITY ignore TYPE PagingPriority PRESENCE optional }|
{ ID id-PagingCell-List CRITICALITY ignore TYPE PagingCell-list PRESENCE mandatory },
{ ID id-PagingCell-List CRITICALITY ignore TYPE PagingCell-list PRESENCE mandatory }|
{ ID id-PagingOrigin CRITICALITY ignore TYPE PagingOrigin PRESENCE optional },
...
}

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.473 V15.4.1 (2019-01)
-- 3GPP TS 38.473 V15.5.0 (2019-03)
-- 9.4.3 Elementary Procedure Definitions
-- **************************************************************
--
@ -65,7 +65,8 @@ FROM F1AP-CommonDataTypes
PWSRestartIndication,
PWSFailureIndication,
GNBDUStatusIndication,
RRCDeliveryReport
RRCDeliveryReport,
UEContextModificationRefuse
FROM F1AP-PDU-Contents
id-Reset,
@ -220,7 +221,7 @@ reset F1AP-ELEMENTARY-PROCEDURE ::= {
f1Setup F1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE F1SetupRequest
SUCCESSFUL OUTCOME F1SetupResponse
UNSUCCESSFUL OUTCOME F1SetupFailure
UNSUCCESSFUL OUTCOME F1SetupFailure
PROCEDURE CODE id-F1Setup
CRITICALITY reject
}
@ -267,6 +268,7 @@ uEContextModification F1AP-ELEMENTARY-PROCEDURE ::= {
uEContextModificationRequired F1AP-ELEMENTARY-PROCEDURE ::= {
INITIATING MESSAGE UEContextModificationRequired
SUCCESSFUL OUTCOME UEContextModificationConfirm
UNSUCCESSFUL OUTCOME UEContextModificationRefuse
PROCEDURE CODE id-UEContextModificationRequired
CRITICALITY reject
}

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

@ -211,7 +211,7 @@ id-SRBs-ToBeSetupMod-Item ProtocolIE-ID
id-SRBs-ToBeSetupMod-List ProtocolIE-ID
id-TimeToWait ProtocolIE-ID
id-TransactionID ProtocolIE-ID
id-TransmissionStopIndicator ProtocolIE-ID
id-TransmissionActionIndicator ProtocolIE-ID
id-UE-associatedLogicalF1-ConnectionItem ProtocolIE-ID
id-UE-associatedLogicalF1-ConnectionListResAck ProtocolIE-ID
id-gNB-CU-Name ProtocolIE-ID
@ -326,6 +326,22 @@ id-ExtendedAvailablePLMN-List ProtocolIE-ID
id-Associated-SCell-List ProtocolIE-ID
id-latest-RRC-Version-Enhanced ProtocolIE-ID
id-Associated-SCell-Item ProtocolIE-ID
id-Cell-Direction ProtocolIE-ID
id-SRBs-Setup-List ProtocolIE-ID
id-SRBs-Setup-Item ProtocolIE-ID
id-SRBs-SetupMod-List ProtocolIE-ID
id-SRBs-SetupMod-Item ProtocolIE-ID
id-SRBs-Modified-List ProtocolIE-ID
id-SRBs-Modified-Item ProtocolIE-ID
id-Ph-InfoSCG ProtocolIE-ID
id-RequestedBandCombinationIndex ProtocolIE-ID
id-RequestedFeatureSetEntryIndex ProtocolIE-ID
id-RequestedP-MaxFR2 ProtocolIE-ID
id-DRX-Config ProtocolIE-ID
id-IgnoreResourceCoordinationContainer ProtocolIE-ID
id-UEAssistanceInformation ProtocolIE-ID
id-NeedforGap ProtocolIE-ID
id-PagingOrigin ProtocolIE-ID
#.END
#.REGISTER
@ -406,7 +422,7 @@ SRBs-ToBeSetupMod-Item N f1ap.ies id-SRBs-ToBeSetupMo
SRBs-ToBeSetupMod-List N f1ap.ies id-SRBs-ToBeSetupMod-List
TimeToWait N f1ap.ies id-TimeToWait
TransactionID N f1ap.ies id-TransactionID
TransmissionStopIndicator N f1ap.ies id-TransmissionStopIndicator
TransmissionActionIndicator N f1ap.ies id-TransmissionActionIndicator
UE-associatedLogicalF1-ConnectionItem N f1ap.ies id-UE-associatedLogicalF1-ConnectionItem
UE-associatedLogicalF1-ConnectionListResAck N f1ap.ies id-UE-associatedLogicalF1-ConnectionListResAck
GNB-CU-Name N f1ap.ies id-gNB-CU-Name
@ -495,6 +511,15 @@ Dedicated-SIDelivery-NeededUE-List N f1ap.ies id-Dedicated-SIDeli
Dedicated-SIDelivery-NeededUE-Item N f1ap.ies id-Dedicated-SIDelivery-NeededUE-Item
Associated-SCell-List N f1ap.ies id-Associated-SCell-List
Associated-SCell-Item N f1ap.ies id-Associated-SCell-Item
SRBs-Setup-List N f1ap.ies id-SRBs-Setup-List
SRBs-Setup-Item N f1ap.ies id-SRBs-Setup-Item
SRBs-SetupMod-List N f1ap.ies id-SRBs-SetupMod-List
SRBs-SetupMod-Item N f1ap.ies id-SRBs-SetupMod-Item
SRBs-Modified-List N f1ap.ies id-SRBs-Modified-List
SRBs-Modified-Item N f1ap.ies id-SRBs-Modified-Item
IgnoreResourceCoordinationContainer N f1ap.ies id-IgnoreResourceCoordinationContainer
NeedforGap N f1ap.ies id-NeedforGap
PagingOrigin N f1ap.ies id-PagingOrigin
#F1AP-PROTOCOL-EXTENSION
GNB-CUSystemInformation N f1ap.extension id-gNB-CUSystemInformation
@ -523,6 +548,13 @@ ResourceCoordinationTransferInformation N f1ap.extension id-ResourceCo
ExtendedServedPLMNs-List N f1ap.extension id-ExtendedServedPLMNs-List
ExtendedAvailablePLMN-List N f1ap.extension id-ExtendedAvailablePLMN-List
Latest-RRC-Version-Enhanced N f1ap.extension id-latest-RRC-Version-Enhanced
Cell-Direction N f1ap.extension id-Cell-Direction
Ph-InfoSCG N f1ap.extension id-Ph-InfoSCG
RequestedBandCombinationIndex N f1ap.extension id-RequestedBandCombinationIndex
RequestedFeatureSetEntryIndex N f1ap.extension id-RequestedFeatureSetEntryIndex
RequestedP-MaxFR2 N f1ap.extension id-RequestedP-MaxFR2
DRX-Config N f1ap.extension id-DRX-Config
UEAssistanceInformation N f1ap.extension id-UEAssistanceInformation
#F1AP-ELEMENTARY-PROCEDURE
Reset N f1ap.proc.imsg id-Reset
@ -553,6 +585,7 @@ UEContextModificationFailure N f1ap.proc.uout id-UEContextModification
UEContextModificationRequired N f1ap.proc.imsg id-UEContextModificationRequired
UEContextModificationConfirm N f1ap.proc.sout id-UEContextModificationRequired
UEContextModificationRefuse N f1ap.proc.uout id-UEContextModificationRequired
WriteReplaceWarningRequest N f1ap.proc.imsg id-WriteReplaceWarning
WriteReplaceWarningResponse N f1ap.proc.sout id-WriteReplaceWarning
@ -919,6 +952,54 @@ MaximumDataBurstVolume DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_byte_byt
}
}
#.FN_BODY DRX-Config VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s
if (param_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_DRX_Config);
dissect_nr_rrc_DRX_Config_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY Ph-InfoSCG VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s
if (param_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_Ph_InfoSCG);
dissect_nr_rrc_PH_TypeListSCG_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY RequestedBandCombinationIndex VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s
if (param_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_RequestedBandCombinationIndex);
dissect_nr_rrc_BandCombinationIndex_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY RequestedFeatureSetEntryIndex VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s
if (param_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_RequestedFeatureSetEntryIndex);
dissect_nr_rrc_FeatureSetEntryIndex_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY RequestedP-MaxFR2 VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s
if (param_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_RequestedP_MaxFR2);
dissect_nr_rrc_P_Max_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY UEAssistanceInformation VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s
if (param_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_UEAssistanceInformation);
dissect_nr_rrc_UEAssistanceInformation_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
#.FN_HDR Reset
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Reset");
#.FN_HDR ResetAcknowledge
@ -961,6 +1042,8 @@ MaximumDataBurstVolume DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_byte_byt
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationRequired");
#.FN_HDR UEContextModificationConfirm
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationConfirm");
#.FN_HDR UEContextModificationRefuse
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationRefuse");
#.FN_HDR WriteReplaceWarningRequest
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "WriteReplaceWarningRequest");
#.FN_HDR WriteReplaceWarningResponse

14
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 V15.4.1 (2019-01)
* References: 3GPP TS 38.473 V15.5.0 (2019-03)
*/
#include "config.h"
@ -64,6 +64,12 @@ static gint ett_f1ap_ProtectedEUTRAResourceIndication = -1;
static gint ett_f1ap_RRCContainer = -1;
static gint ett_f1ap_sIBmessage = -1;
static gint ett_f1ap_UplinkTxDirectCurrentListInformation = -1;
static gint ett_f1ap_DRX_Config = -1;
static gint ett_f1ap_Ph_InfoSCG = -1;
static gint ett_f1ap_RequestedBandCombinationIndex = -1;
static gint ett_f1ap_RequestedFeatureSetEntryIndex = -1;
static gint ett_f1ap_RequestedP_MaxFR2 = -1;
static gint ett_f1ap_UEAssistanceInformation = -1;
#include "packet-f1ap-ett.c"
enum{
@ -235,6 +241,12 @@ void proto_register_f1ap(void) {
&ett_f1ap_RRCContainer,
&ett_f1ap_sIBmessage,
&ett_f1ap_UplinkTxDirectCurrentListInformation,
&ett_f1ap_DRX_Config,
&ett_f1ap_Ph_InfoSCG,
&ett_f1ap_RequestedBandCombinationIndex,
&ett_f1ap_RequestedFeatureSetEntryIndex,
&ett_f1ap_RequestedP_MaxFR2,
&ett_f1ap_UEAssistanceInformation,
#include "packet-f1ap-ettarr.c"
};

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

@ -40,11 +40,14 @@ T-StatusProhibit
UL-DataSplitThreshold
#.EXPORTS
BandCombinationIndex_PDU
BandCombinationInfoSN_PDU
CellGroupConfig_PDU
DRX-Config_PDU
CG-Config_PDU
CG-ConfigInfo_PDU
ConfigRestrictInfoSCG_PDU
FeatureSetEntryIndex_PDU
FreqBandList_PDU
HandoverCommand_PDU
HandoverPreparationInformation_PDU
@ -54,6 +57,7 @@ MeasResultSCG-Failure_PDU
MeasurementTimingConfiguration_PDU
MIB_PDU
P-Max_PDU
PH-TypeListSCG_PDU
RadioBearerConfig_PDU
RRCReconfiguration_PDU
RRCReconfigurationComplete_PDU
@ -70,10 +74,12 @@ UE-CapabilityRAT-ContainerList_PDU
UE-CapabilityRequestFilterNR_PDU
UE-MRDC-Capability_PDU
UE-NR-Capability_PDU
UEAssistanceInformation_PDU
UL-DCCH-Message_PDU
UplinkTxDirectCurrentList_PDU
#.PDU
BandCombinationIndex
BandCombinationInfoSN
BCCH-BCH-Message @bcch.bch
BCCH-DL-SCH-Message @bcch.dl.sch
@ -83,6 +89,8 @@ CG-ConfigInfo
ConfigRestrictInfoSCG
DL-CCCH-Message @dl.ccch
DL-DCCH-Message @dl.dcch
DRX-Config
FeatureSetEntryIndex
FreqBandList
HandoverCommand
HandoverPreparationInformation
@ -93,6 +101,7 @@ MeasurementTimingConfiguration
MIB
P-Max
PCCH-Message @pcch
PH-TypeListSCG
RadioBearerConfig
RRCReconfiguration @rrc_reconf
RRCReconfigurationComplete
@ -109,6 +118,7 @@ UE-CapabilityRAT-ContainerList
UE-CapabilityRequestFilterNR
UE-MRDC-Capability @ue_mrdc_cap
UE-NR-Capability @ue_nr_cap
UEAssistanceInformation
UERadioAccessCapabilityInformation @ue_radio_access_cap_info
UERadioPagingInformation @ue_radio_paging_info
UL-CCCH-Message @ul.ccch

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

File diff suppressed because it is too large Load Diff

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

@ -249,9 +249,12 @@ static int proto_nr_rrc = -1;
static int hf_nr_rrc_nr_rrc_HandoverCommand_PDU = -1; /* HandoverCommand */
static int hf_nr_rrc_nr_rrc_HandoverPreparationInformation_PDU = -1; /* HandoverPreparationInformation */
static int hf_nr_rrc_nr_rrc_CG_Config_PDU = -1; /* CG_Config */
static int hf_nr_rrc_nr_rrc_PH_TypeListSCG_PDU = -1; /* PH_TypeListSCG */
static int hf_nr_rrc_nr_rrc_BandCombinationIndex_PDU = -1; /* BandCombinationIndex */
static int hf_nr_rrc_nr_rrc_BandCombinationInfoSN_PDU = -1; /* BandCombinationInfoSN */
static int hf_nr_rrc_nr_rrc_CG_ConfigInfo_PDU = -1; /* CG_ConfigInfo */
static int hf_nr_rrc_nr_rrc_ConfigRestrictInfoSCG_PDU = -1; /* ConfigRestrictInfoSCG */
static int hf_nr_rrc_nr_rrc_FeatureSetEntryIndex_PDU = -1; /* FeatureSetEntryIndex */
static int hf_nr_rrc_nr_rrc_MeasurementTimingConfiguration_PDU = -1; /* MeasurementTimingConfiguration */
static int hf_nr_rrc_UERadioPagingInformation_PDU = -1; /* UERadioPagingInformation */
static int hf_nr_rrc_UERadioAccessCapabilityInformation_PDU = -1; /* UERadioAccessCapabilityInformation */
@ -267,6 +270,7 @@ 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_RRCReconfigurationComplete_PDU = -1; /* RRCReconfigurationComplete */
static int hf_nr_rrc_nr_rrc_SIB1_PDU = -1; /* SIB1 */
static int hf_nr_rrc_nr_rrc_UEAssistanceInformation_PDU = -1; /* UEAssistanceInformation */
static int hf_nr_rrc_nr_rrc_SIB2_PDU = -1; /* SIB2 */
static int hf_nr_rrc_nr_rrc_SIB3_PDU = -1; /* SIB3 */
static int hf_nr_rrc_nr_rrc_SIB4_PDU = -1; /* SIB4 */
@ -276,6 +280,7 @@ static int hf_nr_rrc_nr_rrc_SIB7_PDU = -1; /* SIB7 */
static int hf_nr_rrc_nr_rrc_SIB8_PDU = -1; /* SIB8 */
static int hf_nr_rrc_nr_rrc_SIB9_PDU = -1; /* SIB9 */
static int hf_nr_rrc_nr_rrc_CellGroupConfig_PDU = -1; /* CellGroupConfig */
static int hf_nr_rrc_nr_rrc_DRX_Config_PDU = -1; /* DRX_Config */
static int hf_nr_rrc_nr_rrc_MeasConfig_PDU = -1; /* MeasConfig */
static int hf_nr_rrc_nr_rrc_MeasGapConfig_PDU = -1; /* MeasGapConfig */
static int hf_nr_rrc_nr_rrc_MeasResultSCG_Failure_PDU = -1; /* MeasResultSCG_Failure */
@ -287,7 +292,6 @@ static int hf_nr_rrc_nr_rrc_UE_CapabilityRAT_ContainerList_PDU = -1; /* UE_Capa
static int hf_nr_rrc_nr_rrc_UE_CapabilityRequestFilterNR_PDU = -1; /* UE_CapabilityRequestFilterNR */
static int hf_nr_rrc_nr_rrc_UE_MRDC_Capability_PDU = -1; /* UE_MRDC_Capability */
static int hf_nr_rrc_nr_rrc_UE_NR_Capability_PDU = -1; /* UE_NR_Capability */
static int hf_nr_rrc_UEAssistanceInformation_PDU = -1; /* UEAssistanceInformation */
static int hf_nr_rrc_MeasResultList2NR_PDU = -1; /* MeasResultList2NR */
static int hf_nr_rrc_SystemInformation_PDU = -1; /* SystemInformation */
static int hf_nr_rrc_criticalExtensions = -1; /* T_criticalExtensions */
@ -4549,7 +4553,6 @@ nr_rrc_SINR_Range_fmt(gchar *s, guint32 v)
/*--- Included file: packet-nr-rrc-fn.c ---*/
#line 1 "./asn1/nr-rrc/packet-nr-rrc-fn.c"
/*--- PDUs declarations ---*/
static int dissect_UEAssistanceInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_MeasResultList2NR_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_SystemInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
@ -5464,6 +5467,8 @@ dissect_nr_rrc_ReestablishmentInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
static int
dissect_nr_rrc_BandCombinationIndex(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
1U, maxBandComb, NULL, FALSE);
@ -5474,6 +5479,8 @@ dissect_nr_rrc_BandCombinationIndex(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
static int
dissect_nr_rrc_FeatureSetEntryIndex(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
1U, maxFeatureSetsPerBand, NULL, FALSE);
@ -5769,7 +5776,7 @@ dissect_nr_rrc_AS_Context_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
static int
dissect_nr_rrc_T_ueAssistanceInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_octet_string_containing_pdu_new(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, dissect_UEAssistanceInformation_PDU);
NO_BOUND, NO_BOUND, FALSE, dissect_nr_rrc_UEAssistanceInformation_PDU);
return offset;
}
@ -20762,6 +20769,8 @@ static const per_sequence_t UEAssistanceInformation_sequence[] = {
static int
dissect_nr_rrc_UEAssistanceInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UE Assistance Information");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@ -41353,6 +41362,26 @@ int dissect_nr_rrc_CG_Config_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_PH_TypeListSCG_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_PH_TypeListSCG(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_nr_rrc_PH_TypeListSCG_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_BandCombinationIndex_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_BandCombinationIndex(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_nr_rrc_BandCombinationIndex_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_BandCombinationInfoSN_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);
@ -41383,6 +41412,16 @@ int dissect_nr_rrc_ConfigRestrictInfoSCG_PDU(tvbuff_t *tvb _U_, packet_info *pin
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_FeatureSetEntryIndex_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_FeatureSetEntryIndex(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_nr_rrc_FeatureSetEntryIndex_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_MeasurementTimingConfiguration_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);
@ -41533,6 +41572,16 @@ int dissect_nr_rrc_SIB1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_UEAssistanceInformation_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_UEAssistanceInformation(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_nr_rrc_UEAssistanceInformation_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_SIB2_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);
@ -41623,6 +41672,16 @@ int dissect_nr_rrc_CellGroupConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_DRX_Config_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_DRX_Config(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_nr_rrc_DRX_Config_PDU);
offset += 7; offset >>= 3;
return offset;
}
int dissect_nr_rrc_MeasConfig_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);
@ -41733,16 +41792,6 @@ int dissect_nr_rrc_UE_NR_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U
offset += 7; offset >>= 3;
return offset;
}
static int dissect_UEAssistanceInformation_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_UEAssistanceInformation(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_UEAssistanceInformation_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_MeasResultList2NR_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);
@ -41789,6 +41838,14 @@ proto_register_nr_rrc(void) {
{ "CG-Config", "nr-rrc.CG_Config_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_PH_TypeListSCG_PDU,
{ "PH-TypeListSCG", "nr-rrc.PH_TypeListSCG",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_BandCombinationIndex_PDU,
{ "BandCombinationIndex", "nr-rrc.BandCombinationIndex",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_BandCombinationInfoSN_PDU,
{ "BandCombinationInfoSN", "nr-rrc.BandCombinationInfoSN_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -41801,6 +41858,10 @@ proto_register_nr_rrc(void) {
{ "ConfigRestrictInfoSCG", "nr-rrc.ConfigRestrictInfoSCG_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_FeatureSetEntryIndex_PDU,
{ "FeatureSetEntryIndex", "nr-rrc.FeatureSetEntryIndex",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_MeasurementTimingConfiguration_PDU,
{ "MeasurementTimingConfiguration", "nr-rrc.MeasurementTimingConfiguration_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -41861,6 +41922,10 @@ proto_register_nr_rrc(void) {
{ "SIB1", "nr-rrc.SIB1_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_UEAssistanceInformation_PDU,
{ "UEAssistanceInformation", "nr-rrc.UEAssistanceInformation_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_SIB2_PDU,
{ "SIB2", "nr-rrc.SIB2_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -41897,6 +41962,10 @@ proto_register_nr_rrc(void) {
{ "CellGroupConfig", "nr-rrc.CellGroupConfig_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_DRX_Config_PDU,
{ "DRX-Config", "nr-rrc.DRX_Config_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_MeasConfig_PDU,
{ "MeasConfig", "nr-rrc.MeasConfig_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -41941,10 +42010,6 @@ proto_register_nr_rrc(void) {
{ "UE-NR-Capability", "nr-rrc.UE_NR_Capability_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_UEAssistanceInformation_PDU,
{ "UEAssistanceInformation", "nr-rrc.UEAssistanceInformation_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_nr_rrc_MeasResultList2NR_PDU,
{ "MeasResultList2NR", "nr-rrc.MeasResultList2NR",
FT_UINT32, BASE_DEC, NULL, 0,

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

@ -25,15 +25,19 @@
int dissect_nr_rrc_HandoverCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_CG_Config_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_PH_TypeListSCG_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_BandCombinationIndex_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_BandCombinationInfoSN_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_CG_ConfigInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_ConfigRestrictInfoSCG_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_FeatureSetEntryIndex_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_MeasurementTimingConfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
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_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_UEAssistanceInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_SIB2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_SIB3_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_SIB4_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
@ -43,6 +47,7 @@ int dissect_nr_rrc_SIB7_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre
int dissect_nr_rrc_SIB8_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_SIB9_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_CellGroupConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_DRX_Config_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_MeasConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_MeasGapConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_MeasResultSCG_Failure_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);