NR RRC: upgrade dissector to v16.1.0

Change-Id: I961820125dca0f6b72dc84658d3010ca94a563ac
Reviewed-on: https://code.wireshark.org/review/38180
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>

1 files changed, 305 insertions, 64 deletions

diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index 5ba79d4649..bc68269006 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -345,6 +345,8 @@ static int hf_lte_rrc_SC_MCCH_Message_r13_PDU = -1;  /* SC_MCCH_Message_r13 */
 static int hf_lte_rrc_lte_rrc_MeasurementReport_PDU = -1;  /* MeasurementReport */
 static int hf_lte_rrc_RRCConnectionReconfiguration_PDU = -1;  /* RRCConnectionReconfiguration */
 static int hf_lte_rrc_lte_rrc_RRCConnectionReconfigurationComplete_PDU = -1;  /* RRCConnectionReconfigurationComplete */
+static int hf_lte_rrc_lte_rrc_SidelinkUEInformation_r12_PDU = -1;  /* SidelinkUEInformation_r12 */
+static int hf_lte_rrc_lte_rrc_UEAssistanceInformation_r11_PDU = -1;  /* UEAssistanceInformation_r11 */
 static int hf_lte_rrc_lte_rrc_UECapabilityEnquiry_PDU = -1;  /* UECapabilityEnquiry */
 static int hf_lte_rrc_UECapabilityInformation_PDU = -1;  /* UECapabilityInformation */
 static int hf_lte_rrc_lte_rrc_RLF_Report_r9_PDU = -1;  /* RLF_Report_r9 */
@@ -352,6 +354,13 @@ static int hf_lte_rrc_lte_rrc_RLF_Report_v9e0_PDU = -1;  /* RLF_Report_v9e0 */
 static int hf_lte_rrc_lte_rrc_MeasResultSCG_FailureMRDC_r15_PDU = -1;  /* MeasResultSCG_FailureMRDC_r15 */
 static int hf_lte_rrc_lte_rrc_MeasResultList3EUTRA_r15_PDU = -1;  /* MeasResultList3EUTRA_r15 */
 static int hf_lte_rrc_lte_rrc_UE_EUTRA_Capability_PDU = -1;  /* UE_EUTRA_Capability */
+static int hf_lte_rrc_lte_rrc_V2X_BandParameters_r14_PDU = -1;  /* V2X_BandParameters_r14 */
+static int hf_lte_rrc_lte_rrc_V2X_BandParameters_v1530_PDU = -1;  /* V2X_BandParameters_v1530 */
+static int hf_lte_rrc_lte_rrc_SL_Parameters_v1430_PDU = -1;  /* SL_Parameters_v1430 */
+static int hf_lte_rrc_lte_rrc_SL_Parameters_v1530_PDU = -1;  /* SL_Parameters_v1530 */
+static int hf_lte_rrc_lte_rrc_SL_Parameters_v1540_PDU = -1;  /* SL_Parameters_v1540 */
+static int hf_lte_rrc_lte_rrc_V2X_SupportedBandCombination_r14_PDU = -1;  /* V2X_SupportedBandCombination_r14 */
+static int hf_lte_rrc_lte_rrc_V2X_SupportedBandCombination_v1530_PDU = -1;  /* V2X_SupportedBandCombination_v1530 */
 static int hf_lte_rrc_lte_rrc_VisitedCellInfoList_r12_PDU = -1;  /* VisitedCellInfoList_r12 */
 static int hf_lte_rrc_lte_rrc_VisitedCellInfo_r12_PDU = -1;  /* VisitedCellInfo_r12 */
 static int hf_lte_rrc_SBCCH_SL_BCH_Message_PDU = -1;  /* SBCCH_SL_BCH_Message */
@@ -375,8 +384,6 @@ static int hf_lte_rrc_MBMSInterestIndication_r11_PDU = -1;  /* MBMSInterestIndic
 static int hf_lte_rrc_UE_RadioPagingInfo_r12_PDU = -1;  /* UE_RadioPagingInfo_r12 */
 static int hf_lte_rrc_SystemInformationBlockType1_v890_IEs_PDU = -1;  /* SystemInformationBlockType1_v890_IEs */
 static int hf_lte_rrc_InDeviceCoexIndication_r11_PDU = -1;  /* InDeviceCoexIndication_r11 */
