diff options
Diffstat (limited to 'epan/dissectors/asn1/nr-rrc/nr-rrc.cnf')
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/nr-rrc.cnf | 321 |
1 files changed, 264 insertions, 57 deletions
diff --git a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf index cf99fcac7c..5de06a6c0e 100644 --- a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf +++ b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf @@ -1,6 +1,6 @@ # nr-rrc.cnf # nr-rrc conformation file -# Copyright 2018-2021 Pascal Quantin +# Copyright 2018-2024 Pascal Quantin #.OPT PER @@ -24,8 +24,8 @@ DRX-Config/drx-RetransmissionTimerDL DRX-Config/drx-RetransmissionTimerUL DRX-Config/drx-LongCycleStartOffset DRX-Config/shortDRX/drx-ShortCycle -DRX-ConfigSecondaryGroup/drx-onDurationTimer/milliSeconds -DRX-ConfigSecondaryGroup/drx-InactivityTimer +DRX-ConfigSecondaryGroup-r16/drx-onDurationTimer-r16/milliSeconds +DRX-ConfigSecondaryGroup-r16/drx-InactivityTimer-r16 DRX-Info/drx-LongCycleStartOffset DRX-Info/shortDRX/drx-ShortCycle DRX-Info2/drx-onDurationTimer/milliSeconds @@ -62,29 +62,48 @@ CellGroupConfig_PDU DRX-Config_PDU CG-Config_PDU CG-ConfigInfo_PDU +CondReconfigExecCondSCG-r17_PDU +ConfigRestrictInfoDAPS-r16_PDU ConfigRestrictInfoSCG_PDU FeatureSetEntryIndex_PDU FreqBandList_PDU HandoverCommand_PDU HandoverPreparationInformation_PDU +LocationMeasurementInfo_PDU +MBS-NeighbourCellList-r17_PDU +MBSInterestIndication-r17_PDU MeasConfig_PDU MeasGapConfig_PDU MeasGapSharingConfig_PDU +MeasObjectToAddMod_PDU MeasResultSCG-Failure_PDU MeasurementTimingConfiguration_PDU MIB_PDU +MRB-PDCP-ConfigBroadcast-r17_PDU +MUSIM-GapConfig-r17_PDU +NeedForGapsInfoNR-r16_PDU +NeedForGapNCSG-InfoEUTRA-r17_PDU +NeedForGapNCSG-InfoNR-r17_PDU +NonCellDefiningSSB-r17_PDU NZP-CSI-RS-Resource_PDU +OverheatingAssistance_PDU +OverheatingAssistance-r17_PDU P-Max_PDU PDCCH-ConfigSIB1_PDU PH-TypeListMCG_PDU PH-TypeListSCG_PDU +PosMeasGapPreConfigToAddModList-r17_PDU +PosMeasGapPreConfigToReleaseList-r17_PDU RA-ReportList-r16_PDU RACH-ConfigCommon_PDU RadioBearerConfig_PDU ReferenceTime-r16_PDU +ReportConfigToAddMod_PDU +RLC-BearerConfig_PDU RRCReconfiguration_PDU RRCReconfigurationComplete_PDU SchedulingRequestResourceConfig_PDU +SDT-MAC-PHY-CG-Config-r17_PDU SIB1_PDU SIB2_PDU SIB3_PDU @@ -99,10 +118,21 @@ SIB11-r16_PDU SIB12-r16_PDU SIB13-r16_PDU SIB14-r16_PDU +SIB15-r17_PDU +SIB16-r17_PDU +SIB17-r17_PDU +SIB18-r17_PDU +SIB19-r17_PDU +SIB20-r17_PDU +SIB21-r17_PDU SidelinkParametersNR-r16_PDU SidelinkUEInformationNR-r16_PDU SL-ConfigDedicatedEUTRA-Info-r16_PDU +SL-ConfigDedicatedNR-r16_PDU SL-PHY-MAC-RLC-Config-r16_PDU +SL-RLC-ChannelToAddModList-r17_PDU +SRS-PosRRC-InactiveConfig-r17_PDU +SuccessHO-Report-r17_PDU TDD-UL-DL-ConfigCommon_PDU UE-CapabilityRAT-ContainerList_PDU UE-CapabilityRequestFilterCommon_PDU @@ -112,7 +142,9 @@ UE-NR-Capability_PDU UEAssistanceInformation_PDU UERadioPagingInformation_PDU UL-DCCH-Message_PDU +UL-GapFR2-Config-r17_PDU UplinkTxDirectCurrentList_PDU +UplinkTxDirectCurrentTwoCarrierList-r16_PDU VisitedCellInfoList-r16_PDU #.PDU @@ -122,6 +154,8 @@ BandParametersSidelink-r16 BCCH-BCH-Message @bcch.bch BCCH-DL-SCH-Message @bcch.dl.sch CellGroupConfig +CondReconfigExecCondSCG-r17 +ConfigRestrictInfoDAPS-r16 CG-Config CG-ConfigInfo ConfigRestrictInfoSCG @@ -132,31 +166,47 @@ FeatureSetEntryIndex FreqBandList HandoverCommand HandoverPreparationInformation +LocationMeasurementInfo +MBS-NeighbourCellList-r17 +MBSInterestIndication-r17 +MCCH-Message-r17 @mcch MeasConfig MeasGapConfig MeasGapSharingConfig +MeasObjectToAddMod MeasResultSCG-Failure MeasurementTimingConfiguration MIB +MRB-PDCP-ConfigBroadcast-r17 +MUSIM-GapConfig-r17 +NeedForGapsInfoNR-r16 +NeedForGapNCSG-InfoEUTRA-r17 +NeedForGapNCSG-InfoNR-r17 +NonCellDefiningSSB-r17 NZP-CSI-RS-Resource +OverheatingAssistance +OverheatingAssistance-r17 P-Max PCCH-Message @pcch PDCCH-ConfigSIB1 PH-TypeListMCG PH-TypeListSCG +PosMeasGapPreConfigToAddModList-r17 +PosMeasGapPreConfigToReleaseList-r17 RA-ReportList-r16 RACH-ConfigCommon RadioBearerConfig ReferenceTime-r16 +ReportConfigToAddMod +RLC-BearerConfig RRCReconfiguration @rrc_reconf -RRCReconfigurationComplete +RRCReconfigurationComplete @rrc_reconf_compl SBCCH-SL-BCH-Message @sbcch.sl.bch SCCH-Message @scch SchedulingRequestResourceConfig +SDT-MAC-PHY-CG-Config-r17 SidelinkParametersNR-r16 SidelinkUEInformationNR-r16 -SL-ConfigDedicatedEUTRA-Info-r16 -SL-PHY-MAC-RLC-Config-r16 SIB1 SIB2 SIB3 @@ -171,6 +221,21 @@ SIB11-r16 SIB12-r16 SIB13-r16 SIB14-r16 +SIB15-r17 +SIB16-r17 +SIB17-r17 +SIB18-r17 +SIB19-r17 +SIB20-r17 +SIB21-r17 +SL-ConfigDedicatedEUTRA-Info-r16 +SL-ConfigDedicatedNR-r16 +SL-MeasResultListRelay-r17 +SL-MeasResultRelay-r17 +SL-PHY-MAC-RLC-Config-r16 +SL-RLC-ChannelToAddModList-r17 +SRS-PosRRC-InactiveConfig-r17 +SuccessHO-Report-r17 TDD-UL-DL-ConfigCommon UE-CapabilityRAT-ContainerList UE-CapabilityRequestFilterCommon @@ -184,46 +249,31 @@ UERadioPagingInformation @ue_radio_paging_info UL-CCCH-Message @ul.ccch UL-CCCH1-Message @ul.ccch1 UL-DCCH-Message @ul.dcch +UL-GapFR2-Config-r17 UplinkTxDirectCurrentList +UplinkTxDirectCurrentTwoCarrierList-r16 VisitedCellInfoList-r16 #.END #.OMIT_ASSIGNMENT -CellsTriggeredList -CLI-RSSI-TriggeredList-r16 -CLI-TriggeredList-r16 -PLMN-IdentityList-r16 +CG-CandidateInfo-r17 +CG-CandidateInfoId-r17 +CG-CandidateList +CG-CandidateList-r17-IEs SIB12-IEs-r16 -SidelinkPreconfigNR-r16 +SIB17-IEs-r17 SL-BWP-ConfigCommon-r16 +SL-BWP-DiscPoolConfigCommon-r17 SL-BWP-PoolConfigCommon-r16 SL-ConfigCommonNR-r16 +SL-DiscConfigCommon-r17 SL-EUTRA-AnchorCarrierFreqList-r16 SL-FreqConfigCommon-r16 SL-MeasConfigCommon-r16 SL-NR-AnchorCarrierFreqList-r16 -SL-PreconfigGeneral-r16 -SL-PreconfigurationNR-r16 -SL-RoHC-Profiles-r16 -SRS-RSRP-TriggeredList-r16 -VarConditionalReconfig -VarConnEstFailReport-r16 -VarLogMeasConfig-r16-IEs -VarLogMeasReport-r16 -VarMeasConfig -VarMeasConfigSL-r16 -VarMeasIdleConfig-r16 -VarMeasIdleReport-r16 -VarMeasReport -VarMeasReportList -VarMeasReportListSL-r16 -VarMeasReportSL-r16 -VarMobilityHistoryReport-r16 -VarPendingRNA-Update -VarRA-Report-r16 -VarResumeMAC-Input -VarRLF-Report-r16 -VarShortMAC-Input +SL-ServingCellInfo-r17 +TRS-ResourceSet-r17 +UE-TimersAndConstantsRemoteUE-r17 #.FIELD_RENAME RRM-Config/eag_1/candidateCellInfoListSN-EUTRA rRM-Config_eag_1_candidateCellInfoListSN-EUTRA @@ -329,7 +379,7 @@ MIMO-ParametersPerBand/maxNumberRxTxBeamSwitchDL/scs-60kHz MIMO-ParametersPerBand/beamReportTiming/scs-60kHz mIMO-ParametersPerBand_beamReportTiming_scs-60kHz MIMO-ParametersPerBand/ptrs-DensityRecommendationSetDL/scs-60kHz mIMO-ParametersPerBand_ptrs-DensityRecommendationSetDL_scs-60kHz MIMO-ParametersPerBand/ptrs-DensityRecommendationSetUL/scs-60kHz mIMO-ParametersPerBand_ptrs-DensityRecommendationSetUL_scs-60kHz -MIMO-ParametersPerBand/eag_1/beamSwitchTiming/scs-60kHz MmIMO-ParametersPerBand_eag_1_beamSwitchTiming_scs-60kHz +MIMO-ParametersPerBand/eag_1/beamSwitchTiming/scs-60kHz mIMO-ParametersPerBand_eag_1_beamSwitchTiming_scs-60kHz BandNR/channelBWs-DL/fr1/scs-60kHz bandNR_channelBWs-DL_fr1_scs-60kHz BandNR/channelBWs-UL/fr1/scs-60kHz bandNR_channelBWs-UL_fr1_scs-60kHz BandNR/channelBWs-DL/fr2/scs-60kHz bandNR_channelBWs-DL_fr2_scs-60kHz @@ -718,6 +768,27 @@ RAT-Type TYPE_PREFIX #.FN_HDR SIB14-r16 col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB14"); +#.FN_HDR SIB15-r17 + col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB15"); + +#.FN_HDR SIB16-r17 + col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB16"); + +#.FN_HDR SIB17-r17 + col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB17"); + +#.FN_HDR SIB18-r17 + col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB18"); + +#.FN_HDR SIB19-r17 + col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB19"); + +#.FN_HDR SIB20-r17 + col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB20"); + +#.FN_HDR SIB21-r17 + col_append_str(actx->pinfo->cinfo, COL_INFO, " SIB21"); + #.FN_HDR SIB1 col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SIB1"); @@ -778,6 +849,16 @@ RAT-Type TYPE_PREFIX #.FN_HDR RRCReestablishmentRequest col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRC Reestablishment Request"); + if (!PINFO_FD_VISITED(actx->pinfo)) { + /* Look for UE identifier */ + guint16 *p_ueid = nr_rrc_get_ueid_from_lower_layers(wmem_file_scope(), actx->pinfo); + + if (p_ueid != NULL) { + /* Inform PDCP about the RRCreestablishmentRequest */ + set_pdcp_nr_rrc_reestablishment_request(*p_ueid); + } + } + #.FN_HDR RRCSystemInfoRequest col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRC System Info Request"); @@ -803,16 +884,16 @@ RAT-Type TYPE_PREFIX col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Security Mode Complete"); #.FN_BODY SecurityModeFailure - mac_nr_info *p_mac_nr_info; + guint16 *p_ueid; col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Security Mode Failure"); %(DEFAULT_BODY)s /* Look for UE identifier */ - p_mac_nr_info = (mac_nr_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_mac_nr, 0); + p_ueid = nr_rrc_get_ueid_from_lower_layers(wmem_file_scope(), actx->pinfo); - if (p_mac_nr_info != NULL) { + if (p_ueid != NULL) { /* Inform PDCP that the UE failed to execute the securityModeCommand */ - set_pdcp_nr_security_algorithms_failed(p_mac_nr_info->ueid); + set_pdcp_nr_security_algorithms_failed(*p_ueid); } #.FN_HDR ULInformationTransfer @@ -863,6 +944,15 @@ RAT-Type TYPE_PREFIX #.FN_HDR IABOtherInformation-r16 col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "IAB Other Information"); +#.FN_HDR MBSInterestIndication-r17 + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MBS Interest Indication"); + +#.FN_HDR UEPositioningAssistanceInfo-r17 + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UE Positioning Assistance Info"); + +#.FN_HDR MeasurementReportAppLayer-r17 + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Measurement Report App Layer"); + #.FN_BODY MRDC-SecondaryCellGroupConfig/mrdc-SecondaryCellGroup/eutra-SCG VAL_PTR = &eutra_scg_tvb tvbuff_t *eutra_scg_tvb = NULL; %(DEFAULT_BODY)s @@ -1032,6 +1122,15 @@ SIB1/cellSelectionInfo/q-QualMinOffset DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS dissect_UECapabilityInformationSidelink_PDU(sl_cap_info_sidelink_tvb, actx->pinfo, subtree, NULL); } +#.FN_BODY SL-TxResourceReqL2U2N-Relay-r17/sl-CapabilityInformationSidelink-r17 VAL_PTR = &sl_cap_info_sidelink_tvb + tvbuff_t *sl_cap_info_sidelink_tvb = NULL; +%(DEFAULT_BODY)s + if (sl_cap_info_sidelink_tvb) { + proto_tree *subtree; + subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_sl_CapabilityInformationSidelink); + dissect_UECapabilityInformationSidelink_PDU(sl_cap_info_sidelink_tvb, actx->pinfo, subtree, NULL); + } + #.TYPE_ATTR LogMeasInfo-r16/relativeTimeStamp-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds @@ -1047,12 +1146,27 @@ RLF-Report-r16/nr-RLF-Report-r16/timeConnFailure-r16 DISPLAY=BASE_CUSTOM STRINGS dissect_lte_rrc_RLF_Report_r9_PDU(meas_result_rlf_report_eutra_tvb, actx->pinfo, subtree, NULL); } +#.FN_BODY RLF-Report-r16/eutra-RLF-Report-r16/eag_1/measResult-RLF-Report-EUTRA-v1690 VAL_PTR = &meas_result_rlf_report_eutra_v1690_tvb + tvbuff_t *meas_result_rlf_report_eutra_v1690_tvb = NULL; +%(DEFAULT_BODY)s + if (meas_result_rlf_report_eutra_v1690_tvb) { + proto_tree *subtree; + subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_measResult_RLF_Report_EUTRA_v1690); + dissect_lte_rrc_RLF_Report_v9e0_PDU(meas_result_rlf_report_eutra_v1690_tvb, actx->pinfo, subtree, NULL); + } + #.TYPE_ATTR TimeSinceFailure-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds #.TYPE_ATTR TimeUntilReconnection-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +#.TYPE_ATTR +TimeSinceCHO-Reconfig-r17 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_TimeSinceCHO_Reconfig_r17_fmt) + +#.TYPE_ATTR +UPInterruptionTimeAtHO-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_milliseconds + #.FN_BODY ULInformationTransferIRAT-r16-IEs/ul-DCCH-MessageEUTRA-r16 VAL_PTR = &ul_dcch_msg_eutra_tvb tvbuff_t *ul_dcch_msg_eutra_tvb = NULL; %(DEFAULT_BODY)s @@ -1671,7 +1785,7 @@ T-Reselection DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds EUTRA-NS-PmaxValue/additionalPmax DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm #.TYPE_ATTR -WLAN-Identifiers-r16/ssid-r16 TYPE=FT_STRING DISPLAY=STR_ASCII +WLAN-Identifiers-r16/ssid-r16 TYPE=FT_STRING DISPLAY=BASE_NONE #.FN_BODY WLAN-Identifiers-r16/ssid-r16 VAL_PTR=&ssid_tvb HF_INDEX=-1 tvbuff_t *ssid_tvb = NULL; @@ -1688,6 +1802,9 @@ WLAN-Identifiers-r16/hessid-r16 TYPE=FT_ETHER #.TYPE_ATTR VisitedCellInfo-r16/timeSpent-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +#.TYPE_ATTR +VisitedPSCellInfo-r17/timeSpent-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds + #.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_UNKNOWN; @@ -1802,6 +1919,36 @@ VisitedCellInfo-r16/timeSpent-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&uni #.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib6-3-r16 nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_6_3; +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib1-9-v1700 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_1_9; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib1-10-v1700 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_1_10; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib2-24-v1700 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_2_24; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib2-25-v1700 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_2_25; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib6-4-v1700 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_6_4; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib6-5-v1700 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_6_5; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib6-6-v1700 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_6_6; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib2-17a-v1770 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_2_17a; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib2-18a-v1770 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_2_18a; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib2-20a-v1770 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_2_20a; + #.FN_BODY SIBpos-r16/assistanceDataSIB-Element-r16 VAL_PTR = &assist_data_sib_elem_tvb tvbuff_t *assist_data_sib_elem_tvb = NULL; %(DEFAULT_BODY)s @@ -1813,16 +1960,16 @@ VisitedCellInfo-r16/timeSpent-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&uni } #.FN_BODY RLC-BearerConfig - struct mac_nr_info *p_mac_nr_info; + guint16 *p_ueid; /* Get the struct and clear it out */ nr_drb_mac_rlc_mapping_t *drb_mapping = &nr_rrc_get_private_data(actx)->drb_rlc_mapping; memset(drb_mapping, 0, sizeof(nr_drb_mac_rlc_mapping_t)); drb_mapping->active = TRUE; %(DEFAULT_BODY)s /* Need UE identifier */ - p_mac_nr_info = (mac_nr_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_mac_nr, 0); - if (p_mac_nr_info && drb_mapping->drbid) { - drb_mapping->ueid = p_mac_nr_info->ueid; + p_ueid = nr_rrc_get_ueid_from_lower_layers(wmem_file_scope(), actx->pinfo); + if (p_ueid != NULL && drb_mapping->drbid) { + drb_mapping->ueid = *p_ueid; /* Tell MAC about this mapping */ set_mac_nr_bearer_mapping(drb_mapping); } @@ -1879,11 +2026,11 @@ VisitedCellInfo-r16/timeSpent-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&uni nr_drb_mac_rlc_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_rlc_mapping; if (mapping->tempDirection == DIRECTION_UPLINK) { mapping->rlcUlSnLength_present = TRUE; - mapping->rlcUlSnLength = (value=0) ? 6 : 12; + mapping->rlcUlSnLength = (value==0) ? 6 : 12; } else { mapping->rlcDlSnLength_present = TRUE; - mapping->rlcDlSnLength = (value=0) ? 6 : 12; + mapping->rlcDlSnLength = (value==0) ? 6 : 12; } #.FN_BODY SN-FieldLengthAM VAL_PTR=&value @@ -1892,11 +2039,11 @@ VisitedCellInfo-r16/timeSpent-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&uni nr_drb_mac_rlc_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_rlc_mapping; if (mapping->tempDirection == DIRECTION_UPLINK) { mapping->rlcUlSnLength_present = TRUE; - mapping->rlcUlSnLength = (value=0) ? 12 : 18; + mapping->rlcUlSnLength = (value==0) ? 12 : 18; } else { mapping->rlcDlSnLength_present = TRUE; - mapping->rlcDlSnLength = (value=0) ? 12 : 18; + mapping->rlcDlSnLength = (value==0) ? 12 : 18; } @@ -1905,12 +2052,12 @@ VisitedCellInfo-r16/timeSpent-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&uni memset(mapping, 0, sizeof(*mapping)); mapping->active = TRUE; %(DEFAULT_BODY)s - /* Need UE identifier. Use mac-nr. */ - mac_nr_info *p_mac_nr_info = (mac_nr_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_mac_nr, 0); - if (p_mac_nr_info) { + /* Need UE identifier. */ + guint16 *p_ueid = nr_rrc_get_ueid_from_lower_layers(wmem_file_scope(), actx->pinfo); + if (p_ueid != NULL) { /* Configure PDCP SN length(s) for this DRB */ if (mapping->pdcpUlSnLength_present || mapping->pdcpDlSnLength_present) { - mapping->ueid = p_mac_nr_info->ueid; + mapping->ueid = *p_ueid; set_rlc_nr_drb_pdcp_mapping(actx->pinfo, mapping); } } @@ -2046,20 +2193,20 @@ CA-ParametersEUTRA-v1570/dl-1024QAM-TotalWeightedLayers DISPLAY=BASE_CUSTOM STRI } #.FN_BODY SecurityAlgorithmConfig - mac_nr_info *p_mac_nr_info; + guint16 *p_ueid; pdcp_nr_security_info_t *p_security_algorithms; %(DEFAULT_BODY)s p_security_algorithms = &(nr_rrc_get_private_data(actx)->pdcp_security); - p_security_algorithms->configuration_frame = actx->pinfo->num; - p_security_algorithms->previous_configuration_frame = 0; + p_security_algorithms->algorithm_configuration_frame = actx->pinfo->num; + p_security_algorithms->previous_algorithm_configuration_frame = 0; p_security_algorithms->previous_integrity = nia0; p_security_algorithms->previous_ciphering = nea0; /* Look for UE identifier */ - p_mac_nr_info = (mac_nr_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_mac_nr, 0); - if (p_mac_nr_info != NULL) { + p_ueid = nr_rrc_get_ueid_from_lower_layers(wmem_file_scope(), actx->pinfo); + if (p_ueid != NULL) { /* Configure algorithms */ - set_pdcp_nr_security_algorithms(p_mac_nr_info->ueid, p_security_algorithms); + set_pdcp_nr_security_algorithms(*p_ueid, p_security_algorithms); } #.FN_BODY CipheringAlgorithm VAL_PTR=&value @@ -2094,6 +2241,54 @@ CA-ParametersEUTRA-v1570/dl-1024QAM-TotalWeightedLayers DISPLAY=BASE_CUSTOM STRI dissect_lte_rrc_TDD_Config_PDU(tdd_config_tvb, actx->pinfo, subtree, NULL); } +#.FN_BODY UEInformationResponse-v1700-IEs/coarseLocationInfo-r17 VAL_PTR = &ellipsoid_point_tvb + tvbuff_t *ellipsoid_point_tvb = NULL; +%(DEFAULT_BODY)s + if (ellipsoid_point_tvb) { + proto_tree *subtree; + subtree = proto_item_add_subtree(actx->created_item, ett_nr_coarseLocationInfo_r17); + dissect_lpp_Ellipsoid_Point_PDU(ellipsoid_point_tvb, actx->pinfo, subtree, NULL); + } + +#.FN_BODY MeasResults/measResultNeighCells/sl-MeasResultsCandRelay-r17 VAL_PTR = &sl_meas_result_list_relay_tvb + tvbuff_t *sl_meas_result_list_relay_tvb = NULL; +%(DEFAULT_BODY)s + if (sl_meas_result_list_relay_tvb) { + proto_tree *subtree; + subtree = proto_item_add_subtree(actx->created_item, ett_nr_sl_MeasResultsCandRelay_r17); + dissect_SL_MeasResultListRelay_r17_PDU(sl_meas_result_list_relay_tvb, actx->pinfo, subtree, NULL); + } + +#.FN_BODY MeasResults/eag_4/sl-MeasResultServingRelay-r17 VAL_PTR = &sl_meas_result_serving_relay_tvb + tvbuff_t *sl_meas_result_serving_relay_tvb = NULL; +%(DEFAULT_BODY)s + if (sl_meas_result_serving_relay_tvb) { + proto_tree *subtree; + subtree = proto_item_add_subtree(actx->created_item, ett_nr_sl_MeasResultServingRelay_r17); + dissect_SL_MeasResultRelay_r17_PDU(sl_meas_result_serving_relay_tvb, actx->pinfo, subtree, NULL); + } + +#.FN_BODY MeasResults/eag_4/coarseLocationInfo-r17 VAL_PTR = &ellipsoid_point_tvb + tvbuff_t *ellipsoid_point_tvb = NULL; +%(DEFAULT_BODY)s + if (ellipsoid_point_tvb) { + proto_tree *subtree; + subtree = proto_item_add_subtree(actx->created_item, ett_nr_coarseLocationInfo_r17); + dissect_lpp_Ellipsoid_Point_PDU(ellipsoid_point_tvb, actx->pinfo, subtree, NULL); + } + +#.TYPE_ATTR +TimeBetweenEvent-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_milliseconds + +#.FN_BODY ReferenceLocation-r17 VAL_PTR = &ellipsoid_point_tvb + tvbuff_t *ellipsoid_point_tvb = NULL; +%(DEFAULT_BODY)s + if (ellipsoid_point_tvb) { + proto_tree *subtree; + subtree = proto_item_add_subtree(actx->created_item, ett_nr_ReferenceLocation_r17); + dissect_lpp_Ellipsoid_Point_PDU(ellipsoid_point_tvb, actx->pinfo, subtree, NULL); + } + #.FN_HDR SBCCH-SL-BCH-Message proto_item *ti; @@ -2132,3 +2327,15 @@ CA-ParametersEUTRA-v1570/dl-1024QAM-TotalWeightedLayers DISPLAY=BASE_CUSTOM STRI #.FN_HDR UECapabilityInformationSidelink col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UE Capability Information Sidelink"); + +#.FN_HDR MCCH-Message-r17 + proto_item *ti; + + col_set_str(actx->pinfo->cinfo, COL_PROTOCOL, "NR RRC"); + col_clear(actx->pinfo->cinfo, COL_INFO); + + ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); + tree = proto_item_add_subtree(ti, ett_nr_rrc); + +#.FN_HDR MBSBroadcastConfiguration-r17 + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MBS Broadcast Configuration"); |