aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Quantin <pascal@wireshark.org>2019-10-04 13:15:42 +0200
committerPascal Quantin <pascal@wireshark.org>2019-10-04 11:57:55 +0000
commitba88d0a7cf16edd050d07c14dd0dd1d6c163ca56 (patch)
tree26b4e5393c892f5c204bc6753dd092cb1f9d5f42
parent591e8e55a764c1e69a46d9df744a40e56a61f635 (diff)
F1AP: upgrade dissector to v15.7.0
Change-Id: I0d582d2e62ef2b16fc58051c710ae242eb2b28c1 Reviewed-on: https://code.wireshark.org/review/34710 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Diffstat
-rw-r--r--epan/dissectors/asn1/f1ap/F1AP-CommonDataTypes.asn2
-rw-r--r--epan/dissectors/asn1/f1ap/F1AP-Constants.asn6
-rw-r--r--epan/dissectors/asn1/f1ap/F1AP-Containers.asn2
-rw-r--r--epan/dissectors/asn1/f1ap/F1AP-IEs.asn38
-rw-r--r--epan/dissectors/asn1/f1ap/F1AP-PDU-Contents.asn244
-rw-r--r--epan/dissectors/asn1/f1ap/F1AP-PDU-Descriptions.asn2
-rw-r--r--epan/dissectors/asn1/f1ap/f1ap.cnf48
-rw-r--r--epan/dissectors/asn1/f1ap/packet-f1ap-template.c10
-rw-r--r--epan/dissectors/asn1/nr-rrc/nr-rrc.cnf2
-rw-r--r--epan/dissectors/packet-f1ap.c326
-rw-r--r--epan/dissectors/packet-nr-rrc.c15
-rw-r--r--epan/dissectors/packet-nr-rrc.h1
12 files changed, 462 insertions, 234 deletions
diff --git a/epan/dissectors/asn1/f1ap/F1AP-CommonDataTypes.asn b/epan/dissectors/asn1/f1ap/F1AP-CommonDataTypes.asn
index 9ee851121f..d8508bc621 100644
--- a/epan/dissectors/asn1/f1ap/F1AP-CommonDataTypes.asn
+++ b/epan/dissectors/asn1/f1ap/F1AP-CommonDataTypes.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.473 V15.6.0 (2019-06)
+-- 3GPP TS 38.473 V15.7.0 (2019-09)
-- 9.4.6 Common Definitions
-- **************************************************************
--
diff --git a/epan/dissectors/asn1/f1ap/F1AP-Constants.asn b/epan/dissectors/asn1/f1ap/F1AP-Constants.asn
index 9d938c330f..f71220b71c 100644
--- a/epan/dissectors/asn1/f1ap/F1AP-Constants.asn
+++ b/epan/dissectors/asn1/f1ap/F1AP-Constants.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.473 V15.6.0 (2019-06)
+-- 3GPP TS 38.473 V15.7.0 (2019-09)
-- 9.4.7 Constant Definitions
-- **************************************************************
--
@@ -350,5 +350,9 @@ id-portNumber ProtocolIE-ID ::= 230
id-AdditionalSIBMessageList ProtocolIE-ID ::= 231
id-Cell-Type ProtocolIE-ID ::= 232
id-IgnorePRACHConfiguration ProtocolIE-ID ::= 233
+id-CG-Config ProtocolIE-ID ::= 234
+id-PDCCH-BlindDetectionSCG ProtocolIE-ID ::= 235
+id-Requested-PDCCH-BlindDetectionSCG ProtocolIE-ID ::= 236
+id-Ph-InfoMCG ProtocolIE-ID ::= 237
END
diff --git a/epan/dissectors/asn1/f1ap/F1AP-Containers.asn b/epan/dissectors/asn1/f1ap/F1AP-Containers.asn
index 81d1ea7f4a..961513514b 100644
--- a/epan/dissectors/asn1/f1ap/F1AP-Containers.asn
+++ b/epan/dissectors/asn1/f1ap/F1AP-Containers.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.473 V15.6.0 (2019-06)
+-- 3GPP TS 38.473 V15.7.0 (2019-09)
-- 9.4.8 Container Definitions
-- **************************************************************
--
diff --git a/epan/dissectors/asn1/f1ap/F1AP-IEs.asn b/epan/dissectors/asn1/f1ap/F1AP-IEs.asn
index 7a23966f53..088b00a0f8 100644
--- a/epan/dissectors/asn1/f1ap/F1AP-IEs.asn
+++ b/epan/dissectors/asn1/f1ap/F1AP-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.473 V15.6.0 (2019-06)
+-- 3GPP TS 38.473 V15.7.0 (2019-09)
-- 9.4.5 Information Element Definitions
-- **************************************************************
--
@@ -49,12 +49,16 @@ IMPORTS
id-RequestedP-MaxFR2,
id-DRX-Config,
id-UEAssistanceInformation,
+ id-PDCCH-BlindDetectionSCG,
+ id-Requested-PDCCH-BlindDetectionSCG,
id-BPLMN-ID-Info-List,
id-NotificationInformation,
id-TNLAssociationTransportLayerAddressgNBDU,
id-portNumber,
id-AdditionalSIBMessageList,
id-IgnorePRACHConfiguration,
+ id-CG-Config,
+ id-Ph-InfoMCG,
maxNRARFCN,
maxnoofErrors,
maxnoofBPLMNs,
@@ -426,7 +430,8 @@ 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-UEAssistanceInformation CRITICALITY ignore EXTENSION UEAssistanceInformation PRESENCE optional },
+ { ID id-UEAssistanceInformation CRITICALITY ignore EXTENSION UEAssistanceInformation PRESENCE optional }|
+ { ID id-CG-Config CRITICALITY ignore EXTENSION CG-Config PRESENCE optional },
...
}
@@ -698,14 +703,17 @@ 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-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 },
+ { 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-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 }|
+ { ID id-PDCCH-BlindDetectionSCG CRITICALITY ignore EXTENSION PDCCH-BlindDetectionSCG PRESENCE optional }|
+ { ID id-Requested-PDCCH-BlindDetectionSCG CRITICALITY ignore EXTENSION Requested-PDCCH-BlindDetectionSCG PRESENCE optional }|
+ { ID id-Ph-InfoMCG CRITICALITY ignore EXTENSION Ph-InfoMCG PRESENCE optional },
...
}
@@ -828,7 +836,8 @@ EUTRA-PRACH-Configuration ::= SEQUENCE {
zeroCorrelationIndex INTEGER (0..15),
highSpeedFlag BOOLEAN,
prach-FreqOffset INTEGER (0..94),
- prach-ConfigIndex INTEGER (0..63) OPTIONAL, -- present for TDD --
+ prach-ConfigIndex INTEGER (0..63) OPTIONAL,
+ -- C-ifTDD: This IE shall be present if the EUTRA-Mode-Info IE in the Resource Coordination E-UTRA Cell Information IE is set to the value "TDD"
iE-Extensions ProtocolExtensionContainer { {EUTRA-PRACH-Configuration-ExtIEs} } OPTIONAL,
...
}
@@ -1010,6 +1019,7 @@ GBR-QosFlowInformation-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
+CG-Config ::= OCTET STRING
GNB-CUSystemInformation::= SEQUENCE {
sibtypetobeupdatedlist SEQUENCE (SIZE(1.. maxnoofSIBTypes)) OF SibtypetobeupdatedListItem,
@@ -1324,12 +1334,16 @@ PagingOrigin ::= ENUMERATED { non-3gpp, ...}
PagingPriority ::= ENUMERATED { priolevel1, priolevel2, priolevel3, priolevel4, priolevel5, priolevel6, priolevel7, priolevel8,...}
+PDCCH-BlindDetectionSCG ::= OCTET STRING
+
PDCP-SN ::= INTEGER (0..4095)
PDCPSNLength ::= ENUMERATED { twelve-bits,eighteen-bits,...}
PDUSessionID ::= INTEGER (0..255)
+Ph-InfoMCG ::= OCTET STRING
+
Ph-InfoSCG ::= OCTET STRING
PLMN-Identity ::= OCTET STRING (SIZE(3))
@@ -1472,6 +1486,8 @@ RequestedBandCombinationIndex ::= OCTET STRING
RequestedFeatureSetEntryIndex ::= OCTET STRING
+Requested-PDCCH-BlindDetectionSCG ::= OCTET STRING
+
RequestedP-MaxFR2 ::= OCTET STRING
RequestType ::= ENUMERATED {offer, execution, ...}
diff --git a/epan/dissectors/asn1/f1ap/F1AP-PDU-Contents.asn b/epan/dissectors/asn1/f1ap/F1AP-PDU-Contents.asn
index 6ec4e9b3f6..b7a2bcb525 100644
--- a/epan/dissectors/asn1/f1ap/F1AP-PDU-Contents.asn
+++ b/epan/dissectors/asn1/f1ap/F1AP-PDU-Contents.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.473 V15.6.0 (2019-06)
+-- 3GPP TS 38.473 V15.7.0 (2019-09)
-- 9.4.4 PDU Definitions
-- **************************************************************
--
@@ -6,11 +6,11 @@
--
-- **************************************************************
-F1AP-PDU-Contents {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
+F1AP-PDU-Contents {
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
ngran-access (22) modules (3) f1ap (3) version1 (1) f1ap-PDU-Contents (1) }
-DEFINITIONS AUTOMATIC TAGS ::=
+DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
@@ -26,11 +26,11 @@ IMPORTS
Cells-Failed-to-be-Activated-List-Item,
Cells-Status-Item,
Cells-to-be-Activated-List-Item,
- Cells-to-be-Deactivated-List-Item,
+ Cells-to-be-Deactivated-List-Item,
CellULConfigured,
- CriticalityDiagnostics,
+ CriticalityDiagnostics,
C-RNTI,
- CUtoDURRCInformation,
+ CUtoDURRCInformation,
DRB-Activity-Item,
DRBID,
DRBs-FailedToBeModified-Item,
@@ -57,7 +57,7 @@ IMPORTS
GNB-DU-UE-F1AP-ID,
GNB-DU-ID,
GNB-DU-Served-Cells-Item,
- GNB-DU-System-Information,
+ GNB-DU-System-Information,
GNB-CU-Name,
GNB-DU-Name,
InactivityMonitoringRequest,
@@ -76,7 +76,7 @@ IMPORTS
SCell-ToBeSetup-Item,
SCell-ToBeSetupMod-Item,
SCell-FailedtoSetup-Item,
- SCell-FailedtoSetupMod-Item,
+ SCell-FailedtoSetupMod-Item,
ServCellIndex,
Served-Cell-Information,
Served-Cells-To-Add-Item,
@@ -98,7 +98,7 @@ IMPORTS
TransmissionActionIndicator,
UE-associatedLogicalF1-ConnectionItem,
DUtoCURRCContainer,
- PagingCell-Item,
+ PagingCell-Item,
SItype-List,
UEIdentityIndexValue,
GNB-CU-TNL-Association-Setup-Item,
@@ -125,7 +125,7 @@ IMPORTS
EUTRA-NR-CellResourceCoordinationReqAck-Container,
RequestType,
PLMN-Identity,
- RLCFailureIndication,
+ RLCFailureIndication,
UplinkTxDirectCurrentListInformation,
SULAccessIndication,
Protected-EUTRA-Resources-Item,
@@ -165,7 +165,7 @@ FROM F1AP-Containers
id-Cause,
id-Cancel-all-Warning-Messages-Indicator,
id-Cells-Failed-to-be-Activated-List,
- id-Cells-Failed-to-be-Activated-List-Item,
+ id-Cells-Failed-to-be-Activated-List-Item,
id-Cells-Status-Item,
id-Cells-Status-List,
id-Cells-to-be-Activated-List,
@@ -214,7 +214,7 @@ FROM F1AP-Containers
id-gNB-DU-UE-F1AP-ID,
id-gNB-DU-ID,
id-GNB-DU-Served-Cells-Item,
- id-gNB-DU-Served-Cells-List,
+ id-gNB-DU-Served-Cells-List,
id-gNB-CU-Name,
id-gNB-DU-Name,
id-InactivityMonitoringRequest,
@@ -225,7 +225,7 @@ FROM F1AP-Containers
id-PLMNAssistanceInfoForNetShar,
id-Potential-SpCell-Item,
id-Potential-SpCell-List,
- id-RAT-FrequencyPriorityInformation,
+ id-RAT-FrequencyPriorityInformation,
id-RedirectedRRCmessage,
id-ResetType,
id-ResourceCoordinationTransferContainer,
@@ -260,7 +260,7 @@ FROM F1AP-Containers
id-SRBs-Required-ToBeReleased-Item,
id-SRBs-Required-ToBeReleased-List,
id-SRBs-ToBeReleased-Item,
- id-SRBs-ToBeReleased-List,
+ id-SRBs-ToBeReleased-List,
id-SRBs-ToBeSetup-Item,
id-SRBs-ToBeSetup-List,
id-SRBs-ToBeSetupMod-Item,
@@ -273,7 +273,7 @@ FROM F1AP-Containers
id-SRBs-SetupMod-List,
id-TimeToWait,
id-TransactionID,
- id-TransmissionActionIndicator,
+ id-TransmissionActionIndicator,
id-UEContextNotRetrievable,
id-UE-associatedLogicalF1-ConnectionItem,
id-UE-associatedLogicalF1-ConnectionListResAck,
@@ -378,7 +378,7 @@ Reset ::= SEQUENCE {
...
}
-ResetIEs F1AP-PROTOCOL-IES ::= {
+ResetIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory }|
{ ID id-ResetType CRITICALITY reject TYPE ResetType PRESENCE mandatory },
@@ -387,7 +387,7 @@ ResetIEs F1AP-PROTOCOL-IES ::= {
ResetType ::= CHOICE {
f1-Interface ResetAll,
- partOfF1-Interface UE-associatedLogicalF1-ConnectionListRes,
+ partOfF1-Interface UE-associatedLogicalF1-ConnectionListRes,
choice-extension ProtocolIE-SingleContainer { { ResetType-ExtIEs} }
}
@@ -484,7 +484,7 @@ F1SetupRequestIEs F1AP-PROTOCOL-IES ::= {
{ ID id-gNB-DU-Served-Cells-List CRITICALITY reject TYPE GNB-DU-Served-Cells-List PRESENCE optional }|
{ ID id-GNB-DU-RRC-Version CRITICALITY reject TYPE RRC-Version PRESENCE mandatory },
...
-}
+}
GNB-DU-Served-Cells-List ::= SEQUENCE (SIZE(1.. maxCellingNBDU)) OF ProtocolIE-SingleContainer { { GNB-DU-Served-Cells-ItemIEs } }
@@ -572,7 +572,7 @@ GNBDUConfigurationUpdateIEs F1AP-PROTOCOL-IES ::= {
{ ID id-gNB-DU-ID CRITICALITY reject TYPE GNB-DU-ID PRESENCE optional }|
{ ID id-GNB-DU-TNL-Association-To-Remove-List CRITICALITY reject TYPE GNB-DU-TNL-Association-To-Remove-List PRESENCE optional },
...
-}
+}
Served-Cells-To-Add-List ::= SEQUENCE (SIZE(1.. maxCellingNBDU)) OF ProtocolIE-SingleContainer { { Served-Cells-To-Add-ItemIEs } }
Served-Cells-To-Modify-List ::= SEQUENCE (SIZE(1.. maxCellingNBDU)) OF ProtocolIE-SingleContainer { { Served-Cells-To-Modify-ItemIEs } }
@@ -607,7 +607,7 @@ Cells-Status-ItemIEs F1AP-PROTOCOL-IES ::= {
Dedicated-SIDelivery-NeededUE-ItemIEs F1AP-PROTOCOL-IES ::= {
{ ID id-Dedicated-SIDelivery-NeededUE-Item CRITICALITY ignore TYPE Dedicated-SIDelivery-NeededUE-Item PRESENCE mandatory },
...
-}
+}
GNB-DU-TNL-Association-To-Remove-ItemIEs F1AP-PROTOCOL-IES ::= {
{ ID id-GNB-DU-TNL-Association-To-Remove-Item CRITICALITY reject TYPE GNB-DU-TNL-Association-To-Remove-Item PRESENCE mandatory },
@@ -681,7 +681,7 @@ GNBCUConfigurationUpdateIEs F1AP-PROTOCOL-IES ::= {
{ ID id-Cells-to-be-Barred-List CRITICALITY ignore TYPE Cells-to-be-Barred-List PRESENCE optional }|
{ ID id-Protected-EUTRA-Resources-List CRITICALITY reject TYPE Protected-EUTRA-Resources-List PRESENCE optional },
...
-}
+}
Cells-to-be-Deactivated-List ::= SEQUENCE (SIZE(1.. maxCellingNBDU)) OF ProtocolIE-SingleContainer { { Cells-to-be-Deactivated-List-ItemIEs } }
GNB-CU-TNL-Association-To-Add-List ::= SEQUENCE (SIZE(1.. maxnoofTNLAssociations)) OF ProtocolIE-SingleContainer { { GNB-CU-TNL-Association-To-Add-ItemIEs } }
@@ -787,7 +787,7 @@ GNBCUConfigurationUpdateFailureIEs F1AP-PROTOCOL-IES ::= {
-- **************************************************************
--
--- GNB-DU RESOURCE COORDINATION REQUEST
+-- GNB-DU RESOURCE COORDINATION REQUEST
--
-- **************************************************************
@@ -807,7 +807,7 @@ GNBDUResourceCoordinationRequest-IEs F1AP-PROTOCOL-IES ::= {
-- **************************************************************
--
--- GNB-DU RESOURCE COORDINATION RESPONSE
+-- GNB-DU RESOURCE COORDINATION RESPONSE
--
-- **************************************************************
@@ -864,7 +864,7 @@ UEContextSetupRequestIEs F1AP-PROTOCOL-IES ::= {
{ ID id-new-gNB-CU-UE-F1AP-ID CRITICALITY reject TYPE GNB-DU-UE-F1AP-ID PRESENCE optional }|
{ ID id-RANUEID CRITICALITY ignore TYPE RANUEID PRESENCE optional },
...
-}
+}
Candidate-SpCell-List::= SEQUENCE (SIZE(1..maxnoofCandidateSpCells)) OF ProtocolIE-SingleContainer { { Candidate-SpCell-ItemIEs} }
SCell-ToBeSetup-List::= SEQUENCE (SIZE(1..maxnoofSCells)) OF ProtocolIE-SingleContainer { { SCell-ToBeSetup-ItemIEs} }
@@ -1018,7 +1018,7 @@ UEContextReleaseRequestIEs F1AP-PROTOCOL-IES ::= {
-- **************************************************************
--
--- UE CONTEXT RELEASE COMMAND
+-- UE CONTEXT RELEASE COMMAND
--
-- **************************************************************
@@ -1032,12 +1032,12 @@ UEContextReleaseCommandIEs F1AP-PROTOCOL-IES ::= {
{ 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-RRCContainer CRITICALITY ignore TYPE RRCContainer PRESENCE optional }|
- { ID id-SRBID CRITICALITY ignore TYPE SRBID PRESENCE optional }|
+ { ID id-SRBID CRITICALITY ignore TYPE SRBID PRESENCE conditional }|
{ ID id-oldgNB-DU-UE-F1AP-ID CRITICALITY ignore TYPE GNB-DU-UE-F1AP-ID PRESENCE optional }|
{ ID id-ExecuteDuplication CRITICALITY ignore TYPE ExecuteDuplication PRESENCE optional}|
{ ID id-RRCDeliveryStatusRequest CRITICALITY ignore TYPE RRCDeliveryStatusRequest PRESENCE optional },
...
-}
+}
-- **************************************************************
--
@@ -1108,7 +1108,7 @@ UEContextModificationRequestIEs F1AP-PROTOCOL-IES ::= {
{ ID id-NeedforGap CRITICALITY ignore TYPE NeedforGap PRESENCE optional }|
{ ID id-FullConfiguration CRITICALITY reject TYPE FullConfiguration PRESENCE optional },
...
-}
+}
SCell-ToBeSetupMod-List::= SEQUENCE (SIZE(1..maxnoofSCells)) OF ProtocolIE-SingleContainer { { SCell-ToBeSetupMod-ItemIEs} }
SCell-ToBeRemoved-List::= SEQUENCE (SIZE(1..maxnoofSCells)) OF ProtocolIE-SingleContainer { { SCell-ToBeRemoved-ItemIEs} }
@@ -1192,7 +1192,7 @@ UEContextModificationResponseIEs F1AP-PROTOCOL-IES ::= {
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} }
@@ -1299,7 +1299,7 @@ UEContextModificationRequiredIEs F1AP-PROTOCOL-IES ::= {
{ ID id-DRBs-Required-ToBeReleased-List CRITICALITY reject TYPE DRBs-Required-ToBeReleased-List PRESENCE optional}|
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory },
...
-}
+}
DRBs-Required-ToBeModified-List::= SEQUENCE (SIZE(1..maxnoofDRBs)) OF ProtocolIE-SingleContainer { { DRBs-Required-ToBeModified-ItemIEs } }
DRBs-Required-ToBeReleased-List::= SEQUENCE (SIZE(1..maxnoofDRBs)) OF ProtocolIE-SingleContainer { { DRBs-Required-ToBeReleased-ItemIEs } }
@@ -1373,30 +1373,30 @@ UEContextModificationRefuseIEs F1AP-PROTOCOL-IES ::= {
}
--- **************************************************************
---
--- WRITE-REPLACE WARNING ELEMENTARY PROCEDURE
---
--- **************************************************************
+-- **************************************************************
+--
+-- WRITE-REPLACE WARNING ELEMENTARY PROCEDURE
+--
+-- **************************************************************
--- **************************************************************
---
--- Write-Replace Warning Request
---
--- **************************************************************
+-- **************************************************************
+--
+-- Write-Replace Warning Request
+--
+-- **************************************************************
-WriteReplaceWarningRequest ::= SEQUENCE {
- protocolIEs ProtocolIE-Container { {WriteReplaceWarningRequestIEs} },
- ...
-}
+WriteReplaceWarningRequest ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { {WriteReplaceWarningRequestIEs} },
+ ...
+}
-WriteReplaceWarningRequestIEs F1AP-PROTOCOL-IES ::= {
+WriteReplaceWarningRequestIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
- { ID id-PWSSystemInformation CRITICALITY reject TYPE PWSSystemInformation PRESENCE mandatory }|
- { ID id-RepetitionPeriod CRITICALITY reject TYPE RepetitionPeriod PRESENCE mandatory }|
- { ID id-NumberofBroadcastRequest CRITICALITY reject TYPE NumberofBroadcastRequest PRESENCE mandatory }|
+ { ID id-PWSSystemInformation CRITICALITY reject TYPE PWSSystemInformation PRESENCE mandatory }|
+ { ID id-RepetitionPeriod CRITICALITY reject TYPE RepetitionPeriod PRESENCE mandatory }|
+ { ID id-NumberofBroadcastRequest CRITICALITY reject TYPE NumberofBroadcastRequest PRESENCE mandatory }|
{ ID id-Cells-To-Be-Broadcast-List CRITICALITY reject TYPE Cells-To-Be-Broadcast-List PRESENCE optional },
- ...
+ ...
}
Cells-To-Be-Broadcast-List ::= SEQUENCE (SIZE(1.. maxCellingNBDU)) OF ProtocolIE-SingleContainer { { Cells-To-Be-Broadcast-List-ItemIEs } }
@@ -1406,18 +1406,18 @@ Cells-To-Be-Broadcast-List-ItemIEs F1AP-PROTOCOL-IES ::= {
...
}
--- **************************************************************
---
--- Write-Replace Warning Response
---
--- **************************************************************
+-- **************************************************************
+--
+-- Write-Replace Warning Response
+--
+-- **************************************************************
-WriteReplaceWarningResponse ::= SEQUENCE {
- protocolIEs ProtocolIE-Container { {WriteReplaceWarningResponseIEs} },
- ...
-}
+WriteReplaceWarningResponse ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { {WriteReplaceWarningResponseIEs} },
+ ...
+}
-WriteReplaceWarningResponseIEs F1AP-PROTOCOL-IES ::= {
+WriteReplaceWarningResponseIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
{ ID id-Cells-Broadcast-Completed-List CRITICALITY reject TYPE Cells-Broadcast-Completed-List PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
@@ -1433,29 +1433,29 @@ Cells-Broadcast-Completed-List-ItemIEs F1AP-PROTOCOL-IES ::= {
}
--- **************************************************************
---
--- PWS CANCEL ELEMENTARY PROCEDURE
---
--- **************************************************************
+-- **************************************************************
+--
+-- PWS CANCEL ELEMENTARY PROCEDURE
+--
+-- **************************************************************
--- **************************************************************
---
--- PWS Cancel Request
---
--- **************************************************************
+-- **************************************************************
+--
+-- PWS Cancel Request
+--
+-- **************************************************************
-PWSCancelRequest ::= SEQUENCE {
- protocolIEs ProtocolIE-Container { {PWSCancelRequestIEs} },
- ...
-}
+PWSCancelRequest ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { {PWSCancelRequestIEs} },
+ ...
+}
-PWSCancelRequestIEs F1AP-PROTOCOL-IES ::= {
+PWSCancelRequestIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
- { ID id-NumberofBroadcastRequest CRITICALITY reject TYPE NumberofBroadcastRequest PRESENCE mandatory }|
+ { ID id-NumberofBroadcastRequest CRITICALITY reject TYPE NumberofBroadcastRequest PRESENCE mandatory }|
{ ID id-Broadcast-To-Be-Cancelled-List CRITICALITY reject TYPE Broadcast-To-Be-Cancelled-List PRESENCE optional }|
{ ID id-Cancel-all-Warning-Messages-Indicator CRITICALITY reject TYPE Cancel-all-Warning-Messages-Indicator PRESENCE optional },
- ...
+ ...
}
Broadcast-To-Be-Cancelled-List ::= SEQUENCE (SIZE(1.. maxCellingNBDU)) OF ProtocolIE-SingleContainer { { Broadcast-To-Be-Cancelled-List-ItemIEs } }
@@ -1465,22 +1465,22 @@ Broadcast-To-Be-Cancelled-List-ItemIEs F1AP-PROTOCOL-IES ::= {
...
}
--- **************************************************************
---
--- PWS Cancel Response
---
--- **************************************************************
+-- **************************************************************
+--
+-- PWS Cancel Response
+--
+-- **************************************************************
-PWSCancelResponse ::= SEQUENCE {
- protocolIEs ProtocolIE-Container { {PWSCancelResponseIEs} },
- ...
-}
+PWSCancelResponse ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { {PWSCancelResponseIEs} },
+ ...
+}
-PWSCancelResponseIEs F1AP-PROTOCOL-IES ::= {
+PWSCancelResponseIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
{ ID id-Cells-Broadcast-Cancelled-List CRITICALITY reject TYPE Cells-Broadcast-Cancelled-List PRESENCE optional }|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
- ...
+ ...
}
Cells-Broadcast-Cancelled-List ::= SEQUENCE (SIZE(1.. maxCellingNBDU)) OF ProtocolIE-SingleContainer { { Cells-Broadcast-Cancelled-List-ItemIEs } }
@@ -1736,33 +1736,33 @@ NetworkAccessRateReduction ::= SEQUENCE {
...
}
-NetworkAccessRateReductionIEs F1AP-PROTOCOL-IES ::= {
+NetworkAccessRateReductionIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
{ ID id-UAC-Assistance-Info CRITICALITY reject TYPE UAC-Assistance-Info PRESENCE mandatory },
...
}
--- **************************************************************
---
--- PWS RESTART INDICATION ELEMENTARY PROCEDURE
---
--- **************************************************************
+-- **************************************************************
+--
+-- PWS RESTART INDICATION ELEMENTARY PROCEDURE
+--
+-- **************************************************************
--- **************************************************************
---
--- PWS Restart Indication
---
--- **************************************************************
+-- **************************************************************
+--
+-- PWS Restart Indication
+--
+-- **************************************************************
-PWSRestartIndication ::= SEQUENCE {
- protocolIEs ProtocolIE-Container { { PWSRestartIndicationIEs} },
- ...
-}
+PWSRestartIndication ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { { PWSRestartIndicationIEs} },
+ ...
+}
-PWSRestartIndicationIEs F1AP-PROTOCOL-IES ::= {
+PWSRestartIndicationIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
{ ID id-NR-CGI-List-For-Restart-List CRITICALITY reject TYPE NR-CGI-List-For-Restart-List PRESENCE mandatory },
- ...
+ ...
}
NR-CGI-List-For-Restart-List ::= SEQUENCE (SIZE(1.. maxCellingNBDU)) OF ProtocolIE-SingleContainer { { NR-CGI-List-For-Restart-List-ItemIEs } }
@@ -1772,27 +1772,27 @@ NR-CGI-List-For-Restart-List-ItemIEs F1AP-PROTOCOL-IES ::= {
...
}
--- **************************************************************
---
--- PWS FAILURE INDICATION ELEMENTARY PROCEDURE
---
--- **************************************************************
+-- **************************************************************
+--
+-- PWS FAILURE INDICATION ELEMENTARY PROCEDURE
+--
+-- **************************************************************
--- **************************************************************
---
--- PWS Failure Indication
---
--- **************************************************************
+-- **************************************************************
+--
+-- PWS Failure Indication
+--
+-- **************************************************************
-PWSFailureIndication ::= SEQUENCE {
- protocolIEs ProtocolIE-Container { { PWSFailureIndicationIEs} },
- ...
-}
+PWSFailureIndication ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container { { PWSFailureIndicationIEs} },
+ ...
+}
-PWSFailureIndicationIEs F1AP-PROTOCOL-IES ::= {
+PWSFailureIndicationIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
{ ID id-PWS-Failed-NR-CGI-List CRITICALITY reject TYPE PWS-Failed-NR-CGI-List PRESENCE optional },
- ...
+ ...
}
PWS-Failed-NR-CGI-List ::= SEQUENCE (SIZE(1.. maxCellingNBDU)) OF ProtocolIE-SingleContainer { { PWS-Failed-NR-CGI-List-ItemIEs } }
@@ -1820,7 +1820,7 @@ GNBDUStatusIndication ::= SEQUENCE {
...
}
-GNBDUStatusIndicationIEs F1AP-PROTOCOL-IES ::= {
+GNBDUStatusIndicationIEs F1AP-PROTOCOL-IES ::= {
{ ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
{ ID id-GNBDUOverloadInformation CRITICALITY reject TYPE GNBDUOverloadInformation PRESENCE mandatory },
...
diff --git a/epan/dissectors/asn1/f1ap/F1AP-PDU-Descriptions.asn b/epan/dissectors/asn1/f1ap/F1AP-PDU-Descriptions.asn
index 43d0b8b5b3..a2dbf7ddd0 100644
--- a/epan/dissectors/asn1/f1ap/F1AP-PDU-Descriptions.asn
+++ b/epan/dissectors/asn1/f1ap/F1AP-PDU-Descriptions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.473 V15.6.0 (2019-06)
+-- 3GPP TS 38.473 V15.7.0 (2019-09)
-- 9.4.3 Elementary Procedure Definitions
-- **************************************************************
--
diff --git a/epan/dissectors/asn1/f1ap/f1ap.cnf b/epan/dissectors/asn1/f1ap/f1ap.cnf
index e42590f8fe..a8a77cf0f5 100644
--- a/epan/dissectors/asn1/f1ap/f1ap.cnf
+++ b/epan/dissectors/asn1/f1ap/f1ap.cnf
@@ -239,7 +239,7 @@ id-EUTRA-NR-CellResourceCoordinationReq-Container ProtocolIE-ID
id-EUTRA-NR-CellResourceCoordinationReqAck-Container ProtocolIE-ID
id-Protected-EUTRA-Resources-List ProtocolIE-ID
id-RequestType ProtocolIE-ID
-id-ServCellIndex ProtocolIE-ID
+id-ServCellIndex ProtocolIE-ID
id-RAT-FrequencyPriorityInformation ProtocolIE-ID
id-ExecuteDuplication ProtocolIE-ID
id-NRCGI ProtocolIE-ID
@@ -361,6 +361,10 @@ id-portNumber ProtocolIE-ID
id-AdditionalSIBMessageList ProtocolIE-ID
id-Cell-Type ProtocolIE-ID
id-IgnorePRACHConfiguration ProtocolIE-ID
+id-CG-Config ProtocolIE-ID
+id-PDCCH-BlindDetectionSCG ProtocolIE-ID
+id-Requested-PDCCH-BlindDetectionSCG ProtocolIE-ID
+id-Ph-InfoMCG ProtocolIE-ID
#.END
#.REGISTER
@@ -591,6 +595,10 @@ PortNumber N f1ap.extension id-portNumber
AdditionalSIBMessageList N f1ap.extension id-AdditionalSIBMessageList
CellType N f1ap.extension id-Cell-Type
IgnorePRACHConfiguration N f1ap.extension id-IgnorePRACHConfiguration
+CG-Config N f1ap.extension id-CG-Config
+PDCCH-BlindDetectionSCG N f1ap.extension id-PDCCH-BlindDetectionSCG
+Requested-PDCCH-BlindDetectionSCG N f1ap.extension id-Requested-PDCCH-BlindDetectionSCG
+Ph-InfoMCG N f1ap.extension id-Ph-InfoMCG
#F1AP-ELEMENTARY-PROCEDURE
Reset N f1ap.proc.imsg id-Reset
@@ -819,11 +827,19 @@ PortNumber TYPE = FT_UINT16 DISPLAY = BASE_DEC
#.TYPE_ATTR
BitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec
+#.FN_BODY CG-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_CG_Config);
+ dissect_nr_rrc_CG_Config_PDU(param_tvb, actx->pinfo, subtree, NULL);
+ }
+
#.FN_BODY CG-ConfigInfo 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_SCG_Config_Info);
+ proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_CG_ConfigInfo);
dissect_nr_rrc_CG_ConfigInfo_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
@@ -1036,6 +1052,34 @@ UACReductionIndication DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_percent
dissect_nr_rrc_DRX_Config_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
+#.FN_BODY PDCCH-BlindDetectionSCG VAL_PTR=&parameter_tvb HF_INDEX=-1
+ tvbuff_t *parameter_tvb = NULL;
+%(DEFAULT_BODY)s
+ if (parameter_tvb) {
+ actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 1, ENC_BIG_ENDIAN);
+ }
+
+#.TYPE_ATTR
+PDCCH-BlindDetectionSCG TYPE=FT_UINT8 DISPLAY=BASE_DEC
+
+#.FN_BODY Requested-PDCCH-BlindDetectionSCG VAL_PTR=&parameter_tvb HF_INDEX=-1
+ tvbuff_t *parameter_tvb = NULL;
+%(DEFAULT_BODY)s
+ if (parameter_tvb) {
+ actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 1, ENC_BIG_ENDIAN);
+ }
+
+#.TYPE_ATTR
+Requested-PDCCH-BlindDetectionSCG TYPE=FT_UINT8 DISPLAY=BASE_DEC
+
+#.FN_BODY Ph-InfoMCG 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_InfoMCG);
+ dissect_nr_rrc_PH_TypeListMCG_PDU(param_tvb, actx->pinfo, subtree, NULL);
+ }
+
#.FN_BODY Ph-InfoSCG VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s
diff --git a/epan/dissectors/asn1/f1ap/packet-f1ap-template.c b/epan/dissectors/asn1/f1ap/packet-f1ap-template.c
index 3aa2d4ca51..75068fe653 100644
--- a/epan/dissectors/asn1/f1ap/packet-f1ap-template.c
+++ b/epan/dissectors/asn1/f1ap/packet-f1ap-template.c
@@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
- * References: 3GPP TS 38.473 V15.6.0 (2019-06)
+ * References: 3GPP TS 38.473 V15.7.0 (2019-09)
*/
#include "config.h"
@@ -48,7 +48,7 @@ static gint ett_f1ap_ResourceCoordinationTransferContainer = -1;
static gint ett_f1ap_PLMN_Identity = -1;
static gint ett_f1ap_MIB_message = -1;
static gint ett_f1ap_SIB1_message = -1;
-static gint ett_f1ap_SCG_Config_Info = -1;
+static gint ett_f1ap_CG_ConfigInfo = -1;
static gint ett_f1ap_CellGroupConfig = -1;
static gint ett_f1ap_TransportLayerAddress = -1;
static gint ett_f1ap_UE_CapabilityRAT_ContainerList = -1;
@@ -70,6 +70,8 @@ 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;
+static gint ett_f1ap_CG_Config = -1;
+static gint ett_f1ap_Ph_InfoMCG = -1;
#include "packet-f1ap-ett.c"
enum{
@@ -225,7 +227,7 @@ void proto_register_f1ap(void) {
&ett_f1ap_PLMN_Identity,
&ett_f1ap_MIB_message,
&ett_f1ap_SIB1_message,
- &ett_f1ap_SCG_Config_Info,
+ &ett_f1ap_CG_ConfigInfo,
&ett_f1ap_CellGroupConfig,
&ett_f1ap_TransportLayerAddress,
&ett_f1ap_UE_CapabilityRAT_ContainerList,
@@ -247,6 +249,8 @@ void proto_register_f1ap(void) {
&ett_f1ap_RequestedFeatureSetEntryIndex,
&ett_f1ap_RequestedP_MaxFR2,
&ett_f1ap_UEAssistanceInformation,
+ &ett_f1ap_CG_Config,
+ &ett_f1ap_Ph_InfoMCG,
#include "packet-f1ap-ettarr.c"
};
diff --git a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
index ce122aa5df..cb1c75d760 100644
--- a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
+++ b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
@@ -57,6 +57,7 @@ MeasResultSCG-Failure_PDU
MeasurementTimingConfiguration_PDU
MIB_PDU
P-Max_PDU
+PH-TypeListMCG_PDU
PH-TypeListSCG_PDU
RadioBearerConfig_PDU
RRCReconfiguration_PDU
@@ -103,6 +104,7 @@ MeasurementTimingConfiguration
MIB
P-Max
PCCH-Message @pcch
+PH-TypeListMCG
PH-TypeListSCG
RadioBearerConfig
RRCReconfiguration @rrc_reconf
diff --git a/epan/dissectors/packet-f1ap.c b/epan/dissectors/packet-f1ap.c
index 33b59a4242..0403827221 100644
--- a/epan/dissectors/packet-f1ap.c
+++ b/epan/dissectors/packet-f1ap.c
@@ -16,7 +16,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
- * References: 3GPP TS 38.473 V15.6.0 (2019-06)
+ * References: 3GPP TS 38.473 V15.7.0 (2019-09)
*/
#include "config.h"
@@ -338,7 +338,11 @@ typedef enum _ProtocolIE_ID_enum {
id_portNumber = 230,
id_AdditionalSIBMessageList = 231,
id_Cell_Type = 232,
- id_IgnorePRACHConfiguration = 233
+ id_IgnorePRACHConfiguration = 233,
+ id_CG_Config = 234,
+ id_PDCCH_BlindDetectionSCG = 235,
+ id_Requested_PDCCH_BlindDetectionSCG = 236,
+ id_Ph_InfoMCG = 237
} ProtocolIE_ID_enum;
/*--- End of included file: packet-f1ap-val.h ---*/
@@ -409,6 +413,7 @@ static int hf_f1ap_ExecuteDuplication_PDU = -1; /* ExecuteDuplication */
static int hf_f1ap_EUTRA_NR_CellResourceCoordinationReq_Container_PDU = -1; /* EUTRA_NR_CellResourceCoordinationReq_Container */
static int hf_f1ap_EUTRA_NR_CellResourceCoordinationReqAck_Container_PDU = -1; /* EUTRA_NR_CellResourceCoordinationReqAck_Container */
static int hf_f1ap_FullConfiguration_PDU = -1; /* FullConfiguration */
+static int hf_f1ap_CG_Config_PDU = -1; /* CG_Config */
static int hf_f1ap_GNB_CUSystemInformation_PDU = -1; /* GNB_CUSystemInformation */
static int hf_f1ap_GNB_CU_TNL_Association_Setup_Item_PDU = -1; /* GNB_CU_TNL_Association_Setup_Item */
static int hf_f1ap_GNB_CU_TNL_Association_Failed_To_Setup_Item_PDU = -1; /* GNB_CU_TNL_Association_Failed_To_Setup_Item */
@@ -441,8 +446,10 @@ static int hf_f1ap_PagingDRX_PDU = -1; /* PagingDRX */
static int hf_f1ap_PagingIdentity_PDU = -1; /* PagingIdentity */
static int hf_f1ap_PagingOrigin_PDU = -1; /* PagingOrigin */
static int hf_f1ap_PagingPriority_PDU = -1; /* PagingPriority */
+static int hf_f1ap_PDCCH_BlindDetectionSCG_PDU = -1; /* PDCCH_BlindDetectionSCG */
static int hf_f1ap_PDCPSNLength_PDU = -1; /* PDCPSNLength */
static int hf_f1ap_PDUSessionID_PDU = -1; /* PDUSessionID */
+static int hf_f1ap_Ph_InfoMCG_PDU = -1; /* Ph_InfoMCG */
static int hf_f1ap_Ph_InfoSCG_PDU = -1; /* Ph_InfoSCG */
static int hf_f1ap_PLMN_Identity_PDU = -1; /* PLMN_Identity */
static int hf_f1ap_PortNumber_PDU = -1; /* PortNumber */
@@ -456,6 +463,7 @@ static int hf_f1ap_RANUEID_PDU = -1; /* RANUEID */
static int hf_f1ap_RAT_FrequencyPriorityInformation_PDU = -1; /* RAT_FrequencyPriorityInformation */
static int hf_f1ap_RequestedBandCombinationIndex_PDU = -1; /* RequestedBandCombinationIndex */
static int hf_f1ap_RequestedFeatureSetEntryIndex_PDU = -1; /* RequestedFeatureSetEntryIndex */
+static int hf_f1ap_Requested_PDCCH_BlindDetectionSCG_PDU = -1; /* Requested_PDCCH_BlindDetectionSCG */
static int hf_f1ap_RequestedP_MaxFR2_PDU = -1; /* RequestedP_MaxFR2 */
static int hf_f1ap_RequestType_PDU = -1; /* RequestType */
static int hf_f1ap_ResourceCoordinationTransferInformation_PDU = -1; /* ResourceCoordinationTransferInformation */
@@ -919,7 +927,7 @@ static gint ett_f1ap_ResourceCoordinationTransferContainer = -1;
static gint ett_f1ap_PLMN_Identity = -1;
static gint ett_f1ap_MIB_message = -1;
static gint ett_f1ap_SIB1_message = -1;
-static gint ett_f1ap_SCG_Config_Info = -1;
+static gint ett_f1ap_CG_ConfigInfo = -1;
static gint ett_f1ap_CellGroupConfig = -1;
static gint ett_f1ap_TransportLayerAddress = -1;
static gint ett_f1ap_UE_CapabilityRAT_ContainerList = -1;
@@ -941,6 +949,8 @@ 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;
+static gint ett_f1ap_CG_Config = -1;
+static gint ett_f1ap_Ph_InfoMCG = -1;
/*--- Included file: packet-f1ap-ett.c ---*/
#line 1 "./asn1/f1ap/packet-f1ap-ett.c"
@@ -1215,7 +1225,7 @@ static gint ett_f1ap_SuccessfulOutcome = -1;
static gint ett_f1ap_UnsuccessfulOutcome = -1;
/*--- End of included file: packet-f1ap-ett.c ---*/
-#line 74 "./asn1/f1ap/packet-f1ap-template.c"
+#line 76 "./asn1/f1ap/packet-f1ap-template.c"
enum{
INITIATING_MESSAGE,
@@ -1648,6 +1658,10 @@ static const value_string f1ap_ProtocolIE_ID_vals[] = {
{ id_AdditionalSIBMessageList, "id-AdditionalSIBMessageList" },
{ id_Cell_Type, "id-Cell-Type" },
{ id_IgnorePRACHConfiguration, "id-IgnorePRACHConfiguration" },
+ { id_CG_Config, "id-CG-Config" },
+ { id_PDCCH_BlindDetectionSCG, "id-PDCCH-BlindDetectionSCG" },
+ { id_Requested_PDCCH_BlindDetectionSCG, "id-Requested-PDCCH-BlindDetectionSCG" },
+ { id_Ph_InfoMCG, "id-Ph-InfoMCG" },
{ 0, NULL }
};
@@ -1830,7 +1844,7 @@ dissect_f1ap_PrivateIE_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
static int
dissect_f1ap_T_additionalSIB(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 670 "./asn1/f1ap/f1ap.cnf"
+#line 678 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -1958,7 +1972,7 @@ dissect_f1ap_AllocationAndRetentionPriority(tvbuff_t *tvb _U_, int offset _U_, a
static int
dissect_f1ap_PLMN_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 786 "./asn1/f1ap/f1ap.cnf"
+#line 794 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
3, 3, FALSE, &param_tvb);
@@ -2111,7 +2125,7 @@ dissect_f1ap_ExtendedAvailablePLMN_List(tvbuff_t *tvb _U_, int offset _U_, asn1_
static int
dissect_f1ap_FiveGS_TAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 889 "./asn1/f1ap/f1ap.cnf"
+#line 905 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *parameter_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, -1,
3, 3, FALSE, &parameter_tvb);
@@ -2347,7 +2361,7 @@ dissect_f1ap_Cause(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
static int
dissect_f1ap_CellGroupConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 855 "./asn1/f1ap/f1ap.cnf"
+#line 871 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -2688,7 +2702,7 @@ dissect_f1ap_CNUEPagingIdentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
static int
dissect_f1ap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1006 "./asn1/f1ap/f1ap.cnf"
+#line 1022 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
1, 160, TRUE, NULL, 0, &param_tvb, NULL);
@@ -2847,13 +2861,13 @@ dissect_f1ap_C_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
static int
dissect_f1ap_CG_ConfigInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 823 "./asn1/f1ap/f1ap.cnf"
+#line 839 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
if (param_tvb) {
- proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_SCG_Config_Info);
+ proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_CG_ConfigInfo);
dissect_nr_rrc_CG_ConfigInfo_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
@@ -2866,7 +2880,7 @@ dissect_f1ap_CG_ConfigInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
static int
dissect_f1ap_UE_CapabilityRAT_ContainerList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 831 "./asn1/f1ap/f1ap.cnf"
+#line 847 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -2885,7 +2899,7 @@ dissect_f1ap_UE_CapabilityRAT_ContainerList(tvbuff_t *tvb _U_, int offset _U_, a
static int
dissect_f1ap_MeasConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 839 "./asn1/f1ap/f1ap.cnf"
+#line 855 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -3952,7 +3966,7 @@ dissect_f1ap_DRXCycle(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
static int
dissect_f1ap_DRX_Config(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1032 "./asn1/f1ap/f1ap.cnf"
+#line 1048 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -3996,7 +4010,7 @@ dissect_f1ap_DRX_LongCycleStartOffset(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
static int
dissect_f1ap_DUtoCURRCContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 770 "./asn1/f1ap/f1ap.cnf"
+#line 778 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -4015,7 +4029,7 @@ dissect_f1ap_DUtoCURRCContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
static int
dissect_f1ap_MeasGapConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 871 "./asn1/f1ap/f1ap.cnf"
+#line 887 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -4034,7 +4048,7 @@ dissect_f1ap_MeasGapConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
static int
dissect_f1ap_T_requestedP_MaxFR1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 879 "./asn1/f1ap/f1ap.cnf"
+#line 895 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -4220,7 +4234,7 @@ dissect_f1ap_EUTRA_Mode_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
static int
dissect_f1ap_ProtectedEUTRAResourceIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 982 "./asn1/f1ap/f1ap.cnf"
+#line 998 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -4551,7 +4565,7 @@ dissect_f1ap_ExecuteDuplication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
static int
dissect_f1ap_EUTRA_NR_CellResourceCoordinationReq_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 691 "./asn1/f1ap/f1ap.cnf"
+#line 699 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -4570,7 +4584,7 @@ dissect_f1ap_EUTRA_NR_CellResourceCoordinationReq_Container(tvbuff_t *tvb _U_, i
static int
dissect_f1ap_EUTRA_NR_CellResourceCoordinationReqAck_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 699 "./asn1/f1ap/f1ap.cnf"
+#line 707 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -4812,8 +4826,27 @@ dissect_f1ap_FullConfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
static int
+dissect_f1ap_CG_Config(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 831 "./asn1/f1ap/f1ap.cnf"
+ tvbuff_t *param_tvb = NULL;
+ offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+ NO_BOUND, NO_BOUND, FALSE, &param_tvb);
+
+ if (param_tvb) {
+ proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_CG_Config);
+ dissect_nr_rrc_CG_Config_PDU(param_tvb, actx->pinfo, subtree, NULL);
+ }
+
+
+
+ return offset;
+}
+
+
+
+static int
dissect_f1ap_T_sIBtype(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 905 "./asn1/f1ap/f1ap.cnf"
+#line 921 "./asn1/f1ap/f1ap.cnf"
f1ap_private_data_t *f1ap_data = f1ap_get_private_data(actx->pinfo);
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
2U, 32U, &f1ap_data->sib_type, TRUE);
@@ -4828,7 +4861,7 @@ dissect_f1ap_T_sIBtype(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
static int
dissect_f1ap_T_sIBmessage_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 909 "./asn1/f1ap/f1ap.cnf"
+#line 925 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -5066,7 +5099,7 @@ dissect_f1ap_GNB_DU_Name(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
static int
dissect_f1ap_Configured_EPS_TAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 898 "./asn1/f1ap/f1ap.cnf"
+#line 914 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *parameter_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, -1,
2, 2, FALSE, &parameter_tvb);
@@ -5124,7 +5157,7 @@ dissect_f1ap_NR_Mode_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
static int
dissect_f1ap_T_measurementTimingConfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 778 "./asn1/f1ap/f1ap.cnf"
+#line 786 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -5164,7 +5197,7 @@ dissect_f1ap_Served_Cell_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
static int
dissect_f1ap_MIB_message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 804 "./asn1/f1ap/f1ap.cnf"
+#line 812 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -5183,7 +5216,7 @@ dissect_f1ap_MIB_message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
static int
dissect_f1ap_SIB1_message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 812 "./asn1/f1ap/f1ap.cnf"
+#line 820 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -5281,7 +5314,7 @@ dissect_f1ap_GNB_DU_TNL_Association_To_Remove_Item(tvbuff_t *tvb _U_, int offset
static int
dissect_f1ap_HandoverPreparationInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 847 "./asn1/f1ap/f1ap.cnf"
+#line 863 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -5370,7 +5403,7 @@ dissect_f1ap_MaskedIMEISV(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
static int
dissect_f1ap_MeasurementTimingConfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 863 "./asn1/f1ap/f1ap.cnf"
+#line 879 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -5583,6 +5616,24 @@ dissect_f1ap_PagingPriority(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
static int
+dissect_f1ap_PDCCH_BlindDetectionSCG(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 1056 "./asn1/f1ap/f1ap.cnf"
+ tvbuff_t *parameter_tvb = NULL;
+ offset = dissect_per_octet_string(tvb, offset, actx, tree, -1,
+ NO_BOUND, NO_BOUND, FALSE, &parameter_tvb);
+
+ if (parameter_tvb) {
+ actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 1, ENC_BIG_ENDIAN);
+ }
+
+
+
+ return offset;
+}
+
+
+
+static int
dissect_f1ap_PDCP_SN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 4095U, NULL, FALSE);
@@ -5619,8 +5670,27 @@ dissect_f1ap_PDUSessionID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
static int
+dissect_f1ap_Ph_InfoMCG(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 1076 "./asn1/f1ap/f1ap.cnf"
+ tvbuff_t *param_tvb = NULL;
+ offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+ NO_BOUND, NO_BOUND, FALSE, &param_tvb);
+
+ if (param_tvb) {
+ proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_f1ap_Ph_InfoMCG);
+ dissect_nr_rrc_PH_TypeListMCG_PDU(param_tvb, actx->pinfo, subtree, NULL);
+ }
+
+
+
+ return offset;
+}
+
+
+
+static int
dissect_f1ap_Ph_InfoSCG(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1040 "./asn1/f1ap/f1ap.cnf"
+#line 1084 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -5639,7 +5709,7 @@ dissect_f1ap_Ph_InfoSCG(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
static int
dissect_f1ap_PortNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 797 "./asn1/f1ap/f1ap.cnf"
+#line 805 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *parameter_tvb = NULL;
offset = dissect_per_bit_string(tvb, offset, actx, tree, -1,
16, 16, FALSE, NULL, 0, &parameter_tvb, NULL);
@@ -5714,7 +5784,7 @@ dissect_f1ap_PWS_Failed_NR_CGI_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
static int
dissect_f1ap_SIBType_PWS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 945 "./asn1/f1ap/f1ap.cnf"
+#line 961 "./asn1/f1ap/f1ap.cnf"
f1ap_private_data_t *f1ap_data = f1ap_get_private_data(actx->pinfo);
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
6U, 8U, &f1ap_data->sib_type, TRUE);
@@ -5729,7 +5799,7 @@ dissect_f1ap_SIBType_PWS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
static int
dissect_f1ap_T_sIBmessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 949 "./asn1/f1ap/f1ap.cnf"
+#line 965 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -5862,7 +5932,7 @@ dissect_f1ap_Reestablishment_Indication(tvbuff_t *tvb _U_, int offset _U_, asn1_
static int
dissect_f1ap_RequestedBandCombinationIndex(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1048 "./asn1/f1ap/f1ap.cnf"
+#line 1092 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -5881,7 +5951,7 @@ dissect_f1ap_RequestedBandCombinationIndex(tvbuff_t *tvb _U_, int offset _U_, as
static int
dissect_f1ap_RequestedFeatureSetEntryIndex(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1056 "./asn1/f1ap/f1ap.cnf"
+#line 1100 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -5899,8 +5969,26 @@ dissect_f1ap_RequestedFeatureSetEntryIndex(tvbuff_t *tvb _U_, int offset _U_, as
static int
+dissect_f1ap_Requested_PDCCH_BlindDetectionSCG(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 1066 "./asn1/f1ap/f1ap.cnf"
+ tvbuff_t *parameter_tvb = NULL;
+ offset = dissect_per_octet_string(tvb, offset, actx, tree, -1,
+ NO_BOUND, NO_BOUND, FALSE, &parameter_tvb);
+
+ if (parameter_tvb) {
+ actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 1, ENC_BIG_ENDIAN);
+ }
+
+
+
+ return offset;
+}
+
+
+
+static int
dissect_f1ap_RequestedP_MaxFR2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1064 "./asn1/f1ap/f1ap.cnf"
+#line 1108 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -5967,7 +6055,7 @@ dissect_f1ap_ResourceCoordinationTransferInformation(tvbuff_t *tvb _U_, int offs
static int
dissect_f1ap_ResourceCoordinationTransferContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 707 "./asn1/f1ap/f1ap.cnf"
+#line 715 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -6058,7 +6146,7 @@ dissect_f1ap_RLC_Status(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
static int
dissect_f1ap_RRCContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 747 "./asn1/f1ap/f1ap.cnf"
+#line 755 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -6164,14 +6252,14 @@ dissect_f1ap_RRC_Version(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
static int
dissect_f1ap_Latest_RRC_Version_Enhanced(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 998 "./asn1/f1ap/f1ap.cnf"
+#line 1014 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
3, 3, FALSE, &param_tvb);
-#line 1001 "./asn1/f1ap/f1ap.cnf"
+#line 1017 "./asn1/f1ap/f1ap.cnf"
if (param_tvb) {
proto_item_set_text(actx->created_item, "%u.%u.%u", tvb_get_guint8(param_tvb, 0), tvb_get_guint8(param_tvb, 1), tvb_get_guint8(param_tvb, 2));
}
@@ -6784,7 +6872,7 @@ dissect_f1ap_UE_associatedLogicalF1_ConnectionItem(tvbuff_t *tvb _U_, int offset
static int
dissect_f1ap_UEAssistanceInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1072 "./asn1/f1ap/f1ap.cnf"
+#line 1116 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -6850,7 +6938,7 @@ dissect_f1ap_UEIdentityIndexValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
static int
dissect_f1ap_UplinkTxDirectCurrentListInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 990 "./asn1/f1ap/f1ap.cnf"
+#line 1006 "./asn1/f1ap/f1ap.cnf"
tvbuff_t *param_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &param_tvb);
@@ -6873,7 +6961,7 @@ static const per_sequence_t Reset_sequence[] = {
static int
dissect_f1ap_Reset(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1080 "./asn1/f1ap/f1ap.cnf"
+#line 1124 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Reset");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -6943,7 +7031,7 @@ static const per_sequence_t ResetAcknowledge_sequence[] = {
static int
dissect_f1ap_ResetAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1082 "./asn1/f1ap/f1ap.cnf"
+#line 1126 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResetAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -6974,7 +7062,7 @@ static const per_sequence_t ErrorIndication_sequence[] = {
static int
dissect_f1ap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1132 "./asn1/f1ap/f1ap.cnf"
+#line 1176 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ErrorIndication");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -6991,7 +7079,7 @@ static const per_sequence_t F1SetupRequest_sequence[] = {
static int
dissect_f1ap_F1SetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1084 "./asn1/f1ap/f1ap.cnf"
+#line 1128 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "F1SetupRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7022,7 +7110,7 @@ static const per_sequence_t F1SetupResponse_sequence[] = {
static int
dissect_f1ap_F1SetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1086 "./asn1/f1ap/f1ap.cnf"
+#line 1130 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "F1SetupResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7053,7 +7141,7 @@ static const per_sequence_t F1SetupFailure_sequence[] = {
static int
dissect_f1ap_F1SetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1088 "./asn1/f1ap/f1ap.cnf"
+#line 1132 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "F1SetupFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7070,7 +7158,7 @@ static const per_sequence_t GNBDUConfigurationUpdate_sequence[] = {
static int
dissect_f1ap_GNBDUConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1090 "./asn1/f1ap/f1ap.cnf"
+#line 1134 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUConfigurationUpdate");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7171,7 +7259,7 @@ static const per_sequence_t GNBDUConfigurationUpdateAcknowledge_sequence[] = {
static int
dissect_f1ap_GNBDUConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1092 "./asn1/f1ap/f1ap.cnf"
+#line 1136 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUConfigurationUpdateAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7188,7 +7276,7 @@ static const per_sequence_t GNBDUConfigurationUpdateFailure_sequence[] = {
static int
dissect_f1ap_GNBDUConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1094 "./asn1/f1ap/f1ap.cnf"
+#line 1138 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUConfigurationUpdateFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7205,7 +7293,7 @@ static const per_sequence_t GNBCUConfigurationUpdate_sequence[] = {
static int
dissect_f1ap_GNBCUConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1096 "./asn1/f1ap/f1ap.cnf"
+#line 1140 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBCUConfigurationUpdate");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7306,7 +7394,7 @@ static const per_sequence_t GNBCUConfigurationUpdateAcknowledge_sequence[] = {
static int
dissect_f1ap_GNBCUConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1098 "./asn1/f1ap/f1ap.cnf"
+#line 1142 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBCUConfigurationUpdateAcknowledge");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7365,7 +7453,7 @@ static const per_sequence_t GNBCUConfigurationUpdateFailure_sequence[] = {
static int
dissect_f1ap_GNBCUConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1100 "./asn1/f1ap/f1ap.cnf"
+#line 1144 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBCUConfigurationUpdateFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7382,7 +7470,7 @@ static const per_sequence_t GNBDUResourceCoordinationRequest_sequence[] = {
static int
dissect_f1ap_GNBDUResourceCoordinationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1144 "./asn1/f1ap/f1ap.cnf"
+#line 1188 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUResourceCoordinationRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7399,7 +7487,7 @@ static const per_sequence_t GNBDUResourceCoordinationResponse_sequence[] = {
static int
dissect_f1ap_GNBDUResourceCoordinationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1146 "./asn1/f1ap/f1ap.cnf"
+#line 1190 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUResourceCoordinationResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7416,7 +7504,7 @@ static const per_sequence_t UEContextSetupRequest_sequence[] = {
static int
dissect_f1ap_UEContextSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1102 "./asn1/f1ap/f1ap.cnf"
+#line 1146 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextSetupRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7489,7 +7577,7 @@ static const per_sequence_t UEContextSetupResponse_sequence[] = {
static int
dissect_f1ap_UEContextSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1104 "./asn1/f1ap/f1ap.cnf"
+#line 1148 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextSetupResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7576,7 +7664,7 @@ static const per_sequence_t UEContextSetupFailure_sequence[] = {
static int
dissect_f1ap_UEContextSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1106 "./asn1/f1ap/f1ap.cnf"
+#line 1150 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextSetupFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7607,7 +7695,7 @@ static const per_sequence_t UEContextReleaseRequest_sequence[] = {
static int
dissect_f1ap_UEContextReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1134 "./asn1/f1ap/f1ap.cnf"
+#line 1178 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7624,7 +7712,7 @@ static const per_sequence_t UEContextReleaseCommand_sequence[] = {
static int
dissect_f1ap_UEContextReleaseCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1108 "./asn1/f1ap/f1ap.cnf"
+#line 1152 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseCommand");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7641,7 +7729,7 @@ static const per_sequence_t UEContextReleaseComplete_sequence[] = {
static int
dissect_f1ap_UEContextReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1110 "./asn1/f1ap/f1ap.cnf"
+#line 1154 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseComplete");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7658,7 +7746,7 @@ static const per_sequence_t UEContextModificationRequest_sequence[] = {
static int
dissect_f1ap_UEContextModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1112 "./asn1/f1ap/f1ap.cnf"
+#line 1156 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7773,7 +7861,7 @@ static const per_sequence_t UEContextModificationResponse_sequence[] = {
static int
dissect_f1ap_UEContextModificationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1114 "./asn1/f1ap/f1ap.cnf"
+#line 1158 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7916,7 +8004,7 @@ static const per_sequence_t UEContextModificationFailure_sequence[] = {
static int
dissect_f1ap_UEContextModificationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1116 "./asn1/f1ap/f1ap.cnf"
+#line 1160 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7933,7 +8021,7 @@ static const per_sequence_t UEContextModificationRequired_sequence[] = {
static int
dissect_f1ap_UEContextModificationRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1118 "./asn1/f1ap/f1ap.cnf"
+#line 1162 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationRequired");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -7992,7 +8080,7 @@ static const per_sequence_t UEContextModificationConfirm_sequence[] = {
static int
dissect_f1ap_UEContextModificationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1120 "./asn1/f1ap/f1ap.cnf"
+#line 1164 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationConfirm");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8023,7 +8111,7 @@ static const per_sequence_t UEContextModificationRefuse_sequence[] = {
static int
dissect_f1ap_UEContextModificationRefuse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1122 "./asn1/f1ap/f1ap.cnf"
+#line 1166 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationRefuse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8040,7 +8128,7 @@ static const per_sequence_t WriteReplaceWarningRequest_sequence[] = {
static int
dissect_f1ap_WriteReplaceWarningRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1124 "./asn1/f1ap/f1ap.cnf"
+#line 1168 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "WriteReplaceWarningRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8071,7 +8159,7 @@ static const per_sequence_t WriteReplaceWarningResponse_sequence[] = {
static int
dissect_f1ap_WriteReplaceWarningResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1126 "./asn1/f1ap/f1ap.cnf"
+#line 1170 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "WriteReplaceWarningResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8102,7 +8190,7 @@ static const per_sequence_t PWSCancelRequest_sequence[] = {
static int
dissect_f1ap_PWSCancelRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1128 "./asn1/f1ap/f1ap.cnf"
+#line 1172 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSCancelRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8133,7 +8221,7 @@ static const per_sequence_t PWSCancelResponse_sequence[] = {
static int
dissect_f1ap_PWSCancelResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1130 "./asn1/f1ap/f1ap.cnf"
+#line 1174 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSCancelResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8164,7 +8252,7 @@ static const per_sequence_t UEInactivityNotification_sequence[] = {
static int
dissect_f1ap_UEInactivityNotification(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1142 "./asn1/f1ap/f1ap.cnf"
+#line 1186 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEInactivityNotification");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8195,7 +8283,7 @@ static const per_sequence_t InitialULRRCMessageTransfer_sequence[] = {
static int
dissect_f1ap_InitialULRRCMessageTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1136 "./asn1/f1ap/f1ap.cnf"
+#line 1180 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "InitialULRRCMessageTransfer");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8212,7 +8300,7 @@ static const per_sequence_t DLRRCMessageTransfer_sequence[] = {
static int
dissect_f1ap_DLRRCMessageTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1138 "./asn1/f1ap/f1ap.cnf"
+#line 1182 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DLRRCMessageTransfer");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8239,7 +8327,7 @@ static const per_sequence_t ULRRCMessageTransfer_sequence[] = {
static int
dissect_f1ap_ULRRCMessageTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1140 "./asn1/f1ap/f1ap.cnf"
+#line 1184 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ULRRCMessageTransfer");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8256,7 +8344,7 @@ static const per_sequence_t PrivateMessage_sequence[] = {
static int
dissect_f1ap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1148 "./asn1/f1ap/f1ap.cnf"
+#line 1192 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PrivateMessage");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8273,7 +8361,7 @@ static const per_sequence_t SystemInformationDeliveryCommand_sequence[] = {
static int
dissect_f1ap_SystemInformationDeliveryCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1150 "./asn1/f1ap/f1ap.cnf"
+#line 1194 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SystemInformationDeliveryCommand");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8290,7 +8378,7 @@ static const per_sequence_t Paging_sequence[] = {
static int
dissect_f1ap_Paging(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1152 "./asn1/f1ap/f1ap.cnf"
+#line 1196 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Paging");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8321,7 +8409,7 @@ static const per_sequence_t Notify_sequence[] = {
static int
dissect_f1ap_Notify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1154 "./asn1/f1ap/f1ap.cnf"
+#line 1198 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Notify");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8352,7 +8440,7 @@ static const per_sequence_t NetworkAccessRateReduction_sequence[] = {
static int
dissect_f1ap_NetworkAccessRateReduction(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1156 "./asn1/f1ap/f1ap.cnf"
+#line 1200 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NetworkAccessRateReduction");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8369,7 +8457,7 @@ static const per_sequence_t PWSRestartIndication_sequence[] = {
static int
dissect_f1ap_PWSRestartIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1158 "./asn1/f1ap/f1ap.cnf"
+#line 1202 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSRestartIndication");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8400,7 +8488,7 @@ static const per_sequence_t PWSFailureIndication_sequence[] = {
static int
dissect_f1ap_PWSFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1160 "./asn1/f1ap/f1ap.cnf"
+#line 1204 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSFailureIndication");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8431,7 +8519,7 @@ static const per_sequence_t GNBDUStatusIndication_sequence[] = {
static int
dissect_f1ap_GNBDUStatusIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1162 "./asn1/f1ap/f1ap.cnf"
+#line 1206 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "GNBDUStatusIndication");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8448,7 +8536,7 @@ static const per_sequence_t RRCDeliveryReport_sequence[] = {
static int
dissect_f1ap_RRCDeliveryReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1164 "./asn1/f1ap/f1ap.cnf"
+#line 1208 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRCDeliveryReport");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8465,7 +8553,7 @@ static const per_sequence_t F1RemovalRequest_sequence[] = {
static int
dissect_f1ap_F1RemovalRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1167 "./asn1/f1ap/f1ap.cnf"
+#line 1211 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "F1RemovalRequest");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8482,7 +8570,7 @@ static const per_sequence_t F1RemovalResponse_sequence[] = {
static int
dissect_f1ap_F1RemovalResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1170 "./asn1/f1ap/f1ap.cnf"
+#line 1214 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "F1RemovalResponse");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -8499,7 +8587,7 @@ static const per_sequence_t F1RemovalFailure_sequence[] = {
static int
dissect_f1ap_F1RemovalFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1173 "./asn1/f1ap/f1ap.cnf"
+#line 1217 "./asn1/f1ap/f1ap.cnf"
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "F1RemovalFailure");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9079,6 +9167,14 @@ static int dissect_FullConfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_CG_Config_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_f1ap_CG_Config(tvb, offset, &asn1_ctx, tree, hf_f1ap_CG_Config_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_GNB_CUSystemInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -9335,6 +9431,14 @@ static int dissect_PagingPriority_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_PDCCH_BlindDetectionSCG_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_f1ap_PDCCH_BlindDetectionSCG(tvb, offset, &asn1_ctx, tree, hf_f1ap_PDCCH_BlindDetectionSCG_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_PDCPSNLength_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -9351,6 +9455,14 @@ static int dissect_PDUSessionID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_Ph_InfoMCG_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_f1ap_Ph_InfoMCG(tvb, offset, &asn1_ctx, tree, hf_f1ap_Ph_InfoMCG_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_Ph_InfoSCG_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -9455,6 +9567,14 @@ static int dissect_RequestedFeatureSetEntryIndex_PDU(tvbuff_t *tvb _U_, packet_i
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_Requested_PDCCH_BlindDetectionSCG_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_f1ap_Requested_PDCCH_BlindDetectionSCG(tvb, offset, &asn1_ctx, tree, hf_f1ap_Requested_PDCCH_BlindDetectionSCG_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_RequestedP_MaxFR2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -10690,7 +10810,7 @@ static int dissect_F1AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
/*--- End of included file: packet-f1ap-fn.c ---*/
-#line 138 "./asn1/f1ap/packet-f1ap-template.c"
+#line 140 "./asn1/f1ap/packet-f1ap-template.c"
static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
@@ -11002,6 +11122,10 @@ void proto_register_f1ap(void) {
{ "FullConfiguration", "f1ap.FullConfiguration",
FT_UINT32, BASE_DEC, VALS(f1ap_FullConfiguration_vals), 0,
NULL, HFILL }},
+ { &hf_f1ap_CG_Config_PDU,
+ { "CG-Config", "f1ap.CG_Config",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_GNB_CUSystemInformation_PDU,
{ "GNB-CUSystemInformation", "f1ap.GNB_CUSystemInformation_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -11130,6 +11254,10 @@ void proto_register_f1ap(void) {
{ "PagingPriority", "f1ap.PagingPriority",
FT_UINT32, BASE_DEC, VALS(f1ap_PagingPriority_vals), 0,
NULL, HFILL }},
+ { &hf_f1ap_PDCCH_BlindDetectionSCG_PDU,
+ { "PDCCH-BlindDetectionSCG", "f1ap.PDCCH_BlindDetectionSCG",
+ FT_UINT8, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_PDCPSNLength_PDU,
{ "PDCPSNLength", "f1ap.PDCPSNLength",
FT_UINT32, BASE_DEC, VALS(f1ap_PDCPSNLength_vals), 0,
@@ -11138,6 +11266,10 @@ void proto_register_f1ap(void) {
{ "PDUSessionID", "f1ap.PDUSessionID",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_Ph_InfoMCG_PDU,
+ { "Ph-InfoMCG", "f1ap.Ph_InfoMCG",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_Ph_InfoSCG_PDU,
{ "Ph-InfoSCG", "f1ap.Ph_InfoSCG",
FT_BYTES, BASE_NONE, NULL, 0,
@@ -11190,6 +11322,10 @@ void proto_register_f1ap(void) {
{ "RequestedFeatureSetEntryIndex", "f1ap.RequestedFeatureSetEntryIndex",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_Requested_PDCCH_BlindDetectionSCG_PDU,
+ { "Requested-PDCCH-BlindDetectionSCG", "f1ap.Requested_PDCCH_BlindDetectionSCG",
+ FT_UINT8, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_RequestedP_MaxFR2_PDU,
{ "RequestedP-MaxFR2", "f1ap.RequestedP_MaxFR2",
FT_BYTES, BASE_NONE, NULL, 0,
@@ -13004,7 +13140,7 @@ void proto_register_f1ap(void) {
"UnsuccessfulOutcome_value", HFILL }},
/*--- End of included file: packet-f1ap-hfarr.c ---*/
-#line 219 "./asn1/f1ap/packet-f1ap-template.c"
+#line 221 "./asn1/f1ap/packet-f1ap-template.c"
};
/* List of subtrees */
@@ -13014,7 +13150,7 @@ void proto_register_f1ap(void) {
&ett_f1ap_PLMN_Identity,
&ett_f1ap_MIB_message,
&ett_f1ap_SIB1_message,
- &ett_f1ap_SCG_Config_Info,
+ &ett_f1ap_CG_ConfigInfo,
&ett_f1ap_CellGroupConfig,
&ett_f1ap_TransportLayerAddress,
&ett_f1ap_UE_CapabilityRAT_ContainerList,
@@ -13036,6 +13172,8 @@ void proto_register_f1ap(void) {
&ett_f1ap_RequestedFeatureSetEntryIndex,
&ett_f1ap_RequestedP_MaxFR2,
&ett_f1ap_UEAssistanceInformation,
+ &ett_f1ap_CG_Config,
+ &ett_f1ap_Ph_InfoMCG,
/*--- Included file: packet-f1ap-ettarr.c ---*/
#line 1 "./asn1/f1ap/packet-f1ap-ettarr.c"
@@ -13310,7 +13448,7 @@ void proto_register_f1ap(void) {
&ett_f1ap_UnsuccessfulOutcome,
/*--- End of included file: packet-f1ap-ettarr.c ---*/
-#line 251 "./asn1/f1ap/packet-f1ap-template.c"
+#line 255 "./asn1/f1ap/packet-f1ap-template.c"
};
/* Register protocol */
@@ -13562,6 +13700,10 @@ proto_reg_handoff_f1ap(void)
dissector_add_uint("f1ap.extension", id_AdditionalSIBMessageList, create_dissector_handle(dissect_AdditionalSIBMessageList_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_Cell_Type, create_dissector_handle(dissect_CellType_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_IgnorePRACHConfiguration, create_dissector_handle(dissect_IgnorePRACHConfiguration_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.extension", id_CG_Config, create_dissector_handle(dissect_CG_Config_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.extension", id_PDCCH_BlindDetectionSCG, create_dissector_handle(dissect_PDCCH_BlindDetectionSCG_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.extension", id_Requested_PDCCH_BlindDetectionSCG, create_dissector_handle(dissect_Requested_PDCCH_BlindDetectionSCG_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.extension", id_Ph_InfoMCG, create_dissector_handle(dissect_Ph_InfoMCG_PDU, proto_f1ap));
dissector_add_uint("f1ap.proc.imsg", id_Reset, create_dissector_handle(dissect_Reset_PDU, proto_f1ap));
dissector_add_uint("f1ap.proc.sout", id_Reset, create_dissector_handle(dissect_ResetAcknowledge_PDU, proto_f1ap));
dissector_add_uint("f1ap.proc.imsg", id_F1Setup, create_dissector_handle(dissect_F1SetupRequest_PDU, proto_f1ap));
@@ -13611,7 +13753,7 @@ proto_reg_handoff_f1ap(void)
/*--- End of included file: packet-f1ap-dis-tab.c ---*/
-#line 277 "./asn1/f1ap/packet-f1ap-template.c"
+#line 281 "./asn1/f1ap/packet-f1ap-template.c"
}
/*
diff --git a/epan/dissectors/packet-nr-rrc.c b/epan/dissectors/packet-nr-rrc.c
index f79745e5ba..e270e0031c 100644
--- a/epan/dissectors/packet-nr-rrc.c
+++ b/epan/dissectors/packet-nr-rrc.c
@@ -259,6 +259,7 @@ static int hf_nr_rrc_nr_rrc_BandCombinationIndex_PDU = -1; /* BandCombinationIn
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_PH_TypeListMCG_PDU = -1; /* PH_TypeListMCG */
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_nr_rrc_UERadioPagingInformation_PDU = -1; /* UERadioPagingInformation */
@@ -43877,6 +43878,16 @@ int dissect_nr_rrc_ConfigRestrictInfoSCG_PDU(tvbuff_t *tvb _U_, packet_info *pin
offset += 7; offset >>= 3;
return offset;
}
+int dissect_nr_rrc_PH_TypeListMCG_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_TypeListMCG(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_nr_rrc_PH_TypeListMCG_PDU);
+ 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);
@@ -44343,6 +44354,10 @@ proto_register_nr_rrc(void) {
{ "ConfigRestrictInfoSCG", "nr-rrc.ConfigRestrictInfoSCG_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_nr_rrc_nr_rrc_PH_TypeListMCG_PDU,
+ { "PH-TypeListMCG", "nr-rrc.PH_TypeListMCG",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_FeatureSetEntryIndex_PDU,
{ "FeatureSetEntryIndex", "nr-rrc.FeatureSetEntryIndex",
FT_UINT32, BASE_DEC, NULL, 0,
diff --git a/epan/dissectors/packet-nr-rrc.h b/epan/dissectors/packet-nr-rrc.h
index 09e7c7d629..6726ea17b3 100644
--- a/epan/dissectors/packet-nr-rrc.h
+++ b/epan/dissectors/packet-nr-rrc.h
@@ -30,6 +30,7 @@ int dissect_nr_rrc_BandCombinationIndex_PDU(tvbuff_t *tvb _U_, packet_info *pinf
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_PH_TypeListMCG_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_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 09:47:48 +0000