-static int hf_lte_rrc_UEAssistanceInformation_r11_PDU = -1;  /* UEAssistanceInformation_r11 */
-static int hf_lte_rrc_SidelinkUEInformation_r12_PDU = -1;  /* SidelinkUEInformation_r12 */
 static int hf_lte_rrc_WLANConnectionStatusReport_r13_PDU = -1;  /* WLANConnectionStatusReport_r13 */
 static int hf_lte_rrc_SystemInformationBlockType1_PDU = -1;  /* SystemInformationBlockType1 */
 static int hf_lte_rrc_RRCConnectionReconfiguration_v8m0_IEs_PDU = -1;  /* RRCConnectionReconfiguration_v8m0_IEs */
@@ -592,8 +599,8 @@ static int hf_lte_rrc_sidelinkUEInformation_r12 = -1;  /* T_sidelinkUEInformatio
 static int hf_lte_rrc_sourceContextEN_DC_r15 = -1;  /* T_sourceContextEN_DC_r15 */
 static int hf_lte_rrc_selectedbandCombinationInfoEN_DC_v1540 = -1;  /* T_selectedbandCombinationInfoEN_DC_v1540 */
 static int hf_lte_rrc_wlanConnectionStatusReport_r13 = -1;  /* T_wlanConnectionStatusReport_r13 */
-static int hf_lte_rrc_sidelinkUEInformationNR_r16 = -1;  /* OCTET_STRING */
-static int hf_lte_rrc_ueAssistanceInformationNR_r16 = -1;  /* OCTET_STRING */
+static int hf_lte_rrc_sidelinkUEInformationNR_r16 = -1;  /* T_sidelinkUEInformationNR_r16 */
+static int hf_lte_rrc_ueAssistanceInformationNR_r16 = -1;  /* T_ueAssistanceInformationNR_r16 */
 static int hf_lte_rrc_configRestrictInfoDAPS_r16 = -1;  /* ConfigRestrictInfoDAPS_r16 */
 static int hf_lte_rrc_maxSCH_TB_BitsDL_r16 = -1;  /* INTEGER_1_100 */
 static int hf_lte_rrc_maxSCH_TB_BitsUL_r16 = -1;  /* INTEGER_1_100 */
@@ -5489,7 +5496,7 @@ static int hf_lte_rrc_cbr_PSSCH_r14 = -1;         /* SL_CBR_r14 */
 static int hf_lte_rrc_cbr_PSCCH_r14 = -1;         /* SL_CBR_r14 */
 static int hf_lte_rrc_MeasResultListNR_SL_r16_item = -1;  /* MeasResultCBR_NR_r16 */
 static int hf_lte_rrc_poolIdentityNR_r16 = -1;    /* SL_ResourcePoolID_NR_r16 */
-static int hf_lte_rrc_cbr_ResultsNR_r16 = -1;     /* OCTET_STRING */
+static int hf_lte_rrc_cbr_ResultsNR_r16 = -1;     /* T_cbr_ResultsNR_r16 */
 static int hf_lte_rrc_sl_TxPoolReportID_r16 = -1;  /* INTEGER_1_maxSL_PoolToMeasureNR_r16 */
 static int hf_lte_rrc_sl_SubframeRef_r15 = -1;    /* INTEGER_0_10239 */
 static int hf_lte_rrc_sensingResult_r15 = -1;     /* SEQUENCE_SIZE_0_400_OF_SensingResult_r15 */
@@ -7043,8 +7050,8 @@ static int hf_lte_rrc_sl_64QAM_Rx_r15 = -1;       /* T_sl_64QAM_Rx_r15 */
 static int hf_lte_rrc_sl_RateMatchingTBSScaling_r15 = -1;  /* T_sl_RateMatchingTBSScaling_r15 */
 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;    /* OCTET_STRING */
-static int hf_lte_rrc_v2x_SupportedBandCombinationListNR_r16 = -1;  /* OCTET_STRING */
+static int hf_lte_rrc_sl_ParameterNR_r16 = -1;    /* T_sl_ParameterNR_r16 */
+static int hf_lte_rrc_v2x_SupportedBandCombinationListNR_r16 = -1;  /* T_v2x_SupportedBandCombinationListNR_r16 */
 static int hf_lte_rrc_v2x_SupportedBandCombinationListEUTRA_NR_r16 = -1;  /* V2X_SupportedBandCombinationEUTRA_NR_r16 */
 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 */
@@ -7057,7 +7064,7 @@ static int hf_lte_rrc_eutra_01 = -1;              /* T_eutra */
 static int hf_lte_rrc_v2x_BandParameters1_r16 = -1;  /* V2X_BandParameters_r14 */
 static int hf_lte_rrc_v2x_BandParameters2_r16 = -1;  /* V2X_BandParameters_v1530 */
 static int hf_lte_rrc_nr = -1;                    /* T_nr */
