aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Quantin <pascal@wireshark.org>2023-01-11 16:57:49 +0100
committerPascal Quantin <pascal@wireshark.org>2023-01-11 16:57:49 +0100
commitce9689da01a38df5c2d8be09e9d6e68b8b2e70d7 (patch)
tree545391f57e819ea5efd97e4ac8ef55173b5bcef9
parentb1482084b389310a7421e69bc3456f8fdb60ca79 (diff)
F1AP: upgrade dissector to v17.3.0
-rw-r--r--epan/dissectors/asn1/f1ap/F1AP-CommonDataTypes.asn2
-rw-r--r--epan/dissectors/asn1/f1ap/F1AP-Constants.asn28
-rw-r--r--epan/dissectors/asn1/f1ap/F1AP-Containers.asn2
-rw-r--r--epan/dissectors/asn1/f1ap/F1AP-IEs.asn183
-rw-r--r--epan/dissectors/asn1/f1ap/F1AP-PDU-Contents.asn138
-rw-r--r--epan/dissectors/asn1/f1ap/F1AP-PDU-Descriptions.asn18
-rw-r--r--epan/dissectors/asn1/f1ap/f1ap.cnf64
-rw-r--r--epan/dissectors/asn1/f1ap/packet-f1ap-template.c10
-rw-r--r--epan/dissectors/asn1/nr-rrc/nr-rrc.cnf4
-rw-r--r--epan/dissectors/packet-f1ap.c886
-rw-r--r--epan/dissectors/packet-nr-rrc.c30
-rw-r--r--epan/dissectors/packet-nr-rrc.h2
12 files changed, 1098 insertions, 269 deletions
diff --git a/epan/dissectors/asn1/f1ap/F1AP-CommonDataTypes.asn b/epan/dissectors/asn1/f1ap/F1AP-CommonDataTypes.asn
index 2c64be3656..5a8add04dd 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 V17.2.0 (2022-09)
+-- 3GPP TS 38.473 V17.3.0 (2022-12)
-- 9.4.6 Common Definitions
-- **************************************************************
--
diff --git a/epan/dissectors/asn1/f1ap/F1AP-Constants.asn b/epan/dissectors/asn1/f1ap/F1AP-Constants.asn
index d70aa91b65..275db9ed74 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 V17.2.0 (2022-09)
+-- 3GPP TS 38.473 V17.3.0 (2022-12)
-- 9.4.7 Constant Definitions
-- **************************************************************
--
@@ -114,6 +114,7 @@ id-measurementActivation ProcedureCode ::= 77
id-QoEInformationTransfer ProcedureCode ::= 78
id-PDCMeasurementTerminationCommand ProcedureCode ::= 79
id-PDCMeasurementFailureIndication ProcedureCode ::= 80
+id-PosSystemInformationDeliveryCommand ProcedureCode ::= 81
@@ -254,6 +255,7 @@ maxnoofMBSSessionsofUE INTEGER ::= 256
maxnoofSLdestinations INTEGER ::= 32
maxnoofNSAGs INTEGER ::= 256
maxnoofSDTBearers INTEGER ::= 72
+maxnoofPosSITypes INTEGER ::= 32
@@ -840,8 +842,8 @@ id-Unknown-563 ProtocolIE-ID ::= 563
id-NumberOfTRPRxTEG ProtocolIE-ID ::= 564
id-NumberOfTRPRxTxTEG ProtocolIE-ID ::= 565
id-TRPTxTEGAssociation ProtocolIE-ID ::= 566
-id-TRPTEGIDInformation ProtocolIE-ID ::= 567
-id-TRPRXTEGID ProtocolIE-ID ::= 568
+id-TRPTEGInformation ProtocolIE-ID ::= 567
+id-TRPRx-TEGInformation ProtocolIE-ID ::= 568
id-TRP-PRS-Info-List ProtocolIE-ID ::= 569
id-PRS-Measurement-Info-List ProtocolIE-ID ::= 570
id-PRSConfigRequestType ProtocolIE-ID ::= 571
@@ -861,7 +863,7 @@ id-NRPagingeDRXInformationforRRCINACTIVE ProtocolIE-ID ::= 583
id-NR-TADV ProtocolIE-ID ::= 584
id-QoEInformation ProtocolIE-ID ::= 585
id-CG-SDTQueryIndication ProtocolIE-ID ::= 586
-id-SDT-MAC-PHY-CG-Config ProtocolIE-ID ::= 587
+id-SDT-MAC-PHY-CG-Config ProtocolIE-ID ::= 587
id-CG-SDTKeptIndicator ProtocolIE-ID ::= 588
id-CG-SDTindicatorSetup ProtocolIE-ID ::= 589
id-CG-SDTindicatorMod ProtocolIE-ID ::= 590
@@ -942,9 +944,9 @@ id-PEISubgroupingSupportIndication ProtocolIE-ID ::= 664
id-NeedForGapsInfoNR ProtocolIE-ID ::= 665
id-NeedForGapNCSGInfoNR ProtocolIE-ID ::= 666
id-NeedForGapNCSGInfoEUTRA ProtocolIE-ID ::= 667
-id-TRPTxTimingErrorMargin ProtocolIE-ID ::= 668
-id-TRPRxTimingErrorMargin ProtocolIE-ID ::= 669
-id-TRPRxTxTimingErrorMargin ProtocolIE-ID ::= 670
+id-procedure-code-668-not-to-be-used ProtocolIE-ID ::= 668
+id-procedure-code-669-not-to-be-used ProtocolIE-ID ::= 669
+id-procedure-code-670-not-to-be-used ProtocolIE-ID ::= 670
id-Source-MRB-ID ProtocolIE-ID ::= 671
id-PosMeasurementPeriodicityNR-AoA ProtocolIE-ID ::= 672
id-RedCapIndication ProtocolIE-ID ::= 673
@@ -952,5 +954,17 @@ id-SRSPosRRCInactiveConfig ProtocolIE-ID ::= 674
id-SDTBearerConfigurationQueryIndication ProtocolIE-ID ::= 675
id-SDTBearerConfigurationInfo ProtocolIE-ID ::= 676
id-UL-GapFR2-Config ProtocolIE-ID ::= 677
+id-ConfigRestrictInfoDAPS ProtocolIE-ID ::= 678
+id-UE-MulticastMRBs-Setup-List ProtocolIE-ID ::= 679
+id-UE-MulticastMRBs-Setup-Item ProtocolIE-ID ::= 680
+id-MulticastF1UContextReferenceCU ProtocolIE-ID ::= 681
+id-PosSItypeList ProtocolIE-ID ::= 682
+id-DAPS-HO-Status ProtocolIE-ID ::= 683
+id-UplinkTxDirectCurrentTwoCarrierListInfo ProtocolIE-ID ::= 684
+id-UE-MulticastMRBs-ToBeSetup-atModify-List ProtocolIE-ID ::= 685
+id-UE-MulticastMRBs-ToBeSetup-atModify-Item ProtocolIE-ID ::= 686
+id-MC-PagingCell-List ProtocolIE-ID ::= 687
+id-MC-PagingCell-Item ProtocolIE-ID ::= 688
+id-SRSPosRRCInactiveQueryIndication ProtocolIE-ID ::= 689
END
diff --git a/epan/dissectors/asn1/f1ap/F1AP-Containers.asn b/epan/dissectors/asn1/f1ap/F1AP-Containers.asn
index 9aaf281ca7..e28adf06b2 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 V17.2.0 (2022-09)
+-- 3GPP TS 38.473 V17.3.0 (2022-12)
-- 9.4.8 Container Definitions
-- **************************************************************
--
diff --git a/epan/dissectors/asn1/f1ap/F1AP-IEs.asn b/epan/dissectors/asn1/f1ap/F1AP-IEs.asn
index 8311c28331..611dcdd639 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 V17.2.0 (2022-09)
+-- 3GPP TS 38.473 V17.3.0 (2022-12)
-- 9.4.5 Information Element Definitions
-- **************************************************************
--
@@ -155,8 +155,8 @@ IMPORTS
id-NumberOfTRPRxTEG,
id-NumberOfTRPRxTxTEG,
id-TRPTxTEGAssociation,
- id-TRPTEGIDInformation,
- id-TRPRXTEGID,
+ id-TRPTEGInformation,
+ id-TRPRx-TEGInformation,
id-TRPBeamAntennaInformation,
id-Redcap-Bcast-Information,
id-NR-TADV,
@@ -189,12 +189,11 @@ IMPORTS
id-NeedForGapsInfoNR,
id-NeedForGapNCSGInfoNR,
id-NeedForGapNCSGInfoEUTRA,
- id-TRPTxTimingErrorMargin,
- id-TRPRxTimingErrorMargin,
- id-TRPRxTxTimingErrorMargin,
id-Source-MRB-ID,
id-RedCapIndication,
id-UL-GapFR2-Config,
+ id-ConfigRestrictInfoDAPS,
+ id-MulticastF1UContextReferenceCU,
maxNRARFCN,
maxnoofErrors,
maxnoofBPLMNs,
@@ -300,7 +299,8 @@ IMPORTS
maxnoofMBSSessionsofUE,
maxnoofSLdestinations,
maxnoofNSAGs,
- maxnoofSDTBearers
+ maxnoofSDTBearers,
+ maxnoofPosSITypes
FROM F1AP-Constants
@@ -983,9 +983,9 @@ BroadcastMRBs-SetupMod-Item-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
BroadcastMRBs-ToBeModified-Item ::= SEQUENCE {
mRB-ID MRB-ID,
- mRB-QoSInformation QoSInformation OPTIONAL,
+ mRB-QoSInformation QoSFlowLevelQoSParameters OPTIONAL,
mBS-Flows-Mapped-To-MRB-List MBS-Flows-Mapped-To-MRB-List OPTIONAL,
- bcBearerCtxtF1U-TNLInfoatCU BCBearerContextF1U-TNLInfo OPTIONAL,
+ bcBearerCtxtF1U-TNLInfoatCU BCBearerContextF1U-TNLInfo OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { BroadcastMRBs-ToBeModified-Item-ExtIEs} } OPTIONAL,
...
}
@@ -1006,7 +1006,7 @@ BroadcastMRBs-ToBeReleased-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
BroadcastMRBs-ToBeSetup-Item ::= SEQUENCE {
mRB-ID MRB-ID,
- mRB-QoSInformation QoSInformation,
+ mRB-QoSInformation QoSFlowLevelQoSParameters,
mBS-Flows-Mapped-To-MRB-List MBS-Flows-Mapped-To-MRB-List,
bcBearerCtxtF1U-TNLInfoatCU BCBearerContextF1U-TNLInfo ,
iE-Extensions ProtocolExtensionContainer { { BroadcastMRBs-ToBeSetup-Item-ExtIEs} },
@@ -1019,9 +1019,9 @@ BroadcastMRBs-ToBeSetup-Item-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
BroadcastMRBs-ToBeSetupMod-Item ::= SEQUENCE {
mRB-ID MRB-ID,
- mRB-QoSInformation QoSInformation,
+ mRB-QoSInformation QoSFlowLevelQoSParameters,
mBS-Flows-Mapped-To-MRB-List MBS-Flows-Mapped-To-MRB-List,
- bcBearerCtxtF1U-TNLInfoatCU BCBearerContextF1U-TNLInfo OPTIONAL,
+ bcBearerCtxtF1U-TNLInfoatCU BCBearerContextF1U-TNLInfo OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { BroadcastMRBs-ToBeSetupMod-Item-ExtIEs} },
...
}
@@ -1506,6 +1506,8 @@ ConditionalIntraDUMobilityInformation-ExtIEs F1AP-PROTOCOL-EXTENSION ::={
...
}
+ConfigRestrictInfoDAPS ::= OCTET STRING
+
ConfiguredTACIndication ::= ENUMERATED {
true,
...
@@ -1641,12 +1643,15 @@ CUtoDURRCInformation-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-MBSInterestIndication CRITICALITY ignore EXTENSION MBSInterestIndication PRESENCE optional }|
{ ID id-NeedForGapsInfoNR CRITICALITY ignore EXTENSION NeedForGapsInfoNR PRESENCE optional }|
{ ID id-NeedForGapNCSGInfoNR CRITICALITY ignore EXTENSION NeedForGapNCSGInfoNR PRESENCE optional }|
- { ID id-NeedForGapNCSGInfoEUTRA CRITICALITY ignore EXTENSION NeedForGapNCSGInfoEUTRA PRESENCE optional },
+ { ID id-NeedForGapNCSGInfoEUTRA CRITICALITY ignore EXTENSION NeedForGapNCSGInfoEUTRA PRESENCE optional }|
+ { ID id-ConfigRestrictInfoDAPS CRITICALITY ignore EXTENSION ConfigRestrictInfoDAPS PRESENCE optional },
...
}
-- D
+DAPS-HO-Status::= ENUMERATED{initiation,... }
+
DCBasedDuplicationConfigured::= ENUMERATED{true,..., false}
Dedicated-SIDelivery-NeededUE-Item ::= SEQUENCE {
@@ -2929,7 +2934,7 @@ GNB-RxTxTimeDiff ::= SEQUENCE {
GNB-RxTxTimeDiff-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
{ ID id-ExtendedAdditionalPathList CRITICALITY ignore EXTENSION ExtendedAdditionalPathList PRESENCE optional}|
- { ID id-TRPTEGIDInformation CRITICALITY ignore EXTENSION TRPTEGIDInformation PRESENCE optional },
+ { ID id-TRPTEGInformation CRITICALITY ignore EXTENSION TRPTEGInformation PRESENCE optional },
...
}
@@ -3675,6 +3680,14 @@ MBS-ServiceAreaInformationItem-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
+MC-PagingCell-Item ::= SEQUENCE {
+ nRCGI NRCGI,
+ iE-Extensions ProtocolExtensionContainer { { MC-PagingCell-ItemExtIEs } } OPTIONAL
+}
+
+MC-PagingCell-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
MIB-message ::= OCTET STRING
@@ -3722,6 +3735,8 @@ MRB-ProgressInformation-ExtIEs F1AP-PROTOCOL-IES ::= {
MulticastF1UContextReferenceF1 ::= OCTET STRING (SIZE(4))
+MulticastF1UContextReferenceCU ::= OCTET STRING (SIZE(4))
+
MultipleULAoA ::= SEQUENCE {
multipleULAoA MultipleULAoA-List,
iE-Extensions ProtocolExtensionContainer { { MultipleULAoA-ExtIEs} } OPTIONAL,
@@ -3824,7 +3839,7 @@ MulticastMRBs-SetupMod-Item-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
MulticastMRBs-ToBeModified-Item ::= SEQUENCE {
mRB-ID MRB-ID,
- mRB-QoSInformation QoSInformation OPTIONAL,
+ mRB-QoSInformation QoSFlowLevelQoSParameters OPTIONAL,
mBS-Flows-Mapped-To-MRB-List MBS-Flows-Mapped-To-MRB-List OPTIONAL,
mBS-DL-PDCP-SN-Length PDCPSNLength OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { MulticastMRBs-ToBeModified-Item-ExtIEs} } OPTIONAL,
@@ -3847,7 +3862,7 @@ MulticastMRBs-ToBeReleased-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
MulticastMRBs-ToBeSetup-Item ::= SEQUENCE {
mRB-ID MRB-ID,
- mRB-QoSInformation QoSInformation,
+ mRB-QoSInformation QoSFlowLevelQoSParameters,
mBS-Flows-Mapped-To-MRB-List MBS-Flows-Mapped-To-MRB-List,
mBS-DL-PDCP-SN-Length PDCPSNLength,
iE-Extensions ProtocolExtensionContainer { { MulticastMRBs-ToBeSetup-Item-ExtIEs} },
@@ -3860,7 +3875,7 @@ MulticastMRBs-ToBeSetup-Item-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
MulticastMRBs-ToBeSetupMod-Item ::= SEQUENCE {
mRB-ID MRB-ID,
- mRB-QoSInformation QoSInformation,
+ mRB-QoSInformation QoSFlowLevelQoSParameters,
mBS-Flows-Mapped-To-MRB-List MBS-Flows-Mapped-To-MRB-List,
mBS-DL-PDCP-SN-Length PDCPSNLength,
iE-Extensions ProtocolExtensionContainer { { MulticastMRBs-ToBeSetupMod-Item-ExtIEs} },
@@ -5009,6 +5024,18 @@ PosResourceSetTypeAP-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
+PosSItypeList ::= SEQUENCE (SIZE(1.. maxnoofPosSITypes)) OF PosSItype-Item
+PosSItype-Item ::= SEQUENCE {
+ posItype PosSItype ,
+ iE-Extensions ProtocolExtensionContainer { { PosSItype-ItemExtIEs } } OPTIONAL
+}
+
+PosSItype-ItemExtIEs F1AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+PosSItype ::= INTEGER (1..32, ...)
+
PosSRSResourceID-List ::= SEQUENCE (SIZE (1..maxnoSRS-PosResourcePerSet)) OF SRSPosResourceID
PosSRSResource-Item ::= SEQUENCE {
@@ -5809,7 +5836,7 @@ ResourceTypePos-ExtIEs F1AP-PROTOCOL-IES ::= {
}
ResourceTypePeriodicPos ::= SEQUENCE {
- periodicity ENUMERATED{slot1, slot2, slot4, slot5, slot8, slot10, slot16, slot20, slot32, slot40, slot64, slot80, slot160, slot320, slot640, slot1280, slot2560, slot5120, slot10240, slot40960, slot81920, ...},
+ periodicity ENUMERATED{slot1, slot2, slot4, slot5, slot8, slot10, slot16, slot20, slot32, slot40, slot64, slot80, slot160, slot320, slot640, slot1280, slot2560, slot5120, slot10240, slot40960, slot81920, ..., slot128, slot256, slot512, slot20480},
offset INTEGER(0..81919, ...),
iE-Extensions ProtocolExtensionContainer { { ResourceTypePeriodicPos-ExtIEs} } OPTIONAL
}
@@ -5819,7 +5846,7 @@ ResourceTypePeriodicPos-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
}
ResourceTypeSemi-persistentPos ::= SEQUENCE {
- periodicity ENUMERATED{slot1, slot2, slot4, slot5, slot8, slot10, slot16, slot20, slot32, slot40, slot64, slot80, slot160, slot320, slot640, slot1280, slot2560, slot5120, slot10240, slot40960, slot81920, ...},
+ periodicity ENUMERATED{slot1, slot2, slot4, slot5, slot8, slot10, slot16, slot20, slot32, slot40, slot64, slot80, slot160, slot320, slot640, slot1280, slot2560, slot5120, slot10240, slot40960, slot81920, ..., slot128, slot256, slot512, slot20480},
offset INTEGER(0..81919, ...),
iE-Extensions ProtocolExtensionContainer { { ResourceTypeSemi-persistentPos-ExtIEs} } OPTIONAL
}
@@ -5951,6 +5978,7 @@ ResponseTime-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
+RxTxTimingErrorMargin ::= ENUMERATED {tc0dot5, tc1, tc2, tc4, tc8, tc12, tc16, tc20, tc24, tc32, tc40, tc48, tc64, tc80, tc96, tc128, ...}
-- S
@@ -6896,6 +6924,8 @@ SRSInfo ::= SEQUENCE {
SRSPosRRCInactiveConfig ::= OCTET STRING
+SRSPosRRCInactiveQueryIndication ::= ENUMERATED {true, ...}
+
PosSRSInfo ::= SEQUENCE {
posSRSResourceID SRSPosResourceID,
...
@@ -7170,38 +7200,35 @@ TDD-InfoRel16-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
TDD-UL-DLConfigCommonNR ::= OCTET STRING
-TRPTEGIDInformation ::= CHOICE {
+TRPTEGInformation ::= CHOICE {
rxTx-TEG RxTxTEG,
rx-TEG RxTEG,
- choice-extension ProtocolIE-SingleContainer { { TRPTEGIDInformation-ExtIEs} }
+ choice-extension ProtocolIE-SingleContainer { { TRPTEGInformation-ExtIEs} }
}
-TRPTEGIDInformation-ExtIEs F1AP-PROTOCOL-IES ::= {
+TRPTEGInformation-ExtIEs F1AP-PROTOCOL-IES ::= {
...
}
RxTxTEG ::= SEQUENCE {
- tRP-RxTx-TEGID INTEGER (0..255),
- tRP-Tx-TEGID INTEGER (0..7) OPTIONAL,
+ tRP-RxTx-TEGInformation TRP-RxTx-TEGInformation,
+ tRP-Tx-TEGInformation TRP-Tx-TEGInformation OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { RxTxTEG-ExtIEs } } OPTIONAL,
...
}
RxTxTEG-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
- { ID id-TRPRxTxTimingErrorMargin CRITICALITY ignore EXTENSION TimingErrorMargin PRESENCE optional }|
- { ID id-TRPTxTimingErrorMargin CRITICALITY ignore EXTENSION TimingErrorMargin PRESENCE optional },
...
}
+
RxTEG ::= SEQUENCE {
- tRP-Rx-TEGID INTEGER (0..31),
- tRP-Tx-TEGID INTEGER (0..7),
+ tRP-Rx-TEGInformation TRP-Rx-TEGInformation,
+ tRP-Tx-TEGInformation TRP-Tx-TEGInformation,
iE-Extensions ProtocolExtensionContainer { { RxTEG-ExtIEs } } OPTIONAL,
...
}
RxTEG-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
- { ID id-TRPRxTimingErrorMargin CRITICALITY ignore EXTENSION TimingErrorMargin PRESENCE optional }|
- { ID id-TRPTxTimingErrorMargin CRITICALITY ignore EXTENSION TimingErrorMargin PRESENCE optional },
...
}
@@ -7246,7 +7273,7 @@ TimeStampSlotIndex-ExtIEs F1AP-PROTOCOL-IES ::= {
TimeToWait ::= ENUMERATED {v1s, v2s, v5s, v10s, v20s, v60s, ...}
-TimingErrorMargin ::= ENUMERATED {m0Tc, m2Tc, m4Tc, m6Tc, m8Tc, m12Tc, m16Tc, m20Tc, m24Tc, m32Tc, m40Tc, m48Tc, m56Tc, m64Tc, m72Tc, m80Tc, ...}
+TimingErrorMargin ::= ENUMERATED {m0Tc, m2Tc, m4Tc, m6Tc, m8Tc, m12Tc, m16Tc, m20Tc, m24Tc, m32Tc, m40Tc, m48Tc, m56Tc, m64Tc, m72Tc, m80Tc, ...}
TimingMeasurementQuality ::= SEQUENCE {
measurementQuality INTEGER(0..31),
@@ -7638,18 +7665,51 @@ TRPReferencePointType-ExtIEs F1AP-PROTOCOL-IES ::= {
...
}
+TRP-Rx-TEGInformation ::= SEQUENCE {
+ tRP-Rx-TEGID INTEGER (0..31),
+ tRP-Rx-TimingErrorMargin TimingErrorMargin,
+ iE-Extensions ProtocolExtensionContainer { { TRP-Rx-TEGInformation-ExtIEs } } OPTIONAL,
+ ...
+}
+
+TRP-Rx-TEGInformation-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+TRP-RxTx-TEGInformation ::= SEQUENCE {
+ tRP-RxTx-TEGID INTEGER (0..255),
+ tRP-RxTx-TimingErrorMargin RxTxTimingErrorMargin,
+ iE-Extensions ProtocolExtensionContainer { { TRP-RxTx-TEGInformation-ExtIEs } } OPTIONAL,
+ ...
+}
+
+TRP-RxTx-TEGInformation-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+
+TRP-Tx-TEGInformation ::= SEQUENCE {
+ tRP-Tx-TEGID INTEGER (0..7),
+ tRP-Tx-TimingErrorMargin TimingErrorMargin,
+ iE-Extensions ProtocolExtensionContainer { { TRP-Tx-TEGInformation-ExtIEs } } OPTIONAL,
+ ...
+}
+
+TRP-Tx-TEGInformation-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
TRPTxTEGAssociation ::= SEQUENCE (SIZE(1.. maxnoTRPTEGs)) OF TRPTEG-Item
TRPTEG-Item ::= SEQUENCE {
- tRP-Tx-TEG-ID INTEGER (0..7),
- dl-PRSResourceSetID PRS-Resource-Set-ID,
+ tRP-Tx-TEGInformation TRP-Tx-TEGInformation,
+ dl-PRSResourceSetID PRS-Resource-Set-ID,
dl-PRSResourceID-List SEQUENCE (SIZE(1.. maxnoofPRS-ResourcesPerSet)) OF DLPRSResourceID-Item OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { TRPTEGItem-ExtIEs } } OPTIONAL,
...
}
TRPTEGItem-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
- { ID id-TRPTxTimingErrorMargin CRITICALITY ignore EXTENSION TimingErrorMargin PRESENCE optional },
...
}
@@ -7842,20 +7902,21 @@ UE-MulticastMRBs-ConfirmedToBeModified-Item-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
UE-MulticastMRBs-RequiredToBeModified-Item::= SEQUENCE {
- mRB-ID MRB-ID,
- mrb-type-reconfiguration ENUMERATED {true, ...} OPTIONAL,
- mrb-reconfigured-RLCtype ENUMERATED {
- rlc-um-ptp,
- rlc-am-ptp,
- rlc-um-dl-ptm,
- two-rlc-um-dl-ptp-and-dl-ptm,
- three-rlc-um-dl-ptp-ul-ptp-dl-ptm,
- two-rlc-am-ptp-um-dl-ptm,
- ...} OPTIONAL,
- iE-Extensions ProtocolExtensionContainer { { UE-MulticastMRBs-RequiredToBeModified-Item-ExtIEs } } OPTIONAL
+ mRB-ID MRB-ID,
+ mrb-type-reconfiguration ENUMERATED {true, ...} OPTIONAL,
+ mrb-reconfigured-RLCtype ENUMERATED {
+ rlc-um-ptp,
+ rlc-am-ptp,
+ rlc-um-dl-ptm,
+ two-rlc-um-dl-ptp-and-dl-ptm,
+ three-rlc-um-dl-ptp-ul-ptp-dl-ptm,
+ two-rlc-am-ptp-um-dl-ptm,
+ ...} OPTIONAL,
+ iE-Extensions ProtocolExtensionContainer { { UE-MulticastMRBs-RequiredToBeModified-Item-ExtIEs } } OPTIONAL
}
UE-MulticastMRBs-RequiredToBeModified-Item-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
+ { ID id-MulticastF1UContextReferenceCU CRITICALITY reject EXTENSION MulticastF1UContextReferenceCU PRESENCE optional},
...
}
@@ -7868,6 +7929,15 @@ UE-MulticastMRBs-RequiredToBeReleased-Item-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
+UE-MulticastMRBs-Setup-Item ::= SEQUENCE {
+ mRB-ID MRB-ID,
+ multicastF1UContextReferenceCU MulticastF1UContextReferenceCU OPTIONAL,
+ iE-Extensions ProtocolExtensionContainer { { UE-MulticastMRBs-Setup-Item-ExtIEs } } OPTIONAL
+}
+
+UE-MulticastMRBs-Setup-Item-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
UE-MulticastMRBs-ToBeReleased-Item ::= SEQUENCE {
mRB-ID MRB-ID,
@@ -7890,6 +7960,17 @@ UE-MulticastMRBs-ToBeSetup-Item-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
...
}
+UE-MulticastMRBs-ToBeSetup-atModify-Item ::= SEQUENCE {
+ mRB-ID MRB-ID,
+ mbsPTPRetransmissionTunnelRequired MBSPTPRetransmissionTunnelRequired OPTIONAL,
+ mbsPTPForwardingRequiredInformation MRB-ProgressInformation OPTIONAL,
+ iE-Extensions ProtocolExtensionContainer { { UE-MulticastMRBs-ToBeSetup-atModify-Item-ExtIEs } } OPTIONAL
+}
+
+UE-MulticastMRBs-ToBeSetup-atModify-Item-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
UEPagingCapability ::= SEQUENCE {
iNACTIVEStatePODetermination ENUMERATED {supported, ...} OPTIONAL,
@@ -7965,6 +8046,8 @@ UL-RTOA-Measurement ::= SEQUENCE {
}
UL-RTOA-Measurement-ExtIEs F1AP-PROTOCOL-EXTENSION ::= {
+ { ID id-ExtendedAdditionalPathList CRITICALITY ignore EXTENSION ExtendedAdditionalPathList PRESENCE optional}|
+ { ID id-TRPRx-TEGInformation CRITICALITY ignore EXTENSION TRP-Rx-TEGInformation PRESENCE optional},
...
}
@@ -7978,15 +8061,7 @@ UL-RTOA-MeasurementItem ::= CHOICE {
choice-extension ProtocolIE-SingleContainer { { UL-RTOA-MeasurementItem-ExtIEs } }
}
--- WS modification: define a specific type
-TRPRXTEGID ::= INTEGER (0..31)
-
UL-RTOA-MeasurementItem-ExtIEs F1AP-PROTOCOL-IES ::= {
- { ID id-ExtendedAdditionalPathList CRITICALITY ignore TYPE ExtendedAdditionalPathList PRESENCE optional}|
--- WS modification: define a specific type
--- { ID id-TRPRXTEGID CRITICALITY ignore TYPE INTEGER (0..31) PRESENCE optional }|
- { ID id-TRPRXTEGID CRITICALITY ignore TYPE TRPRXTEGID PRESENCE optional }|
- { ID id-TRPRxTimingErrorMargin CRITICALITY ignore TYPE TimingErrorMargin PRESENCE optional },
...
}
@@ -8048,6 +8123,8 @@ UplinkChannelBW-PerSCS-List ::= SEQUENCE (SIZE (1..maxnoSCSs)) OF SCS-SpecificCa
UplinkTxDirectCurrentListInformation ::= OCTET STRING
+UplinkTxDirectCurrentTwoCarrierListInfo ::= OCTET STRING
+
UPTransportLayerInformation ::= CHOICE {
gTPTunnel GTPTunnel,
choice-extension ProtocolIE-SingleContainer { { UPTransportLayerInformation-ExtIEs} }
diff --git a/epan/dissectors/asn1/f1ap/F1AP-PDU-Contents.asn b/epan/dissectors/asn1/f1ap/F1AP-PDU-Contents.asn
index 443aa98f31..5a971e9cdd 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 V17.2.0 (2022-09)
+-- 3GPP TS 38.473 V17.3.0 (2022-12)
-- 9.4.4 PDU Definitions
-- **************************************************************
--
@@ -80,6 +80,7 @@ IMPORTS
MBSMulticastF1UContextDescriptor,
MBS-Session-ID,
MBS-ServiceArea,
+ MulticastF1UContextReferenceCU,
MulticastF1UContext-ToBeSetup-Item,
MulticastF1UContext-Setup-Item,
MulticastF1UContext-FailedToBeSetup-Item,
@@ -377,8 +378,10 @@ IMPORTS
UE-MulticastMRBs-ConfirmedToBeModified-Item,
UE-MulticastMRBs-RequiredToBeModified-Item,
UE-MulticastMRBs-RequiredToBeReleased-Item,
+ UE-MulticastMRBs-Setup-Item,
UE-MulticastMRBs-ToBeReleased-Item,
UE-MulticastMRBs-ToBeSetup-Item,
+ UE-MulticastMRBs-ToBeSetup-atModify-Item,
PosMeasurementAmount,
BAP-Header-Rewriting-Removed-List-Item,
SLDRXCycleList,
@@ -388,7 +391,13 @@ IMPORTS
PosMeasurementPeriodicityNR-AoA,
SRSPosRRCInactiveConfig,
SDTBearerConfigurationQueryIndication,
- SDTBearerConfigurationInfo
+ SDTBearerConfigurationInfo,
+ PosSItypeList,
+ DAPS-HO-Status,
+ UuRLCChannelID,
+ UplinkTxDirectCurrentTwoCarrierListInfo,
+ SRSPosRRCInactiveQueryIndication,
+ MC-PagingCell-Item
@@ -494,6 +503,9 @@ FROM F1AP-Containers
id-MBS-Session-ID,
id-MBS-ServiceArea,
id-MBSMulticastF1UContextDescriptor,
+ id-MC-PagingCell-Item,
+ id-MC-PagingCell-List,
+ id-MulticastF1UContextReferenceCU,
id-MulticastMBSSessionSetupList,
id-MulticastMBSSessionRemoveList,
id-MulticastMRBs-FailedToBeModified-List,
@@ -593,8 +605,12 @@ FROM F1AP-Containers
id-UE-MulticastMRBs-RequiredToBeModified-Item,
id-UE-MulticastMRBs-RequiredToBeReleased-List,
id-UE-MulticastMRBs-RequiredToBeReleased-Item,
+ id-UE-MulticastMRBs-Setup-List,
+ id-UE-MulticastMRBs-Setup-Item,
id-UE-MulticastMRBs-ToBeReleased-List,
id-UE-MulticastMRBs-ToBeReleased-Item,
+ id-UE-MulticastMRBs-ToBeSetup-atModify-List,
+ id-UE-MulticastMRBs-ToBeSetup-atModify-Item,
id-UE-MulticastMRBs-ToBeSetup-List,
id-UE-MulticastMRBs-ToBeSetup-Item,
id-DUtoCURRCContainer,
@@ -893,6 +909,11 @@ FROM F1AP-Containers
id-SRSPosRRCInactiveConfig,
id-SDTBearerConfigurationQueryIndication,
id-SDTBearerConfigurationInfo,
+ id-PosSItypeList,
+ id-DAPS-HO-Status,
+ id-SRBMappingInfo,
+ id-UplinkTxDirectCurrentTwoCarrierListInfo,
+ id-SRSPosRRCInactiveQueryIndication,
maxCellingNBDU,
maxnoofCandidateSpCells,
maxnoofDRBs,
@@ -1803,30 +1824,32 @@ UEContextModificationRequestIEs F1AP-PROTOCOL-IES ::= {
{ ID id-ConditionalIntraDUMobilityInformation CRITICALITY reject TYPE ConditionalIntraDUMobilityInformation PRESENCE optional}|
{ ID id-F1CTransferPath CRITICALITY reject TYPE F1CTransferPath PRESENCE optional }|
{ ID id-SCGIndicator CRITICALITY ignore TYPE SCGIndicator PRESENCE optional }|
+ { ID id-UplinkTxDirectCurrentTwoCarrierListInfo CRITICALITY ignore TYPE UplinkTxDirectCurrentTwoCarrierListInfo PRESENCE optional }|
{ ID id-IABConditionalRRCMessageDeliveryIndication CRITICALITY reject TYPE IABConditionalRRCMessageDeliveryIndication PRESENCE optional }|
- { ID id-F1CTransferPathNRDC CRITICALITY reject TYPE F1CTransferPathNRDC PRESENCE optional }|
- { ID id-MDTPollutedMeasurementIndicator CRITICALITY ignore TYPE MDTPollutedMeasurementIndicator PRESENCE optional }|
- { ID id-SCGActivationRequest CRITICALITY ignore TYPE SCGActivationRequest PRESENCE optional }|
- { ID id-CG-SDTQueryIndication CRITICALITY ignore TYPE CG-SDTQueryIndication PRESENCE optional }|
- { ID id-FiveG-ProSeAuthorized CRITICALITY ignore TYPE FiveG-ProSeAuthorized PRESENCE optional }|
- { ID id-FiveG-ProSeUEPC5AggregateMaximumBitrate CRITICALITY ignore TYPE NRUESidelinkAggregateMaximumBitrate PRESENCE optional }|
- { ID id-FiveG-ProSePC5LinkAMBR CRITICALITY ignore TYPE BitRate PRESENCE optional}|
- { ID id-UpdatedRemoteUELocalID CRITICALITY ignore TYPE RemoteUELocalID PRESENCE optional }|
- { ID id-UuRLCChannelToBeSetupList CRITICALITY reject TYPE UuRLCChannelToBeSetupList PRESENCE optional}|
- { ID id-UuRLCChannelToBeModifiedList CRITICALITY reject TYPE UuRLCChannelToBeModifiedList PRESENCE optional}|
- { ID id-UuRLCChannelToBeReleasedList CRITICALITY reject TYPE UuRLCChannelToBeReleasedList PRESENCE optional}|
- { ID id-PC5RLCChannelToBeSetupList CRITICALITY reject TYPE PC5RLCChannelToBeSetupList PRESENCE optional}|
- { ID id-PC5RLCChannelToBeModifiedList CRITICALITY reject TYPE PC5RLCChannelToBeModifiedList PRESENCE optional}|
- { ID id-PC5RLCChannelToBeReleasedList CRITICALITY reject TYPE PC5RLCChannelToBeReleasedList PRESENCE optional}|
- { ID id-PathSwitchConfiguration CRITICALITY ignore TYPE PathSwitchConfiguration PRESENCE optional }|
- { ID id-GNBDUUESliceMaximumBitRateList CRITICALITY ignore TYPE GNBDUUESliceMaximumBitRateList PRESENCE optional }|
- { ID id-MulticastMBSSessionSetupList CRITICALITY reject TYPE MulticastMBSSessionList PRESENCE optional }|
- { ID id-MulticastMBSSessionRemoveList CRITICALITY reject TYPE MulticastMBSSessionList PRESENCE optional }|
- { ID id-UE-MulticastMRBs-ToBeSetup-List CRITICALITY reject TYPE UE-MulticastMRBs-ToBeSetup-List PRESENCE optional }|
- { ID id-UE-MulticastMRBs-ToBeReleased-List CRITICALITY reject TYPE UE-MulticastMRBs-ToBeReleased-List PRESENCE optional }|
- { ID id-SLDRXCycleList CRITICALITY ignore TYPE SLDRXCycleList PRESENCE optional }|
- { ID id-ManagementBasedMDTPLMNModificationList CRITICALITY ignore TYPE MDTPLMNModificationList PRESENCE optional }|
- { ID id-SDTBearerConfigurationQueryIndication CRITICALITY ignore TYPE SDTBearerConfigurationQueryIndication PRESENCE optional },
+ { ID id-F1CTransferPathNRDC CRITICALITY reject TYPE F1CTransferPathNRDC PRESENCE optional }|
+ { ID id-MDTPollutedMeasurementIndicator CRITICALITY ignore TYPE MDTPollutedMeasurementIndicator PRESENCE optional }|
+ { ID id-SCGActivationRequest CRITICALITY ignore TYPE SCGActivationRequest PRESENCE optional }|
+ { ID id-CG-SDTQueryIndication CRITICALITY ignore TYPE CG-SDTQueryIndication PRESENCE optional }|
+ { ID id-FiveG-ProSeAuthorized CRITICALITY ignore TYPE FiveG-ProSeAuthorized PRESENCE optional }|
+ { ID id-FiveG-ProSeUEPC5AggregateMaximumBitrate CRITICALITY ignore TYPE NRUESidelinkAggregateMaximumBitrate PRESENCE optional }|
+ { ID id-FiveG-ProSePC5LinkAMBR CRITICALITY ignore TYPE BitRate PRESENCE optional}|
+ { ID id-UpdatedRemoteUELocalID CRITICALITY ignore TYPE RemoteUELocalID PRESENCE optional }|
+ { ID id-UuRLCChannelToBeSetupList CRITICALITY reject TYPE UuRLCChannelToBeSetupList PRESENCE optional}|
+ { ID id-UuRLCChannelToBeModifiedList CRITICALITY reject TYPE UuRLCChannelToBeModifiedList PRESENCE optional}|
+ { ID id-UuRLCChannelToBeReleasedList CRITICALITY reject TYPE UuRLCChannelToBeReleasedList PRESENCE optional}|
+ { ID id-PC5RLCChannelToBeSetupList CRITICALITY reject TYPE PC5RLCChannelToBeSetupList PRESENCE optional}|
+ { ID id-PC5RLCChannelToBeModifiedList CRITICALITY reject TYPE PC5RLCChannelToBeModifiedList PRESENCE optional}|
+ { ID id-PC5RLCChannelToBeReleasedList CRITICALITY reject TYPE PC5RLCChannelToBeReleasedList PRESENCE optional}|
+ { ID id-PathSwitchConfiguration CRITICALITY ignore TYPE PathSwitchConfiguration PRESENCE optional }|
+ { ID id-GNBDUUESliceMaximumBitRateList CRITICALITY ignore TYPE GNBDUUESliceMaximumBitRateList PRESENCE optional }|
+ { ID id-MulticastMBSSessionSetupList CRITICALITY reject TYPE MulticastMBSSessionList PRESENCE optional }|
+ { ID id-MulticastMBSSessionRemoveList CRITICALITY reject TYPE MulticastMBSSessionList PRESENCE optional }|
+ { ID id-UE-MulticastMRBs-ToBeSetup-atModify-List CRITICALITY reject TYPE UE-MulticastMRBs-ToBeSetup-atModify-List PRESENCE optional }|
+ { ID id-UE-MulticastMRBs-ToBeReleased-List CRITICALITY reject TYPE UE-MulticastMRBs-ToBeReleased-List PRESENCE optional }|
+ { ID id-SLDRXCycleList CRITICALITY ignore TYPE SLDRXCycleList PRESENCE optional }|
+ { ID id-ManagementBasedMDTPLMNModificationList CRITICALITY ignore TYPE MDTPLMNModificationList PRESENCE optional }|
+ { ID id-SDTBearerConfigurationQueryIndication CRITICALITY ignore TYPE SDTBearerConfigurationQueryIndication PRESENCE optional }|
+ { ID id-DAPS-HO-Status CRITICALITY ignore TYPE DAPS-HO-Status PRESENCE optional } ,
...
}
@@ -1841,6 +1864,8 @@ BHChannels-ToBeModified-List ::= SEQUENCE (SIZE(1..maxnoofBHRLCChannels)) OF Pro
SRBs-ToBeReleased-List ::= SEQUENCE (SIZE(1..maxnoofSRBs)) OF ProtocolIE-SingleContainer { { SRBs-ToBeReleased-ItemIEs} }
DRBs-ToBeReleased-List ::= SEQUENCE (SIZE(1..maxnoofDRBs)) OF ProtocolIE-SingleContainer { { DRBs-ToBeReleased-ItemIEs} }
BHChannels-ToBeReleased-List ::= SEQUENCE (SIZE(1..maxnoofBHRLCChannels)) OF ProtocolIE-SingleContainer { { BHChannels-ToBeReleased-ItemIEs} }
+UE-MulticastMRBs-ToBeSetup-atModify-List ::= SEQUENCE (SIZE(1..maxnoofMRBsforUE)) OF
+ ProtocolIE-SingleContainer { { UE-MulticastMRBs-ToBeSetup-atModify-ItemIEs} }
UE-MulticastMRBs-ToBeReleased-List ::= SEQUENCE (SIZE(1..maxnoofMRBsforUE)) OF ProtocolIE-SingleContainer { { UE-MulticastMRBs-ToBeReleased-ItemIEs} }
@@ -1916,6 +1941,11 @@ SLDRBs-ToBeReleased-ItemIEs F1AP-PROTOCOL-IES ::= {
...
}
+UE-MulticastMRBs-ToBeSetup-atModify-ItemIEs F1AP-PROTOCOL-IES ::= {
+ { ID id-UE-MulticastMRBs-ToBeSetup-atModify-Item CRITICALITY reject TYPE UE-MulticastMRBs-ToBeSetup-atModify-Item PRESENCE mandatory},
+ ...
+}
+
UE-MulticastMRBs-ToBeReleased-ItemIEs F1AP-PROTOCOL-IES ::= {
{ ID id-UE-MulticastMRBs-ToBeReleased-Item CRITICALITY reject TYPE UE-MulticastMRBs-ToBeReleased-Item PRESENCE mandatory},
@@ -1961,7 +1991,7 @@ UEContextModificationResponseIEs F1AP-PROTOCOL-IES ::= {
{ ID id-SLDRBs-FailedToBeSetupMod-List CRITICALITY ignore TYPE SLDRBs-FailedToBeSetupMod-List PRESENCE optional }|
{ ID id-SLDRBs-FailedToBeModified-List CRITICALITY ignore TYPE SLDRBs-FailedToBeModified-List PRESENCE optional }|
{ ID id-requestedTargetCellGlobalID CRITICALITY reject TYPE NRCGI PRESENCE optional}|
- { ID id-SCGActivationStatus CRITICALITY ignore TYPE SCGActivationStatus PRESENCE optional }|
+ { ID id-SCGActivationStatus CRITICALITY ignore TYPE SCGActivationStatus PRESENCE optional }|
{ ID id-UuRLCChannelSetupList CRITICALITY ignore TYPE UuRLCChannelSetupList PRESENCE optional}|
{ ID id-UuRLCChannelFailedToBeSetupList CRITICALITY ignore TYPE UuRLCChannelFailedToBeSetupList PRESENCE optional}|
{ ID id-UuRLCChannelModifiedList CRITICALITY ignore TYPE UuRLCChannelModifiedList PRESENCE optional}|
@@ -1970,7 +2000,8 @@ UEContextModificationResponseIEs F1AP-PROTOCOL-IES ::= {
{ ID id-PC5RLCChannelFailedToBeSetupList CRITICALITY ignore TYPE PC5RLCChannelFailedToBeSetupList PRESENCE optional}|
{ ID id-PC5RLCChannelModifiedList CRITICALITY ignore TYPE PC5RLCChannelModifiedList PRESENCE optional}|
{ ID id-PC5RLCChannelFailedToBeModifiedList CRITICALITY ignore TYPE PC5RLCChannelFailedToBeModifiedList PRESENCE optional}|
- { ID id-SDTBearerConfigurationInfo CRITICALITY ignore TYPE SDTBearerConfigurationInfo PRESENCE optional },
+ { ID id-SDTBearerConfigurationInfo CRITICALITY ignore TYPE SDTBearerConfigurationInfo PRESENCE optional}|
+ { ID id-UE-MulticastMRBs-Setup-List CRITICALITY reject TYPE UE-MulticastMRBs-Setup-List PRESENCE optional},
...
}
@@ -2085,6 +2116,14 @@ SLDRBs-FailedToBeModified-ItemIEs F1AP-PROTOCOL-IES ::= {
...
}
+UE-MulticastMRBs-Setup-List ::= SEQUENCE (SIZE(1..maxnoofMRBsforUE)) OF ProtocolIE-SingleContainer { { UE-MulticastMRBs-Setup-ItemIEs } }
+
+UE-MulticastMRBs-Setup-ItemIEs F1AP-PROTOCOL-IES ::= {
+ { ID id-UE-MulticastMRBs-Setup-Item CRITICALITY reject TYPE UE-MulticastMRBs-Setup-Item PRESENCE mandatory},
+ ...
+}
+
+
-- **************************************************************
--
-- UE CONTEXT MODIFICATION FAILURE
@@ -2492,7 +2531,8 @@ DLRRCMessageTransferIEs F1AP-PROTOCOL-IES ::= {
{ ID id-RedirectedRRCmessage CRITICALITY reject TYPE RedirectedRRCmessage PRESENCE optional }|
{ ID id-PLMNAssistanceInfoForNetShar CRITICALITY ignore TYPE PLMN-Identity PRESENCE optional }|
{ ID id-new-gNB-CU-UE-F1AP-ID CRITICALITY reject TYPE GNB-CU-UE-F1AP-ID PRESENCE optional }|
- { ID id-AdditionalRRMPriorityIndex CRITICALITY ignore TYPE AdditionalRRMPriorityIndex PRESENCE optional },
+ { ID id-AdditionalRRMPriorityIndex CRITICALITY ignore TYPE AdditionalRRMPriorityIndex PRESENCE optional }|
+ { ID id-SRBMappingInfo CRITICALITY ignore TYPE UuRLCChannelID PRESENCE optional },
...
}
-- **************************************************************
@@ -3784,10 +3824,11 @@ PositioningInformationRequest ::= SEQUENCE {
}
PositioningInformationRequestIEs 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-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-RequestedSRSTransmissionCharacteristics CRITICALITY ignore TYPE RequestedSRSTransmissionCharacteristics PRESENCE optional}|
- { ID id-UEReportingInformation CRITICALITY ignore TYPE UEReportingInformation PRESENCE optional},
+ { ID id-UEReportingInformation CRITICALITY ignore TYPE UEReportingInformation PRESENCE optional}|
+ { ID id-SRSPosRRCInactiveQueryIndication CRITICALITY ignore TYPE SRSPosRRCInactiveQueryIndication PRESENCE optional},
...
}
@@ -4445,9 +4486,9 @@ MulticastGroupPaging ::= SEQUENCE {
}
MulticastGroupPagingIEs F1AP-PROTOCOL-IES ::= {
- { ID id-MBS-Session-ID CRITICALITY reject TYPE MBS-Session-ID PRESENCE mandatory }|
- { ID id-UEIdentity-List-For-Paging-List CRITICALITY ignore TYPE UEIdentity-List-For-Paging-List PRESENCE optional }|
- { ID id-PagingCell-List CRITICALITY ignore TYPE PagingCell-list PRESENCE optional },
+ { ID id-MBS-Session-ID CRITICALITY reject TYPE MBS-Session-ID PRESENCE mandatory }|
+ { ID id-UEIdentity-List-For-Paging-List CRITICALITY ignore TYPE UEIdentity-List-For-Paging-List PRESENCE optional }|
+ { ID id-MC-PagingCell-List CRITICALITY ignore TYPE MC-PagingCell-list PRESENCE optional },
...
}
@@ -4459,6 +4500,13 @@ UEIdentity-List-For-Paging-ItemIEs F1AP-PROTOCOL-IES ::= {
...
}
+MC-PagingCell-list::= SEQUENCE (SIZE(1.. maxnoofPagingCells)) OF ProtocolIE-SingleContainer { { MC-PagingCell-ItemIEs } }
+
+MC-PagingCell-ItemIEs F1AP-PROTOCOL-IES ::= {
+ { ID id-MC-PagingCell-Item CRITICALITY ignore TYPE MC-PagingCell-Item PRESENCE mandatory} ,
+ ...
+}
+
-- **************************************************************
@@ -4789,7 +4837,8 @@ MulticastDistributionSetupResponseIEs F1AP-PROTOCOL-IES ::= {
{ ID id-MBSMulticastF1UContextDescriptor CRITICALITY reject TYPE MBSMulticastF1UContextDescriptor PRESENCE mandatory}|
{ ID id-MulticastF1UContext-Setup-List CRITICALITY reject TYPE MulticastF1UContext-Setup-List PRESENCE mandatory}|
{ ID id-MulticastF1UContext-FailedToBeSetup-List CRITICALITY ignore TYPE MulticastF1UContext-FailedToBeSetup-List PRESENCE optional}|
- { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
+ { ID id-MulticastF1UContextReferenceCU CRITICALITY reject TYPE MulticastF1UContextReferenceCU PRESENCE mandatory},
...
}
@@ -5191,5 +5240,24 @@ QoEInformationTransfer-IEs F1AP-PROTOCOL-IES ::= {
...
}
+-- **************************************************************
+--
+-- Positioning System information Delivery Command
+--
+-- **************************************************************
+
+PosSystemInformationDeliveryCommand ::= SEQUENCE {
+ protocolIEs ProtocolIE-Container {{ PosSystemInformationDeliveryCommandIEs}},
+ ...
+}
+
+PosSystemInformationDeliveryCommandIEs F1AP-PROTOCOL-IES ::= {
+ { ID id-TransactionID CRITICALITY reject TYPE TransactionID PRESENCE mandatory }|
+ { ID id-NRCGI CRITICALITY reject TYPE NRCGI PRESENCE mandatory }|
+ { ID id-PosSItypeList CRITICALITY reject TYPE PosSItypeList PRESENCE mandatory }|
+ { ID id-ConfirmedUEID CRITICALITY reject TYPE GNB-DU-UE-F1AP-ID PRESENCE mandatory },
+ ...
+}
+
END
diff --git a/epan/dissectors/asn1/f1ap/F1AP-PDU-Descriptions.asn b/epan/dissectors/asn1/f1ap/F1AP-PDU-Descriptions.asn
index e81cfef0eb..76aa14b10e 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 V17.2.0 (2022-09)
+-- 3GPP TS 38.473 V17.3.0 (2022-12)
-- 9.4.3 Elementary Procedure Definitions
-- **************************************************************
--
@@ -159,7 +159,9 @@ FROM F1AP-CommonDataTypes
MeasurementPreconfigurationConfirm,
MeasurementPreconfigurationRefuse,
MeasurementActivation,
- QoEInformationTransfer
+ QoEInformationTransfer,
+ PosSystemInformationDeliveryCommand
+
@@ -243,7 +245,8 @@ FROM F1AP-PDU-Contents
id-pRSConfigurationExchange,
id-measurementPreconfiguration,
id-measurementActivation,
- id-QoEInformationTransfer
+ id-QoEInformationTransfer,
+ id-PosSystemInformationDeliveryCommand
FROM F1AP-Constants
@@ -404,7 +407,8 @@ F1AP-ELEMENTARY-PROCEDURES-CLASS-2 F1AP-ELEMENTARY-PROCEDURE ::= {
pDCMeasurementTerminationCommand |
pDCMeasurementFailureIndication |
measurementActivation |
- qoEInformationTransfer ,
+ qoEInformationTransfer |
+ posSystemInformationDelivery,
...
}
-- **************************************************************
@@ -942,5 +946,11 @@ qoEInformationTransfer F1AP-ELEMENTARY-PROCEDURE ::= {
CRITICALITY ignore
}
+posSystemInformationDelivery F1AP-ELEMENTARY-PROCEDURE ::= {
+ INITIATING MESSAGE PosSystemInformationDeliveryCommand
+ PROCEDURE CODE id-PosSystemInformationDeliveryCommand
+ CRITICALITY ignore
+}
+
END
diff --git a/epan/dissectors/asn1/f1ap/f1ap.cnf b/epan/dissectors/asn1/f1ap/f1ap.cnf
index 7fff14dc67..78081a00cc 100644
--- a/epan/dissectors/asn1/f1ap/f1ap.cnf
+++ b/epan/dissectors/asn1/f1ap/f1ap.cnf
@@ -191,6 +191,7 @@ id-measurementActivation ProcedureCode
id-QoEInformationTransfer ProcedureCode
id-PDCMeasurementTerminationCommand ProcedureCode
id-PDCMeasurementFailureIndication ProcedureCode
+id-PosSystemInformationDeliveryCommand ProcedureCode
# ProtocolIE-ID
id-Cause ProtocolIE-ID
@@ -745,8 +746,8 @@ id-LoS-NLoSInformation ProtocolIE-ID
id-NumberOfTRPRxTEG ProtocolIE-ID
id-NumberOfTRPRxTxTEG ProtocolIE-ID
id-TRPTxTEGAssociation ProtocolIE-ID
-id-TRPTEGIDInformation ProtocolIE-ID
-id-TRPRXTEGID ProtocolIE-ID
+id-TRPTEGInformation ProtocolIE-ID
+id-TRPRx-TEGInformation ProtocolIE-ID
id-TRP-PRS-Info-List ProtocolIE-ID
id-PRS-Measurement-Info-List ProtocolIE-ID
id-PRSConfigRequestType ProtocolIE-ID
@@ -845,9 +846,9 @@ id-PEISubgroupingSupportIndication ProtocolIE-ID
id-NeedForGapsInfoNR ProtocolIE-ID
id-NeedForGapNCSGInfoNR ProtocolIE-ID
id-NeedForGapNCSGInfoEUTRA ProtocolIE-ID
-id-TRPTxTimingErrorMargin ProtocolIE-ID
-id-TRPRxTimingErrorMargin ProtocolIE-ID
-id-TRPRxTxTimingErrorMargin ProtocolIE-ID
+id-procedure-code-668-not-to-be-used ProtocolIE-ID
+id-procedure-code-669-not-to-be-used ProtocolIE-ID
+id-procedure-code-670-not-to-be-used ProtocolIE-ID
id-Source-MRB-ID ProtocolIE-ID
id-PosMeasurementPeriodicityNR-AoA ProtocolIE-ID
id-RedCapIndication ProtocolIE-ID
@@ -855,6 +856,18 @@ id-SRSPosRRCInactiveConfig ProtocolIE-ID
id-SDTBearerConfigurationQueryIndication ProtocolIE-ID
id-SDTBearerConfigurationInfo ProtocolIE-ID
id-UL-GapFR2-Config ProtocolIE-ID
+id-ConfigRestrictInfoDAPS ProtocolIE-ID
+id-UE-MulticastMRBs-Setup-List ProtocolIE-ID
+id-UE-MulticastMRBs-Setup-Item ProtocolIE-ID
+id-MulticastF1UContextReferenceCU ProtocolIE-ID
+id-PosSItypeList ProtocolIE-ID
+id-DAPS-HO-Status ProtocolIE-ID
+id-UplinkTxDirectCurrentTwoCarrierListInfo ProtocolIE-ID
+id-UE-MulticastMRBs-ToBeSetup-atModify-List ProtocolIE-ID
+id-UE-MulticastMRBs-ToBeSetup-atModify-Item ProtocolIE-ID
+id-MC-PagingCell-List ProtocolIE-ID
+id-MC-PagingCell-Item ProtocolIE-ID
+id-SRSPosRRCInactiveQueryIndication ProtocolIE-ID
#.END
#.REGISTER
@@ -1275,7 +1288,7 @@ MultipleULAoA N f1ap.ies id-MultipleULAoA
UL-SRS-RSRPP N f1ap.ies id-UL-SRS-RSRPP
ExtendedAdditionalPathList N f1ap.ies id-ExtendedAdditionalPathList
TRPTxTEGAssociation N f1ap.ies id-TRPTxTEGAssociation
-TRPRXTEGID N f1ap.ies id-TRPRXTEGID
+TRP-Rx-TEGInformation N f1ap.ies id-TRPRx-TEGInformation
TRP-PRS-Info-List N f1ap.ies id-TRP-PRS-Info-List
PRS-Measurement-Info-List N f1ap.ies id-PRS-Measurement-Info-List
PRSConfigRequestType N f1ap.ies id-PRSConfigRequestType
@@ -1351,6 +1364,17 @@ SCS-960 N f1ap.ies id-SCS-960
SRSPosRRCInactiveConfig N f1ap.ies id-SRSPosRRCInactiveConfig
SDTBearerConfigurationQueryIndication N f1ap.ies id-SDTBearerConfigurationQueryIndication
SDTBearerConfigurationInfo N f1ap.ies id-SDTBearerConfigurationInfo
+UE-MulticastMRBs-Setup-List N f1ap.ies id-UE-MulticastMRBs-Setup-List
+UE-MulticastMRBs-Setup-Item N f1ap.ies id-UE-MulticastMRBs-Setup-Item
+MulticastF1UContextReferenceCU N f1ap.ies id-MulticastF1UContextReferenceCU
+PosSItypeList N f1ap.ies id-PosSItypeList
+DAPS-HO-Status N f1ap.ies id-DAPS-HO-Status
+UplinkTxDirectCurrentTwoCarrierListInfo N f1ap.ies id-UplinkTxDirectCurrentTwoCarrierListInfo
+UE-MulticastMRBs-ToBeSetup-atModify-List N f1ap.ies id-UE-MulticastMRBs-ToBeSetup-atModify-List
+UE-MulticastMRBs-ToBeSetup-atModify-Item N f1ap.ies id-UE-MulticastMRBs-ToBeSetup-atModify-Item
+MC-PagingCell-list N f1ap.ies id-MC-PagingCell-List
+MC-PagingCell-Item N f1ap.ies id-MC-PagingCell-Item
+SRSPosRRCInactiveQueryIndication N f1ap.ies id-SRSPosRRCInactiveQueryIndication
#F1AP-PROTOCOL-EXTENSION
GNB-CUSystemInformation N f1ap.extension id-gNB-CUSystemInformation
@@ -1488,7 +1512,7 @@ ExtendedAdditionalPathList N f1ap.extension id-ExtendedAd
LoS-NLoSInformation N f1ap.extension id-LoS-NLoSInformation
NumberOfTRPRxTEG N f1ap.extension id-NumberOfTRPRxTEG
NumberOfTRPRxTxTEG N f1ap.extension id-NumberOfTRPRxTxTEG
-TRPTEGIDInformation N f1ap.extension id-TRPTEGIDInformation
+TRPTEGInformation N f1ap.extension id-TRPTEGInformation
Redcap-Bcast-Information N f1ap.extension id-Redcap-Bcast-Information
SDT-MAC-PHY-CG-Config N f1ap.extension id-SDT-MAC-PHY-CG-Config
CG-SDTindicatorSetup N f1ap.extension id-CG-SDTindicatorSetup
@@ -1515,13 +1539,12 @@ PEISubgroupingSupportIndication N f1ap.extension id-PEISubgrou
NeedForGapsInfoNR N f1ap.extension id-NeedForGapsInfoNR
NeedForGapNCSGInfoNR N f1ap.extension id-NeedForGapNCSGInfoNR
NeedForGapNCSGInfoEUTRA N f1ap.extension id-NeedForGapNCSGInfoEUTRA
-TimingErrorMargin N f1ap.extension id-TRPTxTimingErrorMargin
-TimingErrorMargin N f1ap.extension id-TRPRxTimingErrorMargin
-TimingErrorMargin N f1ap.extension id-TRPRxTxTimingErrorMargin
MRB-ID N f1ap.extension id-Source-MRB-ID
PosMeasurementPeriodicityNR-AoA N f1ap.extension id-PosMeasurementPeriodicityNR-AoA
RedCapIndication N f1ap.extension id-RedCapIndication
UL-GapFR2-Config N f1ap.extension id-UL-GapFR2-Config
+ConfigRestrictInfoDAPS N f1ap.extension id-ConfigRestrictInfoDAPS
+MulticastF1UContextReferenceCU N f1ap.extension id-MulticastF1UContextReferenceCU
#F1AP-ELEMENTARY-PROCEDURE
Reset N f1ap.proc.imsg id-Reset
@@ -1736,6 +1759,8 @@ MeasurementActivation N f1ap.proc.imsg id-measurementActivati
QoEInformationTransfer N f1ap.proc.imsg id-QoEInformationTransfer
+PosSystemInformationDeliveryCommand N f1ap.proc.imsg id-PosSystemInformationDeliveryCommand
+
#.FN_BODY AdditionalSIBMessageList-Item/additionalSIB VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s
@@ -2246,6 +2271,14 @@ MaximumDataBurstVolume DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_byte_byt
dissect_nr_rrc_UplinkTxDirectCurrentList_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
+#.FN_BODY UplinkTxDirectCurrentTwoCarrierListInfo 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_UplinkTxDirectCurrentTwoCarrierListInfo);
+ dissect_nr_rrc_UplinkTxDirectCurrentTwoCarrierList_r16_PDU(param_tvb, actx->pinfo, subtree, NULL);
+ }
+
#.FN_BODY Latest-RRC-Version-Enhanced VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s
@@ -2734,6 +2767,14 @@ Periodicity DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_microseconds
dissect_nr_rrc_NeedForGapNCSG_InfoEUTRA_r17_PDU(param_tvb, actx->pinfo, subtree, NULL);
}
+#.FN_BODY ConfigRestrictInfoDAPS 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_ConfigRestrictInfoDAPS);
+ dissect_nr_rrc_ConfigRestrictInfoDAPS_r16_PDU(param_tvb, actx->pinfo, subtree, NULL);
+ }
+
#.FN_BODY MBS-Broadcast-NeighbourCellList VAL_PTR = &param_tvb
tvbuff_t *param_tvb = NULL;
%(DEFAULT_BODY)s
@@ -3308,6 +3349,9 @@ SurvivalTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_microseconds
#.FN_HDR QoEInformationTransfer
set_message_label(actx, MTYPE_QOE_INFORMATION_TRANSFER);
set_stats_message_type(actx->pinfo, MTYPE_QOE_INFORMATION_TRANSFER);
+#.FN_HDR PosSystemInformationDeliveryCommand
+ set_message_label(actx, MTYPE_POS_SYSTEM_INFORMATION_DELIVERY_COMMAND);
+ set_stats_message_type(actx->pinfo, MTYPE_POS_SYSTEM_INFORMATION_DELIVERY_COMMAND);
#.END
#
diff --git a/epan/dissectors/asn1/f1ap/packet-f1ap-template.c b/epan/dissectors/asn1/f1ap/packet-f1ap-template.c
index ce93f2353c..4a2cb276b5 100644
--- a/epan/dissectors/asn1/f1ap/packet-f1ap-template.c
+++ b/epan/dissectors/asn1/f1ap/packet-f1ap-template.c
@@ -1,6 +1,6 @@
/* packet-f1ap.c
* Routines for E-UTRAN F1 Application Protocol (F1AP) packet dissection
- * Copyright 2018-2022, Pascal Quantin <pascal@wireshark.org>
+ * Copyright 2018-2023, Pascal Quantin <pascal@wireshark.org>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
- * References: 3GPP TS 38.473 V17.2.0 (2022-09)
+ * References: 3GPP TS 38.473 V17.3.0 (2022-12)
*/
#include "config.h"
@@ -146,6 +146,8 @@ static gint ett_f1ap_SidelinkConfigurationContainer = -1;
static gint ett_f1ap_SRSPosRRCInactiveConfig = -1;
static gint ett_f1ap_successfulHOReportContainer = -1;
static gint ett_f1ap_UL_GapFR2_Config = -1;
+static gint ett_f1ap_ConfigRestrictInfoDAPS = -1;
+static gint ett_f1ap_UplinkTxDirectCurrentTwoCarrierListInfo = -1;
#include "packet-f1ap-ett.c"
enum{
@@ -304,6 +306,7 @@ struct f1ap_tap_t {
#define MTYPE_MEASUREMENT_PRECONFIGURATION_REFUSE 132
#define MTYPE_MEASUREMENT_ACTIVATION 133
#define MTYPE_QOE_INFORMATION_TRANSFER 134
+#define MTYPE_POS_SYSTEM_INFORMATION_DELIVERY_COMMAND 135
static const value_string mtype_names[] = {
{ MTYPE_RESET, "Reset" },
@@ -441,6 +444,7 @@ static const value_string mtype_names[] = {
{ MTYPE_MEASUREMENT_PRECONFIGURATION_REFUSE, "MeasurementPreconfigurationRefuse" },
{ MTYPE_MEASUREMENT_ACTIVATION, "MeasurementActivation" },
{ MTYPE_QOE_INFORMATION_TRANSFER, "QoEInformationTransfer" },
+ { MTYPE_POS_SYSTEM_INFORMATION_DELIVERY_COMMAND, "PosSystemInformationDeliveryCommand" },
{ 0, NULL }
};
static value_string_ext mtype_names_ext = VALUE_STRING_EXT_INIT(mtype_names);
@@ -845,6 +849,8 @@ void proto_register_f1ap(void) {
&ett_f1ap_SRSPosRRCInactiveConfig,
&ett_f1ap_successfulHOReportContainer,
&ett_f1ap_UL_GapFR2_Config,
+ &ett_f1ap_ConfigRestrictInfoDAPS,
+ &ett_f1ap_UplinkTxDirectCurrentTwoCarrierListInfo,
#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 63eaf4a249..e230a00d59 100644
--- a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
+++ b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
@@ -63,6 +63,7 @@ DRX-Config_PDU
CG-Config_PDU
CG-ConfigInfo_PDU
CondReconfigExecCondSCG-r17_PDU
+ConfigRestrictInfoDAPS-r16_PDU
ConfigRestrictInfoSCG_PDU
FeatureSetEntryIndex_PDU
FreqBandList_PDU
@@ -142,6 +143,7 @@ UERadioPagingInformation_PDU
UL-DCCH-Message_PDU
UL-GapFR2-Config-r17_PDU
UplinkTxDirectCurrentList_PDU
+UplinkTxDirectCurrentTwoCarrierList-r16_PDU
VisitedCellInfoList-r16_PDU
#.PDU
@@ -152,6 +154,7 @@ BCCH-BCH-Message @bcch.bch
BCCH-DL-SCH-Message @bcch.dl.sch
CellGroupConfig
CondReconfigExecCondSCG-r17
+ConfigRestrictInfoDAPS-r16
CG-Config
CG-ConfigInfo
ConfigRestrictInfoSCG
@@ -246,6 +249,7 @@ UL-CCCH1-Message @ul.ccch1
UL-DCCH-Message @ul.dcch
UL-GapFR2-Config-r17
UplinkTxDirectCurrentList
+UplinkTxDirectCurrentTwoCarrierList-r16
VisitedCellInfoList-r16
#.END
diff --git a/epan/dissectors/packet-f1ap.c b/epan/dissectors/packet-f1ap.c
index 96d3156acc..a70f5ceb53 100644
--- a/epan/dissectors/packet-f1ap.c
+++ b/epan/dissectors/packet-f1ap.c
@@ -5,7 +5,7 @@
/* packet-f1ap.c
* Routines for E-UTRAN F1 Application Protocol (F1AP) packet dissection
- * Copyright 2018-2022, Pascal Quantin <pascal@wireshark.org>
+ * Copyright 2018-2023, Pascal Quantin <pascal@wireshark.org>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -13,7 +13,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
- * References: 3GPP TS 38.473 V17.2.0 (2022-09)
+ * References: 3GPP TS 38.473 V17.3.0 (2022-12)
*/
#include "config.h"
@@ -168,6 +168,7 @@ void proto_reg_handoff_f1ap(void);
#define maxnoofSLdestinations 32
#define maxnoofNSAGs 256
#define maxnoofSDTBearers 72
+#define maxnoofPosSITypes 32
typedef enum _ProcedureCode_enum {
id_Reset = 0,
@@ -250,7 +251,8 @@ typedef enum _ProcedureCode_enum {
id_measurementActivation = 77,
id_QoEInformationTransfer = 78,
id_PDCMeasurementTerminationCommand = 79,
- id_PDCMeasurementFailureIndication = 80
+ id_PDCMeasurementFailureIndication = 80,
+ id_PosSystemInformationDeliveryCommand = 81
} ProcedureCode_enum;
typedef enum _ProtocolIE_ID_enum {
@@ -820,8 +822,8 @@ typedef enum _ProtocolIE_ID_enum {
id_NumberOfTRPRxTEG = 564,
id_NumberOfTRPRxTxTEG = 565,
id_TRPTxTEGAssociation = 566,
- id_TRPTEGIDInformation = 567,
- id_TRPRXTEGID = 568,
+ id_TRPTEGInformation = 567,
+ id_TRPRx_TEGInformation = 568,
id_TRP_PRS_Info_List = 569,
id_PRS_Measurement_Info_List = 570,
id_PRSConfigRequestType = 571,
@@ -921,16 +923,28 @@ typedef enum _ProtocolIE_ID_enum {
id_NeedForGapsInfoNR = 665,
id_NeedForGapNCSGInfoNR = 666,
id_NeedForGapNCSGInfoEUTRA = 667,
- id_TRPTxTimingErrorMargin = 668,
- id_TRPRxTimingErrorMargin = 669,
- id_TRPRxTxTimingErrorMargin = 670,
+ id_procedure_code_668_not_to_be_used = 668,
+ id_procedure_code_669_not_to_be_used = 669,
+ id_procedure_code_670_not_to_be_used = 670,
id_Source_MRB_ID = 671,
id_PosMeasurementPeriodicityNR_AoA = 672,
id_RedCapIndication = 673,
id_SRSPosRRCInactiveConfig = 674,
id_SDTBearerConfigurationQueryIndication = 675,
id_SDTBearerConfigurationInfo = 676,
- id_UL_GapFR2_Config = 677
+ id_UL_GapFR2_Config = 677,
+ id_ConfigRestrictInfoDAPS = 678,
+ id_UE_MulticastMRBs_Setup_List = 679,
+ id_UE_MulticastMRBs_Setup_Item = 680,
+ id_MulticastF1UContextReferenceCU = 681,
+ id_PosSItypeList = 682,
+ id_DAPS_HO_Status = 683,
+ id_UplinkTxDirectCurrentTwoCarrierListInfo = 684,
+ id_UE_MulticastMRBs_ToBeSetup_atModify_List = 685,
+ id_UE_MulticastMRBs_ToBeSetup_atModify_Item = 686,
+ id_MC_PagingCell_List = 687,
+ id_MC_PagingCell_Item = 688,
+ id_SRSPosRRCInactiveQueryIndication = 689
} ProtocolIE_ID_enum;
/* Initialize the protocol and registered fields */
@@ -1040,6 +1054,7 @@ static int hf_f1ap_CompositeAvailableCapacity_PDU = -1; /* CompositeAvailableCa
static int hf_f1ap_CHO_Probability_PDU = -1; /* CHO_Probability */
static int hf_f1ap_ConditionalInterDUMobilityInformation_PDU = -1; /* ConditionalInterDUMobilityInformation */
static int hf_f1ap_ConditionalIntraDUMobilityInformation_PDU = -1; /* ConditionalIntraDUMobilityInformation */
+static int hf_f1ap_ConfigRestrictInfoDAPS_PDU = -1; /* ConfigRestrictInfoDAPS */
static int hf_f1ap_ConfiguredTACIndication_PDU = -1; /* ConfiguredTACIndication */
static int hf_f1ap_Coverage_Modification_Notification_PDU = -1; /* Coverage_Modification_Notification */
static int hf_f1ap_CCO_Assistance_Information_PDU = -1; /* CCO_Assistance_Information */
@@ -1048,6 +1063,7 @@ static int hf_f1ap_CriticalityDiagnostics_PDU = -1; /* CriticalityDiagnostics *
static int hf_f1ap_C_RNTI_PDU = -1; /* C_RNTI */
static int hf_f1ap_CUDURadioInformationType_PDU = -1; /* CUDURadioInformationType */
static int hf_f1ap_CUtoDURRCInformation_PDU = -1; /* CUtoDURRCInformation */
+static int hf_f1ap_DAPS_HO_Status_PDU = -1; /* DAPS_HO_Status */
static int hf_f1ap_DCBasedDuplicationConfigured_PDU = -1; /* DCBasedDuplicationConfigured */
static int hf_f1ap_Dedicated_SIDelivery_NeededUE_Item_PDU = -1; /* Dedicated_SIDelivery_NeededUE_Item */
static int hf_f1ap_DL_UP_TNL_Address_to_Update_List_Item_PDU = -1; /* DL_UP_TNL_Address_to_Update_List_Item */
@@ -1158,12 +1174,14 @@ static int hf_f1ap_MulticastF1UContext_ToBeSetup_Item_PDU = -1; /* MulticastF1U
static int hf_f1ap_MulticastF1UContext_Setup_Item_PDU = -1; /* MulticastF1UContext_Setup_Item */
static int hf_f1ap_MulticastF1UContext_FailedToBeSetup_Item_PDU = -1; /* MulticastF1UContext_FailedToBeSetup_Item */
static int hf_f1ap_MBS_ServiceArea_PDU = -1; /* MBS_ServiceArea */
+static int hf_f1ap_MC_PagingCell_Item_PDU = -1; /* MC_PagingCell_Item */
static int hf_f1ap_MeasGapSharingConfig_PDU = -1; /* MeasGapSharingConfig */
static int hf_f1ap_PosMeasurementAmount_PDU = -1; /* PosMeasurementAmount */
static int hf_f1ap_MeasurementBeamInfoRequest_PDU = -1; /* MeasurementBeamInfoRequest */
static int hf_f1ap_MeasurementTimingConfiguration_PDU = -1; /* MeasurementTimingConfiguration */
static int hf_f1ap_MeasurementTimeOccasion_PDU = -1; /* MeasurementTimeOccasion */
static int hf_f1ap_MeasurementCharacteristicsRequestIndicator_PDU = -1; /* MeasurementCharacteristicsRequestIndicator */
+static int hf_f1ap_MulticastF1UContextReferenceCU_PDU = -1; /* MulticastF1UContextReferenceCU */
static int hf_f1ap_MultipleULAoA_PDU = -1; /* MultipleULAoA */
static int hf_f1ap_MDTPollutedMeasurementIndicator_PDU = -1; /* MDTPollutedMeasurementIndicator */
static int hf_f1ap_MRB_ID_PDU = -1; /* MRB_ID */
@@ -1257,6 +1275,7 @@ static int hf_f1ap_PosMeasurementPeriodicityNR_AoA_PDU = -1; /* PosMeasurementP
static int hf_f1ap_PosMeasurementQuantities_PDU = -1; /* PosMeasurementQuantities */
static int hf_f1ap_PosMeasurementResultList_PDU = -1; /* PosMeasurementResultList */
static int hf_f1ap_PosReportCharacteristics_PDU = -1; /* PosReportCharacteristics */
+static int hf_f1ap_PosSItypeList_PDU = -1; /* PosSItypeList */
static int hf_f1ap_Protected_EUTRA_Resources_Item_PDU = -1; /* Protected_EUTRA_Resources_Item */
static int hf_f1ap_PRS_Measurement_Info_List_PDU = -1; /* PRS_Measurement_Info_List */
static int hf_f1ap_Potential_SpCell_Item_PDU = -1; /* Potential_SpCell_Item */
@@ -1384,6 +1403,7 @@ static int hf_f1ap_SrsFrequency_PDU = -1; /* SrsFrequency */
static int hf_f1ap_SRSPortIndex_PDU = -1; /* SRSPortIndex */
static int hf_f1ap_SRSResourcetype_PDU = -1; /* SRSResourcetype */
static int hf_f1ap_SRSPosRRCInactiveConfig_PDU = -1; /* SRSPosRRCInactiveConfig */
+static int hf_f1ap_SRSPosRRCInactiveQueryIndication_PDU = -1; /* SRSPosRRCInactiveQueryIndication */
static int hf_f1ap_SSB_PositionsInBurst_PDU = -1; /* SSB_PositionsInBurst */
static int hf_f1ap_SuccessfulHOReportInformationList_PDU = -1; /* SuccessfulHOReportInformationList */
static int hf_f1ap_SULAccessIndication_PDU = -1; /* SULAccessIndication */
@@ -1393,10 +1413,9 @@ static int hf_f1ap_SystemInformationAreaID_PDU = -1; /* SystemInformationAreaID
static int hf_f1ap_TargetCellList_PDU = -1; /* TargetCellList */
static int hf_f1ap_NSAGSupportList_PDU = -1; /* NSAGSupportList */
static int hf_f1ap_TDD_UL_DLConfigCommonNR_PDU = -1; /* TDD_UL_DLConfigCommonNR */
-static int hf_f1ap_TRPTEGIDInformation_PDU = -1; /* TRPTEGIDInformation */
+static int hf_f1ap_TRPTEGInformation_PDU = -1; /* TRPTEGInformation */
static int hf_f1ap_TimeReferenceInformation_PDU = -1; /* TimeReferenceInformation */
static int hf_f1ap_TimeToWait_PDU = -1; /* TimeToWait */
-static int hf_f1ap_TimingErrorMargin_PDU = -1; /* TimingErrorMargin */
static int hf_f1ap_TNLCapacityIndicator_PDU = -1; /* TNLCapacityIndicator */
static int hf_f1ap_TraceActivation_PDU = -1; /* TraceActivation */
static int hf_f1ap_TraceID_PDU = -1; /* TraceID */
@@ -1412,6 +1431,7 @@ static int hf_f1ap_TRPInformationTypeItem_PDU = -1; /* TRPInformationTypeItem *
static int hf_f1ap_TRPList_PDU = -1; /* TRPList */
static int hf_f1ap_TRP_MeasurementRequestList_PDU = -1; /* TRP_MeasurementRequestList */
static int hf_f1ap_TRP_PRS_Info_List_PDU = -1; /* TRP_PRS_Info_List */
+static int hf_f1ap_TRP_Rx_TEGInformation_PDU = -1; /* TRP_Rx_TEGInformation */
static int hf_f1ap_TRPTxTEGAssociation_PDU = -1; /* TRPTxTEGAssociation */
static int hf_f1ap_Transport_Layer_Address_Info_PDU = -1; /* Transport_Layer_Address_Info */
static int hf_f1ap_TRPType_PDU = -1; /* TRPType */
@@ -1427,17 +1447,19 @@ static int hf_f1ap_UEIdentity_List_For_Paging_Item_PDU = -1; /* UEIdentity_List
static int hf_f1ap_UE_MulticastMRBs_ConfirmedToBeModified_Item_PDU = -1; /* UE_MulticastMRBs_ConfirmedToBeModified_Item */
static int hf_f1ap_UE_MulticastMRBs_RequiredToBeModified_Item_PDU = -1; /* UE_MulticastMRBs_RequiredToBeModified_Item */
static int hf_f1ap_UE_MulticastMRBs_RequiredToBeReleased_Item_PDU = -1; /* UE_MulticastMRBs_RequiredToBeReleased_Item */
+static int hf_f1ap_UE_MulticastMRBs_Setup_Item_PDU = -1; /* UE_MulticastMRBs_Setup_Item */
static int hf_f1ap_UE_MulticastMRBs_ToBeReleased_Item_PDU = -1; /* UE_MulticastMRBs_ToBeReleased_Item */
static int hf_f1ap_UE_MulticastMRBs_ToBeSetup_Item_PDU = -1; /* UE_MulticastMRBs_ToBeSetup_Item */
+static int hf_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_Item_PDU = -1; /* UE_MulticastMRBs_ToBeSetup_atModify_Item */
static int hf_f1ap_UEPagingCapability_PDU = -1; /* UEPagingCapability */
static int hf_f1ap_UEReportingInformation_PDU = -1; /* UEReportingInformation */
static int hf_f1ap_UL_BH_Non_UP_Traffic_Mapping_PDU = -1; /* UL_BH_Non_UP_Traffic_Mapping */
static int hf_f1ap_UL_GapFR2_Config_PDU = -1; /* UL_GapFR2_Config */
-static int hf_f1ap_TRPRXTEGID_PDU = -1; /* TRPRXTEGID */
static int hf_f1ap_UL_SRS_RSRPP_PDU = -1; /* UL_SRS_RSRPP */
static int hf_f1ap_UL_UP_TNL_Information_to_Update_List_Item_PDU = -1; /* UL_UP_TNL_Information_to_Update_List_Item */
static int hf_f1ap_UL_UP_TNL_Address_to_Update_List_Item_PDU = -1; /* UL_UP_TNL_Address_to_Update_List_Item */
static int hf_f1ap_UplinkTxDirectCurrentListInformation_PDU = -1; /* UplinkTxDirectCurrentListInformation */
+static int hf_f1ap_UplinkTxDirectCurrentTwoCarrierListInfo_PDU = -1; /* UplinkTxDirectCurrentTwoCarrierListInfo */
static int hf_f1ap_URI_address_PDU = -1; /* URI_address */
static int hf_f1ap_UuRLCChannelID_PDU = -1; /* UuRLCChannelID */
static int hf_f1ap_UuRLCChannelToBeSetupList_PDU = -1; /* UuRLCChannelToBeSetupList */
@@ -1519,6 +1541,7 @@ static int hf_f1ap_BHChannels_ToBeModified_List_PDU = -1; /* BHChannels_ToBeMod
static int hf_f1ap_SRBs_ToBeReleased_List_PDU = -1; /* SRBs_ToBeReleased_List */
static int hf_f1ap_DRBs_ToBeReleased_List_PDU = -1; /* DRBs_ToBeReleased_List */
static int hf_f1ap_BHChannels_ToBeReleased_List_PDU = -1; /* BHChannels_ToBeReleased_List */
+static int hf_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_List_PDU = -1; /* UE_MulticastMRBs_ToBeSetup_atModify_List */
static int hf_f1ap_UE_MulticastMRBs_ToBeReleased_List_PDU = -1; /* UE_MulticastMRBs_ToBeReleased_List */
static int hf_f1ap_SLDRBs_ToBeSetupMod_List_PDU = -1; /* SLDRBs_ToBeSetupMod_List */
static int hf_f1ap_SLDRBs_ToBeModified_List_PDU = -1; /* SLDRBs_ToBeModified_List */
@@ -1541,6 +1564,7 @@ static int hf_f1ap_SLDRBs_SetupMod_List_PDU = -1; /* SLDRBs_SetupMod_List */
static int hf_f1ap_SLDRBs_Modified_List_PDU = -1; /* SLDRBs_Modified_List */
static int hf_f1ap_SLDRBs_FailedToBeModified_List_PDU = -1; /* SLDRBs_FailedToBeModified_List */
static int hf_f1ap_SLDRBs_FailedToBeSetupMod_List_PDU = -1; /* SLDRBs_FailedToBeSetupMod_List */
+static int hf_f1ap_UE_MulticastMRBs_Setup_List_PDU = -1; /* UE_MulticastMRBs_Setup_List */
static int hf_f1ap_UEContextModificationFailure_PDU = -1; /* UEContextModificationFailure */
static int hf_f1ap_UEContextModificationRequired_PDU = -1; /* UEContextModificationRequired */
static int hf_f1ap_DRBs_Required_ToBeModified_List_PDU = -1; /* DRBs_Required_ToBeModified_List */
@@ -1670,6 +1694,7 @@ static int hf_f1ap_BroadcastMRBs_FailedToBeModified_List_PDU = -1; /* Broadcast
static int hf_f1ap_BroadcastContextModificationFailure_PDU = -1; /* BroadcastContextModificationFailure */
static int hf_f1ap_MulticastGroupPaging_PDU = -1; /* MulticastGroupPaging */
static int hf_f1ap_UEIdentity_List_For_Paging_List_PDU = -1; /* UEIdentity_List_For_Paging_List */
+static int hf_f1ap_MC_PagingCell_list_PDU = -1; /* MC_PagingCell_list */
static int hf_f1ap_MulticastContextSetupRequest_PDU = -1; /* MulticastContextSetupRequest */
static int hf_f1ap_MulticastMRBs_ToBeSetup_List_PDU = -1; /* MulticastMRBs_ToBeSetup_List */
static int hf_f1ap_MulticastContextSetupResponse_PDU = -1; /* MulticastContextSetupResponse */
@@ -1711,6 +1736,7 @@ static int hf_f1ap_MeasurementPreconfigurationConfirm_PDU = -1; /* MeasurementP
static int hf_f1ap_MeasurementPreconfigurationRefuse_PDU = -1; /* MeasurementPreconfigurationRefuse */
static int hf_f1ap_MeasurementActivation_PDU = -1; /* MeasurementActivation */
static int hf_f1ap_QoEInformationTransfer_PDU = -1; /* QoEInformationTransfer */
+static int hf_f1ap_PosSystemInformationDeliveryCommand_PDU = -1; /* PosSystemInformationDeliveryCommand */
static int hf_f1ap_F1AP_PDU_PDU = -1; /* F1AP_PDU */
static int hf_f1ap_local = -1; /* INTEGER_0_65535 */
static int hf_f1ap_global = -1; /* T_global */
@@ -1833,7 +1859,7 @@ static int hf_f1ap_ServedPLMNs_List_item = -1; /* ServedPLMNs_Item */
static int hf_f1ap_BroadcastCAGList_item = -1; /* CAGID */
static int hf_f1ap_mRB_ID = -1; /* MRB_ID */
static int hf_f1ap_bcBearerCtxtF1U_TNLInfoatDU = -1; /* BCBearerContextF1U_TNLInfo */
-static int hf_f1ap_mRB_QoSInformation = -1; /* QoSInformation */
+static int hf_f1ap_mRB_QoSInformation = -1; /* QoSFlowLevelQoSParameters */
static int hf_f1ap_mBS_Flows_Mapped_To_MRB_List = -1; /* MBS_Flows_Mapped_To_MRB_List */
static int hf_f1ap_bcBearerCtxtF1U_TNLInfoatCU = -1; /* BCBearerContextF1U_TNLInfo */
static int hf_f1ap_BroadcastNIDList_item = -1; /* NID */
@@ -2393,6 +2419,8 @@ static int hf_f1ap_aperiodic = -1; /* PosResourceSetTypeAP */
static int hf_f1ap_posperiodicSet = -1; /* T_posperiodicSet */
static int hf_f1ap_possemi_persistentSet = -1; /* T_possemi_persistentSet */
static int hf_f1ap_sRSResourceTrigger_List = -1; /* INTEGER_1_3 */
+static int hf_f1ap_PosSItypeList_item = -1; /* PosSItype_Item */
+static int hf_f1ap_posItype = -1; /* PosSItype */
static int hf_f1ap_PosSRSResourceID_List_item = -1; /* SRSPosResourceID */
static int hf_f1ap_srs_PosResourceId = -1; /* SRSPosResourceID */
static int hf_f1ap_transmissionCombPos = -1; /* TransmissionCombPos */
@@ -2733,9 +2761,9 @@ static int hf_f1ap_tDD_FreqInfo = -1; /* FreqInfoRel16 */
static int hf_f1ap_tDD_UL_DLConfigCommonNR = -1; /* TDD_UL_DLConfigCommonNR */
static int hf_f1ap_rxTx_TEG = -1; /* RxTxTEG */
static int hf_f1ap_rx_TEG = -1; /* RxTEG */
-static int hf_f1ap_tRP_RxTx_TEGID = -1; /* INTEGER_0_255 */
-static int hf_f1ap_tRP_Tx_TEGID = -1; /* INTEGER_0_7 */
-static int hf_f1ap_tRP_Rx_TEGID = -1; /* INTEGER_0_31 */
+static int hf_f1ap_tRP_RxTx_TEGInformation = -1; /* TRP_RxTx_TEGInformation */
+static int hf_f1ap_tRP_Tx_TEGInformation = -1; /* TRP_Tx_TEGInformation */
+static int hf_f1ap_tRP_Rx_TEGInformation = -1; /* TRP_Rx_TEGInformation */
static int hf_f1ap_referenceTime = -1; /* ReferenceTime */
static int hf_f1ap_referenceSFN = -1; /* ReferenceSFN */
static int hf_f1ap_uncertainty = -1; /* Uncertainty */
@@ -2817,8 +2845,13 @@ static int hf_f1ap_referencePoint = -1; /* ReferencePoint */
static int hf_f1ap_referencePointType = -1; /* TRPReferencePointType */
static int hf_f1ap_tRPPositionRelativeGeodetic = -1; /* RelativeGeodeticLocation */
static int hf_f1ap_tRPPositionRelativeCartesian = -1; /* RelativeCartesianLocation */
+static int hf_f1ap_tRP_Rx_TEGID = -1; /* INTEGER_0_31 */
+static int hf_f1ap_tRP_Rx_TimingErrorMargin = -1; /* TimingErrorMargin */
+static int hf_f1ap_tRP_RxTx_TEGID = -1; /* INTEGER_0_255 */
+static int hf_f1ap_tRP_RxTx_TimingErrorMargin = -1; /* RxTxTimingErrorMargin */
+static int hf_f1ap_tRP_Tx_TEGID = -1; /* INTEGER_0_7 */
+static int hf_f1ap_tRP_Tx_TimingErrorMargin = -1; /* TimingErrorMargin */
static int hf_f1ap_TRPTxTEGAssociation_item = -1; /* TRPTEG_Item */
-static int hf_f1ap_tRP_Tx_TEG_ID = -1; /* INTEGER_0_7 */
static int hf_f1ap_dl_PRSResourceID_List = -1; /* SEQUENCE_SIZE_1_maxnoofPRS_ResourcesPerSet_OF_DLPRSResourceID_Item */
static int hf_f1ap_dl_PRSResourceID_List_item = -1; /* DLPRSResourceID_Item */
static int hf_f1ap_transport_UP_Layer_Address_Info_To_Add_List = -1; /* Transport_UP_Layer_Address_Info_To_Add_List */
@@ -2845,6 +2878,7 @@ static int hf_f1ap_pagingDRX = -1; /* PagingDRX */
static int hf_f1ap_mrb_type_reconfiguration = -1; /* MBSPTPRetransmissionTunnelRequired */
static int hf_f1ap_mrb_type_reconfiguration_01 = -1; /* T_mrb_type_reconfiguration */
static int hf_f1ap_mrb_reconfigured_RLCtype = -1; /* T_mrb_reconfigured_RLCtype */
+static int hf_f1ap_multicastF1UContextReferenceCU = -1; /* MulticastF1UContextReferenceCU */
static int hf_f1ap_mbsPTPRetransmissionTunnelRequired = -1; /* MBSPTPRetransmissionTunnelRequired */
static int hf_f1ap_mbsPTPForwardingRequiredInformation = -1; /* MRB_ProgressInformation */
static int hf_f1ap_iNACTIVEStatePODetermination = -1; /* T_iNACTIVEStatePODetermination */
@@ -2926,6 +2960,7 @@ static int hf_f1ap_BHChannels_ToBeModified_List_item = -1; /* ProtocolIE_Single
static int hf_f1ap_SRBs_ToBeReleased_List_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_DRBs_ToBeReleased_List_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_BHChannels_ToBeReleased_List_item = -1; /* ProtocolIE_SingleContainer */
+static int hf_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_List_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_UE_MulticastMRBs_ToBeReleased_List_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_SLDRBs_ToBeSetupMod_List_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_SLDRBs_ToBeModified_List_item = -1; /* ProtocolIE_SingleContainer */
@@ -2947,6 +2982,7 @@ static int hf_f1ap_SLDRBs_SetupMod_List_item = -1; /* ProtocolIE_SingleContaine
static int hf_f1ap_SLDRBs_Modified_List_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_SLDRBs_FailedToBeModified_List_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_SLDRBs_FailedToBeSetupMod_List_item = -1; /* ProtocolIE_SingleContainer */
+static int hf_f1ap_UE_MulticastMRBs_Setup_List_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_DRBs_Required_ToBeModified_List_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_DRBs_Required_ToBeReleased_List_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_SRBs_Required_ToBeReleased_List_item = -1; /* ProtocolIE_SingleContainer */
@@ -2995,6 +3031,7 @@ static int hf_f1ap_BroadcastMRBs_FailedToBeSetupMod_List_item = -1; /* Protocol
static int hf_f1ap_BroadcastMRBs_Modified_List_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_BroadcastMRBs_FailedToBeModified_List_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_UEIdentity_List_For_Paging_List_item = -1; /* ProtocolIE_SingleContainer */
+static int hf_f1ap_MC_PagingCell_list_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_MulticastMRBs_ToBeSetup_List_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_MulticastMRBs_Setup_List_item = -1; /* ProtocolIE_SingleContainer */
static int hf_f1ap_MulticastMRBs_FailedToBeSetup_List_item = -1; /* ProtocolIE_SingleContainer */
@@ -3092,6 +3129,8 @@ static gint ett_f1ap_SidelinkConfigurationContainer = -1;
static gint ett_f1ap_SRSPosRRCInactiveConfig = -1;
static gint ett_f1ap_successfulHOReportContainer = -1;
static gint ett_f1ap_UL_GapFR2_Config = -1;
+static gint ett_f1ap_ConfigRestrictInfoDAPS = -1;
+static gint ett_f1ap_UplinkTxDirectCurrentTwoCarrierListInfo = -1;
static gint ett_f1ap_PrivateIE_ID = -1;
static gint ett_f1ap_ProtocolIE_Container = -1;
static gint ett_f1ap_ProtocolIE_Field = -1;
@@ -3398,6 +3437,7 @@ static gint ett_f1ap_MBS_ServiceAreaTAIList = -1;
static gint ett_f1ap_MBS_ServiceAreaTAIList_Item = -1;
static gint ett_f1ap_MBS_ServiceAreaInformationList = -1;
static gint ett_f1ap_MBS_ServiceAreaInformationItem = -1;
+static gint ett_f1ap_MC_PagingCell_Item = -1;
static gint ett_f1ap_MeasurementBeamInfo = -1;
static gint ett_f1ap_MRB_ProgressInformation = -1;
static gint ett_f1ap_MultipleULAoA = -1;
@@ -3516,6 +3556,8 @@ static gint ett_f1ap_PosResourceSetType = -1;
static gint ett_f1ap_PosResourceSetTypePR = -1;
static gint ett_f1ap_PosResourceSetTypeSP = -1;
static gint ett_f1ap_PosResourceSetTypeAP = -1;
+static gint ett_f1ap_PosSItypeList = -1;
+static gint ett_f1ap_PosSItype_Item = -1;
static gint ett_f1ap_PosSRSResourceID_List = -1;
static gint ett_f1ap_PosSRSResource_Item = -1;
static gint ett_f1ap_PosSRSResource_List = -1;
@@ -3724,7 +3766,7 @@ static gint ett_f1ap_NSAGSupportList = -1;
static gint ett_f1ap_NSAGSupportItem = -1;
static gint ett_f1ap_TDD_Info = -1;
static gint ett_f1ap_TDD_InfoRel16 = -1;
-static gint ett_f1ap_TRPTEGIDInformation = -1;
+static gint ett_f1ap_TRPTEGInformation = -1;
static gint ett_f1ap_RxTxTEG = -1;
static gint ett_f1ap_RxTEG = -1;
static gint ett_f1ap_TimeReferenceInformation = -1;
@@ -3772,6 +3814,9 @@ static gint ett_f1ap_TRPPositionDirect = -1;
static gint ett_f1ap_TRPPositionDirectAccuracy = -1;
static gint ett_f1ap_TRPPositionReferenced = -1;
static gint ett_f1ap_TRPReferencePointType = -1;
+static gint ett_f1ap_TRP_Rx_TEGInformation = -1;
+static gint ett_f1ap_TRP_RxTx_TEGInformation = -1;
+static gint ett_f1ap_TRP_Tx_TEGInformation = -1;
static gint ett_f1ap_TRPTxTEGAssociation = -1;
static gint ett_f1ap_TRPTEG_Item = -1;
static gint ett_f1ap_SEQUENCE_SIZE_1_maxnoofPRS_ResourcesPerSet_OF_DLPRSResourceID_Item = -1;
@@ -3794,8 +3839,10 @@ static gint ett_f1ap_UEIdentity_List_For_Paging_Item = -1;
static gint ett_f1ap_UE_MulticastMRBs_ConfirmedToBeModified_Item = -1;
static gint ett_f1ap_UE_MulticastMRBs_RequiredToBeModified_Item = -1;
static gint ett_f1ap_UE_MulticastMRBs_RequiredToBeReleased_Item = -1;
+static gint ett_f1ap_UE_MulticastMRBs_Setup_Item = -1;
static gint ett_f1ap_UE_MulticastMRBs_ToBeReleased_Item = -1;
static gint ett_f1ap_UE_MulticastMRBs_ToBeSetup_Item = -1;
+static gint ett_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_Item = -1;
static gint ett_f1ap_UEPagingCapability = -1;
static gint ett_f1ap_UEReportingInformation = -1;
static gint ett_f1ap_UL_AoA = -1;
@@ -3902,6 +3949,7 @@ static gint ett_f1ap_BHChannels_ToBeModified_List = -1;
static gint ett_f1ap_SRBs_ToBeReleased_List = -1;
static gint ett_f1ap_DRBs_ToBeReleased_List = -1;
static gint ett_f1ap_BHChannels_ToBeReleased_List = -1;
+static gint ett_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_List = -1;
static gint ett_f1ap_UE_MulticastMRBs_ToBeReleased_List = -1;
static gint ett_f1ap_SLDRBs_ToBeSetupMod_List = -1;
static gint ett_f1ap_SLDRBs_ToBeModified_List = -1;
@@ -3924,6 +3972,7 @@ static gint ett_f1ap_SLDRBs_SetupMod_List = -1;
static gint ett_f1ap_SLDRBs_Modified_List = -1;
static gint ett_f1ap_SLDRBs_FailedToBeModified_List = -1;
static gint ett_f1ap_SLDRBs_FailedToBeSetupMod_List = -1;
+static gint ett_f1ap_UE_MulticastMRBs_Setup_List = -1;
static gint ett_f1ap_UEContextModificationFailure = -1;
static gint ett_f1ap_UEContextModificationRequired = -1;
static gint ett_f1ap_DRBs_Required_ToBeModified_List = -1;
@@ -4054,6 +4103,7 @@ static gint ett_f1ap_BroadcastMRBs_FailedToBeModified_List = -1;
static gint ett_f1ap_BroadcastContextModificationFailure = -1;
static gint ett_f1ap_MulticastGroupPaging = -1;
static gint ett_f1ap_UEIdentity_List_For_Paging_List = -1;
+static gint ett_f1ap_MC_PagingCell_list = -1;
static gint ett_f1ap_MulticastContextSetupRequest = -1;
static gint ett_f1ap_MulticastMRBs_ToBeSetup_List = -1;
static gint ett_f1ap_MulticastContextSetupResponse = -1;
@@ -4095,6 +4145,7 @@ static gint ett_f1ap_MeasurementPreconfigurationConfirm = -1;
static gint ett_f1ap_MeasurementPreconfigurationRefuse = -1;
static gint ett_f1ap_MeasurementActivation = -1;
static gint ett_f1ap_QoEInformationTransfer = -1;
+static gint ett_f1ap_PosSystemInformationDeliveryCommand = -1;
static gint ett_f1ap_F1AP_PDU = -1;
static gint ett_f1ap_InitiatingMessage = -1;
static gint ett_f1ap_SuccessfulOutcome = -1;
@@ -4256,6 +4307,7 @@ struct f1ap_tap_t {
#define MTYPE_MEASUREMENT_PRECONFIGURATION_REFUSE 132
#define MTYPE_MEASUREMENT_ACTIVATION 133
#define MTYPE_QOE_INFORMATION_TRANSFER 134
+#define MTYPE_POS_SYSTEM_INFORMATION_DELIVERY_COMMAND 135
static const value_string mtype_names[] = {
{ MTYPE_RESET, "Reset" },
@@ -4393,6 +4445,7 @@ static const value_string mtype_names[] = {
{ MTYPE_MEASUREMENT_PRECONFIGURATION_REFUSE, "MeasurementPreconfigurationRefuse" },
{ MTYPE_MEASUREMENT_ACTIVATION, "MeasurementActivation" },
{ MTYPE_QOE_INFORMATION_TRANSFER, "QoEInformationTransfer" },
+ { MTYPE_POS_SYSTEM_INFORMATION_DELIVERY_COMMAND, "PosSystemInformationDeliveryCommand" },
{ 0, NULL }
};
static value_string_ext mtype_names_ext = VALUE_STRING_EXT_INIT(mtype_names);
@@ -4653,6 +4706,7 @@ static const value_string f1ap_ProcedureCode_vals[] = {
{ id_QoEInformationTransfer, "id-QoEInformationTransfer" },
{ id_PDCMeasurementTerminationCommand, "id-PDCMeasurementTerminationCommand" },
{ id_PDCMeasurementFailureIndication, "id-PDCMeasurementFailureIndication" },
+ { id_PosSystemInformationDeliveryCommand, "id-PosSystemInformationDeliveryCommand" },
{ 0, NULL }
};
@@ -5250,8 +5304,8 @@ static const value_string f1ap_ProtocolIE_ID_vals[] = {
{ id_NumberOfTRPRxTEG, "id-NumberOfTRPRxTEG" },
{ id_NumberOfTRPRxTxTEG, "id-NumberOfTRPRxTxTEG" },
{ id_TRPTxTEGAssociation, "id-TRPTxTEGAssociation" },
- { id_TRPTEGIDInformation, "id-TRPTEGIDInformation" },
- { id_TRPRXTEGID, "id-TRPRXTEGID" },
+ { id_TRPTEGInformation, "id-TRPTEGInformation" },
+ { id_TRPRx_TEGInformation, "id-TRPRx-TEGInformation" },
{ id_TRP_PRS_Info_List, "id-TRP-PRS-Info-List" },
{ id_PRS_Measurement_Info_List, "id-PRS-Measurement-Info-List" },
{ id_PRSConfigRequestType, "id-PRSConfigRequestType" },
@@ -5351,9 +5405,9 @@ static const value_string f1ap_ProtocolIE_ID_vals[] = {
{ id_NeedForGapsInfoNR, "id-NeedForGapsInfoNR" },
{ id_NeedForGapNCSGInfoNR, "id-NeedForGapNCSGInfoNR" },
{ id_NeedForGapNCSGInfoEUTRA, "id-NeedForGapNCSGInfoEUTRA" },
- { id_TRPTxTimingErrorMargin, "id-TRPTxTimingErrorMargin" },
- { id_TRPRxTimingErrorMargin, "id-TRPRxTimingErrorMargin" },
- { id_TRPRxTxTimingErrorMargin, "id-TRPRxTxTimingErrorMargin" },
+ { id_procedure_code_668_not_to_be_used, "id-procedure-code-668-not-to-be-used" },
+ { id_procedure_code_669_not_to_be_used, "id-procedure-code-669-not-to-be-used" },
+ { id_procedure_code_670_not_to_be_used, "id-procedure-code-670-not-to-be-used" },
{ id_Source_MRB_ID, "id-Source-MRB-ID" },
{ id_PosMeasurementPeriodicityNR_AoA, "id-PosMeasurementPeriodicityNR-AoA" },
{ id_RedCapIndication, "id-RedCapIndication" },
@@ -5361,6 +5415,18 @@ static const value_string f1ap_ProtocolIE_ID_vals[] = {
{ id_SDTBearerConfigurationQueryIndication, "id-SDTBearerConfigurationQueryIndication" },
{ id_SDTBearerConfigurationInfo, "id-SDTBearerConfigurationInfo" },
{ id_UL_GapFR2_Config, "id-UL-GapFR2-Config" },
+ { id_ConfigRestrictInfoDAPS, "id-ConfigRestrictInfoDAPS" },
+ { id_UE_MulticastMRBs_Setup_List, "id-UE-MulticastMRBs-Setup-List" },
+ { id_UE_MulticastMRBs_Setup_Item, "id-UE-MulticastMRBs-Setup-Item" },
+ { id_MulticastF1UContextReferenceCU, "id-MulticastF1UContextReferenceCU" },
+ { id_PosSItypeList, "id-PosSItypeList" },
+ { id_DAPS_HO_Status, "id-DAPS-HO-Status" },
+ { id_UplinkTxDirectCurrentTwoCarrierListInfo, "id-UplinkTxDirectCurrentTwoCarrierListInfo" },
+ { id_UE_MulticastMRBs_ToBeSetup_atModify_List, "id-UE-MulticastMRBs-ToBeSetup-atModify-List" },
+ { id_UE_MulticastMRBs_ToBeSetup_atModify_Item, "id-UE-MulticastMRBs-ToBeSetup-atModify-Item" },
+ { id_MC_PagingCell_List, "id-MC-PagingCell-List" },
+ { id_MC_PagingCell_Item, "id-MC-PagingCell-Item" },
+ { id_SRSPosRRCInactiveQueryIndication, "id-SRSPosRRCInactiveQueryIndication" },
{ 0, NULL }
};
@@ -6773,6 +6839,10 @@ static const value_string f1ap_T_periodicity_02_vals[] = {
{ 18, "slot10240" },
{ 19, "slot40960" },
{ 20, "slot81920" },
+ { 21, "slot128" },
+ { 22, "slot256" },
+ { 23, "slot512" },
+ { 24, "slot20480" },
{ 0, NULL }
};
@@ -6780,7 +6850,7 @@ static const value_string f1ap_T_periodicity_02_vals[] = {
static int
dissect_f1ap_T_periodicity_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
- 21, NULL, TRUE, 0, NULL);
+ 21, NULL, TRUE, 4, NULL);
return offset;
}
@@ -6834,6 +6904,10 @@ static const value_string f1ap_T_periodicity_03_vals[] = {
{ 18, "slot10240" },
{ 19, "slot40960" },
{ 20, "slot81920" },
+ { 21, "slot128" },
+ { 22, "slot256" },
+ { 23, "slot512" },
+ { 24, "slot20480" },
{ 0, NULL }
};
@@ -6841,7 +6915,7 @@ static const value_string f1ap_T_periodicity_03_vals[] = {
static int
dissect_f1ap_T_periodicity_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
- 21, NULL, TRUE, 0, NULL);
+ 21, NULL, TRUE, 4, NULL);
return offset;
}
@@ -10283,28 +10357,6 @@ dissect_f1ap_BroadcastMRBs_SetupMod_Item(tvbuff_t *tvb _U_, int offset _U_, asn1
}
-static const value_string f1ap_QoSInformation_vals[] = {
- { 0, "eUTRANQoS" },
- { 1, "choice-extension" },
- { 0, NULL }
-};
-
-static const per_choice_t QoSInformation_choice[] = {
- { 0, &hf_f1ap_eUTRANQoS , ASN1_NO_EXTENSIONS , dissect_f1ap_EUTRANQoS },
- { 1, &hf_f1ap_choice_extension, ASN1_NO_EXTENSIONS , dissect_f1ap_ProtocolIE_SingleContainer },
- { 0, NULL, 0, NULL }
-};
-
-static int
-dissect_f1ap_QoSInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
- ett_f1ap_QoSInformation, QoSInformation_choice,
- NULL);
-
- return offset;
-}
-
-
static int
dissect_f1ap_QoSFlowIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -10347,7 +10399,7 @@ dissect_f1ap_MBS_Flows_Mapped_To_MRB_List(tvbuff_t *tvb _U_, int offset _U_, asn
static const per_sequence_t BroadcastMRBs_ToBeModified_Item_sequence[] = {
{ &hf_f1ap_mRB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_MRB_ID },
- { &hf_f1ap_mRB_QoSInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_QoSInformation },
+ { &hf_f1ap_mRB_QoSInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_QoSFlowLevelQoSParameters },
{ &hf_f1ap_mBS_Flows_Mapped_To_MRB_List, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_MBS_Flows_Mapped_To_MRB_List },
{ &hf_f1ap_bcBearerCtxtF1U_TNLInfoatCU, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_BCBearerContextF1U_TNLInfo },
{ &hf_f1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_ProtocolExtensionContainer },
@@ -10380,7 +10432,7 @@ dissect_f1ap_BroadcastMRBs_ToBeReleased_Item(tvbuff_t *tvb _U_, int offset _U_,
static const per_sequence_t BroadcastMRBs_ToBeSetup_Item_sequence[] = {
{ &hf_f1ap_mRB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_MRB_ID },
- { &hf_f1ap_mRB_QoSInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_QoSInformation },
+ { &hf_f1ap_mRB_QoSInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_QoSFlowLevelQoSParameters },
{ &hf_f1ap_mBS_Flows_Mapped_To_MRB_List, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_MBS_Flows_Mapped_To_MRB_List },
{ &hf_f1ap_bcBearerCtxtF1U_TNLInfoatCU, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_BCBearerContextF1U_TNLInfo },
{ &hf_f1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_ProtocolExtensionContainer },
@@ -10398,7 +10450,7 @@ dissect_f1ap_BroadcastMRBs_ToBeSetup_Item(tvbuff_t *tvb _U_, int offset _U_, asn
static const per_sequence_t BroadcastMRBs_ToBeSetupMod_Item_sequence[] = {
{ &hf_f1ap_mRB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_MRB_ID },
- { &hf_f1ap_mRB_QoSInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_QoSInformation },
+ { &hf_f1ap_mRB_QoSInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_QoSFlowLevelQoSParameters },
{ &hf_f1ap_mBS_Flows_Mapped_To_MRB_List, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_MBS_Flows_Mapped_To_MRB_List },
{ &hf_f1ap_bcBearerCtxtF1U_TNLInfoatCU, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_BCBearerContextF1U_TNLInfo },
{ &hf_f1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_ProtocolExtensionContainer },
@@ -12623,6 +12675,23 @@ dissect_f1ap_ConditionalIntraDUMobilityInformation(tvbuff_t *tvb _U_, int offset
}
+
+static int
+dissect_f1ap_ConfigRestrictInfoDAPS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ 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_ConfigRestrictInfoDAPS);
+ dissect_nr_rrc_ConfigRestrictInfoDAPS_r16_PDU(param_tvb, actx->pinfo, subtree, NULL);
+ }
+
+
+ return offset;
+}
+
+
static const value_string f1ap_ConfiguredTACIndication_vals[] = {
{ 0, "true" },
{ 0, NULL }
@@ -13023,6 +13092,21 @@ dissect_f1ap_CUtoDURRCInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
}
+static const value_string f1ap_DAPS_HO_Status_vals[] = {
+ { 0, "initiation" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_f1ap_DAPS_HO_Status(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+ 1, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
static const value_string f1ap_DCBasedDuplicationConfigured_vals[] = {
{ 0, "true" },
{ 1, "false" },
@@ -13656,6 +13740,28 @@ dissect_f1ap_DRBs_SetupMod_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
}
+static const value_string f1ap_QoSInformation_vals[] = {
+ { 0, "eUTRANQoS" },
+ { 1, "choice-extension" },
+ { 0, NULL }
+};
+
+static const per_choice_t QoSInformation_choice[] = {
+ { 0, &hf_f1ap_eUTRANQoS , ASN1_NO_EXTENSIONS , dissect_f1ap_EUTRANQoS },
+ { 1, &hf_f1ap_choice_extension, ASN1_NO_EXTENSIONS , dissect_f1ap_ProtocolIE_SingleContainer },
+ { 0, NULL, 0, NULL }
+};
+
+static int
+dissect_f1ap_QoSInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
+ ett_f1ap_QoSInformation, QoSInformation_choice,
+ NULL);
+
+ return offset;
+}
+
+
static const value_string f1ap_ULUEConfiguration_vals[] = {
{ 0, "no-data" },
{ 1, "shared" },
@@ -17685,6 +17791,21 @@ dissect_f1ap_MBS_ServiceArea(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
}
+static const per_sequence_t MC_PagingCell_Item_sequence[] = {
+ { &hf_f1ap_nRCGI , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_f1ap_NRCGI },
+ { &hf_f1ap_iE_Extensions , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_f1ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_f1ap_MC_PagingCell_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_f1ap_MC_PagingCell_Item, MC_PagingCell_Item_sequence);
+
+ return offset;
+}
+
+
static int
dissect_f1ap_MeasGapSharingConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -17809,6 +17930,16 @@ dissect_f1ap_MeasurementCharacteristicsRequestIndicator(tvbuff_t *tvb _U_, int o
}
+
+static int
+dissect_f1ap_MulticastF1UContextReferenceCU(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(tvb, offset, actx, tree, hf_index,
+ 4, 4, FALSE, NULL);
+
+ return offset;
+}
+
+
static const value_string f1ap_MDTPollutedMeasurementIndicator_vals[] = {
{ 0, "iDC" },
{ 1, "no-IDC" },
@@ -17965,7 +18096,7 @@ dissect_f1ap_PDCPSNLength(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
static const per_sequence_t MulticastMRBs_ToBeModified_Item_sequence[] = {
{ &hf_f1ap_mRB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_MRB_ID },
- { &hf_f1ap_mRB_QoSInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_QoSInformation },
+ { &hf_f1ap_mRB_QoSInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_QoSFlowLevelQoSParameters },
{ &hf_f1ap_mBS_Flows_Mapped_To_MRB_List, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_MBS_Flows_Mapped_To_MRB_List },
{ &hf_f1ap_mBS_DL_PDCP_SN_Length, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_PDCPSNLength },
{ &hf_f1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_ProtocolExtensionContainer },
@@ -17998,7 +18129,7 @@ dissect_f1ap_MulticastMRBs_ToBeReleased_Item(tvbuff_t *tvb _U_, int offset _U_,
static const per_sequence_t MulticastMRBs_ToBeSetup_Item_sequence[] = {
{ &hf_f1ap_mRB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_MRB_ID },
- { &hf_f1ap_mRB_QoSInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_QoSInformation },
+ { &hf_f1ap_mRB_QoSInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_QoSFlowLevelQoSParameters },
{ &hf_f1ap_mBS_Flows_Mapped_To_MRB_List, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_MBS_Flows_Mapped_To_MRB_List },
{ &hf_f1ap_mBS_DL_PDCP_SN_Length, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_PDCPSNLength },
{ &hf_f1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_ProtocolExtensionContainer },
@@ -18016,7 +18147,7 @@ dissect_f1ap_MulticastMRBs_ToBeSetup_Item(tvbuff_t *tvb _U_, int offset _U_, asn
static const per_sequence_t MulticastMRBs_ToBeSetupMod_Item_sequence[] = {
{ &hf_f1ap_mRB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_MRB_ID },
- { &hf_f1ap_mRB_QoSInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_QoSInformation },
+ { &hf_f1ap_mRB_QoSInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_QoSFlowLevelQoSParameters },
{ &hf_f1ap_mBS_Flows_Mapped_To_MRB_List, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_MBS_Flows_Mapped_To_MRB_List },
{ &hf_f1ap_mBS_DL_PDCP_SN_Length, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_PDCPSNLength },
{ &hf_f1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_ProtocolExtensionContainer },
@@ -20751,6 +20882,45 @@ dissect_f1ap_PosReportCharacteristics(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
}
+
+static int
+dissect_f1ap_PosSItype(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,
+ 1U, 32U, NULL, TRUE);
+
+ return offset;
+}
+
+
+static const per_sequence_t PosSItype_Item_sequence[] = {
+ { &hf_f1ap_posItype , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_f1ap_PosSItype },
+ { &hf_f1ap_iE_Extensions , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_f1ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_f1ap_PosSItype_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_f1ap_PosSItype_Item, PosSItype_Item_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t PosSItypeList_sequence_of[1] = {
+ { &hf_f1ap_PosSItypeList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_f1ap_PosSItype_Item },
+};
+
+static int
+dissect_f1ap_PosSItypeList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_f1ap_PosSItypeList, PosSItypeList_sequence_of,
+ 1, maxnoofPosSITypes, FALSE);
+
+ return offset;
+}
+
+
static const value_string f1ap_PrimaryPathIndication_vals[] = {
{ 0, "true" },
{ 1, "false" },
@@ -23088,6 +23258,36 @@ dissect_f1ap_ResponseTime(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
}
+static const value_string f1ap_RxTxTimingErrorMargin_vals[] = {
+ { 0, "tc0dot5" },
+ { 1, "tc1" },
+ { 2, "tc2" },
+ { 3, "tc4" },
+ { 4, "tc8" },
+ { 5, "tc12" },
+ { 6, "tc16" },
+ { 7, "tc20" },
+ { 8, "tc24" },
+ { 9, "tc32" },
+ { 10, "tc40" },
+ { 11, "tc48" },
+ { 12, "tc64" },
+ { 13, "tc80" },
+ { 14, "tc96" },
+ { 15, "tc128" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_f1ap_RxTxTimingErrorMargin(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+ 16, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
static const per_sequence_t SCell_FailedtoSetup_Item_sequence[] = {
{ &hf_f1ap_sCell_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_NRCGI },
{ &hf_f1ap_cause , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_Cause },
@@ -24735,6 +24935,21 @@ dissect_f1ap_SRSPosRRCInactiveConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
}
+static const value_string f1ap_SRSPosRRCInactiveQueryIndication_vals[] = {
+ { 0, "true" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_f1ap_SRSPosRRCInactiveQueryIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+ 1, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
static int
dissect_f1ap_T_successfulHOReportContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -24856,9 +25071,71 @@ dissect_f1ap_NSAGSupportList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
}
-static const per_sequence_t RxTxTEG_sequence[] = {
+static const per_sequence_t TRP_RxTx_TEGInformation_sequence[] = {
{ &hf_f1ap_tRP_RxTx_TEGID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_INTEGER_0_255 },
- { &hf_f1ap_tRP_Tx_TEGID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_INTEGER_0_7 },
+ { &hf_f1ap_tRP_RxTx_TimingErrorMargin, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_RxTxTimingErrorMargin },
+ { &hf_f1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_f1ap_TRP_RxTx_TEGInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_f1ap_TRP_RxTx_TEGInformation, TRP_RxTx_TEGInformation_sequence);
+
+ return offset;
+}
+
+
+static const value_string f1ap_TimingErrorMargin_vals[] = {
+ { 0, "m0Tc" },
+ { 1, "m2Tc" },
+ { 2, "m4Tc" },
+ { 3, "m6Tc" },
+ { 4, "m8Tc" },
+ { 5, "m12Tc" },
+ { 6, "m16Tc" },
+ { 7, "m20Tc" },
+ { 8, "m24Tc" },
+ { 9, "m32Tc" },
+ { 10, "m40Tc" },
+ { 11, "m48Tc" },
+ { 12, "m56Tc" },
+ { 13, "m64Tc" },
+ { 14, "m72Tc" },
+ { 15, "m80Tc" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_f1ap_TimingErrorMargin(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+ 16, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
+static const per_sequence_t TRP_Tx_TEGInformation_sequence[] = {
+ { &hf_f1ap_tRP_Tx_TEGID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_INTEGER_0_7 },
+ { &hf_f1ap_tRP_Tx_TimingErrorMargin, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_TimingErrorMargin },
+ { &hf_f1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_f1ap_TRP_Tx_TEGInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_f1ap_TRP_Tx_TEGInformation, TRP_Tx_TEGInformation_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t RxTxTEG_sequence[] = {
+ { &hf_f1ap_tRP_RxTx_TEGInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_TRP_RxTx_TEGInformation },
+ { &hf_f1ap_tRP_Tx_TEGInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_TRP_Tx_TEGInformation },
{ &hf_f1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -24872,9 +25149,25 @@ dissect_f1ap_RxTxTEG(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
}
-static const per_sequence_t RxTEG_sequence[] = {
+static const per_sequence_t TRP_Rx_TEGInformation_sequence[] = {
{ &hf_f1ap_tRP_Rx_TEGID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_INTEGER_0_31 },
- { &hf_f1ap_tRP_Tx_TEGID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_INTEGER_0_7 },
+ { &hf_f1ap_tRP_Rx_TimingErrorMargin, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_TimingErrorMargin },
+ { &hf_f1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_f1ap_TRP_Rx_TEGInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_f1ap_TRP_Rx_TEGInformation, TRP_Rx_TEGInformation_sequence);
+
+ return offset;
+}
+
+
+static const per_sequence_t RxTEG_sequence[] = {
+ { &hf_f1ap_tRP_Rx_TEGInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_TRP_Rx_TEGInformation },
+ { &hf_f1ap_tRP_Tx_TEGInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_TRP_Tx_TEGInformation },
{ &hf_f1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@@ -24888,14 +25181,14 @@ dissect_f1ap_RxTEG(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
}
-static const value_string f1ap_TRPTEGIDInformation_vals[] = {
+static const value_string f1ap_TRPTEGInformation_vals[] = {
{ 0, "rxTx-TEG" },
{ 1, "rx-TEG" },
{ 2, "choice-extension" },
{ 0, NULL }
};
-static const per_choice_t TRPTEGIDInformation_choice[] = {
+static const per_choice_t TRPTEGInformation_choice[] = {
{ 0, &hf_f1ap_rxTx_TEG , ASN1_NO_EXTENSIONS , dissect_f1ap_RxTxTEG },
{ 1, &hf_f1ap_rx_TEG , ASN1_NO_EXTENSIONS , dissect_f1ap_RxTEG },
{ 2, &hf_f1ap_choice_extension, ASN1_NO_EXTENSIONS , dissect_f1ap_ProtocolIE_SingleContainer },
@@ -24903,9 +25196,9 @@ static const per_choice_t TRPTEGIDInformation_choice[] = {
};
static int
-dissect_f1ap_TRPTEGIDInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_f1ap_TRPTEGInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
- ett_f1ap_TRPTEGIDInformation, TRPTEGIDInformation_choice,
+ ett_f1ap_TRPTEGInformation, TRPTEGInformation_choice,
NULL);
return offset;
@@ -24975,36 +25268,6 @@ dissect_f1ap_TimeToWait(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
}
-static const value_string f1ap_TimingErrorMargin_vals[] = {
- { 0, "m0Tc" },
- { 1, "m2Tc" },
- { 2, "m4Tc" },
- { 3, "m6Tc" },
- { 4, "m8Tc" },
- { 5, "m12Tc" },
- { 6, "m16Tc" },
- { 7, "m20Tc" },
- { 8, "m24Tc" },
- { 9, "m32Tc" },
- { 10, "m40Tc" },
- { 11, "m48Tc" },
- { 12, "m56Tc" },
- { 13, "m64Tc" },
- { 14, "m72Tc" },
- { 15, "m80Tc" },
- { 0, NULL }
-};
-
-
-static int
-dissect_f1ap_TimingErrorMargin(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
- 16, NULL, TRUE, 0, NULL);
-
- return offset;
-}
-
-
static int
dissect_f1ap_INTEGER_1_16777216_(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -25561,7 +25824,7 @@ dissect_f1ap_SEQUENCE_SIZE_1_maxnoofPRS_ResourcesPerSet_OF_DLPRSResourceID_Item(
static const per_sequence_t TRPTEG_Item_sequence[] = {
- { &hf_f1ap_tRP_Tx_TEG_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_INTEGER_0_7 },
+ { &hf_f1ap_tRP_Tx_TEGInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_TRP_Tx_TEGInformation },
{ &hf_f1ap_dl_PRSResourceSetID, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_PRS_Resource_Set_ID },
{ &hf_f1ap_dl_PRSResourceID_List, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_SEQUENCE_SIZE_1_maxnoofPRS_ResourcesPerSet_OF_DLPRSResourceID_Item },
{ &hf_f1ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_ProtocolExtensionContainer },
@@ -26047,6 +26310,22 @@ dissect_f1ap_UE_MulticastMRBs_RequiredToBeReleased_Item(tvbuff_t *tvb _U_, int o
}
+static const per_sequence_t UE_MulticastMRBs_Setup_Item_sequence[] = {
+ { &hf_f1ap_mRB_ID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_f1ap_MRB_ID },
+ { &hf_f1ap_multicastF1UContextReferenceCU, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_f1ap_MulticastF1UContextReferenceCU },
+ { &hf_f1ap_iE_Extensions , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_f1ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_f1ap_UE_MulticastMRBs_Setup_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_f1ap_UE_MulticastMRBs_Setup_Item, UE_MulticastMRBs_Setup_Item_sequence);
+
+ return offset;
+}
+
+
static const per_sequence_t UE_MulticastMRBs_ToBeReleased_Item_sequence[] = {
{ &hf_f1ap_mRB_ID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_f1ap_MRB_ID },
{ &hf_f1ap_iE_Extensions , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_f1ap_ProtocolExtensionContainer },
@@ -26079,6 +26358,23 @@ dissect_f1ap_UE_MulticastMRBs_ToBeSetup_Item(tvbuff_t *tvb _U_, int offset _U_,
}
+static const per_sequence_t UE_MulticastMRBs_ToBeSetup_atModify_Item_sequence[] = {
+ { &hf_f1ap_mRB_ID , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_f1ap_MRB_ID },
+ { &hf_f1ap_mbsPTPRetransmissionTunnelRequired, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_f1ap_MBSPTPRetransmissionTunnelRequired },
+ { &hf_f1ap_mbsPTPForwardingRequiredInformation, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_f1ap_MRB_ProgressInformation },
+ { &hf_f1ap_iE_Extensions , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_f1ap_ProtocolExtensionContainer },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_Item, UE_MulticastMRBs_ToBeSetup_atModify_Item_sequence);
+
+ return offset;
+}
+
+
static const value_string f1ap_T_iNACTIVEStatePODetermination_vals[] = {
{ 0, "supported" },
{ 0, NULL }
@@ -26233,16 +26529,6 @@ dissect_f1ap_UL_GapFR2_Config(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
}
-
-static int
-dissect_f1ap_TRPRXTEGID(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, 31U, NULL, FALSE);
-
- return offset;
-}
-
-
static const per_sequence_t UL_UP_TNL_Information_to_Update_List_Item_sequence[] = {
{ &hf_f1ap_uLUPTNLInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_UPTransportLayerInformation },
{ &hf_f1ap_newULUPTNLInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_f1ap_UPTransportLayerInformation },
@@ -26295,6 +26581,23 @@ dissect_f1ap_UplinkTxDirectCurrentListInformation(tvbuff_t *tvb _U_, int offset
static int
+dissect_f1ap_UplinkTxDirectCurrentTwoCarrierListInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ 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_UplinkTxDirectCurrentTwoCarrierListInfo);
+ dissect_nr_rrc_UplinkTxDirectCurrentTwoCarrierList_r16_PDU(param_tvb, actx->pinfo, subtree, NULL);
+ }
+
+
+ return offset;
+}
+
+
+
+static int
dissect_f1ap_URI_address(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_VisibleString(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE);
@@ -27669,6 +27972,20 @@ dissect_f1ap_BHChannels_ToBeReleased_List(tvbuff_t *tvb _U_, int offset _U_, asn
}
+static const per_sequence_t UE_MulticastMRBs_ToBeSetup_atModify_List_sequence_of[1] = {
+ { &hf_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_f1ap_ProtocolIE_SingleContainer },
+};
+
+static int
+dissect_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_List, UE_MulticastMRBs_ToBeSetup_atModify_List_sequence_of,
+ 1, maxnoofMRBsforUE, FALSE);
+
+ return offset;
+}
+
+
static const per_sequence_t UE_MulticastMRBs_ToBeReleased_List_sequence_of[1] = {
{ &hf_f1ap_UE_MulticastMRBs_ToBeReleased_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_f1ap_ProtocolIE_SingleContainer },
};
@@ -27979,6 +28296,20 @@ dissect_f1ap_SLDRBs_FailedToBeSetupMod_List(tvbuff_t *tvb _U_, int offset _U_, a
}
+static const per_sequence_t UE_MulticastMRBs_Setup_List_sequence_of[1] = {
+ { &hf_f1ap_UE_MulticastMRBs_Setup_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_f1ap_ProtocolIE_SingleContainer },
+};
+
+static int
+dissect_f1ap_UE_MulticastMRBs_Setup_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_f1ap_UE_MulticastMRBs_Setup_List, UE_MulticastMRBs_Setup_List_sequence_of,
+ 1, maxnoofMRBsforUE, FALSE);
+
+ return offset;
+}
+
+
static const per_sequence_t UEContextModificationFailure_sequence[] = {
{ &hf_f1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_ProtocolIE_Container },
{ NULL, 0, 0, NULL }
@@ -30008,6 +30339,20 @@ dissect_f1ap_UEIdentity_List_For_Paging_List(tvbuff_t *tvb _U_, int offset _U_,
}
+static const per_sequence_t MC_PagingCell_list_sequence_of[1] = {
+ { &hf_f1ap_MC_PagingCell_list_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_f1ap_ProtocolIE_SingleContainer },
+};
+
+static int
+dissect_f1ap_MC_PagingCell_list(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+ ett_f1ap_MC_PagingCell_list, MC_PagingCell_list_sequence_of,
+ 1, maxnoofPagingCells, FALSE);
+
+ return offset;
+}
+
+
static const per_sequence_t MulticastContextSetupRequest_sequence[] = {
{ &hf_f1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_ProtocolIE_Container },
{ NULL, 0, 0, NULL }
@@ -30638,6 +30983,22 @@ dissect_f1ap_QoEInformationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
}
+static const per_sequence_t PosSystemInformationDeliveryCommand_sequence[] = {
+ { &hf_f1ap_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_f1ap_ProtocolIE_Container },
+ { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_f1ap_PosSystemInformationDeliveryCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ set_message_label(actx, MTYPE_POS_SYSTEM_INFORMATION_DELIVERY_COMMAND);
+ set_stats_message_type(actx->pinfo, MTYPE_POS_SYSTEM_INFORMATION_DELIVERY_COMMAND);
+ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+ ett_f1ap_PosSystemInformationDeliveryCommand, PosSystemInformationDeliveryCommand_sequence);
+
+ return offset;
+}
+
+
static int
dissect_f1ap_InitiatingMessage_value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -31386,6 +31747,14 @@ static int dissect_ConditionalIntraDUMobilityInformation_PDU(tvbuff_t *tvb _U_,
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_ConfigRestrictInfoDAPS_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_ConfigRestrictInfoDAPS(tvb, offset, &asn1_ctx, tree, hf_f1ap_ConfigRestrictInfoDAPS_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_ConfiguredTACIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -31450,6 +31819,14 @@ static int dissect_CUtoDURRCInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinf
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_DAPS_HO_Status_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_DAPS_HO_Status(tvb, offset, &asn1_ctx, tree, hf_f1ap_DAPS_HO_Status_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_DCBasedDuplicationConfigured_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -32330,6 +32707,14 @@ static int dissect_MBS_ServiceArea_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_MC_PagingCell_Item_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_MC_PagingCell_Item(tvb, offset, &asn1_ctx, tree, hf_f1ap_MC_PagingCell_Item_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_MeasGapSharingConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -32378,6 +32763,14 @@ static int dissect_MeasurementCharacteristicsRequestIndicator_PDU(tvbuff_t *tvb
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_MulticastF1UContextReferenceCU_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_MulticastF1UContextReferenceCU(tvb, offset, &asn1_ctx, tree, hf_f1ap_MulticastF1UContextReferenceCU_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_MultipleULAoA_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -33122,6 +33515,14 @@ static int dissect_PosReportCharacteristics_PDU(tvbuff_t *tvb _U_, packet_info *
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_PosSItypeList_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_PosSItypeList(tvb, offset, &asn1_ctx, tree, hf_f1ap_PosSItypeList_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_Protected_EUTRA_Resources_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -34138,6 +34539,14 @@ static int dissect_SRSPosRRCInactiveConfig_PDU(tvbuff_t *tvb _U_, packet_info *p
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_SRSPosRRCInactiveQueryIndication_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_SRSPosRRCInactiveQueryIndication(tvb, offset, &asn1_ctx, tree, hf_f1ap_SRSPosRRCInactiveQueryIndication_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_SSB_PositionsInBurst_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -34210,11 +34619,11 @@ static int dissect_TDD_UL_DLConfigCommonNR_PDU(tvbuff_t *tvb _U_, packet_info *p
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_TRPTEGIDInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+static int dissect_TRPTEGInformation_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_TRPTEGIDInformation(tvb, offset, &asn1_ctx, tree, hf_f1ap_TRPTEGIDInformation_PDU);
+ offset = dissect_f1ap_TRPTEGInformation(tvb, offset, &asn1_ctx, tree, hf_f1ap_TRPTEGInformation_PDU);
offset += 7; offset >>= 3;
return offset;
}
@@ -34234,14 +34643,6 @@ static int dissect_TimeToWait_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_TimingErrorMargin_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_TimingErrorMargin(tvb, offset, &asn1_ctx, tree, hf_f1ap_TimingErrorMargin_PDU);
- offset += 7; offset >>= 3;
- return offset;
-}
static int dissect_TNLCapacityIndicator_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -34362,6 +34763,14 @@ static int dissect_TRP_PRS_Info_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_TRP_Rx_TEGInformation_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_TRP_Rx_TEGInformation(tvb, offset, &asn1_ctx, tree, hf_f1ap_TRP_Rx_TEGInformation_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_TRPTxTEGAssociation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -34482,6 +34891,14 @@ static int dissect_UE_MulticastMRBs_RequiredToBeReleased_Item_PDU(tvbuff_t *tvb
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_UE_MulticastMRBs_Setup_Item_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_UE_MulticastMRBs_Setup_Item(tvb, offset, &asn1_ctx, tree, hf_f1ap_UE_MulticastMRBs_Setup_Item_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_UE_MulticastMRBs_ToBeReleased_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -34498,6 +34915,14 @@ static int dissect_UE_MulticastMRBs_ToBeSetup_Item_PDU(tvbuff_t *tvb _U_, packet
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_UE_MulticastMRBs_ToBeSetup_atModify_Item_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_UE_MulticastMRBs_ToBeSetup_atModify_Item(tvb, offset, &asn1_ctx, tree, hf_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_Item_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_UEPagingCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -34530,14 +34955,6 @@ static int dissect_UL_GapFR2_Config_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U
offset += 7; offset >>= 3;
return offset;
}
-static int dissect_TRPRXTEGID_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_TRPRXTEGID(tvb, offset, &asn1_ctx, tree, hf_f1ap_TRPRXTEGID_PDU);
- offset += 7; offset >>= 3;
- return offset;
-}
static int dissect_UL_SRS_RSRPP_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -34570,6 +34987,14 @@ static int dissect_UplinkTxDirectCurrentListInformation_PDU(tvbuff_t *tvb _U_, p
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_UplinkTxDirectCurrentTwoCarrierListInfo_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_UplinkTxDirectCurrentTwoCarrierListInfo(tvb, offset, &asn1_ctx, tree, hf_f1ap_UplinkTxDirectCurrentTwoCarrierListInfo_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_URI_address_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -35218,6 +35643,14 @@ static int dissect_BHChannels_ToBeReleased_List_PDU(tvbuff_t *tvb _U_, packet_in
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_UE_MulticastMRBs_ToBeSetup_atModify_List_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_UE_MulticastMRBs_ToBeSetup_atModify_List(tvb, offset, &asn1_ctx, tree, hf_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_List_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_UE_MulticastMRBs_ToBeReleased_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -35394,6 +35827,14 @@ static int dissect_SLDRBs_FailedToBeSetupMod_List_PDU(tvbuff_t *tvb _U_, packet_
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_UE_MulticastMRBs_Setup_List_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_UE_MulticastMRBs_Setup_List(tvb, offset, &asn1_ctx, tree, hf_f1ap_UE_MulticastMRBs_Setup_List_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_UEContextModificationFailure_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -36426,6 +36867,14 @@ static int dissect_UEIdentity_List_For_Paging_List_PDU(tvbuff_t *tvb _U_, packet
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_MC_PagingCell_list_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_MC_PagingCell_list(tvb, offset, &asn1_ctx, tree, hf_f1ap_MC_PagingCell_list_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_MulticastContextSetupRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -36754,6 +37203,14 @@ static int dissect_QoEInformationTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pi
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_PosSystemInformationDeliveryCommand_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_PosSystemInformationDeliveryCommand(tvb, offset, &asn1_ctx, tree, hf_f1ap_PosSystemInformationDeliveryCommand_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_F1AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@@ -37292,6 +37749,10 @@ void proto_register_f1ap(void) {
{ "ConditionalIntraDUMobilityInformation", "f1ap.ConditionalIntraDUMobilityInformation_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_ConfigRestrictInfoDAPS_PDU,
+ { "ConfigRestrictInfoDAPS", "f1ap.ConfigRestrictInfoDAPS",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_ConfiguredTACIndication_PDU,
{ "ConfiguredTACIndication", "f1ap.ConfiguredTACIndication",
FT_UINT32, BASE_DEC, VALS(f1ap_ConfiguredTACIndication_vals), 0,
@@ -37324,6 +37785,10 @@ void proto_register_f1ap(void) {
{ "CUtoDURRCInformation", "f1ap.CUtoDURRCInformation_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_DAPS_HO_Status_PDU,
+ { "DAPS-HO-Status", "f1ap.DAPS_HO_Status",
+ FT_UINT32, BASE_DEC, VALS(f1ap_DAPS_HO_Status_vals), 0,
+ NULL, HFILL }},
{ &hf_f1ap_DCBasedDuplicationConfigured_PDU,
{ "DCBasedDuplicationConfigured", "f1ap.DCBasedDuplicationConfigured",
FT_UINT32, BASE_DEC, VALS(f1ap_DCBasedDuplicationConfigured_vals), 0,
@@ -37764,6 +38229,10 @@ void proto_register_f1ap(void) {
{ "MBS-ServiceArea", "f1ap.MBS_ServiceArea",
FT_UINT32, BASE_DEC, VALS(f1ap_MBS_ServiceArea_vals), 0,
NULL, HFILL }},
+ { &hf_f1ap_MC_PagingCell_Item_PDU,
+ { "MC-PagingCell-Item", "f1ap.MC_PagingCell_Item_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_MeasGapSharingConfig_PDU,
{ "MeasGapSharingConfig", "f1ap.MeasGapSharingConfig",
FT_BYTES, BASE_NONE, NULL, 0,
@@ -37788,6 +38257,10 @@ void proto_register_f1ap(void) {
{ "MeasurementCharacteristicsRequestIndicator", "f1ap.MeasurementCharacteristicsRequestIndicator",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_MulticastF1UContextReferenceCU_PDU,
+ { "MulticastF1UContextReferenceCU", "f1ap.MulticastF1UContextReferenceCU",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_MultipleULAoA_PDU,
{ "MultipleULAoA", "f1ap.MultipleULAoA_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -38160,6 +38633,10 @@ void proto_register_f1ap(void) {
{ "PosReportCharacteristics", "f1ap.PosReportCharacteristics",
FT_UINT32, BASE_DEC, VALS(f1ap_PosReportCharacteristics_vals), 0,
NULL, HFILL }},
+ { &hf_f1ap_PosSItypeList_PDU,
+ { "PosSItypeList", "f1ap.PosSItypeList",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_Protected_EUTRA_Resources_Item_PDU,
{ "Protected-EUTRA-Resources-Item", "f1ap.Protected_EUTRA_Resources_Item_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -38668,6 +39145,10 @@ void proto_register_f1ap(void) {
{ "SRSPosRRCInactiveConfig", "f1ap.SRSPosRRCInactiveConfig",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_SRSPosRRCInactiveQueryIndication_PDU,
+ { "SRSPosRRCInactiveQueryIndication", "f1ap.SRSPosRRCInactiveQueryIndication",
+ FT_UINT32, BASE_DEC, VALS(f1ap_SRSPosRRCInactiveQueryIndication_vals), 0,
+ NULL, HFILL }},
{ &hf_f1ap_SSB_PositionsInBurst_PDU,
{ "SSB-PositionsInBurst", "f1ap.SSB_PositionsInBurst",
FT_UINT32, BASE_DEC, VALS(f1ap_SSB_PositionsInBurst_vals), 0,
@@ -38704,9 +39185,9 @@ void proto_register_f1ap(void) {
{ "TDD-UL-DLConfigCommonNR", "f1ap.TDD_UL_DLConfigCommonNR",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
- { &hf_f1ap_TRPTEGIDInformation_PDU,
- { "TRPTEGIDInformation", "f1ap.TRPTEGIDInformation",
- FT_UINT32, BASE_DEC, VALS(f1ap_TRPTEGIDInformation_vals), 0,
+ { &hf_f1ap_TRPTEGInformation_PDU,
+ { "TRPTEGInformation", "f1ap.TRPTEGInformation",
+ FT_UINT32, BASE_DEC, VALS(f1ap_TRPTEGInformation_vals), 0,
NULL, HFILL }},
{ &hf_f1ap_TimeReferenceInformation_PDU,
{ "TimeReferenceInformation", "f1ap.TimeReferenceInformation_element",
@@ -38716,10 +39197,6 @@ void proto_register_f1ap(void) {
{ "TimeToWait", "f1ap.TimeToWait",
FT_UINT32, BASE_DEC, VALS(f1ap_TimeToWait_vals), 0,
NULL, HFILL }},
- { &hf_f1ap_TimingErrorMargin_PDU,
- { "TimingErrorMargin", "f1ap.TimingErrorMargin",
- FT_UINT32, BASE_DEC, VALS(f1ap_TimingErrorMargin_vals), 0,
- NULL, HFILL }},
{ &hf_f1ap_TNLCapacityIndicator_PDU,
{ "TNLCapacityIndicator", "f1ap.TNLCapacityIndicator_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -38780,6 +39257,10 @@ void proto_register_f1ap(void) {
{ "TRP-PRS-Info-List", "f1ap.TRP_PRS_Info_List",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_TRP_Rx_TEGInformation_PDU,
+ { "TRP-Rx-TEGInformation", "f1ap.TRP_Rx_TEGInformation_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_TRPTxTEGAssociation_PDU,
{ "TRPTxTEGAssociation", "f1ap.TRPTxTEGAssociation",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -38840,6 +39321,10 @@ void proto_register_f1ap(void) {
{ "UE-MulticastMRBs-RequiredToBeReleased-Item", "f1ap.UE_MulticastMRBs_RequiredToBeReleased_Item_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_UE_MulticastMRBs_Setup_Item_PDU,
+ { "UE-MulticastMRBs-Setup-Item", "f1ap.UE_MulticastMRBs_Setup_Item_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_UE_MulticastMRBs_ToBeReleased_Item_PDU,
{ "UE-MulticastMRBs-ToBeReleased-Item", "f1ap.UE_MulticastMRBs_ToBeReleased_Item_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -38848,6 +39333,10 @@ void proto_register_f1ap(void) {
{ "UE-MulticastMRBs-ToBeSetup-Item", "f1ap.UE_MulticastMRBs_ToBeSetup_Item_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_Item_PDU,
+ { "UE-MulticastMRBs-ToBeSetup-atModify-Item", "f1ap.UE_MulticastMRBs_ToBeSetup_atModify_Item_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_UEPagingCapability_PDU,
{ "UEPagingCapability", "f1ap.UEPagingCapability_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -38864,10 +39353,6 @@ void proto_register_f1ap(void) {
{ "UL-GapFR2-Config", "f1ap.UL_GapFR2_Config",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
- { &hf_f1ap_TRPRXTEGID_PDU,
- { "TRPRXTEGID", "f1ap.TRPRXTEGID",
- FT_UINT32, BASE_DEC, NULL, 0,
- NULL, HFILL }},
{ &hf_f1ap_UL_SRS_RSRPP_PDU,
{ "UL-SRS-RSRPP", "f1ap.UL_SRS_RSRPP_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -38884,6 +39369,10 @@ void proto_register_f1ap(void) {
{ "UplinkTxDirectCurrentListInformation", "f1ap.UplinkTxDirectCurrentListInformation",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_UplinkTxDirectCurrentTwoCarrierListInfo_PDU,
+ { "UplinkTxDirectCurrentTwoCarrierListInfo", "f1ap.UplinkTxDirectCurrentTwoCarrierListInfo",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_URI_address_PDU,
{ "URI-address", "f1ap.URI_address",
FT_STRING, BASE_NONE, NULL, 0,
@@ -39208,6 +39697,10 @@ void proto_register_f1ap(void) {
{ "BHChannels-ToBeReleased-List", "f1ap.BHChannels_ToBeReleased_List",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_List_PDU,
+ { "UE-MulticastMRBs-ToBeSetup-atModify-List", "f1ap.UE_MulticastMRBs_ToBeSetup_atModify_List",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_UE_MulticastMRBs_ToBeReleased_List_PDU,
{ "UE-MulticastMRBs-ToBeReleased-List", "f1ap.UE_MulticastMRBs_ToBeReleased_List",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -39296,6 +39789,10 @@ void proto_register_f1ap(void) {
{ "SLDRBs-FailedToBeSetupMod-List", "f1ap.SLDRBs_FailedToBeSetupMod_List",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_UE_MulticastMRBs_Setup_List_PDU,
+ { "UE-MulticastMRBs-Setup-List", "f1ap.UE_MulticastMRBs_Setup_List",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_UEContextModificationFailure_PDU,
{ "UEContextModificationFailure", "f1ap.UEContextModificationFailure_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -39812,6 +40309,10 @@ void proto_register_f1ap(void) {
{ "UEIdentity-List-For-Paging-List", "f1ap.UEIdentity_List_For_Paging_List",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_MC_PagingCell_list_PDU,
+ { "MC-PagingCell-list", "f1ap.MC_PagingCell_list",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_MulticastContextSetupRequest_PDU,
{ "MulticastContextSetupRequest", "f1ap.MulticastContextSetupRequest_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -39976,6 +40477,10 @@ void proto_register_f1ap(void) {
{ "QoEInformationTransfer", "f1ap.QoEInformationTransfer_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_PosSystemInformationDeliveryCommand_PDU,
+ { "PosSystemInformationDeliveryCommand", "f1ap.PosSystemInformationDeliveryCommand_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_F1AP_PDU_PDU,
{ "F1AP-PDU", "f1ap.F1AP_PDU",
FT_UINT32, BASE_DEC, VALS(f1ap_F1AP_PDU_vals), 0,
@@ -40465,9 +40970,9 @@ void proto_register_f1ap(void) {
FT_UINT32, BASE_DEC, VALS(f1ap_BCBearerContextF1U_TNLInfo_vals), 0,
"BCBearerContextF1U_TNLInfo", HFILL }},
{ &hf_f1ap_mRB_QoSInformation,
- { "mRB-QoSInformation", "f1ap.mRB_QoSInformation",
- FT_UINT32, BASE_DEC, VALS(f1ap_QoSInformation_vals), 0,
- "QoSInformation", HFILL }},
+ { "mRB-QoSInformation", "f1ap.mRB_QoSInformation_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "QoSFlowLevelQoSParameters", HFILL }},
{ &hf_f1ap_mBS_Flows_Mapped_To_MRB_List,
{ "mBS-Flows-Mapped-To-MRB-List", "f1ap.mBS_Flows_Mapped_To_MRB_List",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -42704,6 +43209,14 @@ void proto_register_f1ap(void) {
{ "sRSResourceTrigger-List", "f1ap.sRSResourceTrigger_List",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_1_3", HFILL }},
+ { &hf_f1ap_PosSItypeList_item,
+ { "PosSItype-Item", "f1ap.PosSItype_Item_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_f1ap_posItype,
+ { "posItype", "f1ap.posItype",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "PosSItype", HFILL }},
{ &hf_f1ap_PosSRSResourceID_List_item,
{ "SRSPosResourceID", "f1ap.SRSPosResourceID",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -44064,18 +44577,18 @@ void proto_register_f1ap(void) {
{ "rx-TEG", "f1ap.rx_TEG_element",
FT_NONE, BASE_NONE, NULL, 0,
"RxTEG", HFILL }},
- { &hf_f1ap_tRP_RxTx_TEGID,
- { "tRP-RxTx-TEGID", "f1ap.tRP_RxTx_TEGID",
- FT_UINT32, BASE_DEC, NULL, 0,
- "INTEGER_0_255", HFILL }},
- { &hf_f1ap_tRP_Tx_TEGID,
- { "tRP-Tx-TEGID", "f1ap.tRP_Tx_TEGID",
- FT_UINT32, BASE_DEC, NULL, 0,
- "INTEGER_0_7", HFILL }},
- { &hf_f1ap_tRP_Rx_TEGID,
- { "tRP-Rx-TEGID", "f1ap.tRP_Rx_TEGID",
- FT_UINT32, BASE_DEC, NULL, 0,
- "INTEGER_0_31", HFILL }},
+ { &hf_f1ap_tRP_RxTx_TEGInformation,
+ { "tRP-RxTx-TEGInformation", "f1ap.tRP_RxTx_TEGInformation_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_f1ap_tRP_Tx_TEGInformation,
+ { "tRP-Tx-TEGInformation", "f1ap.tRP_Tx_TEGInformation_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_f1ap_tRP_Rx_TEGInformation,
+ { "tRP-Rx-TEGInformation", "f1ap.tRP_Rx_TEGInformation_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_referenceTime,
{ "referenceTime", "f1ap.referenceTime",
FT_BYTES, BASE_NONE, NULL, 0,
@@ -44400,14 +44913,34 @@ void proto_register_f1ap(void) {
{ "tRPPositionRelativeCartesian", "f1ap.tRPPositionRelativeCartesian_element",
FT_NONE, BASE_NONE, NULL, 0,
"RelativeCartesianLocation", HFILL }},
+ { &hf_f1ap_tRP_Rx_TEGID,
+ { "tRP-Rx-TEGID", "f1ap.tRP_Rx_TEGID",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "INTEGER_0_31", HFILL }},
+ { &hf_f1ap_tRP_Rx_TimingErrorMargin,
+ { "tRP-Rx-TimingErrorMargin", "f1ap.tRP_Rx_TimingErrorMargin",
+ FT_UINT32, BASE_DEC, VALS(f1ap_TimingErrorMargin_vals), 0,
+ "TimingErrorMargin", HFILL }},
+ { &hf_f1ap_tRP_RxTx_TEGID,
+ { "tRP-RxTx-TEGID", "f1ap.tRP_RxTx_TEGID",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "INTEGER_0_255", HFILL }},
+ { &hf_f1ap_tRP_RxTx_TimingErrorMargin,
+ { "tRP-RxTx-TimingErrorMargin", "f1ap.tRP_RxTx_TimingErrorMargin",
+ FT_UINT32, BASE_DEC, VALS(f1ap_RxTxTimingErrorMargin_vals), 0,
+ "RxTxTimingErrorMargin", HFILL }},
+ { &hf_f1ap_tRP_Tx_TEGID,
+ { "tRP-Tx-TEGID", "f1ap.tRP_Tx_TEGID",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "INTEGER_0_7", HFILL }},
+ { &hf_f1ap_tRP_Tx_TimingErrorMargin,
+ { "tRP-Tx-TimingErrorMargin", "f1ap.tRP_Tx_TimingErrorMargin",
+ FT_UINT32, BASE_DEC, VALS(f1ap_TimingErrorMargin_vals), 0,
+ "TimingErrorMargin", HFILL }},
{ &hf_f1ap_TRPTxTEGAssociation_item,
{ "TRPTEG-Item", "f1ap.TRPTEG_Item_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
- { &hf_f1ap_tRP_Tx_TEG_ID,
- { "tRP-Tx-TEG-ID", "f1ap.tRP_Tx_TEG_ID",
- FT_UINT32, BASE_DEC, NULL, 0,
- "INTEGER_0_7", HFILL }},
{ &hf_f1ap_dl_PRSResourceID_List,
{ "dl-PRSResourceID-List", "f1ap.dl_PRSResourceID_List",
FT_UINT32, BASE_DEC, NULL, 0,
@@ -44512,6 +45045,10 @@ void proto_register_f1ap(void) {
{ "mrb-reconfigured-RLCtype", "f1ap.mrb_reconfigured_RLCtype",
FT_UINT32, BASE_DEC, VALS(f1ap_T_mrb_reconfigured_RLCtype_vals), 0,
NULL, HFILL }},
+ { &hf_f1ap_multicastF1UContextReferenceCU,
+ { "multicastF1UContextReferenceCU", "f1ap.multicastF1UContextReferenceCU",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_mbsPTPRetransmissionTunnelRequired,
{ "mbsPTPRetransmissionTunnelRequired", "f1ap.mbsPTPRetransmissionTunnelRequired",
FT_UINT32, BASE_DEC, VALS(f1ap_MBSPTPRetransmissionTunnelRequired_vals), 0,
@@ -44836,6 +45373,10 @@ void proto_register_f1ap(void) {
{ "ProtocolIE-SingleContainer", "f1ap.ProtocolIE_SingleContainer_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_List_item,
+ { "ProtocolIE-SingleContainer", "f1ap.ProtocolIE_SingleContainer_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_UE_MulticastMRBs_ToBeReleased_List_item,
{ "ProtocolIE-SingleContainer", "f1ap.ProtocolIE_SingleContainer_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -44920,6 +45461,10 @@ void proto_register_f1ap(void) {
{ "ProtocolIE-SingleContainer", "f1ap.ProtocolIE_SingleContainer_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_UE_MulticastMRBs_Setup_List_item,
+ { "ProtocolIE-SingleContainer", "f1ap.ProtocolIE_SingleContainer_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_DRBs_Required_ToBeModified_List_item,
{ "ProtocolIE-SingleContainer", "f1ap.ProtocolIE_SingleContainer_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -45112,6 +45657,10 @@ void proto_register_f1ap(void) {
{ "ProtocolIE-SingleContainer", "f1ap.ProtocolIE_SingleContainer_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_f1ap_MC_PagingCell_list_item,
+ { "ProtocolIE-SingleContainer", "f1ap.ProtocolIE_SingleContainer_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_f1ap_MulticastMRBs_ToBeSetup_List_item,
{ "ProtocolIE-SingleContainer", "f1ap.ProtocolIE_SingleContainer_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -45268,6 +45817,8 @@ void proto_register_f1ap(void) {
&ett_f1ap_SRSPosRRCInactiveConfig,
&ett_f1ap_successfulHOReportContainer,
&ett_f1ap_UL_GapFR2_Config,
+ &ett_f1ap_ConfigRestrictInfoDAPS,
+ &ett_f1ap_UplinkTxDirectCurrentTwoCarrierListInfo,
&ett_f1ap_PrivateIE_ID,
&ett_f1ap_ProtocolIE_Container,
&ett_f1ap_ProtocolIE_Field,
@@ -45574,6 +46125,7 @@ void proto_register_f1ap(void) {
&ett_f1ap_MBS_ServiceAreaTAIList_Item,
&ett_f1ap_MBS_ServiceAreaInformationList,
&ett_f1ap_MBS_ServiceAreaInformationItem,
+ &ett_f1ap_MC_PagingCell_Item,
&ett_f1ap_MeasurementBeamInfo,
&ett_f1ap_MRB_ProgressInformation,
&ett_f1ap_MultipleULAoA,
@@ -45692,6 +46244,8 @@ void proto_register_f1ap(void) {
&ett_f1ap_PosResourceSetTypePR,
&ett_f1ap_PosResourceSetTypeSP,
&ett_f1ap_PosResourceSetTypeAP,
+ &ett_f1ap_PosSItypeList,
+ &ett_f1ap_PosSItype_Item,
&ett_f1ap_PosSRSResourceID_List,
&ett_f1ap_PosSRSResource_Item,
&ett_f1ap_PosSRSResource_List,
@@ -45900,7 +46454,7 @@ void proto_register_f1ap(void) {
&ett_f1ap_NSAGSupportItem,
&ett_f1ap_TDD_Info,
&ett_f1ap_TDD_InfoRel16,
- &ett_f1ap_TRPTEGIDInformation,
+ &ett_f1ap_TRPTEGInformation,
&ett_f1ap_RxTxTEG,
&ett_f1ap_RxTEG,
&ett_f1ap_TimeReferenceInformation,
@@ -45948,6 +46502,9 @@ void proto_register_f1ap(void) {
&ett_f1ap_TRPPositionDirectAccuracy,
&ett_f1ap_TRPPositionReferenced,
&ett_f1ap_TRPReferencePointType,
+ &ett_f1ap_TRP_Rx_TEGInformation,
+ &ett_f1ap_TRP_RxTx_TEGInformation,
+ &ett_f1ap_TRP_Tx_TEGInformation,
&ett_f1ap_TRPTxTEGAssociation,
&ett_f1ap_TRPTEG_Item,
&ett_f1ap_SEQUENCE_SIZE_1_maxnoofPRS_ResourcesPerSet_OF_DLPRSResourceID_Item,
@@ -45970,8 +46527,10 @@ void proto_register_f1ap(void) {
&ett_f1ap_UE_MulticastMRBs_ConfirmedToBeModified_Item,
&ett_f1ap_UE_MulticastMRBs_RequiredToBeModified_Item,
&ett_f1ap_UE_MulticastMRBs_RequiredToBeReleased_Item,
+ &ett_f1ap_UE_MulticastMRBs_Setup_Item,
&ett_f1ap_UE_MulticastMRBs_ToBeReleased_Item,
&ett_f1ap_UE_MulticastMRBs_ToBeSetup_Item,
+ &ett_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_Item,
&ett_f1ap_UEPagingCapability,
&ett_f1ap_UEReportingInformation,
&ett_f1ap_UL_AoA,
@@ -46078,6 +46637,7 @@ void proto_register_f1ap(void) {
&ett_f1ap_SRBs_ToBeReleased_List,
&ett_f1ap_DRBs_ToBeReleased_List,
&ett_f1ap_BHChannels_ToBeReleased_List,
+ &ett_f1ap_UE_MulticastMRBs_ToBeSetup_atModify_List,
&ett_f1ap_UE_MulticastMRBs_ToBeReleased_List,
&ett_f1ap_SLDRBs_ToBeSetupMod_List,
&ett_f1ap_SLDRBs_ToBeModified_List,
@@ -46100,6 +46660,7 @@ void proto_register_f1ap(void) {
&ett_f1ap_SLDRBs_Modified_List,
&ett_f1ap_SLDRBs_FailedToBeModified_List,
&ett_f1ap_SLDRBs_FailedToBeSetupMod_List,
+ &ett_f1ap_UE_MulticastMRBs_Setup_List,
&ett_f1ap_UEContextModificationFailure,
&ett_f1ap_UEContextModificationRequired,
&ett_f1ap_DRBs_Required_ToBeModified_List,
@@ -46230,6 +46791,7 @@ void proto_register_f1ap(void) {
&ett_f1ap_BroadcastContextModificationFailure,
&ett_f1ap_MulticastGroupPaging,
&ett_f1ap_UEIdentity_List_For_Paging_List,
+ &ett_f1ap_MC_PagingCell_list,
&ett_f1ap_MulticastContextSetupRequest,
&ett_f1ap_MulticastMRBs_ToBeSetup_List,
&ett_f1ap_MulticastContextSetupResponse,
@@ -46271,6 +46833,7 @@ void proto_register_f1ap(void) {
&ett_f1ap_MeasurementPreconfigurationRefuse,
&ett_f1ap_MeasurementActivation,
&ett_f1ap_QoEInformationTransfer,
+ &ett_f1ap_PosSystemInformationDeliveryCommand,
&ett_f1ap_F1AP_PDU,
&ett_f1ap_InitiatingMessage,
&ett_f1ap_SuccessfulOutcome,
@@ -46725,7 +47288,7 @@ proto_reg_handoff_f1ap(void)
dissector_add_uint("f1ap.ies", id_UL_SRS_RSRPP, create_dissector_handle(dissect_UL_SRS_RSRPP_PDU, proto_f1ap));
dissector_add_uint("f1ap.ies", id_ExtendedAdditionalPathList, create_dissector_handle(dissect_ExtendedAdditionalPathList_PDU, proto_f1ap));
dissector_add_uint("f1ap.ies", id_TRPTxTEGAssociation, create_dissector_handle(dissect_TRPTxTEGAssociation_PDU, proto_f1ap));
- dissector_add_uint("f1ap.ies", id_TRPRXTEGID, create_dissector_handle(dissect_TRPRXTEGID_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.ies", id_TRPRx_TEGInformation, create_dissector_handle(dissect_TRP_Rx_TEGInformation_PDU, proto_f1ap));
dissector_add_uint("f1ap.ies", id_TRP_PRS_Info_List, create_dissector_handle(dissect_TRP_PRS_Info_List_PDU, proto_f1ap));
dissector_add_uint("f1ap.ies", id_PRS_Measurement_Info_List, create_dissector_handle(dissect_PRS_Measurement_Info_List_PDU, proto_f1ap));
dissector_add_uint("f1ap.ies", id_PRSConfigRequestType, create_dissector_handle(dissect_PRSConfigRequestType_PDU, proto_f1ap));
@@ -46801,6 +47364,17 @@ proto_reg_handoff_f1ap(void)
dissector_add_uint("f1ap.ies", id_SRSPosRRCInactiveConfig, create_dissector_handle(dissect_SRSPosRRCInactiveConfig_PDU, proto_f1ap));
dissector_add_uint("f1ap.ies", id_SDTBearerConfigurationQueryIndication, create_dissector_handle(dissect_SDTBearerConfigurationQueryIndication_PDU, proto_f1ap));
dissector_add_uint("f1ap.ies", id_SDTBearerConfigurationInfo, create_dissector_handle(dissect_SDTBearerConfigurationInfo_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.ies", id_UE_MulticastMRBs_Setup_List, create_dissector_handle(dissect_UE_MulticastMRBs_Setup_List_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.ies", id_UE_MulticastMRBs_Setup_Item, create_dissector_handle(dissect_UE_MulticastMRBs_Setup_Item_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.ies", id_MulticastF1UContextReferenceCU, create_dissector_handle(dissect_MulticastF1UContextReferenceCU_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.ies", id_PosSItypeList, create_dissector_handle(dissect_PosSItypeList_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.ies", id_DAPS_HO_Status, create_dissector_handle(dissect_DAPS_HO_Status_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.ies", id_UplinkTxDirectCurrentTwoCarrierListInfo, create_dissector_handle(dissect_UplinkTxDirectCurrentTwoCarrierListInfo_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.ies", id_UE_MulticastMRBs_ToBeSetup_atModify_List, create_dissector_handle(dissect_UE_MulticastMRBs_ToBeSetup_atModify_List_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.ies", id_UE_MulticastMRBs_ToBeSetup_atModify_Item, create_dissector_handle(dissect_UE_MulticastMRBs_ToBeSetup_atModify_Item_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.ies", id_MC_PagingCell_List, create_dissector_handle(dissect_MC_PagingCell_list_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.ies", id_MC_PagingCell_Item, create_dissector_handle(dissect_MC_PagingCell_Item_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.ies", id_SRSPosRRCInactiveQueryIndication, create_dissector_handle(dissect_SRSPosRRCInactiveQueryIndication_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_gNB_CUSystemInformation, create_dissector_handle(dissect_GNB_CUSystemInformation_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_HandoverPreparationInformation, create_dissector_handle(dissect_HandoverPreparationInformation_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_TAISliceSupportList, create_dissector_handle(dissect_SliceSupportList_PDU, proto_f1ap));
@@ -46936,7 +47510,7 @@ proto_reg_handoff_f1ap(void)
dissector_add_uint("f1ap.extension", id_LoS_NLoSInformation, create_dissector_handle(dissect_LoS_NLoSInformation_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_NumberOfTRPRxTEG, create_dissector_handle(dissect_NumberOfTRPRxTEG_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_NumberOfTRPRxTxTEG, create_dissector_handle(dissect_NumberOfTRPRxTxTEG_PDU, proto_f1ap));
- dissector_add_uint("f1ap.extension", id_TRPTEGIDInformation, create_dissector_handle(dissect_TRPTEGIDInformation_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.extension", id_TRPTEGInformation, create_dissector_handle(dissect_TRPTEGInformation_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_Redcap_Bcast_Information, create_dissector_handle(dissect_Redcap_Bcast_Information_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_SDT_MAC_PHY_CG_Config, create_dissector_handle(dissect_SDT_MAC_PHY_CG_Config_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_CG_SDTindicatorSetup, create_dissector_handle(dissect_CG_SDTindicatorSetup_PDU, proto_f1ap));
@@ -46963,13 +47537,12 @@ proto_reg_handoff_f1ap(void)
dissector_add_uint("f1ap.extension", id_NeedForGapsInfoNR, create_dissector_handle(dissect_NeedForGapsInfoNR_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_NeedForGapNCSGInfoNR, create_dissector_handle(dissect_NeedForGapNCSGInfoNR_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_NeedForGapNCSGInfoEUTRA, create_dissector_handle(dissect_NeedForGapNCSGInfoEUTRA_PDU, proto_f1ap));
- dissector_add_uint("f1ap.extension", id_TRPTxTimingErrorMargin, create_dissector_handle(dissect_TimingErrorMargin_PDU, proto_f1ap));
- dissector_add_uint("f1ap.extension", id_TRPRxTimingErrorMargin, create_dissector_handle(dissect_TimingErrorMargin_PDU, proto_f1ap));
- dissector_add_uint("f1ap.extension", id_TRPRxTxTimingErrorMargin, create_dissector_handle(dissect_TimingErrorMargin_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_Source_MRB_ID, create_dissector_handle(dissect_MRB_ID_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_PosMeasurementPeriodicityNR_AoA, create_dissector_handle(dissect_PosMeasurementPeriodicityNR_AoA_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_RedCapIndication, create_dissector_handle(dissect_RedCapIndication_PDU, proto_f1ap));
dissector_add_uint("f1ap.extension", id_UL_GapFR2_Config, create_dissector_handle(dissect_UL_GapFR2_Config_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.extension", id_ConfigRestrictInfoDAPS, create_dissector_handle(dissect_ConfigRestrictInfoDAPS_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.extension", id_MulticastF1UContextReferenceCU, create_dissector_handle(dissect_MulticastF1UContextReferenceCU_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));
@@ -47105,6 +47678,7 @@ proto_reg_handoff_f1ap(void)
dissector_add_uint("f1ap.proc.uout", id_measurementPreconfiguration, create_dissector_handle(dissect_MeasurementPreconfigurationRefuse_PDU, proto_f1ap));
dissector_add_uint("f1ap.proc.imsg", id_measurementActivation, create_dissector_handle(dissect_MeasurementActivation_PDU, proto_f1ap));
dissector_add_uint("f1ap.proc.imsg", id_QoEInformationTransfer, create_dissector_handle(dissect_QoEInformationTransfer_PDU, proto_f1ap));
+ dissector_add_uint("f1ap.proc.imsg", id_PosSystemInformationDeliveryCommand, create_dissector_handle(dissect_PosSystemInformationDeliveryCommand_PDU, proto_f1ap));
}
diff --git a/epan/dissectors/packet-nr-rrc.c b/epan/dissectors/packet-nr-rrc.c
index 4c89009e15..4265cb35a3 100644
--- a/epan/dissectors/packet-nr-rrc.c
+++ b/epan/dissectors/packet-nr-rrc.c
@@ -448,6 +448,7 @@ typedef enum _T_targetRAT_Type_enum {
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_ConfigRestrictInfoDAPS_r16_PDU = -1; /* ConfigRestrictInfoDAPS_r16 */
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 */
@@ -529,6 +530,7 @@ static int hf_nr_rrc_nr_rrc_SchedulingRequestResourceConfig_PDU = -1; /* Schedu
static int hf_nr_rrc_nr_rrc_TDD_UL_DL_ConfigCommon_PDU = -1; /* TDD_UL_DL_ConfigCommon */
static int hf_nr_rrc_nr_rrc_UL_GapFR2_Config_r17_PDU = -1; /* UL_GapFR2_Config_r17 */
static int hf_nr_rrc_nr_rrc_UplinkTxDirectCurrentList_PDU = -1; /* UplinkTxDirectCurrentList */
+static int hf_nr_rrc_nr_rrc_UplinkTxDirectCurrentTwoCarrierList_r16_PDU = -1; /* UplinkTxDirectCurrentTwoCarrierList_r16 */
static int hf_nr_rrc_nr_rrc_BandParametersSidelink_r16_PDU = -1; /* BandParametersSidelink_r16 */
static int hf_nr_rrc_nr_rrc_FreqBandList_PDU = -1; /* FreqBandList */
static int hf_nr_rrc_nr_rrc_SidelinkParametersNR_r16_PDU = -1; /* SidelinkParametersNR_r16 */
@@ -131284,6 +131286,16 @@ int dissect_nr_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet_
offset += 7; offset >>= 3;
return offset;
}
+int dissect_nr_rrc_ConfigRestrictInfoDAPS_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+ proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
+ proto_item_set_hidden(prot_ti);
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
+ offset = dissect_nr_rrc_ConfigRestrictInfoDAPS_r16(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_nr_rrc_ConfigRestrictInfoDAPS_r16_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
int dissect_nr_rrc_CG_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);
@@ -132094,6 +132106,16 @@ int dissect_nr_rrc_UplinkTxDirectCurrentList_PDU(tvbuff_t *tvb _U_, packet_info
offset += 7; offset >>= 3;
return offset;
}
+int dissect_nr_rrc_UplinkTxDirectCurrentTwoCarrierList_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+ proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
+ proto_item_set_hidden(prot_ti);
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
+ offset = dissect_nr_rrc_UplinkTxDirectCurrentTwoCarrierList_r16(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_nr_rrc_UplinkTxDirectCurrentTwoCarrierList_r16_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
int dissect_nr_rrc_BandParametersSidelink_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
proto_item_set_hidden(prot_ti);
@@ -132426,6 +132448,10 @@ proto_register_nr_rrc(void) {
{ "HandoverPreparationInformation", "nr-rrc.HandoverPreparationInformation_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
+ { &hf_nr_rrc_nr_rrc_ConfigRestrictInfoDAPS_r16_PDU,
+ { "ConfigRestrictInfoDAPS-r16", "nr-rrc.ConfigRestrictInfoDAPS_r16_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_CG_Config_PDU,
{ "CG-Config", "nr-rrc.CG_Config_element",
FT_NONE, BASE_NONE, NULL, 0,
@@ -132750,6 +132776,10 @@ proto_register_nr_rrc(void) {
{ "UplinkTxDirectCurrentList", "nr-rrc.UplinkTxDirectCurrentList",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
+ { &hf_nr_rrc_nr_rrc_UplinkTxDirectCurrentTwoCarrierList_r16_PDU,
+ { "UplinkTxDirectCurrentTwoCarrierList-r16", "nr-rrc.UplinkTxDirectCurrentTwoCarrierList_r16",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
{ &hf_nr_rrc_nr_rrc_BandParametersSidelink_r16_PDU,
{ "BandParametersSidelink-r16", "nr-rrc.BandParametersSidelink_r16_element",
FT_NONE, BASE_NONE, NULL, 0,
diff --git a/epan/dissectors/packet-nr-rrc.h b/epan/dissectors/packet-nr-rrc.h
index 8ced0d9720..16853738b6 100644
--- a/epan/dissectors/packet-nr-rrc.h
+++ b/epan/dissectors/packet-nr-rrc.h
@@ -18,6 +18,7 @@
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_ConfigRestrictInfoDAPS_r16_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_);
@@ -90,6 +91,7 @@ int dissect_nr_rrc_SchedulingRequestResourceConfig_PDU(tvbuff_t *tvb _U_, packet
int dissect_nr_rrc_TDD_UL_DL_ConfigCommon_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_UL_GapFR2_Config_r17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_UplinkTxDirectCurrentList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
+int dissect_nr_rrc_UplinkTxDirectCurrentTwoCarrierList_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_BandParametersSidelink_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_FreqBandList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_SidelinkParametersNR_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);