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

LTE RRC: upgrade dissector to v16.4.0

This commit is contained in:
Pascal Quantin 2021-04-01 21:59:00 +02:00
parent 348daa8d50
commit 352b555b7c
10 changed files with 204 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V16.3.0 (2020-12)
-- 3GPP TS 36.331 V16.4.0 (2021-03)
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=

28
epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V16.3.0 (2020-12)
-- 3GPP TS 36.331 V16.4.0 (2021-03)
EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -1827,7 +1827,7 @@ RRCConnectionRelease-v1320-IEs::= SEQUENCE {
}
RRCConnectionRelease-v1530-IEs ::= SEQUENCE {
drb-ContinueROHC-r15 ENUMERATED {true} OPTIONAL, -- Cond UP-EDT
drb-ContinueROHC-r15 ENUMERATED {true} OPTIONAL, -- Cond UP-EDTorPUR
nextHopChainingCount-r15 NextHopChainingCount OPTIONAL, -- Cond EarlySec
measIdleConfig-r15 MeasIdleConfigDedicated-r15 OPTIONAL, -- Need ON
rrc-InactiveConfig-r15 RRC-InactiveConfig-r15 OPTIONAL, -- Need OR
@ -1850,7 +1850,7 @@ RRCConnectionRelease-v1610-IEs ::= SEQUENCE {
shortI-RNTI-r16 ShortI-RNTI-r15 OPTIONAL, -- Need OR
pur-Config-r16 CHOICE {release NULL, setup PUR-Config-r16} OPTIONAL, -- Need ON
rrc-InactiveConfig-v1610 RRC-InactiveConfig-v1610 OPTIONAL, -- Cond BLCE-IDLEeDRX
releaseIdleMeasConfig ENUMERATED {true} OPTIONAL, -- Need ON
releaseIdleMeasConfig-r16 ENUMERATED {true} OPTIONAL, -- Need ON
altFreqPriorities-r16 ENUMERATED {true} OPTIONAL, -- Need ON
t323-r16 ENUMERATED {
min5, min10, min20, min30, min60, min120, min180,
@ -3594,6 +3594,11 @@ RLF-Report-r9 ::= SEQUENCE {
}
} OPTIONAL,
timeUntilReconnection-r16 TimeUntilReconnection-r16 OPTIONAL
]],
[[ measResultListNR-v1640 SEQUENCE {
carrierFreqNR-r16 ARFCN-ValueNR-r15
} OPTIONAL,
measResultListExtNR-r16 MeasResultFreqListNR-r16 OPTIONAL
]]
}
@ -3681,6 +3686,11 @@ LogMeasInfo-r10 ::= SEQUENCE {
[[ anyCellSelectionDetected-r15 ENUMERATED {true} OPTIONAL
]],
[[ measResultListNR-r16 MeasResultCellListNR-r15 OPTIONAL
]],
[[ measResultListNR-v1640 SEQUENCE {
carrierFreqNR-r16 ARFCN-ValueNR-r15
} OPTIONAL,
measResultListExtNR-r16 MeasResultFreqListNR-r16 OPTIONAL
]]
}
@ -3717,6 +3727,8 @@ BLER-Range-r12 ::= INTEGER(0..31)
MeasResultList2GERAN-r10 ::= SEQUENCE (SIZE (1..maxCellListGERAN)) OF MeasResultListGERAN
MeasResultFreqListNR-r16::= SEQUENCE (SIZE (1..maxFreq-1-r16)) OF MeasResultFreqFailNR-r15
ConnEstFailReport-r11 ::= SEQUENCE {
failedCellId-r11 CellGlobalIdEUTRA,
locationInfo-r11 LocationInfo-r10 OPTIONAL,
@ -3746,6 +3758,11 @@ ConnEstFailReport-r11 ::= SEQUENCE {
logMeasResultListWLAN-r15 LogMeasResultListWLAN-r15 OPTIONAL
]],
[[ measResultListNR-r16 MeasResultCellListNR-r15 OPTIONAL
]],
[[ measResultListNR-v1640 SEQUENCE {
carrierFreqNR-r16 ARFCN-ValueNR-r15
} OPTIONAL,
measResultListExtNR-r16 MeasResultFreqListNR-r16 OPTIONAL
]]
}
@ -8504,7 +8521,7 @@ DRB-ToAddMod ::= SEQUENCE {
rlc-BearerConfigSecondary-r15 RLC-BearerConfig-r15 OPTIONAL, -- Need ON
logicalChannelIdentity-r15 INTEGER (32..38) OPTIONAL -- Need ON
]],
[[ daps-HO-r16 ENUMERATED {true} OPTIONAL -- Cond NotFullConfigHO
[[ daps-HO-r16 ENUMERATED {true} OPTIONAL -- Cond DAPS
]]
}
@ -13819,7 +13836,7 @@ BandParameters-v1530 ::= SEQUENCE {
BandParameters-v1610 ::= SEQUENCE {
intraFreqDAPS-r16 SEQUENCE {
intraFreqAsyncDAPS-r16 ENUMERATED {supported} OPTIONAL,
intraFreqMultiUL-TransmissionDAPS-r16 ENUMERATED {supported} OPTIONAL,
dummy ENUMERATED {supported} OPTIONAL,
intraFreqTwoTAGs-DAPS-r16 ENUMERATED {supported} OPTIONAL
} OPTIONAL,
addSRS-FrequencyHopping-r16 ENUMERATED {supported} OPTIONAL,
@ -16075,6 +16092,7 @@ maxFeatureSets-r15 INTEGER ::= 256 -- Total number of feature sets (size of po
maxPerCC-FeatureSets-r15 INTEGER ::= 32 -- Total number of CC-specific feature sets
-- (size of the pool)
maxFreq INTEGER ::= 8 -- Maximum number of carrier frequencies
maxFreq-1-r16 INTEGER ::= 7 -- Maximum number of carrier frequencies
maxFreqIDC-r11 INTEGER ::= 32 -- Maximum number of carrier frequencies that are
-- affected by the IDC problems
maxFreqIdle-r15 INTEGER ::= 8 -- Maximum number of carrier frequencies for

2
epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V16.3.0 (2020-12)
-- 3GPP TS 36.331 V16.4.0 (2021-03)
EUTRA-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V16.3.0 (2020-12)
-- 3GPP TS 36.331 V16.4.0 (2021-03)
EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V16.3.0 (2020-12)
-- 3GPP TS 36.331 V16.4.0 (2021-03)
NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V16.3.0 (2020-12)
-- 3GPP TS 36.331 V16.4.0 (2021-03)
NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V16.3.0 (2020-12)
-- 3GPP TS 36.331 V16.4.0 (2021-03)
NBIOT-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V16.3.0 (2020-12)
-- 3GPP TS 36.331 V16.4.0 (2021-03)
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=

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

@ -1,7 +1,7 @@
/* packet-lte-rrc-template.c
* Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
* Radio Resource Control (RRC) protocol specification
* (3GPP TS 36.331 V16.3.0 Release 16) packet dissection
* (3GPP TS 36.331 V16.4.0 Release 16) packet dissection
* Copyright 2008, Vincent Helfre
* Copyright 2009-2021, Pascal Quantin
*

211
epan/dissectors/packet-lte-rrc.c
View File

@ -9,7 +9,7 @@
/* packet-lte-rrc-template.c
* Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
* Radio Resource Control (RRC) protocol specification
* (3GPP TS 36.331 V16.3.0 Release 16) packet dissection
* (3GPP TS 36.331 V16.4.0 Release 16) packet dissection
* Copyright 2008, Vincent Helfre
* Copyright 2009-2021, Pascal Quantin
*
@ -152,6 +152,7 @@ extern int proto_pdcp_lte;
#define maxFeatureSets_r15 256
#define maxPerCC_FeatureSets_r15 32
#define maxFreq 8
#define maxFreq_1_r16 7
#define maxFreqIDC_r11 32
#define maxFreqIdle_r15 8
#define maxFreqMBMS_r11 5
@ -1431,7 +1432,7 @@ static int hf_lte_rrc_shortI_RNTI_r16 = -1; /* ShortI_RNTI_r15 */
static int hf_lte_rrc_pur_Config_r16 = -1; /* T_pur_Config_r16 */
static int hf_lte_rrc_rRCConnectionRelease_v1610_IEs_pur_Config_r16_setup = -1; /* PUR_Config_r16 */
static int hf_lte_rrc_rrc_InactiveConfig_v1610 = -1; /* RRC_InactiveConfig_v1610 */
static int hf_lte_rrc_releaseIdleMeasConfig = -1; /* T_releaseIdleMeasConfig */
static int hf_lte_rrc_releaseIdleMeasConfig_r16 = -1; /* T_releaseIdleMeasConfig_r16 */
static int hf_lte_rrc_altFreqPriorities_r16 = -1; /* T_altFreqPriorities_r16 */
static int hf_lte_rrc_t323_r16 = -1; /* T_t323_r16 */
static int hf_lte_rrc_nonCriticalExtension_148 = -1; /* T_nonCriticalExtension_42 */
@ -2201,6 +2202,9 @@ static int hf_lte_rrc_cellGlobalId_r16_01 = -1; /* CellGlobalIdEUTRA */
static int hf_lte_rrc_trackingAreaCode_EPC_r16 = -1; /* TrackingAreaCode */
static int hf_lte_rrc_trackingAreaCode_5GC_r16 = -1; /* TrackingAreaCode_5GC_r15 */
static int hf_lte_rrc_timeUntilReconnection_r16 = -1; /* TimeUntilReconnection_r16 */
static int hf_lte_rrc_measResultListNR_v1640 = -1; /* T_measResultListNR_v1640 */
static int hf_lte_rrc_carrierFreqNR_r16 = -1; /* ARFCN_ValueNR_r15 */
static int hf_lte_rrc_measResultListExtNR_r16 = -1; /* MeasResultFreqListNR_r16 */
static int hf_lte_rrc_measResultListEUTRA_v9e0 = -1; /* MeasResultList2EUTRA_v9e0 */
static int hf_lte_rrc_MeasResultList2EUTRA_r9_item = -1; /* MeasResult2EUTRA_r9 */
static int hf_lte_rrc_MeasResultList2EUTRA_v9e0_item = -1; /* MeasResult2EUTRA_v9e0 */
@ -2235,6 +2239,7 @@ static int hf_lte_rrc_servCellRSRQ_Type_r12 = -1; /* RSRQ_Type_r12 */
static int hf_lte_rrc_inDeviceCoexDetected_r13 = -1; /* T_inDeviceCoexDetected_r13 */
static int hf_lte_rrc_measResultServCell_v1360 = -1; /* RSRP_Range_v1360 */
static int hf_lte_rrc_anyCellSelectionDetected_r15 = -1; /* T_anyCellSelectionDetected_r15 */
static int hf_lte_rrc_measResultListNR_v1640_01 = -1; /* T_measResultListNR_v1640_01 */
static int hf_lte_rrc_MeasResultListMBSFN_r12_item = -1; /* MeasResultMBSFN_r12 */
static int hf_lte_rrc_mbsfn_Area_r12 = -1; /* T_mbsfn_Area_r12 */
static int hf_lte_rrc_rsrpResultMBSFN_r12 = -1; /* RSRP_Range */
@ -2249,6 +2254,7 @@ static int hf_lte_rrc_blocksReceived_r12 = -1; /* T_blocksReceived_r12 */
static int hf_lte_rrc_n_r12 = -1; /* T_n_r12 */
static int hf_lte_rrc_m_r12 = -1; /* T_m_r12 */
static int hf_lte_rrc_MeasResultList2GERAN_r10_item = -1; /* MeasResultListGERAN */
static int hf_lte_rrc_MeasResultFreqListNR_r16_item = -1; /* MeasResultFreqFailNR_r15 */
static int hf_lte_rrc_failedCellId_r11 = -1; /* CellGlobalIdEUTRA */
static int hf_lte_rrc_locationInfo_r11 = -1; /* LocationInfo_r10 */
static int hf_lte_rrc_measResultFailedCell_r11 = -1; /* T_measResultFailedCell_r11 */
@ -2266,6 +2272,7 @@ static int hf_lte_rrc_measResultListEUTRA_v1130 = -1; /* MeasResultList2EUTRA_v
static int hf_lte_rrc_measResultFailedCell_v1250 = -1; /* RSRQ_Range_v1250 */
static int hf_lte_rrc_failedCellRSRQ_Type_r12 = -1; /* RSRQ_Type_r12 */
static int hf_lte_rrc_measResultFailedCell_v1360 = -1; /* RSRP_Range_v1360 */
static int hf_lte_rrc_measResultListNR_v1640_02 = -1; /* T_measResultListNR_v1640_02 */
static int hf_lte_rrc_flightPath_r15 = -1; /* SEQUENCE_SIZE_1_maxWayPoint_r15_OF_WayPointLocation_r15 */
static int hf_lte_rrc_flightPath_r15_item = -1; /* WayPointLocation_r15 */
static int hf_lte_rrc_nonCriticalExtension_251 = -1; /* T_nonCriticalExtension_71 */
@ -5255,7 +5262,6 @@ static int hf_lte_rrc_idleRSRQ_Threshold_r15 = -1; /* RSRQ_Range_r13 */
static int hf_lte_rrc_ValidityAreaList_r16_item = -1; /* ValidityArea_r16 */
static int hf_lte_rrc_validityCellList_r16 = -1; /* ValidityCellList_r16 */
static int hf_lte_rrc_ValidityCellList_r16_item = -1; /* PhysCellIdRange */
static int hf_lte_rrc_carrierFreqNR_r16 = -1; /* ARFCN_ValueNR_r15 */
static int hf_lte_rrc_subcarrierSpacingSSB_r16 = -1; /* T_subcarrierSpacingSSB_r16 */
static int hf_lte_rrc_frequencyBandList = -1; /* MultiFrequencyBandListNR_r15 */
static int hf_lte_rrc_measCellListNR_r16 = -1; /* CellListNR_r16 */
@ -6722,7 +6728,7 @@ static int hf_lte_rrc_qcl_CRI_BasedCSI_Reporting_r15 = -1; /* T_qcl_CRI_BasedCS
static int hf_lte_rrc_stti_SPT_BandParameters_r15 = -1; /* STTI_SPT_BandParameters_r15 */
static int hf_lte_rrc_intraFreqDAPS_r16 = -1; /* T_intraFreqDAPS_r16 */
static int hf_lte_rrc_intraFreqAsyncDAPS_r16 = -1; /* T_intraFreqAsyncDAPS_r16 */
static int hf_lte_rrc_intraFreqMultiUL_TransmissionDAPS_r16 = -1; /* T_intraFreqMultiUL_TransmissionDAPS_r16 */
static int hf_lte_rrc_dummy_01 = -1; /* T_dummy */
static int hf_lte_rrc_intraFreqTwoTAGs_DAPS_r16 = -1; /* T_intraFreqTwoTAGs_DAPS_r16 */
static int hf_lte_rrc_addSRS_FrequencyHopping_r16_01 = -1; /* T_addSRS_FrequencyHopping_r16_01 */
static int hf_lte_rrc_addSRS_AntennaSwitching_r16_01 = -1; /* T_addSRS_AntennaSwitching_r16_01 */
@ -7123,7 +7129,7 @@ static int hf_lte_rrc_sl_RateMatchingTBSScaling_r15 = -1; /* T_sl_RateMatchingT
static int hf_lte_rrc_sl_LowT2min_r15 = -1; /* T_sl_LowT2min_r15 */
static int hf_lte_rrc_v2x_SensingReportingMode3_r15 = -1; /* T_v2x_SensingReportingMode3_r15 */
static int hf_lte_rrc_sl_ParameterNR_r16 = -1; /* T_sl_ParameterNR_r16 */
static int hf_lte_rrc_dummy_01 = -1; /* V2X_SupportedBandCombinationEUTRA_NR_r16 */
static int hf_lte_rrc_dummy_02 = -1; /* V2X_SupportedBandCombinationEUTRA_NR_r16 */
static int hf_lte_rrc_v2x_SupportedBandCombinationListEUTRA_NR_r16 = -1; /* V2X_SupportedBandCombinationEUTRA_NR_v1630 */
static int hf_lte_rrc_ue_CategorySL_C_TX_r15 = -1; /* INTEGER_1_5 */
static int hf_lte_rrc_ue_CategorySL_C_RX_r15 = -1; /* INTEGER_1_4 */
@ -9886,6 +9892,7 @@ static gint ett_lte_rrc_T_failedNR_PCellId_r16 = -1;
static gint ett_lte_rrc_T_pci_arfcn_r16 = -1;
static gint ett_lte_rrc_T_reconnectCellId_r16 = -1;
static gint ett_lte_rrc_T_eutraReconnectCellId_r16 = -1;
static gint ett_lte_rrc_T_measResultListNR_v1640 = -1;
static gint ett_lte_rrc_RLF_Report_v9e0 = -1;
static gint ett_lte_rrc_MeasResultList2EUTRA_r9 = -1;
static gint ett_lte_rrc_MeasResultList2EUTRA_v9e0 = -1;
@ -9902,6 +9909,7 @@ static gint ett_lte_rrc_LogMeasInfoList_r10 = -1;
static gint ett_lte_rrc_LogMeasInfo_r10 = -1;
static gint ett_lte_rrc_T_measResultServCell_r10 = -1;
static gint ett_lte_rrc_T_measResultNeighCells_r10 = -1;
static gint ett_lte_rrc_T_measResultListNR_v1640_01 = -1;
static gint ett_lte_rrc_MeasResultListMBSFN_r12 = -1;
static gint ett_lte_rrc_MeasResultMBSFN_r12 = -1;
static gint ett_lte_rrc_T_mbsfn_Area_r12 = -1;
@ -9910,9 +9918,11 @@ static gint ett_lte_rrc_DataBLER_MCH_Result_r12 = -1;
static gint ett_lte_rrc_BLER_Result_r12 = -1;
static gint ett_lte_rrc_T_blocksReceived_r12 = -1;
static gint ett_lte_rrc_MeasResultList2GERAN_r10 = -1;
static gint ett_lte_rrc_MeasResultFreqListNR_r16 = -1;
static gint ett_lte_rrc_ConnEstFailReport_r11 = -1;
static gint ett_lte_rrc_T_measResultFailedCell_r11 = -1;
static gint ett_lte_rrc_T_measResultNeighCells_r11 = -1;
static gint ett_lte_rrc_T_measResultListNR_v1640_02 = -1;
static gint ett_lte_rrc_FlightPathInfoReport_r15 = -1;
static gint ett_lte_rrc_SEQUENCE_SIZE_1_maxWayPoint_r15_OF_WayPointLocation_r15 = -1;
static gint ett_lte_rrc_T_nonCriticalExtension_71 = -1;
@ -75500,14 +75510,14 @@ dissect_lte_rrc_RRC_InactiveConfig_v1610(tvbuff_t *tvb _U_, int offset _U_, asn1
}
static const value_string lte_rrc_T_releaseIdleMeasConfig_vals[] = {
static const value_string lte_rrc_T_releaseIdleMeasConfig_r16_vals[] = {
{ 0, "true" },
{ 0, NULL }
};
static int
dissect_lte_rrc_T_releaseIdleMeasConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
dissect_lte_rrc_T_releaseIdleMeasConfig_r16(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, FALSE, 0, NULL);
@ -75570,7 +75580,7 @@ static const per_sequence_t RRCConnectionRelease_v1610_IEs_sequence[] = {
{ &hf_lte_rrc_shortI_RNTI_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_ShortI_RNTI_r15 },
{ &hf_lte_rrc_pur_Config_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_pur_Config_r16 },
{ &hf_lte_rrc_rrc_InactiveConfig_v1610, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_RRC_InactiveConfig_v1610 },
{ &hf_lte_rrc_releaseIdleMeasConfig, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_releaseIdleMeasConfig },
{ &hf_lte_rrc_releaseIdleMeasConfig_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_releaseIdleMeasConfig_r16 },
{ &hf_lte_rrc_altFreqPriorities_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_altFreqPriorities_r16 },
{ &hf_lte_rrc_t323_r16 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_t323_r16 },
{ &hf_lte_rrc_nonCriticalExtension_148, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_nonCriticalExtension_42 },
@ -84181,6 +84191,63 @@ dissect_lte_rrc_RLF_Report_r9_eag_8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
}
static const per_sequence_t T_measResultListNR_v1640_sequence[] = {
{ &hf_lte_rrc_carrierFreqNR_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_lte_rrc_ARFCN_ValueNR_r15 },
{ NULL, 0, 0, NULL }
};
static int
dissect_lte_rrc_T_measResultListNR_v1640(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_lte_rrc_T_measResultListNR_v1640, T_measResultListNR_v1640_sequence);
return offset;
}
static const per_sequence_t MeasResultFreqFailNR_r15_sequence[] = {
{ &hf_lte_rrc_carrierFreq_r15, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_ARFCN_ValueNR_r15 },
{ &hf_lte_rrc_measResultCellList_r15, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_MeasResultCellListNR_r15 },
{ NULL, 0, 0, NULL }
};
static int
dissect_lte_rrc_MeasResultFreqFailNR_r15(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_lte_rrc_MeasResultFreqFailNR_r15, MeasResultFreqFailNR_r15_sequence);
return offset;
}
static const per_sequence_t MeasResultFreqListNR_r16_sequence_of[1] = {
{ &hf_lte_rrc_MeasResultFreqListNR_r16_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasResultFreqFailNR_r15 },
};
static int
dissect_lte_rrc_MeasResultFreqListNR_r16(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_lte_rrc_MeasResultFreqListNR_r16, MeasResultFreqListNR_r16_sequence_of,
1, maxFreq_1_r16, FALSE);
return offset;
}
static const per_sequence_t RLF_Report_r9_eag_9_sequence[] = {
{ &hf_lte_rrc_measResultListNR_v1640, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_measResultListNR_v1640 },
{ &hf_lte_rrc_measResultListExtNR_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_MeasResultFreqListNR_r16 },
{ NULL, 0, 0, NULL }
};
static int
dissect_lte_rrc_RLF_Report_r9_eag_9(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence_eag(tvb, offset, actx, tree, RLF_Report_r9_eag_9_sequence);
return offset;
}
static const per_sequence_t RLF_Report_r9_sequence[] = {
{ &hf_lte_rrc_measResultLastServCell_r9, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_measResultLastServCell_r9 },
{ &hf_lte_rrc_measResultNeighCells_r9, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_measResultNeighCells_r9 },
@ -84192,6 +84259,7 @@ static const per_sequence_t RLF_Report_r9_sequence[] = {
{ &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RLF_Report_r9_eag_6 },
{ &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RLF_Report_r9_eag_7 },
{ &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RLF_Report_r9_eag_8 },
{ &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RLF_Report_r9_eag_9 },
{ NULL, 0, 0, NULL }
};
@ -84592,6 +84660,34 @@ dissect_lte_rrc_LogMeasInfo_r10_eag_7(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
}
static const per_sequence_t T_measResultListNR_v1640_01_sequence[] = {
{ &hf_lte_rrc_carrierFreqNR_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_lte_rrc_ARFCN_ValueNR_r15 },
{ NULL, 0, 0, NULL }
};
static int
dissect_lte_rrc_T_measResultListNR_v1640_01(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_lte_rrc_T_measResultListNR_v1640_01, T_measResultListNR_v1640_01_sequence);
return offset;
}
static const per_sequence_t LogMeasInfo_r10_eag_8_sequence[] = {
{ &hf_lte_rrc_measResultListNR_v1640_01, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_measResultListNR_v1640_01 },
{ &hf_lte_rrc_measResultListExtNR_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_MeasResultFreqListNR_r16 },
{ NULL, 0, 0, NULL }
};
static int
dissect_lte_rrc_LogMeasInfo_r10_eag_8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence_eag(tvb, offset, actx, tree, LogMeasInfo_r10_eag_8_sequence);
return offset;
}
static const per_sequence_t LogMeasInfo_r10_sequence[] = {
{ &hf_lte_rrc_locationInfo_r10, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_LocationInfo_r10 },
{ &hf_lte_rrc_relativeTimeStamp_r10, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_INTEGER_0_7200 },
@ -84605,6 +84701,7 @@ static const per_sequence_t LogMeasInfo_r10_sequence[] = {
{ &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_LogMeasInfo_r10_eag_5 },
{ &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_LogMeasInfo_r10_eag_6 },
{ &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_LogMeasInfo_r10_eag_7 },
{ &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_LogMeasInfo_r10_eag_8 },
{ NULL, 0, 0, NULL }
};
@ -84797,6 +84894,34 @@ dissect_lte_rrc_ConnEstFailReport_r11_eag_4(tvbuff_t *tvb _U_, int offset _U_, a
}
static const per_sequence_t T_measResultListNR_v1640_02_sequence[] = {
{ &hf_lte_rrc_carrierFreqNR_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_lte_rrc_ARFCN_ValueNR_r15 },
{ NULL, 0, 0, NULL }
};
static int
dissect_lte_rrc_T_measResultListNR_v1640_02(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_lte_rrc_T_measResultListNR_v1640_02, T_measResultListNR_v1640_02_sequence);
return offset;
}
static const per_sequence_t ConnEstFailReport_r11_eag_5_sequence[] = {
{ &hf_lte_rrc_measResultListNR_v1640_02, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_measResultListNR_v1640_02 },
{ &hf_lte_rrc_measResultListExtNR_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_MeasResultFreqListNR_r16 },
{ NULL, 0, 0, NULL }
};
static int
dissect_lte_rrc_ConnEstFailReport_r11_eag_5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence_eag(tvb, offset, actx, tree, ConnEstFailReport_r11_eag_5_sequence);
return offset;
}
static const per_sequence_t ConnEstFailReport_r11_sequence[] = {
{ &hf_lte_rrc_failedCellId_r11, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_CellGlobalIdEUTRA },
{ &hf_lte_rrc_locationInfo_r11, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_LocationInfo_r10 },
@ -84811,6 +84936,7 @@ static const per_sequence_t ConnEstFailReport_r11_sequence[] = {
{ &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ConnEstFailReport_r11_eag_2 },
{ &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ConnEstFailReport_r11_eag_3 },
{ &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ConnEstFailReport_r11_eag_4 },
{ &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ConnEstFailReport_r11_eag_5 },
{ NULL, 0, 0, NULL }
};
@ -89187,21 +89313,6 @@ dissect_lte_rrc_T_failureType_r15(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
}
static const per_sequence_t MeasResultFreqFailNR_r15_sequence[] = {
{ &hf_lte_rrc_carrierFreq_r15, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_ARFCN_ValueNR_r15 },
{ &hf_lte_rrc_measResultCellList_r15, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_MeasResultCellListNR_r15 },
{ NULL, 0, 0, NULL }
};
static int
dissect_lte_rrc_MeasResultFreqFailNR_r15(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_lte_rrc_MeasResultFreqFailNR_r15, MeasResultFreqFailNR_r15_sequence);
return offset;
}
static const per_sequence_t MeasResultFreqListFailNR_r15_sequence_of[1] = {
{ &hf_lte_rrc_MeasResultFreqListFailNR_r15_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasResultFreqFailNR_r15 },
};
@ -106709,14 +106820,14 @@ dissect_lte_rrc_T_intraFreqAsyncDAPS_r16(tvbuff_t *tvb _U_, int offset _U_, asn1
}
static const value_string lte_rrc_T_intraFreqMultiUL_TransmissionDAPS_r16_vals[] = {
static const value_string lte_rrc_T_dummy_vals[] = {
{ 0, "supported" },
{ 0, NULL }
};
static int
dissect_lte_rrc_T_intraFreqMultiUL_TransmissionDAPS_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
dissect_lte_rrc_T_dummy(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, FALSE, 0, NULL);
@ -106741,7 +106852,7 @@ dissect_lte_rrc_T_intraFreqTwoTAGs_DAPS_r16(tvbuff_t *tvb _U_, int offset _U_, a
static const per_sequence_t T_intraFreqDAPS_r16_sequence[] = {
{ &hf_lte_rrc_intraFreqAsyncDAPS_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_intraFreqAsyncDAPS_r16 },
{ &hf_lte_rrc_intraFreqMultiUL_TransmissionDAPS_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_intraFreqMultiUL_TransmissionDAPS_r16 },
{ &hf_lte_rrc_dummy_01 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_dummy },
{ &hf_lte_rrc_intraFreqTwoTAGs_DAPS_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_intraFreqTwoTAGs_DAPS_r16 },
{ NULL, 0, 0, NULL }
};
@ -107254,7 +107365,7 @@ dissect_lte_rrc_V2X_SupportedBandCombinationEUTRA_NR_r16(tvbuff_t *tvb _U_, int
static const per_sequence_t SL_Parameters_v1610_sequence[] = {
{ &hf_lte_rrc_sl_ParameterNR_r16, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_sl_ParameterNR_r16 },
{ &hf_lte_rrc_dummy_01 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_V2X_SupportedBandCombinationEUTRA_NR_r16 },
{ &hf_lte_rrc_dummy_02 , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_V2X_SupportedBandCombinationEUTRA_NR_r16 },
{ NULL, 0, 0, NULL }
};
@ -132545,9 +132656,9 @@ void proto_register_lte_rrc(void) {
{ "rrc-InactiveConfig-v1610", "lte-rrc.rrc_InactiveConfig_v1610_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_releaseIdleMeasConfig,
{ "releaseIdleMeasConfig", "lte-rrc.releaseIdleMeasConfig",
FT_UINT32, BASE_DEC, VALS(lte_rrc_T_releaseIdleMeasConfig_vals), 0,
{ &hf_lte_rrc_releaseIdleMeasConfig_r16,
{ "releaseIdleMeasConfig-r16", "lte-rrc.releaseIdleMeasConfig_r16",
FT_UINT32, BASE_DEC, VALS(lte_rrc_T_releaseIdleMeasConfig_r16_vals), 0,
NULL, HFILL }},
{ &hf_lte_rrc_altFreqPriorities_r16,
{ "altFreqPriorities-r16", "lte-rrc.altFreqPriorities_r16",
@ -135625,6 +135736,18 @@ void proto_register_lte_rrc(void) {
{ "timeUntilReconnection-r16", "lte-rrc.timeUntilReconnection_r16",
FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &units_seconds, 0,
NULL, HFILL }},
{ &hf_lte_rrc_measResultListNR_v1640,
{ "measResultListNR-v1640", "lte-rrc.measResultListNR_v1640_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_carrierFreqNR_r16,
{ "carrierFreqNR-r16", "lte-rrc.carrierFreqNR_r16",
FT_UINT32, BASE_DEC, NULL, 0,
"ARFCN_ValueNR_r15", HFILL }},
{ &hf_lte_rrc_measResultListExtNR_r16,
{ "measResultListExtNR-r16", "lte-rrc.measResultListExtNR_r16",
FT_UINT32, BASE_DEC, NULL, 0,
"MeasResultFreqListNR_r16", HFILL }},
{ &hf_lte_rrc_measResultListEUTRA_v9e0,
{ "measResultListEUTRA-v9e0", "lte-rrc.measResultListEUTRA_v9e0",
FT_UINT32, BASE_DEC, NULL, 0,
@ -135761,6 +135884,10 @@ void proto_register_lte_rrc(void) {
{ "anyCellSelectionDetected-r15", "lte-rrc.anyCellSelectionDetected_r15",
FT_UINT32, BASE_DEC, VALS(lte_rrc_T_anyCellSelectionDetected_r15_vals), 0,
NULL, HFILL }},
{ &hf_lte_rrc_measResultListNR_v1640_01,
{ "measResultListNR-v1640", "lte-rrc.measResultListNR_v1640_element",
FT_NONE, BASE_NONE, NULL, 0,
"T_measResultListNR_v1640_01", HFILL }},
{ &hf_lte_rrc_MeasResultListMBSFN_r12_item,
{ "MeasResultMBSFN-r12", "lte-rrc.MeasResultMBSFN_r12_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -135817,6 +135944,10 @@ void proto_register_lte_rrc(void) {
{ "MeasResultListGERAN", "lte-rrc.MeasResultListGERAN",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_MeasResultFreqListNR_r16_item,
{ "MeasResultFreqFailNR-r15", "lte-rrc.MeasResultFreqFailNR_r15_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_failedCellId_r11,
{ "failedCellId-r11", "lte-rrc.failedCellId_r11_element",
FT_NONE, BASE_NONE, NULL, 0,
@ -135885,6 +136016,10 @@ void proto_register_lte_rrc(void) {
{ "measResultFailedCell-v1360", "lte-rrc.measResultFailedCell_v1360",
FT_INT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_RSRP_Range_v1360_vals_ext, 0,
"RSRP_Range_v1360", HFILL }},
{ &hf_lte_rrc_measResultListNR_v1640_02,
{ "measResultListNR-v1640", "lte-rrc.measResultListNR_v1640_element",
FT_NONE, BASE_NONE, NULL, 0,
"T_measResultListNR_v1640_02", HFILL }},
{ &hf_lte_rrc_flightPath_r15,
{ "flightPath-r15", "lte-rrc.flightPath_r15",
FT_UINT32, BASE_DEC, NULL, 0,
@ -147841,10 +147976,6 @@ void proto_register_lte_rrc(void) {
{ "PhysCellIdRange", "lte-rrc.PhysCellIdRange_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_carrierFreqNR_r16,
{ "carrierFreqNR-r16", "lte-rrc.carrierFreqNR_r16",
FT_UINT32, BASE_DEC, NULL, 0,
"ARFCN_ValueNR_r15", HFILL }},
{ &hf_lte_rrc_subcarrierSpacingSSB_r16,
{ "subcarrierSpacingSSB-r16", "lte-rrc.subcarrierSpacingSSB_r16",
FT_UINT32, BASE_DEC, VALS(lte_rrc_T_subcarrierSpacingSSB_r16_vals), 0,
@ -153709,9 +153840,9 @@ void proto_register_lte_rrc(void) {
{ "intraFreqAsyncDAPS-r16", "lte-rrc.intraFreqAsyncDAPS_r16",
FT_UINT32, BASE_DEC, VALS(lte_rrc_T_intraFreqAsyncDAPS_r16_vals), 0,
NULL, HFILL }},
{ &hf_lte_rrc_intraFreqMultiUL_TransmissionDAPS_r16,
{ "intraFreqMultiUL-TransmissionDAPS-r16", "lte-rrc.intraFreqMultiUL_TransmissionDAPS_r16",
FT_UINT32, BASE_DEC, VALS(lte_rrc_T_intraFreqMultiUL_TransmissionDAPS_r16_vals), 0,
{ &hf_lte_rrc_dummy_01,
{ "dummy", "lte-rrc.dummy",
FT_UINT32, BASE_DEC, VALS(lte_rrc_T_dummy_vals), 0,
NULL, HFILL }},
{ &hf_lte_rrc_intraFreqTwoTAGs_DAPS_r16,
{ "intraFreqTwoTAGs-DAPS-r16", "lte-rrc.intraFreqTwoTAGs_DAPS_r16",
@ -155313,7 +155444,7 @@ void proto_register_lte_rrc(void) {
{ "sl-ParameterNR-r16", "lte-rrc.sl_ParameterNR_r16",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lte_rrc_dummy_01,
{ &hf_lte_rrc_dummy_02,
{ "dummy", "lte-rrc.dummy",
FT_UINT32, BASE_DEC, NULL, 0,
"V2X_SupportedBandCombinationEUTRA_NR_r16", HFILL }},
@ -163554,6 +163685,7 @@ void proto_register_lte_rrc(void) {
&ett_lte_rrc_T_pci_arfcn_r16,
&ett_lte_rrc_T_reconnectCellId_r16,
&ett_lte_rrc_T_eutraReconnectCellId_r16,
&ett_lte_rrc_T_measResultListNR_v1640,
&ett_lte_rrc_RLF_Report_v9e0,
&ett_lte_rrc_MeasResultList2EUTRA_r9,
&ett_lte_rrc_MeasResultList2EUTRA_v9e0,
@ -163570,6 +163702,7 @@ void proto_register_lte_rrc(void) {
&ett_lte_rrc_LogMeasInfo_r10,
&ett_lte_rrc_T_measResultServCell_r10,
&ett_lte_rrc_T_measResultNeighCells_r10,
&ett_lte_rrc_T_measResultListNR_v1640_01,
&ett_lte_rrc_MeasResultListMBSFN_r12,
&ett_lte_rrc_MeasResultMBSFN_r12,
&ett_lte_rrc_T_mbsfn_Area_r12,
@ -163578,9 +163711,11 @@ void proto_register_lte_rrc(void) {
&ett_lte_rrc_BLER_Result_r12,
&ett_lte_rrc_T_blocksReceived_r12,
&ett_lte_rrc_MeasResultList2GERAN_r10,
&ett_lte_rrc_MeasResultFreqListNR_r16,
&ett_lte_rrc_ConnEstFailReport_r11,
&ett_lte_rrc_T_measResultFailedCell_r11,
&ett_lte_rrc_T_measResultNeighCells_r11,
&ett_lte_rrc_T_measResultListNR_v1640_02,
&ett_lte_rrc_FlightPathInfoReport_r15,
&ett_lte_rrc_SEQUENCE_SIZE_1_maxWayPoint_r15_OF_WayPointLocation_r15,
&ett_lte_rrc_T_nonCriticalExtension_71,