-static int hf_lte_rrc_v2x_BandParametersNR_r16 = -1;  /* OCTET_STRING */
+static int hf_lte_rrc_v2x_BandParametersNR_r16 = -1;  /* T_v2x_BandParametersNR_r16 */
 static int hf_lte_rrc_SupportedBandInfoList_r12_item = -1;  /* SupportedBandInfo_r12 */
 static int hf_lte_rrc_support_r12 = -1;           /* T_support_r12 */
 static int hf_lte_rrc_FreqBandIndicatorListEUTRA_r12_item = -1;  /* FreqBandIndicator_r11 */
@@ -12589,6 +12596,12 @@ static gint ett_lte_rrc_nas_Container_r15 = -1;
 static gint ett_lte_rrc_sourceRB_ConfigIntra5GC_r15 = -1;
 static gint ett_lte_rrc_selectedbandCombinationInfoEN_DC_v1540 = -1;
 static gint ett_lte_rrc_requestedCapabilityCommon_r15 = -1;
+static gint ett_lte_rrc_sidelinkUEInformationNR_r16 = -1;
+static gint ett_lte_rrc_ueAssistanceInformationNR_r16 = -1;
+static gint ett_lte_rrc_cbr_ResultsNR_r16 = -1;
+static gint ett_lte_rrc_sl_ParameterNR_r16 = -1;
+static gint ett_lte_rrc_v2x_SupportedBandCombinationListNR_r16 = -1;
+static gint ett_lte_rrc_v2x_BandParametersNR_r16 = -1;
 
 static expert_field ei_lte_rrc_number_pages_le15 = EI_INIT;
 static expert_field ei_lte_rrc_si_info_value_changed = EI_INIT;
@@ -15474,8 +15487,6 @@ static int dissect_MBMSInterestIndication_r11_PDU(tvbuff_t *tvb _U_, packet_info
 static int dissect_UE_RadioPagingInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 static int dissect_SystemInformationBlockType1_v890_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 static int dissect_InDeviceCoexIndication_r11_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
-static int dissect_UEAssistanceInformation_r11_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
-static int dissect_SidelinkUEInformation_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 static int dissect_WLANConnectionStatusReport_r13_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 static int dissect_SystemInformationBlockType1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 static int dissect_RRCConnectionReconfiguration_v8m0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
@@ -54145,7 +54156,7 @@ dissect_lte_rrc_T_mbmsInterestIndication_r11(tvbuff_t *tvb _U_, int offset _U_,
 static int
 dissect_lte_rrc_T_powerPrefIndication_r11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_octet_string_containing_pdu_new(tvb, offset, actx, tree, hf_index,
-                                                                NO_BOUND, NO_BOUND, FALSE, dissect_UEAssistanceInformation_r11_PDU);
+                                                                NO_BOUND, NO_BOUND, FALSE, dissect_lte_rrc_UEAssistanceInformation_r11_PDU);
 
   return offset;
 }
@@ -54155,7 +54166,7 @@ dissect_lte_rrc_T_powerPrefIndication_r11(tvbuff_t *tvb _U_, int offset _U_, asn
 static int
 dissect_lte_rrc_T_sidelinkUEInformation_r12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_octet_string_containing_pdu_new(tvb, offset, actx, tree, hf_index,
-                                                                NO_BOUND, NO_BOUND, FALSE, dissect_SidelinkUEInformation_r12_PDU);
+                                                                NO_BOUND, NO_BOUND, FALSE, dissect_lte_rrc_SidelinkUEInformation_r12_PDU);
 
   return offset;
 }
@@ -54223,7 +54234,6 @@ dissect_lte_rrc_T_selectedbandCombinationInfoEN_DC_v1540(tvbuff_t *tvb _U_, int
   }
 
 
-
   return offset;
 }
 
