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

RRC: upgrade dissector to v17.1.0

This commit is contained in:
Pascal Quantin 2022-08-13 19:32:33 +02:00 committed by A Wireshark GitLab Utility
parent bc10ddd7ba
commit 8291dc23f3
6 changed files with 714 additions and 709 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/asn1/rrc/Constant-definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 25.331 V16.1.0 (2020-09)
-- 3GPP TS 25.331 V17.1.0 (2022-06)
--
-- 11.4 Constant definitions
--
@ -193,10 +193,10 @@ maxTrCHConcat INTEGER ::= 3
-- maxTrCHpreconf should be 16 but has been set to 32 for compatibility
maxTrCHpreconf INTEGER ::= 32
maxTS INTEGER ::= 14
maxTS-1 INTEGER ::= 13
maxTS-1 INTEGER ::= 13
maxTS-2 INTEGER ::= 12
maxTS-LCR INTEGER ::= 6
maxTS-LCR-1 INTEGER ::= 5
maxTS-LCR-1 INTEGER ::= 5
maxURA INTEGER ::= 8
maxURNTI-Group INTEGER ::= 8
maxWLANID INTEGER ::= 16

742
epan/dissectors/asn1/rrc/InformationElements.asn
View File

File diff suppressed because it is too large Load Diff