@@ -58734,9 +58744,40 @@ dissect_lte_rrc_T_sourceRB_ConfigIntra5GC_r15(tvbuff_t *tvb _U_, int offset _U_,
 
 
 static int
-dissect_lte_rrc_OCTET_STRING(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_lte_rrc_T_sidelinkUEInformationNR_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  tvbuff_t *sidelink_ue_info_nr_tvb = NULL;
+
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
-                                       NO_BOUND, NO_BOUND, FALSE, NULL);
+                                       NO_BOUND, NO_BOUND, FALSE, &sidelink_ue_info_nr_tvb);
+
+
+  if (sidelink_ue_info_nr_tvb) {
+    proto_tree *subtree;
+    subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_sidelinkUEInformationNR_r16);
+    dissect_nr_rrc_SidelinkUEInformationNR_r16_PDU(sidelink_ue_info_nr_tvb, actx->pinfo, subtree, NULL);
+  }
+
+
+  return offset;
+}
+
+
+
+static int
+dissect_lte_rrc_T_ueAssistanceInformationNR_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  tvbuff_t *ue_assist_info_nr_tvb = NULL;
+
+  offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+                                       NO_BOUND, NO_BOUND, FALSE, &ue_assist_info_nr_tvb);
+
+
+  if (ue_assist_info_nr_tvb) {
+    proto_tree *subtree;
+    subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_ueAssistanceInformationNR_r16);
+    dissect_nr_rrc_UEAssistanceInformation_PDU(ue_assist_info_nr_tvb, actx->pinfo, subtree, NULL);
+  }
+
+
 
   return offset;
 }
@@ -58758,8 +58799,8 @@ dissect_lte_rrc_ConfigRestrictInfoDAPS_r16(tvbuff_t *tvb _U_, int offset _U_, as
 
 
 static const per_sequence_t AS_Context_v1610_sequence[] = {
-  { &hf_lte_rrc_sidelinkUEInformationNR_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_lte_rrc_OCTET_STRING },
-  { &hf_lte_rrc_ueAssistanceInformationNR_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_lte_rrc_OCTET_STRING },
+  { &hf_lte_rrc_sidelinkUEInformationNR_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_lte_rrc_T_sidelinkUEInformationNR_r16 },
+  { &hf_lte_rrc_ueAssistanceInformationNR_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_lte_rrc_T_ueAssistanceInformationNR_r16 },
   { &hf_lte_rrc_configRestrictInfoDAPS_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_lte_rrc_ConfigRestrictInfoDAPS_r16 },
   { NULL, 0, 0, NULL }
 };
@@ -59042,6 +59083,16 @@ dissect_lte_rrc_HandoverPreparationInformation(tvbuff_t *tvb _U_, int offset _U_
 }
 
 
+
+static int
+dissect_lte_rrc_OCTET_STRING(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,
+                                       NO_BOUND, NO_BOUND, FALSE, NULL);
+
+  return offset;
+}
+
+
 static const per_sequence_t AS_Config_v10j0_sequence[] = {
   { &hf_lte_rrc_antennaInfoDedicatedPCell_v10i0, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_lte_rrc_AntennaInfoDedicated_v10i0 },
   { NULL, 0, 0, NULL }
@@ -67091,6 +67142,8 @@ static const value_string lte_rrc_T_carrierFreqOffset_r16_vals[] = {
   { 0, NULL }
 };
 
+static value_string_ext lte_rrc_T_carrierFreqOffset_r16_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_T_carrierFreqOffset_r16_vals);
+
 
 static int
 dissect_lte_rrc_T_carrierFreqOffset_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -80026,9 +80079,29 @@ dissect_lte_rrc_SL_ResourcePoolID_NR_r16(tvbuff_t *tvb _U_, int offset _U_, asn1
 }
 
 
+
+static int
+dissect_lte_rrc_T_cbr_ResultsNR_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  tvbuff_t *cbr_results_nr_tvb = NULL;
+
+  offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+                                       NO_BOUND, NO_BOUND, FALSE, &cbr_results_nr_tvb);
+
+
+  if (cbr_results_nr_tvb) {
+    proto_tree *subtree;
+    subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_cbr_ResultsNR_r16);
+    dissect_nr_rrc_SL_CBR_r16_PDU(cbr_results_nr_tvb, actx->pinfo, subtree, NULL);
+  }
+
+
+  return offset;
+}
+
+
 static const per_sequence_t MeasResultCBR_NR_r16_sequence[] = {
   { &hf_lte_rrc_poolIdentityNR_r16, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_lte_rrc_SL_ResourcePoolID_NR_r16 },
-  { &hf_lte_rrc_cbr_ResultsNR_r16, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_lte_rrc_OCTET_STRING },
+  { &hf_lte_rrc_cbr_ResultsNR_r16, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_cbr_ResultsNR_r16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -88975,6 +89048,8 @@ static const value_string lte_rrc_T_requestedTBS_r16_vals[] = {
   { 0, NULL }
 };
 
+static value_string_ext lte_rrc_T_requestedTBS_r16_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_T_requestedTBS_r16_vals);
+
 
 static int
 dissect_lte_rrc_T_requestedTBS_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -89439,7 +89514,6 @@ dissect_lte_rrc_T_ul_DCCH_MessageNR_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_
   }
 
 
-
   return offset;
 }
 
@@ -106217,9 +106291,49 @@ dissect_lte_rrc_UE_BasedNetwPerfMeasParameters_v1610(tvbuff_t *tvb _U_, int offs
 }
 
 
+
+static int
+dissect_lte_rrc_T_sl_ParameterNR_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  tvbuff_t *sl_params_nr_tvb = NULL;
+
+  offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+                                       NO_BOUND, NO_BOUND, FALSE, &sl_params_nr_tvb);
+
+
+  if (sl_params_nr_tvb) {
+    proto_tree *subtree;
+    subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_sl_ParameterNR_r16);
+    dissect_nr_rrc_SidelinkParametersNR_r16_PDU(sl_params_nr_tvb, actx->pinfo, subtree, NULL);
+  }
+
+
+  return offset;
+}
+
+
+
+static int
+dissect_lte_rrc_T_v2x_SupportedBandCombinationListNR_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  tvbuff_t *v2x_supp_band_comb_list_nr_tvb = NULL;
+
+  offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+                                       NO_BOUND, NO_BOUND, FALSE, &v2x_supp_band_comb_list_nr_tvb);
+
+
+  if (v2x_supp_band_comb_list_nr_tvb) {
+    proto_tree *subtree;
+    subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_v2x_SupportedBandCombinationListNR_r16);
+    dissect_nr_rrc_SupportedBandCombinationListSidelink_r16_PDU(v2x_supp_band_comb_list_nr_tvb, actx->pinfo, subtree, NULL);
+  }
+
+
+  return offset;
+}
+
+
 static const per_sequence_t SL_ParametersNR_r16_sequence[] = {
-  { &hf_lte_rrc_sl_ParameterNR_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_lte_rrc_OCTET_STRING },
-  { &hf_lte_rrc_v2x_SupportedBandCombinationListNR_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_lte_rrc_OCTET_STRING },
+  { &hf_lte_rrc_sl_ParameterNR_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_lte_rrc_T_sl_ParameterNR_r16 },
+  { &hf_lte_rrc_v2x_SupportedBandCombinationListNR_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_lte_rrc_T_v2x_SupportedBandCombinationListNR_r16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -106247,8 +106361,29 @@ dissect_lte_rrc_T_eutra(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 }
 
 
+
+static int
+dissect_lte_rrc_T_v2x_BandParametersNR_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  tvbuff_t *v2x_band_params_nr_tvb = NULL;
+
+  offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+                                       NO_BOUND, NO_BOUND, FALSE, &v2x_band_params_nr_tvb);
+
+
+  if (v2x_band_params_nr_tvb) {
+    proto_tree *subtree;
+    subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_v2x_BandParametersNR_r16);
+    dissect_nr_rrc_BandParametersSidelink_r16_PDU(v2x_band_params_nr_tvb, actx->pinfo, subtree, NULL);
+  }
+
+
+
+  return offset;
+}
+
+
 static const per_sequence_t T_nr_sequence[] = {
-  { &hf_lte_rrc_v2x_BandParametersNR_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_lte_rrc_OCTET_STRING },
+  { &hf_lte_rrc_v2x_BandParametersNR_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_lte_rrc_T_v2x_BandParametersNR_r16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -124147,6 +124282,8 @@ static const value_string lte_rrc_T_requestedTBS_r16_01_vals[] = {
   { 0, NULL }
 };
 
+static value_string_ext lte_rrc_T_requestedTBS_r16_01_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_T_requestedTBS_r16_01_vals);
+
 
 static int
 dissect_lte_rrc_T_requestedTBS_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -125583,6 +125720,26 @@ int dissect_lte_rrc_RRCConnectionReconfigurationComplete_PDU(tvbuff_t *tvb _U_,
   offset += 7; offset >>= 3;
   return offset;
 }
+int dissect_lte_rrc_SidelinkUEInformation_r12_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_lte_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_lte_rrc_SidelinkUEInformation_r12(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_SidelinkUEInformation_r12_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
+int dissect_lte_rrc_UEAssistanceInformation_r11_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_lte_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_lte_rrc_UEAssistanceInformation_r11(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_UEAssistanceInformation_r11_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 int dissect_lte_rrc_UECapabilityEnquiry_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_lte_rrc, tvb, 0, -1, ENC_NA);
   proto_item_set_hidden(prot_ti);
@@ -125653,6 +125810,76 @@ int dissect_lte_rrc_UE_EUTRA_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinf
   offset += 7; offset >>= 3;
   return offset;
 }
+int dissect_lte_rrc_V2X_BandParameters_r14_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_lte_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_lte_rrc_V2X_BandParameters_r14(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_V2X_BandParameters_r14_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
+int dissect_lte_rrc_V2X_BandParameters_v1530_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_lte_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_lte_rrc_V2X_BandParameters_v1530(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_V2X_BandParameters_v1530_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
+int dissect_lte_rrc_SL_Parameters_v1430_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_lte_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_lte_rrc_SL_Parameters_v1430(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_SL_Parameters_v1430_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
+int dissect_lte_rrc_SL_Parameters_v1530_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_lte_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_lte_rrc_SL_Parameters_v1530(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_SL_Parameters_v1530_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
+int dissect_lte_rrc_SL_Parameters_v1540_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_lte_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_lte_rrc_SL_Parameters_v1540(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_SL_Parameters_v1540_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
+int dissect_lte_rrc_V2X_SupportedBandCombination_r14_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_lte_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_lte_rrc_V2X_SupportedBandCombination_r14(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_V2X_SupportedBandCombination_r14_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
+int dissect_lte_rrc_V2X_SupportedBandCombination_v1530_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_lte_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_lte_rrc_V2X_SupportedBandCombination_v1530(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_V2X_SupportedBandCombination_v1530_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 int dissect_lte_rrc_VisitedCellInfoList_r12_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_lte_rrc, tvb, 0, -1, ENC_NA);
   proto_item_set_hidden(prot_ti);
@@ -125883,26 +126110,6 @@ static int dissect_InDeviceCoexIndication_r11_PDU(tvbuff_t *tvb _U_, packet_info
   offset += 7; offset >>= 3;
   return offset;
 }
-static int dissect_UEAssistanceInformation_r11_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_lte_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_lte_rrc_UEAssistanceInformation_r11(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_UEAssistanceInformation_r11_PDU);
-  offset += 7; offset >>= 3;
-  return offset;
-}
-static int dissect_SidelinkUEInformation_r12_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_lte_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_lte_rrc_SidelinkUEInformation_r12(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_SidelinkUEInformation_r12_PDU);
-  offset += 7; offset >>= 3;
-  return offset;
-}
 static int dissect_WLANConnectionStatusReport_r13_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_lte_rrc, tvb, 0, -1, ENC_NA);
   proto_item_set_hidden(prot_ti);
@@ -126106,7 +126313,7 @@ static int dissect_UE_RadioPagingInfo_NB_r13_PDU(tvbuff_t *tvb _U_, packet_info
 
 
 /*--- End of included file: packet-lte-rrc-fn.c ---*/
-#line 3195 "./asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 3201 "./asn1/lte-rrc/packet-lte-rrc-template.c"
 
 static int
 dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
@@ -126572,6 +126779,14 @@ void proto_register_lte_rrc(void) {
       { "RRCConnectionReconfigurationComplete", "lte-rrc.RRCConnectionReconfigurationComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_lte_rrc_lte_rrc_SidelinkUEInformation_r12_PDU,
+      { "SidelinkUEInformation-r12", "lte-rrc.SidelinkUEInformation_r12_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
+    { &hf_lte_rrc_lte_rrc_UEAssistanceInformation_r11_PDU,
+      { "UEAssistanceInformation-r11", "lte-rrc.UEAssistanceInformation_r11_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_lte_rrc_lte_rrc_UECapabilityEnquiry_PDU,
       { "UECapabilityEnquiry", "lte-rrc.UECapabilityEnquiry_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -126600,6 +126815,34 @@ void proto_register_lte_rrc(void) {
       { "UE-EUTRA-Capability", "lte-rrc.UE_EUTRA_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_lte_rrc_lte_rrc_V2X_BandParameters_r14_PDU,
+      { "V2X-BandParameters-r14", "lte-rrc.V2X_BandParameters_r14_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
+    { &hf_lte_rrc_lte_rrc_V2X_BandParameters_v1530_PDU,
+      { "V2X-BandParameters-v1530", "lte-rrc.V2X_BandParameters_v1530_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
+    { &hf_lte_rrc_lte_rrc_SL_Parameters_v1430_PDU,
+      { "SL-Parameters-v1430", "lte-rrc.SL_Parameters_v1430_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
+    { &hf_lte_rrc_lte_rrc_SL_Parameters_v1530_PDU,
+      { "SL-Parameters-v1530", "lte-rrc.SL_Parameters_v1530_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
+    { &hf_lte_rrc_lte_rrc_SL_Parameters_v1540_PDU,
+      { "SL-Parameters-v1540", "lte-rrc.SL_Parameters_v1540_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
+    { &hf_lte_rrc_lte_rrc_V2X_SupportedBandCombination_r14_PDU,
+      { "V2X-SupportedBandCombination-r14", "lte-rrc.V2X_SupportedBandCombination_r14",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        NULL, HFILL }},
+    { &hf_lte_rrc_lte_rrc_V2X_SupportedBandCombination_v1530_PDU,
+      { "V2X-SupportedBandCombination-v1530", "lte-rrc.V2X_SupportedBandCombination_v1530",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        NULL, HFILL }},
     { &hf_lte_rrc_lte_rrc_VisitedCellInfoList_r12_PDU,
       { "VisitedCellInfoList-r12", "lte-rrc.VisitedCellInfoList_r12",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -126692,14 +126935,6 @@ void proto_register_lte_rrc(void) {
       { "InDeviceCoexIndication-r11", "lte-rrc.InDeviceCoexIndication_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_lte_rrc_UEAssistanceInformation_r11_PDU,
-      { "UEAssistanceInformation-r11", "lte-rrc.UEAssistanceInformation_r11_element",
-        FT_NONE, BASE_NONE, NULL, 0,
-        NULL, HFILL }},
-    { &hf_lte_rrc_SidelinkUEInformation_r12_PDU,
-      { "SidelinkUEInformation-r12", "lte-rrc.SidelinkUEInformation_r12_element",
-        FT_NONE, BASE_NONE, NULL, 0,
-        NULL, HFILL }},
     { &hf_lte_rrc_WLANConnectionStatusReport_r13_PDU,
       { "WLANConnectionStatusReport-r13", "lte-rrc.WLANConnectionStatusReport_r13_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -127563,11 +127798,11 @@ void proto_register_lte_rrc(void) {
     { &hf_lte_rrc_sidelinkUEInformationNR_r16,
       { "sidelinkUEInformationNR-r16", "lte-rrc.sidelinkUEInformationNR_r16",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "OCTET_STRING", HFILL }},
+        NULL, HFILL }},
     { &hf_lte_rrc_ueAssistanceInformationNR_r16,
       { "ueAssistanceInformationNR-r16", "lte-rrc.ueAssistanceInformationNR_r16",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "OCTET_STRING", HFILL }},
+        NULL, HFILL }},
     { &hf_lte_rrc_configRestrictInfoDAPS_r16,
       { "configRestrictInfoDAPS-r16", "lte-rrc.configRestrictInfoDAPS_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -129602,7 +129837,7 @@ void proto_register_lte_rrc(void) {
         "PUR_PeriodicityAndOffset_r16", HFILL }},
     { &hf_lte_rrc_requestedTBS_r16,
       { "requestedTBS-r16", "lte-rrc.requestedTBS_r16",
-        FT_UINT32, BASE_DEC, VALS(lte_rrc_T_requestedTBS_r16_vals), 0,
+        FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_T_requestedTBS_r16_vals_ext, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rrc_ACK_r16,
       { "rrc-ACK-r16", "lte-rrc.rrc_ACK_r16",
@@ -136602,7 +136837,7 @@ void proto_register_lte_rrc(void) {
         "ARFCN_ValueEUTRA_r9", HFILL }},
     { &hf_lte_rrc_carrierFreqOffset_r16,
       { "carrierFreqOffset-r16", "lte-rrc.carrierFreqOffset_r16",
-        FT_UINT32, BASE_DEC, VALS(lte_rrc_T_carrierFreqOffset_r16_vals), 0,
+        FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_T_carrierFreqOffset_r16_vals_ext, 0,
         "T_carrierFreqOffset_r16", HFILL }},
     { &hf_lte_rrc_segmentNumber_r16_02,
       { "segmentNumber-r16", "lte-rrc.segmentNumber_r16",
@@ -147151,7 +147386,7 @@ void proto_register_lte_rrc(void) {
     { &hf_lte_rrc_cbr_ResultsNR_r16,
       { "cbr-ResultsNR-r16", "lte-rrc.cbr_ResultsNR_r16",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "OCTET_STRING", HFILL }},
+        NULL, HFILL }},
     { &hf_lte_rrc_sl_TxPoolReportID_r16,
       { "sl-TxPoolReportID-r16", "lte-rrc.sl_TxPoolReportID_r16",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -153367,11 +153602,11 @@ void proto_register_lte_rrc(void) {
     { &hf_lte_rrc_sl_ParameterNR_r16,
       { "sl-ParameterNR-r16", "lte-rrc.sl_ParameterNR_r16",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "OCTET_STRING", HFILL }},
+        NULL, HFILL }},
     { &hf_lte_rrc_v2x_SupportedBandCombinationListNR_r16,
       { "v2x-SupportedBandCombinationListNR-r16", "lte-rrc.v2x_SupportedBandCombinationListNR_r16",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "OCTET_STRING", HFILL }},
+        NULL, HFILL }},
     { &hf_lte_rrc_v2x_SupportedBandCombinationListEUTRA_NR_r16,
       { "v2x-SupportedBandCombinationListEUTRA-NR-r16", "lte-rrc.v2x_SupportedBandCombinationListEUTRA_NR_r16",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -153423,7 +153658,7 @@ void proto_register_lte_rrc(void) {
     { &hf_lte_rrc_v2x_BandParametersNR_r16,
       { "v2x-BandParametersNR-r16", "lte-rrc.v2x_BandParametersNR_r16",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "OCTET_STRING", HFILL }},
+        NULL, HFILL }},
     { &hf_lte_rrc_SupportedBandInfoList_r12_item,
       { "SupportedBandInfo-r12", "lte-rrc.SupportedBandInfo_r12_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -156278,7 +156513,7 @@ void proto_register_lte_rrc(void) {
         "PUR_PeriodicityAndOffset_NB_r16", HFILL }},
     { &hf_lte_rrc_requestedTBS_r16_01,
       { "requestedTBS-r16", "lte-rrc.requestedTBS_r16",
-        FT_UINT32, BASE_DEC, VALS(lte_rrc_T_requestedTBS_r16_01_vals), 0,
+        FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_T_requestedTBS_r16_01_vals_ext, 0,
         "T_requestedTBS_r16_01", HFILL }},
     { &hf_lte_rrc_rrc_ACK_r16_01,
       { "rrc-ACK-r16", "lte-rrc.rrc_ACK_r16",
@@ -159878,7 +160113,7 @@ void proto_register_lte_rrc(void) {
         "CarrierFreq_NB_r13", HFILL }},
 
 /*--- End of included file: packet-lte-rrc-hfarr.c ---*/
-#line 3570 "./asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 3576 "./asn1/lte-rrc/packet-lte-rrc-template.c"
 
     { &hf_lte_rrc_eutra_cap_feat_group_ind_1,
       { "Indicator 1", "lte-rrc.eutra_cap_feat_group_ind_1",
@@ -164311,7 +164546,7 @@ void proto_register_lte_rrc(void) {
     &ett_lte_rrc_PCI_ARFCN_NB_r14,
 
 /*--- End of included file: packet-lte-rrc-ettarr.c ---*/
-#line 4329 "./asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 4335 "./asn1/lte-rrc/packet-lte-rrc-template.c"
 
     &ett_lte_rrc_featureGroupIndicators,
     &ett_lte_rrc_featureGroupIndRel9Add,
@@ -164357,7 +164592,13 @@ void proto_register_lte_rrc(void) {
     &ett_lte_rrc_nas_Container_r15,
     &ett_lte_rrc_sourceRB_ConfigIntra5GC_r15,
     &ett_lte_rrc_selectedbandCombinationInfoEN_DC_v1540,
-    &ett_lte_rrc_requestedCapabilityCommon_r15
+    &ett_lte_rrc_requestedCapabilityCommon_r15,
+    &ett_lte_rrc_sidelinkUEInformationNR_r16,
+    &ett_lte_rrc_ueAssistanceInformationNR_r16,
+    &ett_lte_rrc_cbr_ResultsNR_r16,
+    &ett_lte_rrc_sl_ParameterNR_r16,
+    &ett_lte_rrc_v2x_SupportedBandCombinationListNR_r16,
+    &ett_lte_rrc_v2x_BandParametersNR_r16
   };
 
   static ei_register_info ei[] = {
@@ -164450,7 +164691,7 @@ void proto_register_lte_rrc(void) {
 
 
 /*--- End of included file: packet-lte-rrc-dis-reg.c ---*/
-#line 4429 "./asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 4441 "./asn1/lte-rrc/packet-lte-rrc-template.c"
 
   lte_rrc_etws_cmas_dcs_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), g_direct_hash, g_direct_equal);
   lte_rrc_system_info_value_changed_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), g_direct_hash, g_direct_equal);