152
epan/dissectors/asn1/rrc/Internode-definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 25.331 V16.1.0 (2020-09)
-- 3GPP TS 25.331 V17.1.0 (2022-06)
--
-- 11.5 RRC information between network nodes
--
@ -255,7 +255,7 @@ TargetRNC-ToSourceRNC-Container ::= CHOICE {
InterRATHandoverInfoWithInterRATCapabilities-r3 ::= CHOICE {
r3 SEQUENCE {
-- IE InterRATHandoverInfoWithInterRATCapabilities-r3-IEs also
-- IE InterRATHandoverInfoWithInterRATCapabilities-r3-IEs also
-- includes non critical extensions
interRATHandoverInfo-r3 InterRATHandoverInfoWithInterRATCapabilities-r3-IEs,
v390NonCriticalExtensions SEQUENCE {
@ -285,7 +285,7 @@ InterRATHandoverInfoWithInterRATCapabilities-r3-IEs ::= SEQUENCE {
-- but has been chosen to simplify the handling of the information in the BSC
-- Other IEs
ue-RATSpecificCapability InterRAT-UE-RadioAccessCapabilityList OPTIONAL,
-- interRATHandoverInfo, Octet string is used to obtain 8 bit length field prior to
-- interRATHandoverInfo, Octet string is used to obtain 8 bit length field prior to
-- actual information. This makes it possible for BSS to transparently handle information
-- received via GSM air interface even when it includes non critical extensions.
-- The octet string shall include the InterRATHandoverInfo information
@ -538,10 +538,10 @@ SRNC-RelocationInfo-r3 ::= CHOICE {
v8d0NonCriticalExtensions SEQUENCE {
sRNC-RelocationInfo-v8d0ext SRNC-RelocationInfo-v8d0ext-IEs,
v970NonCriticalExtensions SEQUENCE {
sRNC-RelocationInfo-v970ext
sRNC-RelocationInfo-v970ext
SRNC-RelocationInfo-v970ext-IEs,
v9c0NonCriticalExtensions SEQUENCE {
sRNC-RelocationInfo-v9c0ext
sRNC-RelocationInfo-v9c0ext
SRNC-RelocationInfo-v9c0ext-IEs,
nonCriticalExtensions SEQUENCE {} OPTIONAL
} OPTIONAL
@ -553,10 +553,10 @@ SRNC-RelocationInfo-r3 ::= CHOICE {
sRNC-RelocationInfo-r10 SRNC-RelocationInfo-r10-IEs,
sRNC-RelocationInfo-r10-add-ext BIT STRING OPTIONAL,
v9c0NonCriticalExtensions SEQUENCE {
sRNC-RelocationInfo-v9c0ext
sRNC-RelocationInfo-v9c0ext
SRNC-RelocationInfo-v9c0ext-IEs,
vab0NonCriticalExtensions SEQUENCE {
sRNC-RelocationInfo-vab0ext
sRNC-RelocationInfo-vab0ext
SRNC-RelocationInfo-vab0ext-IEs,
nonCriticalExtensions SEQUENCE {} OPTIONAL
} OPTIONAL
@ -655,7 +655,7 @@ SRNC-RelocationInfo-r3-IEs ::= SEQUENCE {
SRNC-RelocationInfo-v380ext-IEs ::= SEQUENCE {
-- Ciphering related information IEs
-- In the SRNC-RelocationInfo-r3-IEs, the IE 'cn-DomainIdentity' is used to represent the
-- In the SRNC-RelocationInfo-r3-IEs, the IE 'cn-DomainIdentity' is used to represent the
-- IE 'Latest configured CN domain' in the tabular.
cn-DomainIdentity CN-DomainIdentity,
cipheringStatusList CipheringStatusList
@ -680,9 +680,9 @@ SRNC-RelocationInfo-v3a0ext-IEs ::= SEQUENCE {
SRNC-RelocationInfo-v3b0ext-IEs ::= SEQUENCE {
-- cn-domain identity for IE startValueForCiphering-v3a0ext included in previous extension
cn-DomainIdentity CN-DomainIdentity,
-- the IE startValueForCiphering-v3b0ext contains the start values for each CN Domain. The
-- the IE startValueForCiphering-v3b0ext contains the start values for each CN Domain. The
-- value of start indicated by the IE startValueForCiphering-v3a0ext should be set to the
-- same value as the start-Value for the corresponding cn-DomainIdentity in the IE
-- same value as the start-Value for the corresponding cn-DomainIdentity in the IE
-- startValueForCiphering-v3b0ext
startValueForCiphering-v3b0ext STARTList2 OPTIONAL
}
@ -930,10 +930,10 @@ SRNC-RelocationInfo-v690ext-IEs ::= SEQUENCE {
-- received from the UE
ueCapabilityContainer BIT STRING
(CONTAINING UE-CapabilityContainer-IEs) OPTIONAL,
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- messages. Only the VLEC of one message needs to be included i.e. the one from these
-- messages that was last received.
-- Case 1: If the last received message was a RRC CONNECTION SETUP COMPLETE (RSC)
@ -984,10 +984,10 @@ SRNC-RelocationInfo-r6-IEs ::= SEQUENCE {
-- received from the UE
ueCapabilityContainer BIT STRING
(CONTAINING UE-CapabilityContainer-IEs) OPTIONAL,
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- messages. Only the VLEC of one message needs to be included i.e. the one from these
-- messages that was last received.
-- Case 1: If the last received message was a RRC CONNECTION SETUP COMPLETE (RSC)
@ -1076,10 +1076,10 @@ SRNC-RelocationInfo-r7-IEs ::= SEQUENCE {
-- received from the UE
ueCapabilityContainer BIT STRING
(CONTAINING UE-CapabilityContainer-IEs) OPTIONAL,
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- messages. Only the VLEC of one message needs to be included i.e. the one from these
-- messages that was last received.
-- Case 1: If the last received message was a RRC CONNECTION SETUP COMPLETE (RSC)
@ -1178,10 +1178,10 @@ SRNC-RelocationInfo-r8-IEs ::= SEQUENCE {
-- received from the UE
ueCapabilityContainer BIT STRING
(CONTAINING UE-CapabilityContainer-IEs) OPTIONAL,
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- messages. Only the VLEC of one message needs to be included i.e. the one from these
-- messages that was last received.
-- Case 1: If the last received message was a RRC CONNECTION SETUP COMPLETE (RSC)
@ -1274,10 +1274,10 @@ SRNC-RelocationInfo-r9-IEs ::= SEQUENCE {
-- received from the UE
ueCapabilityContainer BIT STRING
(CONTAINING UE-CapabilityContainer-IEs) OPTIONAL,
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- messages. Only the VLEC of one message needs to be included i.e. the one from these
-- messages that was last received.
-- Case 1: If the last received message was a RRC CONNECTION SETUP COMPLETE (RSC)
@ -1367,10 +1367,10 @@ SRNC-RelocationInfo-r10-IEs ::= SEQUENCE {
-- received from the UE
ueCapabilityContainer BIT STRING
(CONTAINING UE-CapabilityContainer-IEs) OPTIONAL,
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- messages. Only the VLEC of one message needs to be included i.e. the one from these
-- messages that was last received.
-- Case 1: If the last received message was a RRC CONNECTION SETUP COMPLETE (RSC)
@ -1418,7 +1418,7 @@ SRNC-RelocationInfo-r10-IEs ::= SEQUENCE {
}
SRNC-RelocationInfo-vab0ext-IEs ::= SRNC-RelocationInfo-v970ext-IEs
SRNC-RelocationInfo-r11-IEs ::= SEQUENCE {
-- Non-RRC IEs
-- IE rb-IdentityForHOMessage includes the identity of the RB used by the source SRNC
@ -1453,10 +1453,10 @@ SRNC-RelocationInfo-r11-IEs ::= SEQUENCE {
-- received from the UE
ueCapabilityContainer BIT STRING
(CONTAINING UE-CapabilityContainer-IEs) OPTIONAL,
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- messages. Only the VLEC of one message needs to be included i.e. the one from these
-- messages that was last received.
-- Case 1: If the last received message was a RRC CONNECTION SETUP COMPLETE (RSC)
@ -1537,10 +1537,10 @@ SRNC-RelocationInfo-r12-IEs ::= SEQUENCE {
-- received from the UE
ueCapabilityContainer BIT STRING
(CONTAINING UE-CapabilityContainer-IEs) OPTIONAL,
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was introduced
-- in a release independent manner, i.e., transferred within a VLEC. These UE capabilities
-- are included both in the RRC CONNECTION SETUP COMPLETE and the UE CAPABILITY INFORMATION
-- messages. Only the VLEC of one message needs to be included i.e. the one from these
-- messages that was last received.
-- Case 1: If the last received message was a RRC CONNECTION SETUP COMPLETE (RSC)
@ -1575,7 +1575,7 @@ SRNC-RelocationInfo-r12-IEs ::= SEQUENCE {
e-RGCH-CombinationInfoList E-RGCH-CombinationInfoList OPTIONAL,
storedCompressedModeInfo StoredCompressedModeInfo-r8 OPTIONAL,
secondary-tpc-CombinationInfoList TPC-CombinationInfoList-r9 OPTIONAL,
secondary-e-RGCH-CombinationInfoList E-RGCH-CombinationInfoList-r9 OPTIONAL,
secondary-e-RGCH-CombinationInfoList E-RGCH-CombinationInfoList-r9 OPTIONAL,
serving-HSDSCH-CellInformation Serving-HSDSCH-CellInformation-r12 OPTIONAL,
dtx-drx-Info DTX-DRX-Info-r12 OPTIONAL,
ul-SecondaryCellInfoFDD UL-SecondaryCellInfoFDD-r12 OPTIONAL,
@ -1627,11 +1627,11 @@ SRNC-RelocationInfo-r13-IEs ::= SEQUENCE {
-- information received from the UE
ueCapabilityContainer BIT STRING
(CONTAINING UE-CapabilityContainer-IEs) OPTIONAL,
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was
-- introduced in a release independent manner, i.e., transferred within a VLEC.
-- These UE capabilities are included both in the RRC CONNECTION SETUP COMPLETE and
-- the UE CAPABILITY INFORMATION messages.
-- introduced in a release independent manner, i.e., transferred within a VLEC.
-- These UE capabilities are included both in the RRC CONNECTION SETUP COMPLETE and
-- the UE CAPABILITY INFORMATION messages.
-- Only the VLEC of one message needs to be included i.e. the one from these
-- messages that was last received.
-- Case 1: If the last received message was a RRC CONNECTION SETUP COMPLETE (RSC)
@ -1666,7 +1666,7 @@ SRNC-RelocationInfo-r13-IEs ::= SEQUENCE {
e-RGCH-CombinationInfoList E-RGCH-CombinationInfoList OPTIONAL,
storedCompressedModeInfo StoredCompressedModeInfo-r8 OPTIONAL,
secondary-tpc-CombinationInfoList TPC-CombinationInfoList-r9 OPTIONAL,
secondary-e-RGCH-CombinationInfoList E-RGCH-CombinationInfoList-r9 OPTIONAL,
secondary-e-RGCH-CombinationInfoList E-RGCH-CombinationInfoList-r9 OPTIONAL,
serving-HSDSCH-CellInformation Serving-HSDSCH-CellInformation-r12 OPTIONAL,
dtx-drx-Info DTX-DRX-Info-r12 OPTIONAL,
ul-SecondaryCellInfoFDD UL-SecondaryCellInfoFDD-r13 OPTIONAL,
@ -1740,11 +1740,11 @@ SRNC-RelocationInfo-r14-IEs ::= SEQUENCE {
-- information received from the UE
ueCapabilityContainer BIT STRING
(CONTAINING UE-CapabilityContainer-IEs) OPTIONAL,
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was
-- introduced in a release independent manner, i.e., transferred within a VLEC.
-- These UE capabilities are included both in the RRC CONNECTION SETUP COMPLETE and
-- the UE CAPABILITY INFORMATION messages.
-- introduced in a release independent manner, i.e., transferred within a VLEC.
-- These UE capabilities are included both in the RRC CONNECTION SETUP COMPLETE and
-- the UE CAPABILITY INFORMATION messages.
-- Only the VLEC of one message needs to be included i.e. the one from these
-- messages that was last received.
-- Case 1: If the last received message was a RRC CONNECTION SETUP COMPLETE (RSC)
@ -1831,11 +1831,11 @@ SRNC-RelocationInfo-r15-IEs ::= SEQUENCE {
-- information received from the UE
ueCapabilityContainer BIT STRING
(CONTAINING UE-CapabilityContainer-IEs) OPTIONAL,
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- IE ueCapabilityContainer-RSC and IE ueCapabilityContainer-UCI are used for the
-- transparent transfer of capability information received from the UE that was
-- introduced in a release independent manner, i.e., transferred within a VLEC.
-- These UE capabilities are included both in the RRC CONNECTION SETUP COMPLETE and
-- the UE CAPABILITY INFORMATION messages.
-- introduced in a release independent manner, i.e., transferred within a VLEC.
-- These UE capabilities are included both in the RRC CONNECTION SETUP COMPLETE and
-- the UE CAPABILITY INFORMATION messages.
-- Only the VLEC of one message needs to be included i.e. the one from these
-- messages that was last received.
-- Case 1: If the last received message was a RRC CONNECTION SETUP COMPLETE (RSC)
@ -1907,7 +1907,7 @@ CipheringInfoPerRB-r4 ::= SEQUENCE {
ul-HFN BIT STRING (SIZE (20..25))
}
-- TABULAR: CipheringInfoPerRB-List, multiplicity value numberOfRadioBearers
-- TABULAR: CipheringInfoPerRB-List, multiplicity value numberOfRadioBearers
-- has been replaced with maxRB.
CipheringInfoPerRB-List ::= SEQUENCE (SIZE (1..maxRB)) OF
CipheringInfoPerRB
@ -1951,7 +1951,7 @@ COUNT-C-List ::= SEQUENCE (SIZE (1..maxCNdomains)) OF
COUNT-CSingle ::= SEQUENCE {
cn-DomainIdentity CN-DomainIdentity,
count-C BIT STRING (SIZE (32))
count-C BIT STRING (SIZE (32))
}
DL-PhysChCapabilityFDD-r4 ::= SEQUENCE {
@ -2061,13 +2061,13 @@ IntraFreqReportingCriteria-r6-ext ::= SEQUENCE {
-- dummy is not used in this version of the specification, it should
-- not be sent and if received it should be ignored.
MaxHcContextSpace-r5 ::= ENUMERATED {
dummy, by1024, by2048, by4096, by8192,
MaxHcContextSpace-r5 ::= ENUMERATED {
dummy, by1024, by2048, by4096, by8192,
by16384, by32768, by65536, by131072 }
MeasurementCapability-r4 ::= SEQUENCE {
downlinkCompressedMode CompressedModeMeasCapability-r4,
uplinkCompressedMode CompressedModeMeasCapability-r4
uplinkCompressedMode CompressedModeMeasCapability-r4
}
MeasurementCommandWithType ::= CHOICE {
@ -2203,19 +2203,19 @@ OngoingMeasRep-r9 ::= SEQUENCE {
measurementCommandWithType MeasurementCommandWithType-r9,
measurementReportingMode MeasurementReportingMode OPTIONAL,
-- if any of the additional measurement ID is within the range 17 to 32,
-- "OngoingMeasRep-v970ext-IEs" should be present and should include
-- "OngoingMeasRep-v970ext-IEs" should be present and should include
-- the IE "measurementIdentity" and "additionalMeasurementID-List".
-- The value of the IE "measurementIdentity" in "OngoingMeasRep-v970ext-IEs"
-- should be the same as the "measurementIdentity" value in "OngoingMeasRep-r9",
-- and "additionalMeasurementID-List" should contain the complete list.
-- The IE "additionalMeasurementID-List" in "OngoingMeasRep-r9" should still
-- The IE "additionalMeasurementID-List" in "OngoingMeasRep-r9" should still
-- contain the additional measurement ID which value is within the range 1 to 16.
additionalMeasurementID-List AdditionalMeasurementID-List OPTIONAL
}
-- The IE "OngoingMeasRep-v970ext-IEs" should be included to report
-- measurementIdentity values within the range 17 to 32 and when a
-- "measurementIdentity" in "OngoingMeasRep-r9" needs to contain one of the
-- The IE "OngoingMeasRep-v970ext-IEs" should be included to report
-- measurementIdentity values within the range 17 to 32 and when a
-- "measurementIdentity" in "OngoingMeasRep-r9" needs to contain one of the
-- values within the range 17 to 32 in the IE "additionalMeasurementID-List".
OngoingMeasRep-v970ext-IEs ::= SEQUENCE {
@ -2228,14 +2228,14 @@ OngoingMeasRep-r10 ::= SEQUENCE {
measurementCommandWithType MeasurementCommandWithType-r10,
measurementReportingMode MeasurementReportingMode OPTIONAL,
-- if any of the additional measurement ID is within the range 17 to 32,
-- "OngoingMeasRep-v970ext-IEs" (in SRNC-RelocationInfo-vab0ext-IEs)should be present
-- and should include the IE "measurementIdentity" and
-- "OngoingMeasRep-v970ext-IEs" (in SRNC-RelocationInfo-vab0ext-IEs)should be present
-- and should include the IE "measurementIdentity" and
-- "additionalMeasurementID-List". In this case, the value of the IE "measurementIdentity" in
-- "OngoingMeasRep-v970ext-IEs" (in SRNC-RelocationInfo-vab0ext-IEs) should be the same as the
-- "OngoingMeasRep-v970ext-IEs" (in SRNC-RelocationInfo-vab0ext-IEs) should be the same as the
-- "measurementIdentity" value in "OngoingMeasRep-r10", and "additionalMeasurementID-List"
-- should contain the complete list.
-- The IE "additionalMeasurementID-List" in "OngoingMeasRep-r10" should still
-- contain the additional measurement ID which value is within the range 1 to 16.
-- The IE "additionalMeasurementID-List" in "OngoingMeasRep-r10" should still
-- contain the additional measurement ID which value is within the range 1 to 16.
additionalMeasurementID-List AdditionalMeasurementID-List OPTIONAL
}
@ -2456,11 +2456,11 @@ StateOfRRC-Procedure ::= ENUMERATED {
-- dummy is not used in this version of specification
-- It should not be sent
dummy,
otherStates
otherStates
}
TotalRLC-AM-BufferSize-r5 ::= ENUMERATED {
kb10, kb50, kb100, kb150, kb200,
TotalRLC-AM-BufferSize-r5 ::= ENUMERATED {
kb10, kb50, kb100, kb150, kb200,
kb300, kb400, kb500, kb750, kb1000 }
TPC-Combination-Info ::= SEQUENCE {
@ -2490,7 +2490,7 @@ UE-Positioning-Capability-r4 ::= SEQUENCE {
sfn-sfnType2Capability ENUMERATED { true } OPTIONAL
}
UE-Positioning-LastKnownPos ::= SEQUENCE {
UE-Positioning-LastKnownPos ::= SEQUENCE {
sfn INTEGER (0..4095),
cell-id CellIdentity,
positionEstimate PositionEstimate

420
epan/dissectors/asn1/rrc/PDU-definitions.asn
View File

File diff suppressed because it is too large Load Diff

2
epan/dissectors/asn1/rrc/packet-rrc-template.c
View File

@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref: 3GPP TS 25.331 V16.1.0 (2020-09)
* Ref: 3GPP TS 25.331 V17.1.0 (2022-06)
*/
/**

101
epan/dissectors/packet-rrc.c
View File

@ -18,7 +18,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref: 3GPP TS 25.331 V16.1.0 (2020-09)
* Ref: 3GPP TS 25.331 V17.1.0 (2022-06)
*/
/**
@ -7720,7 +7720,7 @@ static int hf_rrc_measurementBandwidth = -1; /* EUTRA_MeasurementBandwidth
static int hf_rrc_qRxLevMinEUTRA = -1; /* INTEGER_M70_M22 */
static int hf_rrc_threshXhigh = -1; /* INTEGER_0_31 */
static int hf_rrc_threshXlow = -1; /* INTEGER_0_31 */
static int hf_rrc_eutra_blackListedCellList = -1; /* EUTRA_BlacklistedCellPerFreqList */
static int hf_rrc_eutra_exclude_ListedCellList = -1; /* EUTRA_Exclude_listedCellPerFreqList */
static int hf_rrc_qqualMinEUTRA = -1; /* INTEGER_M34_M3 */
static int hf_rrc_threshXhigh2 = -1; /* INTEGER_0_31 */
static int hf_rrc_threshXlow2 = -1; /* INTEGER_0_31 */
@ -7728,6 +7728,7 @@ static int hf_rrc_qqualMinEUTRA_WB = -1; /* INTEGER_M34_M3 */
static int hf_rrc_qqualMinRSRQ_OnAllSymbols = -1; /* INTEGER_M34_M3 */
static int hf_rrc_reducedMeasurementPerformance = -1; /* T_reducedMeasurementPerformance */
static int hf_rrc_subpriority_01 = -1; /* T_subpriority_01 */
static int hf_rrc_eutra_exclude_listedCellList = -1; /* EUTRA_Exclude_listedCellPerFreqList */
static int hf_rrc_reducedMeasurementPerformance_01 = -1; /* T_reducedMeasurementPerformance_01 */
static int hf_rrc_subpriority_02 = -1; /* T_subpriority_02 */
static int hf_rrc_EUTRA_FrequencyAndPriorityInfoExtensionList_item = -1; /* EUTRA_FrequencyAndPriorityInfoExtension_vb50ext */
@ -8238,7 +8239,7 @@ static int hf_rrc_maxReportedCellsOnRACHinterFreq = -1; /* MaxReportedCellsOnRA
static int hf_rrc_modeSpecificInfo_122 = -1; /* T_modeSpecificInfo_122 */
static int hf_rrc_fdd_172 = -1; /* T_fdd_166 */
static int hf_rrc_tdd_119 = -1; /* T_tdd_111 */
static int hf_rrc_InterFreqBlacklistedCellsList_r12_item = -1; /* InterFreqBlacklistedCells_r12 */
static int hf_rrc_InterFreqExclude_listedCellsList_r12_item = -1; /* InterFreqExclude_listedCells_r12 */
static int hf_rrc_excludedCellInfoList = -1; /* CellInfoListToBeExcluded */
static int hf_rrc_interFreqReportingCriteria_01 = -1; /* InterFreqReportingCriteria */
static int hf_rrc_periodicalReportingCriteria_01 = -1; /* PeriodicalWithReportingCellStatus */
@ -8259,7 +8260,7 @@ static int hf_rrc_interFreqEventList_01 = -1; /* InterFreqEventList_r6 */
static int hf_rrc_interFreqEventList_02 = -1; /* InterFreqEventList_r10 */
static int hf_rrc_interFreqEventList_03 = -1; /* InterFreqEventList_r11 */
static int hf_rrc_interFreqEventList_04 = -1; /* InterFreqEventList_r12 */
static int hf_rrc_interFreqBlacklistedCellsList = -1; /* InterFreqBlacklistedCellsList_r12 */
static int hf_rrc_interFreqExclude_listedCellsList = -1; /* InterFreqExclude_listedCellsList_r12 */
static int hf_rrc_utra_Carrier_RSSI = -1; /* BOOLEAN */
static int hf_rrc_frequencyQualityEstimate = -1; /* BOOLEAN */
static int hf_rrc_nonFreqRelatedQuantities = -1; /* CellReportingQuantities */
@ -9877,12 +9878,12 @@ static int hf_rrc_intraFreqMeasQuantity_TDDList_01 = -1; /* IntraFreqMeasQuanti
static int hf_rrc_warningType = -1; /* OCTET_STRING_SIZE_1_2 */
static int hf_rrc_messageIdentifier = -1; /* OCTET_STRING_SIZE_2 */
static int hf_rrc_serialNumber = -1; /* OCTET_STRING_SIZE_2 */
static int hf_rrc_EUTRA_BlacklistedCellPerFreqList_item = -1; /* EUTRA_BlacklistedCell */
static int hf_rrc_EUTRA_Exclude_listedCellPerFreqList_item = -1; /* EUTRA_Exclude_listedCell */
static int hf_rrc_ue_EUTRA_Capability = -1; /* T_ue_EUTRA_Capability */
static int hf_rrc_EUTRA_TargetFreqInfoList_item = -1; /* EUTRA_TargetFreqInfo */
static int hf_rrc_EUTRA_TargetFreqInfoList_vb50ext_item = -1; /* EUTRA_TargetFreqInfo_vb50ext */
static int hf_rrc_dlEUTRACarrierFreq = -1; /* EARFCN */
static int hf_rrc_eutraBlacklistedCellPerFreqList = -1; /* EUTRA_BlacklistedCellPerFreqList */
static int hf_rrc_eutraExclude_listedCellPerFreqList = -1; /* EUTRA_Exclude_listedCellPerFreqList */
static int hf_rrc_extensionGANSS_SIBType = -1; /* SIB_TypeExtGANSS */
static int hf_rrc_schedulingInfo = -1; /* SchedulingInformation */
static int hf_rrc_valueTagInfo = -1; /* ValueTagInfo */
@ -16516,8 +16517,8 @@ static gint ett_rrc_InterFreqRACHReportingInfo = -1;
static gint ett_rrc_T_modeSpecificInfo_122 = -1;
static gint ett_rrc_T_fdd_166 = -1;
static gint ett_rrc_T_tdd_111 = -1;
static gint ett_rrc_InterFreqBlacklistedCellsList_r12 = -1;
static gint ett_rrc_InterFreqBlacklistedCells_r12 = -1;
static gint ett_rrc_InterFreqExclude_listedCellsList_r12 = -1;
static gint ett_rrc_InterFreqExclude_listedCells_r12 = -1;
static gint ett_rrc_InterFreqReportCriteria = -1;
static gint ett_rrc_InterFreqReportCriteria_r4 = -1;
static gint ett_rrc_InterFreqReportCriteria_r6 = -1;
@ -17527,8 +17528,8 @@ static gint ett_rrc_T_modeSpecificInfo_163 = -1;
static gint ett_rrc_T_fdd_202 = -1;
static gint ett_rrc_T_tdd_146 = -1;
static gint ett_rrc_ETWS_Information = -1;
static gint ett_rrc_EUTRA_BlacklistedCell = -1;
static gint ett_rrc_EUTRA_BlacklistedCellPerFreqList = -1;
static gint ett_rrc_EUTRA_Exclude_listedCell = -1;
static gint ett_rrc_EUTRA_Exclude_listedCellPerFreqList = -1;
static gint ett_rrc_EUTRA_RadioAccessCapability = -1;
static gint ett_rrc_EUTRA_TargetFreqInfoList = -1;
static gint ett_rrc_EUTRA_TargetFreqInfoList_vb50ext = -1;
@ -72072,28 +72073,28 @@ dissect_rrc_EUTRA_PhysicalCellIdentity(tvbuff_t *tvb _U_, int offset _U_, asn1_c
}
static const per_sequence_t EUTRA_BlacklistedCell_sequence[] = {
static const per_sequence_t EUTRA_Exclude_listedCell_sequence[] = {
{ &hf_rrc_physicalCellIdentity, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_EUTRA_PhysicalCellIdentity },
{ NULL, 0, 0, NULL }
};
static int
dissect_rrc_EUTRA_BlacklistedCell(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
dissect_rrc_EUTRA_Exclude_listedCell(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_rrc_EUTRA_BlacklistedCell, EUTRA_BlacklistedCell_sequence);
ett_rrc_EUTRA_Exclude_listedCell, EUTRA_Exclude_listedCell_sequence);
return offset;
}
static const per_sequence_t EUTRA_BlacklistedCellPerFreqList_sequence_of[1] = {
{ &hf_rrc_EUTRA_BlacklistedCellPerFreqList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_EUTRA_BlacklistedCell },
static const per_sequence_t EUTRA_Exclude_listedCellPerFreqList_sequence_of[1] = {
{ &hf_rrc_EUTRA_Exclude_listedCellPerFreqList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_EUTRA_Exclude_listedCell },
};
static int
dissect_rrc_EUTRA_BlacklistedCellPerFreqList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
dissect_rrc_EUTRA_Exclude_listedCellPerFreqList(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_rrc_EUTRA_BlacklistedCellPerFreqList, EUTRA_BlacklistedCellPerFreqList_sequence_of,
ett_rrc_EUTRA_Exclude_listedCellPerFreqList, EUTRA_Exclude_listedCellPerFreqList_sequence_of,
1, maxEUTRACellPerFreq, FALSE);
return offset;
@ -72103,7 +72104,7 @@ dissect_rrc_EUTRA_BlacklistedCellPerFreqList(tvbuff_t *tvb _U_, int offset _U_,
static const per_sequence_t EUTRA_FrequencyInfo_sequence[] = {
{ &hf_rrc_earfcn , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_EARFCN },
{ &hf_rrc_measurementBandwidth, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_MeasurementBandwidth },
{ &hf_rrc_eutra_blackListedCellList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_BlacklistedCellPerFreqList },
{ &hf_rrc_eutra_exclude_listedCellList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_Exclude_listedCellPerFreqList },
{ NULL, 0, 0, NULL }
};
@ -72871,7 +72872,7 @@ static const per_sequence_t EUTRA_FrequencyInfo_r11_sequence[] = {
{ &hf_rrc_earfcn , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_EARFCN },
{ &hf_rrc_earfcnExt , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EARFCNExtension },
{ &hf_rrc_measurementBandwidth, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_MeasurementBandwidth },
{ &hf_rrc_eutra_blackListedCellList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_BlacklistedCellPerFreqList },
{ &hf_rrc_eutra_exclude_listedCellList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_Exclude_listedCellPerFreqList },
{ &hf_rrc_widebandRSRQMeasurements, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_T_widebandRSRQMeasurements },
{ NULL, 0, 0, NULL }
};
@ -76479,29 +76480,29 @@ dissect_rrc_InterFreqEventList_r12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
}
static const per_sequence_t InterFreqBlacklistedCells_r12_sequence[] = {
static const per_sequence_t InterFreqExclude_listedCells_r12_sequence[] = {
{ &hf_rrc_frequencyInfo , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_FrequencyInfo },
{ &hf_rrc_excludedCellInfoList, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_CellInfoListToBeExcluded },
{ NULL, 0, 0, NULL }
};
static int
dissect_rrc_InterFreqBlacklistedCells_r12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
dissect_rrc_InterFreqExclude_listedCells_r12(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_rrc_InterFreqBlacklistedCells_r12, InterFreqBlacklistedCells_r12_sequence);
ett_rrc_InterFreqExclude_listedCells_r12, InterFreqExclude_listedCells_r12_sequence);
return offset;
}
static const per_sequence_t InterFreqBlacklistedCellsList_r12_sequence_of[1] = {
{ &hf_rrc_InterFreqBlacklistedCellsList_r12_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_InterFreqBlacklistedCells_r12 },
static const per_sequence_t InterFreqExclude_listedCellsList_r12_sequence_of[1] = {
{ &hf_rrc_InterFreqExclude_listedCellsList_r12_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_InterFreqExclude_listedCells_r12 },
};
static int
dissect_rrc_InterFreqBlacklistedCellsList_r12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
dissect_rrc_InterFreqExclude_listedCellsList_r12(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_rrc_InterFreqBlacklistedCellsList_r12, InterFreqBlacklistedCellsList_r12_sequence_of,
ett_rrc_InterFreqExclude_listedCellsList_r12, InterFreqExclude_listedCellsList_r12_sequence_of,
1, maxFreq, FALSE);
return offset;
@ -76510,7 +76511,7 @@ dissect_rrc_InterFreqBlacklistedCellsList_r12(tvbuff_t *tvb _U_, int offset _U_,
static const per_sequence_t InterFreqReportingCriteria_r12_sequence[] = {
{ &hf_rrc_interFreqEventList_04, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_InterFreqEventList_r12 },
{ &hf_rrc_interFreqBlacklistedCellsList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_InterFreqBlacklistedCellsList_r12 },
{ &hf_rrc_interFreqExclude_listedCellsList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_InterFreqExclude_listedCellsList_r12 },
{ NULL, 0, 0, NULL }
};
@ -76615,7 +76616,7 @@ static const per_sequence_t EUTRA_FrequencyInfo_r12_sequence[] = {
{ &hf_rrc_earfcn_02 , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_EARFCNExtension2 },
{ &hf_rrc_reducedMeasurementPerformance_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_T_reducedMeasurementPerformance_02 },
{ &hf_rrc_measurementBandwidth, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_MeasurementBandwidth },
{ &hf_rrc_eutra_blackListedCellList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_BlacklistedCellPerFreqList },
{ &hf_rrc_eutra_exclude_listedCellList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_Exclude_listedCellPerFreqList },
{ &hf_rrc_widebandRSRQMeasurements_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_T_widebandRSRQMeasurements_01 },
{ NULL, 0, 0, NULL }
};
@ -91688,7 +91689,7 @@ dissect_rrc_RRCConnectionRelease_v770ext_IEs(tvbuff_t *tvb _U_, int offset _U_,
static const per_sequence_t EUTRA_TargetFreqInfo_sequence[] = {
{ &hf_rrc_dlEUTRACarrierFreq, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_EARFCN },
{ &hf_rrc_eutraBlacklistedCellPerFreqList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_BlacklistedCellPerFreqList },
{ &hf_rrc_eutraExclude_listedCellPerFreqList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_Exclude_listedCellPerFreqList },
{ NULL, 0, 0, NULL }
};
@ -147883,7 +147884,7 @@ static const per_sequence_t EUTRA_FrequencyAndPriorityInfo_sequence[] = {
{ &hf_rrc_qRxLevMinEUTRA , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_INTEGER_M70_M22 },
{ &hf_rrc_threshXhigh , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_INTEGER_0_31 },
{ &hf_rrc_threshXlow , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_INTEGER_0_31 },
{ &hf_rrc_eutra_blackListedCellList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_BlacklistedCellPerFreqList },
{ &hf_rrc_eutra_exclude_ListedCellList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_Exclude_listedCellPerFreqList },
{ &hf_rrc_eutraDetection , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_BOOLEAN },
{ NULL, 0, 0, NULL }
};
@ -148009,7 +148010,7 @@ static const per_sequence_t EUTRA_FrequencyAndPriorityInfoExtension_vb50ext_sequ
{ &hf_rrc_qqualMinEUTRA , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_INTEGER_M34_M3 },
{ &hf_rrc_threshXhigh2 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_INTEGER_0_31 },
{ &hf_rrc_threshXlow2 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_INTEGER_0_31 },
{ &hf_rrc_eutra_blackListedCellList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_BlacklistedCellPerFreqList },
{ &hf_rrc_eutra_exclude_listedCellList, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_EUTRA_Exclude_listedCellPerFreqList },
{ &hf_rrc_eutraDetection , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_BOOLEAN },
{ NULL, 0, 0, NULL }
};
@ -194412,10 +194413,10 @@ void proto_register_rrc(void) {
{ "threshXlow", "rrc.threshXlow",
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER_0_31", HFILL }},
{ &hf_rrc_eutra_blackListedCellList,
{ "eutra-blackListedCellList", "rrc.eutra_blackListedCellList",
{ &hf_rrc_eutra_exclude_ListedCellList,
{ "eutra-exclude-ListedCellList", "rrc.eutra_exclude_ListedCellList",
FT_UINT32, BASE_DEC, NULL, 0,
"EUTRA_BlacklistedCellPerFreqList", HFILL }},
"EUTRA_Exclude_listedCellPerFreqList", HFILL }},
{ &hf_rrc_qqualMinEUTRA,
{ "qqualMinEUTRA", "rrc.qqualMinEUTRA",
FT_INT32, BASE_DEC, NULL, 0,
@ -194444,6 +194445,10 @@ void proto_register_rrc(void) {
{ "subpriority", "rrc.subpriority",
FT_UINT32, BASE_DEC, VALS(rrc_T_subpriority_01_vals), 0,
"T_subpriority_01", HFILL }},
{ &hf_rrc_eutra_exclude_listedCellList,
{ "eutra-exclude-listedCellList", "rrc.eutra_exclude_listedCellList",
FT_UINT32, BASE_DEC, NULL, 0,
"EUTRA_Exclude_listedCellPerFreqList", HFILL }},
{ &hf_rrc_reducedMeasurementPerformance_01,
{ "reducedMeasurementPerformance", "rrc.reducedMeasurementPerformance",
FT_UINT32, BASE_DEC, VALS(rrc_T_reducedMeasurementPerformance_01_vals), 0,
@ -196484,8 +196489,8 @@ void proto_register_rrc(void) {
{ "tdd", "rrc.tdd_element",
FT_NONE, BASE_NONE, NULL, 0,
"T_tdd_111", HFILL }},
{ &hf_rrc_InterFreqBlacklistedCellsList_r12_item,
{ "InterFreqBlacklistedCells-r12", "rrc.InterFreqBlacklistedCells_r12_element",
{ &hf_rrc_InterFreqExclude_listedCellsList_r12_item,
{ "InterFreqExclude-listedCells-r12", "rrc.InterFreqExclude_listedCells_r12_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_rrc_excludedCellInfoList,
@ -196568,10 +196573,10 @@ void proto_register_rrc(void) {
{ "interFreqEventList", "rrc.interFreqEventList",
FT_UINT32, BASE_DEC, NULL, 0,
"InterFreqEventList_r12", HFILL }},
{ &hf_rrc_interFreqBlacklistedCellsList,
{ "interFreqBlacklistedCellsList", "rrc.interFreqBlacklistedCellsList",
{ &hf_rrc_interFreqExclude_listedCellsList,
{ "interFreqExclude-listedCellsList", "rrc.interFreqExclude_listedCellsList",
FT_UINT32, BASE_DEC, NULL, 0,
"InterFreqBlacklistedCellsList_r12", HFILL }},
"InterFreqExclude_listedCellsList_r12", HFILL }},
{ &hf_rrc_utra_Carrier_RSSI,
{ "utra-Carrier-RSSI", "rrc.utra_Carrier_RSSI",
FT_BOOLEAN, BASE_NONE, NULL, 0,
@ -203040,8 +203045,8 @@ void proto_register_rrc(void) {
{ "serialNumber", "rrc.serialNumber",
FT_BYTES, BASE_NONE, NULL, 0,
"OCTET_STRING_SIZE_2", HFILL }},
{ &hf_rrc_EUTRA_BlacklistedCellPerFreqList_item,
{ "EUTRA-BlacklistedCell", "rrc.EUTRA_BlacklistedCell_element",
{ &hf_rrc_EUTRA_Exclude_listedCellPerFreqList_item,
{ "EUTRA-Exclude-listedCell", "rrc.EUTRA_Exclude_listedCell_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_rrc_ue_EUTRA_Capability,
@ -203060,10 +203065,10 @@ void proto_register_rrc(void) {
{ "dlEUTRACarrierFreq", "rrc.dlEUTRACarrierFreq",
FT_UINT32, BASE_DEC, NULL, 0,
"EARFCN", HFILL }},
{ &hf_rrc_eutraBlacklistedCellPerFreqList,
{ "eutraBlacklistedCellPerFreqList", "rrc.eutraBlacklistedCellPerFreqList",
{ &hf_rrc_eutraExclude_listedCellPerFreqList,
{ "eutraExclude-listedCellPerFreqList", "rrc.eutraExclude_listedCellPerFreqList",
FT_UINT32, BASE_DEC, NULL, 0,
"EUTRA_BlacklistedCellPerFreqList", HFILL }},
"EUTRA_Exclude_listedCellPerFreqList", HFILL }},
{ &hf_rrc_extensionGANSS_SIBType,
{ "extensionGANSS-SIBType", "rrc.extensionGANSS_SIBType",
FT_UINT32, BASE_DEC, VALS(rrc_SIB_TypeExtGANSS_vals), 0,
@ -214358,8 +214363,8 @@ void proto_register_rrc(void) {
&ett_rrc_T_modeSpecificInfo_122,
&ett_rrc_T_fdd_166,
&ett_rrc_T_tdd_111,
&ett_rrc_InterFreqBlacklistedCellsList_r12,
&ett_rrc_InterFreqBlacklistedCells_r12,
&ett_rrc_InterFreqExclude_listedCellsList_r12,
&ett_rrc_InterFreqExclude_listedCells_r12,
&ett_rrc_InterFreqReportCriteria,
&ett_rrc_InterFreqReportCriteria_r4,
&ett_rrc_InterFreqReportCriteria_r6,
@ -215369,8 +215374,8 @@ void proto_register_rrc(void) {
&ett_rrc_T_fdd_202,
&ett_rrc_T_tdd_146,
&ett_rrc_ETWS_Information,
&ett_rrc_EUTRA_BlacklistedCell,
&ett_rrc_EUTRA_BlacklistedCellPerFreqList,
&ett_rrc_EUTRA_Exclude_listedCell,
&ett_rrc_EUTRA_Exclude_listedCellPerFreqList,
&ett_rrc_EUTRA_RadioAccessCapability,
&ett_rrc_EUTRA_TargetFreqInfoList,
&ett_rrc_EUTRA_TargetFreqInfoList_vb50ext,