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

NR RRC: upgrade dissector to v17.1.0

This commit is contained in:
Pascal Quantin 2022-08-10 18:05:01 +02:00
parent e51916b54c
commit af558f672b
16 changed files with 68069 additions and 15690 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/asn1/lte-rrc/CMakeLists.txt
View File

@ -21,12 +21,9 @@ set( EXT_ASN_FILE_LIST
set( ASN_FILE_LIST
EUTRA-InterNodeDefinitions.asn
EUTRA-RRC-Definitions.asn
EUTRA-Sidelink-Preconf.asn
EUTRA-UE-Variables.asn
PC5-RRC-Definitions.asn
NBIOT-InterNodeDefinitions.asn
NBIOT-RRC-Definitions.asn
NBIOT-UE-Variables.asn
)
set( EXTRA_DIST

86
epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
View File

@ -778,70 +778,8 @@ BCCH-DL-SCH-Message-MBMS @bcch.dl.sch.mbms
#.OMIT_ASSIGNMENT
# Get rid of unused code warnings
CE-PUCCH-TxDurationConfig-r17
CellsTriggeredList
CSI-RS-TriggeredList-r12
LogMeasInfoList2-r10
NPUSCH-ConfigDedicated-NB-v1700
RSRP-RangeSL3-r12
SL-CBR-PPPP-TxPreconfigList-r14
SL-CBR-PPPP-TxPreconfigList-v1530
SL-CBR-PreconfigTxConfigList-r14
SL-PPPP-TxPreconfigIndex-r14
SL-PPPP-TxPreconfigIndex-v1530
SL-PreconfigCommPool-r12
SL-PreconfigCommPoolList4-r12
SL-PreconfigCommRxPoolList-r13
SL-PreconfigCommTxPoolList-r13
SL-PreconfigDiscPool-r13
SL-PreconfigDiscRxPoolList-r13
SL-PreconfigDiscTxPoolList-r13
SL-PreconfigGeneral-r12
SL-PreconfigRelay-r13
SL-PreconfigSync-r12
SL-PreconfigV2X-Sync-r14
SL-PreconfigV2X-RxPoolList-r14
SL-PreconfigV2X-TxPoolList-r14
SL-Preconfiguration-r12
SL-V2X-PreconfigCommPool-r14
SL-V2X-PreconfigFreqInfo-r14
SL-V2X-PreconfigFreqList-r14
SL-V2X-Preconfiguration-r14
SL-V2X-SyncOffsetIndicators-r14
SL-V2X-TxProfile-r15
SL-V2X-TxProfileList-r15
SSB-IndexList-r15
Tx-PreconfigIndex-r14
VarANR-MeasConfig-NB-r16
VarANR-MeasReport-NB-r16
VarConditionalReconfiguration
VarConnEstFailReport-r11
VarLogMeasConfig-r10
VarLogMeasConfig-r11
VarLogMeasConfig-r12
VarLogMeasConfig-r15
VarLogMeasConfig-r17
VarLogMeasReport-r10
VarLogMeasReport-r11
VarMeasConfig
VarMeasIdleConfig-r15
VarMeasIdleConfig-r16
VarMeasIdleReport-r15
VarMeasIdleReport-r16
VarMeasReportList
VarMeasReportList-r12
VarMeasReport
VarMobilityHistoryReport-r12
VarPendingRnaUpdate-r15
VarRLF-Report-NB-r16
VarRLF-Report-r10
VarRLF-Report-r11
VarShortINACTIVE-MAC-Input-r15
VarShortMAC-Input
VarShortMAC-Input-NB-r13
VarShortResumeMAC-Input-NB-r13
VarShortResumeMAC-Input-r13
VarWLAN-MobilityConfig
VarWLAN-Status-r13
#.NO_EMIT ONLY_VALS
EAB-Config-r11/eab-Category-r11
@ -3751,6 +3689,30 @@ P0-SL-r12 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
#.TYPE_ATTR
TimeOffsetUTC-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY OverheatingAssistance-v1610/overheatingAssistanceForSCG-r16 VAL_PTR = &overheating_assist_for_scg_tvb
tvbuff_t *overheating_assist_for_scg_tvb = NULL;
%(DEFAULT_BODY)s
if (overheating_assist_for_scg_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_overheatingAssistanceForSCG_r16);
dissect_nr_rrc_OverheatingAssistance_PDU(overheating_assist_for_scg_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY OverheatingAssistance-v1710/overheatingAssistanceForSCG-FR2-2-r17 VAL_PTR = &overheating_assist_for_scg_tvb
tvbuff_t *overheating_assist_for_scg_tvb = NULL;
%(DEFAULT_BODY)s
if (overheating_assist_for_scg_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_overheatingAssistanceForSCG_FR2_2_r17);
dissect_nr_rrc_OverheatingAssistance_r17_PDU(overheating_assist_for_scg_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY CondReconfigurationAddMod-r16/eag_1/triggerConditionSN-r17 VAL_PTR = &cond_reconfig_exec_cond_scg_tvb
tvbuff_t *cond_reconfig_exec_cond_scg_tvb = NULL;
%(DEFAULT_BODY)s
if (cond_reconfig_exec_cond_scg_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_triggerConditionSN_r17);
dissect_nr_rrc_CondReconfigExecCondSCG_r17_PDU(cond_reconfig_exec_cond_scg_tvb, actx->pinfo, subtree, NULL);
}
#
# EUTRA-Sidelink-Preconf
#

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

@ -325,6 +325,9 @@ static gint ett_lte_rrc_sl_ParameterNR_r16 = -1;
static gint ett_lte_rrc_v2x_BandParametersNR_r16 = -1;
static gint ett_lte_rrc_ueAssistanceInformationNR_SCG_r16 = -1;
static gint ett_lte_rrc_assistanceDataSIB_Element_r15 = -1;
static gint ett_lte_rrc_overheatingAssistanceForSCG_r16 = -1;
static gint ett_lte_rrc_overheatingAssistanceForSCG_FR2_2_r17 = -1;
static gint ett_lte_rrc_triggerConditionSN_r17 = -1;
static expert_field ei_lte_rrc_number_pages_le15 = EI_INIT;
static expert_field ei_lte_rrc_si_info_value_changed = EI_INIT;
@ -4477,7 +4480,10 @@ void proto_register_lte_rrc(void) {
&ett_lte_rrc_sl_ParameterNR_r16,
&ett_lte_rrc_v2x_BandParametersNR_r16,
&ett_lte_rrc_ueAssistanceInformationNR_SCG_r16,
&ett_lte_rrc_assistanceDataSIB_Element_r15
&ett_lte_rrc_assistanceDataSIB_Element_r15,
&ett_lte_rrc_overheatingAssistanceForSCG_r16,
&ett_lte_rrc_overheatingAssistanceForSCG_FR2_2_r17,
&ett_lte_rrc_triggerConditionSN_r17
};
static ei_register_info ei[] = {

2
epan/dissectors/asn1/nr-rrc/CMakeLists.txt
View File

@ -21,8 +21,6 @@ set( EXT_ASN_FILE_LIST
set( ASN_FILE_LIST
NR-InterNodeDefinitions.asn
NR-RRC-Definitions.asn
NR-Sidelink-Preconf.asn
NR-UE-Variables.asn
PC5-RRC-Definitions.asn
)

124
epan/dissectors/asn1/nr-rrc/NR-InterNodeDefinitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V16.8.0 (2022-03)
-- 3GPP TS 38.331 V17.1.0 (2022-06)
NR-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
@ -10,6 +10,7 @@ IMPORTS
CellIdentity,
CGI-InfoEUTRA,
CGI-InfoNR,
CondReconfigExecCondSCG-r17,
CSI-RS-Index,
CSI-RS-CellMobility,
DRX-Config,
@ -20,10 +21,13 @@ IMPORTS
GapConfig,
maxBandComb,
maxBands,
maxBandsEUTRA,
maxCellSFTD,
maxFeatureSetsPerBand,
maxFreqIDC-MRDC,
maxNrofCombIDC,
maxNrofCondCells-r16,
ffsUpperLimit, -- to be removed later
maxNrofPhysicalResourceBlocks,
maxNrofSCells,
maxNrofServingCells,
@ -31,6 +35,7 @@ IMPORTS
maxNrofServingCellsEUTRA,
maxNrofIndexesToReport,
maxSimultaneousBands,
MBSInterestIndication-r17,
MeasQuantityResults,
MeasResultCellListSFTD-EUTRA,
MeasResultCellListSFTD-NR,
@ -38,7 +43,10 @@ IMPORTS
MeasResultSCG-Failure,
MeasResultServFreqListEUTRA-SCG,
NeedForGapsInfoNR-r16,
NeedForGapNCSG-InfoNR-r17,
NeedForGapNCSG-InfoEUTRA-r17,
OverheatingAssistance,
OverheatingAssistance-r17,
P-Max,
PhysCellId,
RadioBearerConfig,
@ -57,11 +65,42 @@ IMPORTS
maxNrofCLI-RSSI-Resources-r16,
maxNrofCLI-SRS-Resources-r16,
RSSI-ResourceId-r16,
SDT-Config-r17,
SidelinkUEInformationNR-r16,
SRS-ResourceId
SRS-ResourceId,
UE-RadioPagingInfo-r17
FROM NR-RRC-Definitions;
-- TAG-NR-INTER-NODE-DEFINITIONS-STOP
-- TAG-CG-CANDIDATELIST-START
CG-CandidateList ::= SEQUENCE {
criticalExtensions CHOICE {
c1 CHOICE{
cg-CandidateList-r17 CG-CandidateList-r17-IEs,
spare3 NULL, spare2 NULL, spare1 NULL
},
criticalExtensionsFuture SEQUENCE {}
}
}
CG-CandidateList-r17-IEs ::= SEQUENCE {
cg-CandidateToAddModList-r17 SEQUENCE (SIZE (1..maxNrofCondCells-r16)) OF CG-CandidateInfo-r17 OPTIONAL,
cg-CandidateToReleaseList-r17 SEQUENCE (SIZE (1..maxNrofCondCells-r16)) OF CG-CandidateInfoId-r17 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
CG-CandidateInfo-r17 ::= SEQUENCE {
cg-CandidateInfoId-r17 CG-CandidateInfoId-r17,
candidateCG-Config-r17 OCTET STRING (CONTAINING CG-Config)
}
CG-CandidateInfoId-r17::= SEQUENCE {
ssbFrequency-r17 ARFCN-ValueNR,
physCellId-r17 PhysCellId
}
-- TAG-CG-CANDIDATELIST-STOP
-- TAG-HANDOVER-COMMAND-START
HandoverCommand ::= SEQUENCE {
@ -110,8 +149,10 @@ AS-Config ::= SEQUENCE {
]],
[[
sourceSCG-Configured ENUMERATED {true} OPTIONAL
]],
[[
sdt-Config-r17 SDT-Config-r17 OPTIONAL
]]
}
AS-Context ::= SEQUENCE {
@ -135,6 +176,11 @@ AS-Context ::= SEQUENCE {
]],
[[
configRestrictInfoDAPS-v1640 ConfigRestrictInfoDAPS-v1640 OPTIONAL
]],
[[
needForGapNCSG-InfoNR-r17 NeedForGapNCSG-InfoNR-r17 OPTIONAL,
needForGapNCSG-InfoEUTRA-r17 NeedForGapNCSG-InfoEUTRA-r17 OPTIONAL,
mbsInterestIndication-r17 OCTET STRING (CONTAINING MBSInterestIndication-r17) OPTIONAL
]]
}
@ -261,7 +307,13 @@ CG-Config-v1630-IEs ::= SEQUENCE {
CG-Config-v1640-IEs ::= SEQUENCE {
servCellInfoListSCG-NR-r16 ServCellInfoListSCG-NR-r16 OPTIONAL,
servCellInfoListSCG-EUTRA-r16 ServCellInfoListSCG-EUTRA-r16 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension CG-Config-v1700-IEs OPTIONAL
}
CG-Config-v1700-IEs ::= SEQUENCE {
candidateCellInfoListCPC-r17 CandidateCellInfoListCPC-r17 OPTIONAL,
twoPHRModeSCG-r17 ENUMERATED {enabled} OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
ServCellInfoListSCG-NR-r16 ::= SEQUENCE (SIZE (1.. maxNrofServingCells)) OF ServCellInfoXCG-NR-r16
@ -296,7 +348,10 @@ PH-InfoSCG ::= SEQUENCE {
servCellIndex ServCellIndex,
ph-Uplink PH-UplinkCarrierSCG,
ph-SupplementaryUplink PH-UplinkCarrierSCG OPTIONAL,
...
...,
[[
twoSRS-PUSCH-Repetition-r17 ENUMERATED{enabled} OPTIONAL
]]
}
PH-UplinkCarrierSCG ::= SEQUENCE{
@ -350,6 +405,19 @@ CandidateServingFreqListEUTRA ::= SEQUENCE (SIZE (1.. maxFreqIDC-MRDC)) OF ARFCN
T-Offset-r16 ::= ENUMERATED {ms0dot5, ms0dot75, ms1, ms1dot5, ms2, ms2dot5, ms3, spare1}
CandidateCellInfoListCPC-r17 ::= SEQUENCE (SIZE (1..ffsUpperLimit)) OF CandidateCellInfo-r17 -- FFS
CandidateCellInfo-r17 ::= SEQUENCE {
ssbFrequency-r17 ARFCN-ValueNR,
candidateList-r17 SEQUENCE (SIZE (1..ffsUpperLimit)) OF CandidateCell-r17 -- FFS
}
CandidateCell-r17 ::= SEQUENCE {
physCellId-r17 PhysCellId,
condExecutionCondSCG-r17 OCTET STRING (CONTAINING CondReconfigExecCondSCG-r17) OPTIONAL
-- FFS whether the Optional flag is to be removed from condExecutionConditionSN-r17
}
-- TAG-CG-CONFIG-STOP
-- TAG-CG-CONFIG-INFO-START
@ -432,7 +500,7 @@ CG-ConfigInfo-v1610-IEs ::= SEQUENCE {
scgFailureInfo-r16 SEQUENCE {
failureType-r16 ENUMERATED { scg-lbtFailure-r16, beamFailureRecoveryFailure-r16,
t312-Expiry-r16, bh-RLF-r16,
spare4, spare3, spare2, spare1},
beamFailure-r17, spare3, spare2, spare1},
measResultSCG-r16 OCTET STRING (CONTAINING MeasResultSCG-Failure)
} OPTIONAL,
dummy1 SEQUENCE {
@ -452,9 +520,16 @@ CG-ConfigInfo-v1620-IEs ::= SEQUENCE {
}
CG-ConfigInfo-v1640-IEs ::= SEQUENCE {
servCellInfoListMCG-NR-r16 ServCellInfoListMCG-NR-r16 OPTIONAL,
servCellInfoListMCG-EUTRA-r16 ServCellInfoListMCG-EUTRA-r16 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
servCellInfoListMCG-NR-r16 ServCellInfoListMCG-NR-r16 OPTIONAL,
servCellInfoListMCG-EUTRA-r16 ServCellInfoListMCG-EUTRA-r16 OPTIONAL,
nonCriticalExtension CG-ConfigInfo-v1700-IEs OPTIONAL
}
CG-ConfigInfo-v1700-IEs ::= SEQUENCE {
candidateCellListCPC-r17 CandidateCellListCPC-r17 OPTIONAL,
twoPHRModeSCG-r17 ENUMERATED {enabled} OPTIONAL,
lowMobilityEvaluationConnectedInPCell-r17 ENUMERATED {enabled} OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
ServCellInfoListMCG-NR-r16 ::= SEQUENCE (SIZE (1.. maxNrofServingCells)) OF ServCellInfoXCG-NR-r16
@ -502,7 +577,13 @@ ConfigRestrictInfoSCG ::= SEQUENCE {
maxNumberEHC-ContextsSN-r16 INTEGER(0..65536) OPTIONAL,
allowedReducedConfigForOverheating-r16 OverheatingAssistance OPTIONAL,
maxToffset-r16 T-Offset-r16 OPTIONAL
]],
[[
allowedReducedConfigForOverheating-r17 OverheatingAssistance-r17 OPTIONAL,
maxNumberUDC-DRB-r17 INTEGER(0..2) OPTIONAL,
maxNumberCPCCandidates-r17 INTEGER(1..maxNrofCondCells-r16) OPTIONAL
]]
-- This field is included according to a working assumption, it can be revisited in next meeting if complications are found
}
SelectedBandEntriesMN ::= SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandEntryIndex
@ -515,7 +596,10 @@ PH-InfoMCG ::= SEQUENCE {
servCellIndex ServCellIndex,
ph-Uplink PH-UplinkCarrierMCG,
ph-SupplementaryUplink PH-UplinkCarrierMCG OPTIONAL,
...
...,
[[
twoSRS-PUSCH-Repetition-r17 ENUMERATED{enabled} OPTIONAL
]]
}
PH-UplinkCarrierMCG ::= SEQUENCE{
@ -590,6 +674,9 @@ MRDC-AssistanceInfo ::= SEQUENCE {
...,
[[
overheatingAssistanceSCG-r16 OCTET STRING (CONTAINING OverheatingAssistance) OPTIONAL
]],
[[
overheatingAssistanceSCG-FR2-2-r17 OCTET STRING (CONTAINING OverheatingAssistance-r17) OPTIONAL
]]
}
@ -615,6 +702,13 @@ AffectedCarrierFreqCombEUTRA ::= SEQUENCE (SIZE (1..maxNrofServingCellsEUTRA)) O
AffectedCarrierFreqCombNR ::= SEQUENCE (SIZE (1..maxNrofServingCells)) OF ARFCN-ValueNR
CandidateCellListCPC-r17 ::= SEQUENCE (SIZE (1..ffsUpperLimit)) OF CandidateCellCPC-r17 -- FFS
CandidateCellCPC-r17 ::= SEQUENCE {
ssbFrequency-r17 ARFCN-ValueNR,
candidateCellList-r17 SEQUENCE (SIZE (1..ffsUpperLimit)) OF PhysCellId -- FFS
}
-- TAG-CG-CONFIG-INFO-STOP
-- TAG-MEASUREMENT-TIMING-CONFIGURATION-START
@ -691,7 +785,15 @@ UERadioPagingInformation-v15e0-IEs ::= SEQUENCE {
dl-SchedulingOffset-PDSCH-TypeB-FDD-FR1 ENUMERATED {supported} OPTIONAL,
dl-SchedulingOffset-PDSCH-TypeB-TDD-FR1 ENUMERATED {supported} OPTIONAL,
dl-SchedulingOffset-PDSCH-TypeB-TDD-FR2 ENUMERATED {supported} OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension UERadioPagingInformation-v1700-IEs OPTIONAL
}
UERadioPagingInformation-v1700-IEs ::= SEQUENCE {
ue-RadioPagingInfo-r17 OCTET STRING (CONTAINING UE-RadioPagingInfo-r17) OPTIONAL,
inactiveStatePO-Determination-r17 ENUMERATED {supported} OPTIONAL,
numberOfRxRedCap-r17 ENUMERATED {one, two} OPTIONAL,
hd-FDDRedCap-r17 ENUMERATED {supported} OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
-- TAG-UE-RADIO-PAGING-INFORMATION-STOP

5463
epan/dissectors/asn1/nr-rrc/NR-RRC-Definitions.asn
View File

File diff suppressed because it is too large Load Diff

17
epan/dissectors/asn1/nr-rrc/NR-Sidelink-DiscoveryMessage.asn Normal file
View File

@ -0,0 +1,17 @@
-- 3GPP TS 38.331 V17.1.0 (2022-06)
NR-Sidelink-DiscoveryMessage DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
IMPORTS
CellAccessRelatedInfo,
SL-ServingCellInfo-r17
FROM NR-RRC-Definitions;
SL-AccessInfo-L2U2N-r17 ::= SEQUENCE {
cellAccessRelatedInfo-r17 CellAccessRelatedInfo,
sl-ServingCellInfo-r17 SL-ServingCellInfo-r17,
...
}
END

38
epan/dissectors/asn1/nr-rrc/NR-Sidelink-Preconf.asn
View File

@ -1,21 +1,24 @@
-- 3GPP TS 38.331 V16.8.0 (2022-03)
-- 3GPP TS 38.331 V17.1.0 (2022-06)
NR-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
IMPORTS
SL-FreqConfigCommon-r16,
SL-RadioBearerConfig-r16,
SL-RLC-BearerConfig-r16,
SL-EUTRA-AnchorCarrierFreqList-r16,
SL-NR-AnchorCarrierFreqList-r16,
SL-MeasConfigCommon-r16,
SL-UE-SelectedConfig-r16,
TDD-UL-DL-ConfigCommon,
maxNrofFreqSL-r16,
maxNrofSLRB-r16,
maxSL-LCID-r16
SL-RemoteUE-Config-r17,
SL-DRX-Config-GC-BC-r17,
ffsUpperLimit, -- to be removed later
SL-FreqConfigCommon-r16,
SL-RadioBearerConfig-r16,
SL-RLC-BearerConfig-r16,
SL-EUTRA-AnchorCarrierFreqList-r16,
SL-NR-AnchorCarrierFreqList-r16,
SL-MeasConfigCommon-r16,
SL-UE-SelectedConfig-r16,
TDD-UL-DL-ConfigCommon,
maxNrofFreqSL-r16,
maxNrofSLRB-r16,
maxSL-LCID-r16
FROM NR-RRC-Definitions;
-- TAG-NR-SIDELINK-PRECONF-DEFINITIONS-STOP
@ -42,9 +45,18 @@ SidelinkPreconfigNR-r16 ::= SEQUENCE {
sl-CSI-Acquisition-r16 ENUMERATED {enabled} OPTIONAL,
sl-RoHC-Profiles-r16 SL-RoHC-Profiles-r16 OPTIONAL,
sl-MaxCID-r16 INTEGER (1..16383) DEFAULT 15,
...
...,
[[
sl-DRX-PreConfig-GC-BC-r17 SL-DRX-Config-GC-BC-r17 OPTIONAL,
sl-TxProfileList-r17 SL-TxProfileList-r17 OPTIONAL,
sl-PreconfigDiscConfig-r17 SL-RemoteUE-Config-r17 OPTIONAL
]]
}
SL-TxProfileList-r17 ::= SEQUENCE (SIZE (1..256)) OF SL-TxProfile-r17
SL-TxProfile-r17 ::= ENUMERATED {drx-Compatible, drx-Incompatible, spare6, spare5, spare4, spare3,spare2, spare1}
SL-PreconfigGeneral-r16 ::= SEQUENCE {
sl-TDD-Configuration-r16 TDD-UL-DL-ConfigCommon OPTIONAL,
reservedBits-r16 BIT STRING (SIZE (2)) OPTIONAL,

37
epan/dissectors/asn1/nr-rrc/NR-UE-Variables.asn
View File

@ -1,13 +1,15 @@
-- 3GPP TS 38.331 V16.8.0 (2022-03)
-- 3GPP TS 38.331 V17.1.0 (2022-06)
NR-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
IMPORTS
AreaConfiguration-v1700,
ARFCN-ValueNR,
CellIdentity,
EUTRA-PhysCellId,
maxCEFReport-r17,
MeasId,
MeasIdToAddModList,
MeasIdleCarrierEUTRA-r16,
@ -44,6 +46,7 @@ IMPORTS
WLAN-NameList-r16,
BT-NameList-r16,
PLMN-Identity,
maxNrofRelayMeas-r17,
maxPLMN,
RA-ReportList-r16,
VisitedCellInfoList-r16,
@ -51,6 +54,8 @@ IMPORTS
LoggedEventTriggerConfig-r16,
LoggedPeriodicalReportConfig-r16,
Sensor-NameList-r16,
SL-SourceIdentity-r17,
SuccessHO-Report-r17,
PLMN-IdentityList2-r16,
AreaConfiguration-r16,
maxNrofSL-MeasId-r16,
@ -68,7 +73,6 @@ VarConditionalReconfig ::= SEQUENCE {
condReconfigList CondReconfigToAddModList-r16 OPTIONAL
}
-- TAG-VARCONDITIONALRECONFIG-STOP
-- TAG-VARCONNESTFAILREPORT-START
@ -78,6 +82,13 @@ VarConnEstFailReport-r16 ::= SEQUENCE {
}
-- TAG-VARCONNESTFAILREPORT-STOP
-- TAG-VARCONNESTFAILREPORTLIST-START
VarConnEstFailReportLIST-r17 ::= SEQUENCE {
connEstFailReportList-r17 SEQUENCE (SIZE (1..maxCEFReport-r17)) OF VarConnEstFailReport-r16
}
-- TAG-VARCONNESTFAILREPORTLIST-STOP
-- TAG-VARLOGMEASCONFIG-START
VarLogMeasConfig-r16-IEs ::= SEQUENCE {
@ -89,7 +100,10 @@ VarLogMeasConfig-r16-IEs ::= SEQUENCE {
reportType CHOICE {
periodical LoggedPeriodicalReportConfig-r16,
eventTriggered LoggedEventTriggerConfig-r16
}
},
sigLoggedMeasType-r17 ENUMERATED {true} OPTIONAL,
earlyMeasIndication-r17 ENUMERATED {true} OPTIONAL,
areaConfiguration-v1700 AreaConfiguration-v1700 OPTIONAL
}
-- TAG-VARLOGMEASCONFIG-STOP
-- TAG-VARLOGMEASREPORT-START
@ -100,7 +114,8 @@ VarLogMeasReport-r16 ::= SEQUENCE {
traceRecordingSessionRef-r16 OCTET STRING (SIZE (2)),
tce-Id-r16 OCTET STRING (SIZE (1)),
logMeasInfoList-r16 LogMeasInfoList-r16,
plmn-IdentityList-r16 PLMN-IdentityList2-r16
plmn-IdentityList-r16 PLMN-IdentityList2-r16,
sigLoggedMeasType-r17 ENUMERATED {true}
}
-- TAG-VARLOGMEASREPORT-STOP
@ -119,7 +134,6 @@ VarMeasConfig ::= SEQUENCE {
ssb-RSRP RSRP-Range,
csi-RSRP RSRP-Range
} OPTIONAL
}
-- TAG-VARMEASCONFIG-STOP
@ -165,7 +179,8 @@ VarMeasReport ::= SEQUENCE {
cellsTriggeredList CellsTriggeredList OPTIONAL,
numberOfReportsSent INTEGER,
cli-TriggeredList-r16 CLI-TriggeredList-r16 OPTIONAL,
tx-PoolMeasToAddModListNR-r16 Tx-PoolMeasList-r16 OPTIONAL
tx-PoolMeasToAddModListNR-r16 Tx-PoolMeasList-r16 OPTIONAL,
relaysTriggeredList-r17 RelaysTriggeredList-r17 OPTIONAL
}
CellsTriggeredList ::= SEQUENCE (SIZE (1..maxNrofCellMeas)) OF CHOICE {
@ -183,6 +198,8 @@ SRS-RSRP-TriggeredList-r16 ::= SEQUENCE (SIZE (1.. maxNrofCLI-SRS-Resources
CLI-RSSI-TriggeredList-r16 ::= SEQUENCE (SIZE (1.. maxNrofCLI-RSSI-Resources-r16)) OF RSSI-ResourceId-r16
RelaysTriggeredList-r17 ::= SEQUENCE (SIZE (1.. maxNrofRelayMeas-r17)) OF SL-SourceIdentity-r17
-- TAG-VARMEASREPORTLIST-STOP
-- TAG-VARMEASREPORTLISTSL-START
@ -224,7 +241,6 @@ VarResumeMAC-Input ::= SEQUENCE {
sourcePhysCellId PhysCellId,
targetCellIdentity CellIdentity,
source-c-RNTI RNTI-Value
}
-- TAG-VARRESUMEMAC-INPUT-STOP
@ -245,5 +261,12 @@ VarShortMAC-Input ::= SEQUENCE {
}
-- TAG-VARSHORTMAC-INPUT-STOP
-- TAG-VARSUCCESSHO-Report-START
VarSuccessHO-Report-r17-IEs ::= SEQUENCE {
successHO-Report-r17 SuccessHO-Report-r17,
plmn-IdentityList-r17 PLMN-IdentityList2-r16
}
-- TAG-VARSUCCESSHO-Report-STOP
END

210
epan/dissectors/asn1/nr-rrc/PC5-RRC-Definitions.asn
View File

@ -1,29 +1,42 @@
-- 3GPP TS 38.331 V16.8.0 (2022-03)
-- 3GPP TS 38.331 V17.1.0 (2022-06)
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
IMPORTS
CellAccessRelatedInfo,
SetupRelease,
RRC-TransactionIdentifier,
SN-FieldLengthAM,
SN-FieldLengthUM,
LogicalChannelIdentity,
maxNrofSLRB-r16,
maxNrofSL-RxInfoSet-r17,
maxNrofSL-QFIs-r16,
maxNrofSL-QFIsPerDest-r16,
PagingCycle,
PagingRecord,
RSRP-Range,
SL-MeasConfig-r16,
SL-MeasId-r16,
FreqBandList,
FreqBandIndicatorNR,
maxNrofRelayMeas-r17,
maxSimultaneousBands,
maxBandComb,
maxBands,
maxSIB-MessagePlus1-r17,
maxSL-LCID-r16,
BandParametersSidelink-r16,
RLC-ParametersSidelink-r16
RLC-ParametersSidelink-r16,
SIB1,
SL-DRX-ConfigUC-r17,
SL-DRX-ConfigUC-SemiStatic-r17,
SL-PagingIdentityRemoteUE-r17,
SL-RLC-ChannelID-r17,
SL-SourceIdentity-r17,
SystemInformation
FROM NR-RRC-Definitions;
-- TAG-PC5-RRC-DEFINITIONS-STOP
@ -56,9 +69,17 @@ SCCH-MessageType ::= CHOICE {
rrcReconfigurationFailureSidelink RRCReconfigurationFailureSidelink,
ueCapabilityEnquirySidelink UECapabilityEnquirySidelink,
ueCapabilityInformationSidelink UECapabilityInformationSidelink,
spare2 NULL, spare1 NULL
uuMessageTransferSidelink-r17 UuMessageTransferSidelink-r17,
remoteUEInformationSidelink-r17 RemoteUEInformationSidelink-r17
},
messageClassExtension SEQUENCE {}
messageClassExtension CHOICE {
c2 CHOICE {
notificationMessageSidelink-r17 NotificationMessageSidelink-r17,
ueAssistanceInformationSidelink-r17 UEAssistanceInformationSidelink-r17,
spare6 NULL, spare5 NULL, spare4 NULL, spare3 NULL, spare2 NULL, spare1 NULL
},
messageClassExtensionFuture-r17 SEQUENCE {}
}
}
-- TAG-SCCH-MESSAGE-STOP
@ -77,12 +98,12 @@ MasterInformationBlockSidelink ::= SEQUENCE {
MeasurementReportSidelink ::= SEQUENCE {
criticalExtensions CHOICE {
measurementReportSidelink-r16 MeasurementReportSidelink-IEs-r16,
measurementReportSidelink-r16 MeasurementReportSidelink-r16-IEs,
criticalExtensionsFuture SEQUENCE {}
}
}
MeasurementReportSidelink-IEs-r16 ::= SEQUENCE {
MeasurementReportSidelink-r16-IEs ::= SEQUENCE {
sl-measResults-r16 SL-MeasResults-r16,
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE{} OPTIONAL
@ -104,18 +125,74 @@ SL-MeasQuantityResult-r16 ::= SEQUENCE {
...
}
SL-MeasResultListRelay-r17 ::= SEQUENCE (SIZE (1..maxNrofRelayMeas-r17)) OF SL-MeasResultRelay-r17
SL-MeasResultRelay-r17 ::= SEQUENCE {
cellIdentity-r17 CellAccessRelatedInfo,
sl-RelayUEIdentity-r17 SL-SourceIdentity-r17,
sl-MeasResult-r17 SL-MeasResult-r16,
...
}
-- TAG-MEASUREMENTREPORTSIDELINK-STOP
-- TAG-NOTIFICATIONMESSAGESIDELINK-START
NotificationMessageSidelink-r17 ::= SEQUENCE {
criticalExtensions CHOICE {
notificationMessageSidelink-r17 NotificationMessageSidelink-r17-IEs,
criticalExtensionsFuture SEQUENCE {}
}
}
NotificationMessageSidelink-r17-IEs ::= SEQUENCE {
indicationType-r17 ENUMERATED {
relayUE-Uu-RLF, relayUE-HO, relayUE-CellReselection,
relayUE-Uu-RRC-Failure
} OPTIONAL, -- Need N
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
-- TAG-NOTIFICATIONMESSAGESIDELINK -STOP
-- TAG-REMOTEUEINFORMATIONSIDELINK-START
RemoteUEInformationSidelink-r17 ::= SEQUENCE {
criticalExtensions CHOICE {
remoteUEInformationSidelink-r17 RemoteUEInformationSidelink-r17-IEs,
criticalExtensionsFuture SEQUENCE {}
}
}
RemoteUEInformationSidelink-r17-IEs ::= SEQUENCE {
sl-RequestedSIB-List-r17 CHOICE {release NULL, setup SL-RequestedSIB-List-r17} OPTIONAL, -- Need M
sl-PagingInfo-RemoteUE-r17 CHOICE {release NULL, setup SL-PagingInfo-RemoteUE-r17} OPTIONAL, -- Need M
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
SL-RequestedSIB-List-r17 ::= SEQUENCE (SIZE (maxSIB-MessagePlus1-r17)) OF SL-SIB-ReqInfo-r17
SL-PagingInfo-RemoteUE-r17 ::= SEQUENCE {
sl-PagingIdentityRemoteUE-r17 SL-PagingIdentityRemoteUE-r17,
sl-PagingCycleRemoteUE-r17 PagingCycle OPTIONAL -- Need M
}
SL-SIB-ReqInfo-r17 ::= ENUMERATED { sib1, sib2, sib3, sib4, sib5, sib6, sib7, sib8, sib9, sib10, sib11, sib12, sib13,
sib14, sib15, sib16, sib17, sib18, sib19, sib20, sib21, spare11, spare10, spare9,
spare8, spare7, spare6, spare5, spare4, spare3, spare2, spare1, ... }
-- TAG-REMOTEUEINFORMATIONSIDELINK-STOP
-- TAG-RRCRECONFIGURATIONSIDELINK-START
RRCReconfigurationSidelink ::= SEQUENCE {
rrc-TransactionIdentifier-r16 RRC-TransactionIdentifier,
criticalExtensions CHOICE {
rrcReconfigurationSidelink-r16 RRCReconfigurationSidelink-IEs-r16,
rrcReconfigurationSidelink-r16 RRCReconfigurationSidelink-r16-IEs,
criticalExtensionsFuture SEQUENCE {}
}
}
RRCReconfigurationSidelink-IEs-r16 ::= SEQUENCE {
RRCReconfigurationSidelink-r16-IEs ::= SEQUENCE {
slrb-ConfigToAddModList-r16 SEQUENCE (SIZE (1..maxNrofSLRB-r16)) OF SLRB-Config-r16 OPTIONAL, -- Need N
slrb-ConfigToReleaseList-r16 SEQUENCE (SIZE (1..maxNrofSLRB-r16)) OF SLRB-PC5-ConfigIndex-r16 OPTIONAL, -- Need N
sl-MeasConfig-r16 CHOICE {release NULL, setup SL-MeasConfig-r16} OPTIONAL, -- Need M
@ -123,9 +200,19 @@ RRCReconfigurationSidelink-IEs-r16 ::= SEQUENCE {
sl-ResetConfig-r16 ENUMERATED {true} OPTIONAL, -- Need N
sl-LatencyBoundCSI-Report-r16 INTEGER (3..160) OPTIONAL, -- Need M
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension RRCReconfigurationSidelink-v1700-IEs OPTIONAL
}
RRCReconfigurationSidelink-v1700-IEs ::= SEQUENCE {
sl-DRX-ConfigUC-PC5-r17 CHOICE {release NULL, setup SL-DRX-ConfigUC-r17 } OPTIONAL, -- Need M
sl-LatencyBoundIUC-Report-r17 CHOICE {release NULL, setup SL-LatencyBoundIUC-Report-r17 } OPTIONAL, -- Need M
sl-RLC-ChannelToReleaseListPC5-r17 SEQUENCE (SIZE (1..maxSL-LCID-r16)) OF SL-RLC-ChannelID-r17 OPTIONAL, -- Need N
sl-RLC-ChannelToAddModListPC5-r17 SEQUENCE (SIZE (1..maxSL-LCID-r16)) OF SL-RLC-ChannelConfigPC5-r17 OPTIONAL, -- Need N
nonCriticalExtension SEQUENCE {} OPTIONAL
}
SL-LatencyBoundIUC-Report-r17::= INTEGER (3..160)
SLRB-Config-r16::= SEQUENCE {
slrb-PC5-ConfigIndex-r16 SLRB-PC5-ConfigIndex-r16,
sl-SDAP-ConfigPC5-r16 SL-SDAP-ConfigPC5-r16 OPTIONAL, -- Need M
@ -181,20 +268,32 @@ SL-CSI-RS-Config-r16 ::= SEQUENCE {
...
}
SL-RLC-ChannelConfigPC5-r17::= SEQUENCE {
sl-RLC-ChannelID-PC5-r17 SL-RLC-ChannelID-r17,
sl-RLC-ConfigPC5-r17 SL-RLC-ConfigPC5-r16 OPTIONAL, -- Need M
sl-MAC-LogicalChannelConfigPC5-r17 SL-LogicalChannelConfigPC5-r16 OPTIONAL, -- Need M
...
}
-- TAG-RRCRECONFIGURATIONSIDELINK-STOP
-- TAG-RRCRECONFIGURATIONCOMPLETESIDELINK-START
RRCReconfigurationCompleteSidelink ::= SEQUENCE {
rrc-TransactionIdentifier-r16 RRC-TransactionIdentifier,
criticalExtensions CHOICE {
rrcReconfigurationCompleteSidelink-r16 RRCReconfigurationCompleteSidelink-IEs-r16,
rrcReconfigurationCompleteSidelink-r16 RRCReconfigurationCompleteSidelink-r16-IEs,
criticalExtensionsFuture SEQUENCE {}
}
}
RRCReconfigurationCompleteSidelink-IEs-r16 ::= SEQUENCE {
RRCReconfigurationCompleteSidelink-r16-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension RRCReconfigurationCompleteSidelink-v1710-IEs OPTIONAL
}
RRCReconfigurationCompleteSidelink-v1710-IEs ::= SEQUENCE {
sl-DRX-ConfigReject-r17 ENUMERATED {true},
nonCriticalExtension SEQUENCE {} OPTIONAL
}
-- TAG-RRCRECONFIGURATIONCOMPLETESIDELINK-STOP
@ -203,28 +302,45 @@ RRCReconfigurationCompleteSidelink-IEs-r16 ::= SEQUENCE {
RRCReconfigurationFailureSidelink ::= SEQUENCE {
rrc-TransactionIdentifier-r16 RRC-TransactionIdentifier,
criticalExtensions CHOICE {
rrcReconfigurationFailureSidelink-r16 RRCReconfigurationFailureSidelink-IEs-r16,
rrcReconfigurationFailureSidelink-r16 RRCReconfigurationFailureSidelink-r16-IEs,
criticalExtensionsFuture SEQUENCE {}
}
}
RRCReconfigurationFailureSidelink-IEs-r16 ::= SEQUENCE {
RRCReconfigurationFailureSidelink-r16-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
-- TAG-RRCRECONFIGURATIONFAILURESIDELINK-STOP
-- TAG-UEASSISTANCEINFORMATIONSIDELINK-START
UEAssistanceInformationSidelink-r17 ::= SEQUENCE {
criticalExtensions CHOICE {
ueAssistanceInformationSidelink-r17 UEAssistanceInformationSidelink-r17-IEs,
criticalExtensionsFuture SEQUENCE {}
}
}
UEAssistanceInformationSidelink-r17-IEs ::= SEQUENCE {
sl-PreferredDRX-ConfigList-r17 SEQUENCE (SIZE (1..maxNrofSL-RxInfoSet-r17)) OF SL-DRX-ConfigUC-SemiStatic-r17
OPTIONAL, -- Need R
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
-- TAG-UEASSISTANCEINFORMATIONSIDELINK-STOP
-- TAG-UECAPABILITYENQUIRYSIDELINK-START
UECapabilityEnquirySidelink ::= SEQUENCE {
rrc-TransactionIdentifier-r16 RRC-TransactionIdentifier,
criticalExtensions CHOICE {
ueCapabilityEnquirySidelink-r16 UECapabilityEnquirySidelink-IEs-r16,
ueCapabilityEnquirySidelink-r16 UECapabilityEnquirySidelink-r16-IEs,
criticalExtensionsFuture SEQUENCE {}
}
}
UECapabilityEnquirySidelink-IEs-r16 ::= SEQUENCE {
UECapabilityEnquirySidelink-r16-IEs ::= SEQUENCE {
frequencyBandListFilterSidelink-r16 FreqBandList OPTIONAL, -- Need N
ue-CapabilityInformationSidelink-r16 OCTET STRING OPTIONAL, -- Need N
lateNonCriticalExtension OCTET STRING OPTIONAL,
@ -237,12 +353,12 @@ UECapabilityEnquirySidelink-IEs-r16 ::= SEQUENCE {
UECapabilityInformationSidelink ::= SEQUENCE {
rrc-TransactionIdentifier-r16 RRC-TransactionIdentifier,
criticalExtensions CHOICE {
ueCapabilityInformationSidelink-r16 UECapabilityInformationSidelink-IEs-r16,
ueCapabilityInformationSidelink-r16 UECapabilityInformationSidelink-r16-IEs,
criticalExtensionsFuture SEQUENCE {}
}
}
UECapabilityInformationSidelink-IEs-r16 ::= SEQUENCE {
UECapabilityInformationSidelink-r16-IEs ::= SEQUENCE {
accessStratumReleaseSidelink-r16 AccessStratumReleaseSidelink-r16,
pdcp-ParametersSidelink-r16 PDCP-ParametersSidelink-r16 OPTIONAL,
rlc-ParametersSidelink-r16 RLC-ParametersSidelink-r16 OPTIONAL,
@ -250,10 +366,21 @@ UECapabilityInformationSidelink-IEs-r16 ::= SEQUENCE {
supportedBandListSidelink-r16 SEQUENCE (SIZE (1..maxBands)) OF BandSidelinkPC5-r16 OPTIONAL,
appliedFreqBandListFilter-r16 FreqBandList OPTIONAL,
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE{} OPTIONAL
nonCriticalExtension UECapabilityInformationSidelink-v1700-IEs OPTIONAL
}
AccessStratumReleaseSidelink-r16 ::= ENUMERATED { rel16, spare7, spare6, spare5, spare4, spare3, spare2, spare1, ... }
UECapabilityInformationSidelink-v1700-IEs ::= SEQUENCE {
mac-ParametersSidelink-r17 MAC-ParametersSidelink-r17 OPTIONAL,
supportedBandCombinationListSidelinkNR-v1710 BandCombinationListSidelinkNR-v1710 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
MAC-ParametersSidelink-r17 ::= SEQUENCE {
drx-OnSidelink-r17 ENUMERATED {supported} OPTIONAL,
...
}
AccessStratumReleaseSidelink-r16 ::= ENUMERATED { rel16, rel17, spare6, spare5, spare4, spare3, spare2, spare1, ... }
PDCP-ParametersSidelink-r16 ::= SEQUENCE {
outOfOrderDeliverySidelink-r16 ENUMERATED {supported} OPTIONAL,
@ -262,8 +389,19 @@ PDCP-ParametersSidelink-r16 ::= SEQUENCE {
BandCombinationListSidelinkNR-r16 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombinationParametersSidelinkNR-r16
BandCombinationListSidelinkNR-v1710 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombinationParametersSidelinkNR-v1710
BandCombinationParametersSidelinkNR-r16 ::= SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParametersSidelink-r16
BandCombinationParametersSidelinkNR-v1710 ::= SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParametersSidelink-v1710
BandParametersSidelink-v1710 ::= SEQUENCE {
--32-5a-1
tx-IUC-Scheme1-Mode2Sidelink-r17 ENUMERATED {supported} OPTIONAL,
--32-5b-1
tx-IUC-Scheme2-Mode2Sidelink-r17 ENUMERATED {n4, n8, n16} OPTIONAL
}
BandSidelinkPC5-r16 ::= SEQUENCE {
freqBandSidelink-r16 FreqBandIndicatorNR,
--15-1
@ -299,9 +437,41 @@ BandSidelinkPC5-r16 ::= SEQUENCE {
sl-openLoopPC-RSRP-ReportSidelink-r16 ENUMERATED {supported} OPTIONAL,
--13-1
sl-Rx-256QAM-r16 ENUMERATED {supported} OPTIONAL
]],
[[
--32-5a-2
rx-IUC-Scheme1-PreferredMode2Sidelink-r17 ENUMERATED {supported} OPTIONAL,
--32-5a-3
rx-IUC-Scheme1-NonPreferredMode2Sidelink-r17 ENUMERATED {supported} OPTIONAL,
--32-5b-2
rx-IUC-Scheme2-Mode2Sidelink-r17 ENUMERATED {n5, n15, n25, n32, n35, n45, n50, n64} OPTIONAL,
--32-6-1
rx-IUC-Scheme1-SCI-r17 ENUMERATED {supported} OPTIONAL,
--32-6-2
rx-IUC-Scheme1-SCI-ExplicitReq-r17 ENUMERATED {supported} OPTIONAL,
--32-7
scheme2-ConflictDeterminationRSRP-r17 ENUMERATED {supported} OPTIONAL
]]
}
-- TAG-UECAPABILITYINFORMATIONSIDELINK-STOP
-- TAG-UUMESSAGETRANSFERSIDELINK-START
UuMessageTransferSidelink-r17 ::= SEQUENCE {
criticalExtensions CHOICE {
uuMessageTransferSidelink-r17 UuMessageTransferSidelink-r17-IEs,
criticalExtensionsFuture SEQUENCE {}
}
}
UuMessageTransferSidelink-r17-IEs ::= SEQUENCE {
sl-PagingDelivery-r17 OCTET STRING (CONTAINING PagingRecord) OPTIONAL, -- Need N
sl-SIB1-Delivery-r17 OCTET STRING (CONTAINING SIB1) OPTIONAL, -- Need N
sl-SystemInformationDelivery-r17 OCTET STRING (CONTAINING SystemInformation) OPTIONAL, -- Need N
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
-- TAG-UUMESSAGETRANSFERSIDELINK-STOP
END

186
epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
View File

@ -62,6 +62,7 @@ CellGroupConfig_PDU
DRX-Config_PDU
CG-Config_PDU
CG-ConfigInfo_PDU
CondReconfigExecCondSCG-r17_PDU
ConfigRestrictInfoSCG_PDU
FeatureSetEntryIndex_PDU
FreqBandList_PDU
@ -75,6 +76,8 @@ MeasResultSCG-Failure_PDU
MeasurementTimingConfiguration_PDU
MIB_PDU
NZP-CSI-RS-Resource_PDU
OverheatingAssistance_PDU
OverheatingAssistance-r17_PDU
P-Max_PDU
PDCCH-ConfigSIB1_PDU
PH-TypeListMCG_PDU
@ -123,6 +126,7 @@ BandParametersSidelink-r16
BCCH-BCH-Message @bcch.bch
BCCH-DL-SCH-Message @bcch.dl.sch
CellGroupConfig
CondReconfigExecCondSCG-r17
CG-Config
CG-ConfigInfo
ConfigRestrictInfoSCG
@ -134,6 +138,7 @@ FreqBandList
HandoverCommand
HandoverPreparationInformation
LocationMeasurementInfo
MCCH-Message-r17 @mcch
MeasConfig
MeasGapConfig
MeasGapSharingConfig
@ -141,6 +146,8 @@ MeasResultSCG-Failure
MeasurementTimingConfiguration
MIB
NZP-CSI-RS-Resource
OverheatingAssistance
OverheatingAssistance-r17
P-Max
PCCH-Message @pcch
PDCCH-ConfigSIB1
@ -158,6 +165,8 @@ SchedulingRequestResourceConfig
SidelinkParametersNR-r16
SidelinkUEInformationNR-r16
SL-ConfigDedicatedEUTRA-Info-r16
SL-MeasResultListRelay-r17
SL-MeasResultRelay-r17
SL-PHY-MAC-RLC-Config-r16
SIB1
SIB2
@ -191,41 +200,24 @@ 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
@ -331,7 +323,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
@ -720,6 +712,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");
@ -875,6 +888,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
@ -1044,6 +1066,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
@ -1059,12 +1090,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
@ -1700,6 +1746,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;
@ -1814,6 +1863,27 @@ 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_BODY SIBpos-r16/assistanceDataSIB-Element-r16 VAL_PTR = &assist_data_sib_elem_tvb
tvbuff_t *assist_data_sib_elem_tvb = NULL;
%(DEFAULT_BODY)s
@ -2106,6 +2176,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;
@ -2144,3 +2262,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");

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

@ -1,7 +1,7 @@
/* packet-nr-rrc-template.c
* NR;
* Radio Resource Control (RRC) protocol specification
* (3GPP TS 38.331 V16.8.0 Release 16) packet dissection
* (3GPP TS 38.331 V17.1.0 Release 17) packet dissection
* Copyright 2018-2022, Pascal Quantin
*
* Wireshark - Network traffic analyzer
@ -138,6 +138,7 @@ static gint ett_nr_rrc_dl_DCCH_MessageEUTRA = -1;
static gint ett_nr_rrc_sl_ConfigDedicatedEUTRA = -1;
static gint ett_nr_rrc_sl_CapabilityInformationSidelink = -1;
static gint ett_nr_rrc_measResult_RLF_Report_EUTRA = -1;
static gint ett_nr_rrc_measResult_RLF_Report_EUTRA_v1690 = -1;
static gint ett_nr_rrc_locationTimestamp_r16 = -1;
static gint ett_nr_rrc_locationCoordinate_r16 = -1;
static gint ett_nr_rrc_locationError_r16 = -1;
@ -154,6 +155,10 @@ static gint ett_nr_rrc_absTimeInfo = -1;
static gint ett_nr_rrc_assistanceDataSIB_Element_r16 = -1;
static gint ett_nr_sl_V2X_ConfigCommon_r16 = -1;
static gint ett_nr_tdd_Config_r16 = -1;
static gint ett_nr_coarseLocationInfo_r17 = -1;
static gint ett_nr_sl_MeasResultsCandRelay_r17 = -1;
static gint ett_nr_sl_MeasResultServingRelay_r17 = -1;
static gint ett_nr_ReferenceLocation_r17 = -1;
static expert_field ei_nr_rrc_number_pages_le15 = EI_INIT;
@ -163,6 +168,8 @@ static int dissect_DL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_
static int dissect_DL_CCCH_Message_PDU(tvbuff_t* tvb _U_, packet_info* pinfo _U_, proto_tree* tree _U_, void* data _U_);
static int dissect_UL_CCCH_Message_PDU(tvbuff_t* tvb _U_, packet_info* pinfo _U_, proto_tree* tree _U_, void* data _U_);
static int dissect_UERadioAccessCapabilityInformation_PDU(tvbuff_t* tvb _U_, packet_info* pinfo _U_, proto_tree* tree _U_, void* data _U_);
static int dissect_SL_MeasResultListRelay_r17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_SL_MeasResultRelay_r17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static const unit_name_string units_periodicities = { " periodicity", " periodicities" };
static const unit_name_string units_prbs = { " PRB", " PRBs" };
@ -531,6 +538,12 @@ nr_rrc_MeasTriggerQuantityOffset_fmt(gchar *s, guint32 v)
snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%d)", (float)d/2, d);
}
static void
nr_rrc_TimeSinceCHO_Reconfig_r17_fmt(gchar *s, guint32 v)
{
snprintf(s, ITEM_LABEL_LENGTH, "%.1fs (%u)", (float)v/10, v);
}
static int
dissect_nr_rrc_cg_configinfo_msg(tvbuff_t* tvb _U_, packet_info* pinfo _U_, proto_tree* tree _U_, void* data _U_)
{
@ -707,7 +720,7 @@ dissect_nr_rrc_handoverpreparationinformation_msg(tvbuff_t* tvb _U_, packet_info
proto_tree* sub_tree;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NR RRC");
col_set_str(pinfo->cinfo, COL_INFO, "MeasGapConfig");
col_set_str(pinfo->cinfo, COL_INFO, "HandoverPreparationInformation");
ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
sub_tree = proto_item_add_subtree(ti, ett_nr_rrc);
@ -964,6 +977,7 @@ proto_register_nr_rrc(void) {
&ett_nr_rrc_sl_ConfigDedicatedEUTRA,
&ett_nr_rrc_sl_CapabilityInformationSidelink,
&ett_nr_rrc_measResult_RLF_Report_EUTRA,
&ett_nr_rrc_measResult_RLF_Report_EUTRA_v1690,
&ett_nr_rrc_locationTimestamp_r16,
&ett_nr_rrc_locationCoordinate_r16,
&ett_nr_rrc_locationError_r16,
@ -979,7 +993,11 @@ proto_register_nr_rrc(void) {
&ett_nr_rrc_absTimeInfo,
&ett_nr_rrc_assistanceDataSIB_Element_r16,
&ett_nr_sl_V2X_ConfigCommon_r16,
&ett_nr_tdd_Config_r16
&ett_nr_tdd_Config_r16,
&ett_nr_coarseLocationInfo_r17,
&ett_nr_sl_MeasResultsCandRelay_r17,
&ett_nr_sl_MeasResultServingRelay_r17,
&ett_nr_ReferenceLocation_r17
};
static ei_register_info ei[] = {

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

@ -1,7 +1,7 @@
/* Do not modify this file. Changes will be overwritten. */
/* Generated automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-lte-rrc.c */
/* asn2wrs.py -L -p lte-rrc -c ./lte-rrc.cnf -s ./packet-lte-rrc-template -D . -O ../.. EUTRA-InterNodeDefinitions.asn EUTRA-RRC-Definitions.asn EUTRA-Sidelink-Preconf.asn EUTRA-UE-Variables.asn PC5-RRC-Definitions.asn NBIOT-InterNodeDefinitions.asn NBIOT-RRC-Definitions.asn NBIOT-UE-Variables.asn */
/* asn2wrs.py -L -p lte-rrc -c ./lte-rrc.cnf -s ./packet-lte-rrc-template -D . -O ../.. EUTRA-InterNodeDefinitions.asn EUTRA-RRC-Definitions.asn PC5-RRC-Definitions.asn NBIOT-InterNodeDefinitions.asn NBIOT-RRC-Definitions.asn */
/* Input file: packet-lte-rrc-template.c */
@ -277,7 +277,6 @@ extern int proto_pdcp_lte;
#define maxWLAN_CarrierInfo_r13 8
#define maxWLAN_Id_Report_r14 32
#define maxWLAN_Name_r15 4
#define maxLogMeas_r10 4060
#define maxFreqANR_NB_r16 2
#define maxFreqEUTRA_NB_r16 8
#define maxFreqsGERAN_NB_r16 8
@ -2118,8 +2117,8 @@ static int hf_lte_rrc_reducedUE_CategoryUL = -1; /* INTEGER_0_21 */
static int hf_lte_rrc_reducedMaxCCs = -1; /* T_reducedMaxCCs */
static int hf_lte_rrc_reducedCCsDL = -1; /* INTEGER_0_31 */
static int hf_lte_rrc_reducedCCsUL = -1; /* INTEGER_0_31 */
static int hf_lte_rrc_overheatingAssistanceForSCG_r16 = -1; /* OCTET_STRING */
static int hf_lte_rrc_overheatingAssistanceForSCG_FR2_2_r17 = -1; /* OCTET_STRING */
static int hf_lte_rrc_overheatingAssistanceForSCG_r16 = -1; /* T_overheatingAssistanceForSCG_r16 */
static int hf_lte_rrc_overheatingAssistanceForSCG_FR2_2_r17 = -1; /* T_overheatingAssistanceForSCG_FR2_2_r17 */
static int hf_lte_rrc_criticalExtensions_52 = -1; /* T_criticalExtensions_52 */
static int hf_lte_rrc_c1_42 = -1; /* T_c1_42 */
static int hf_lte_rrc_ueCapabilityEnquiry_r8 = -1; /* UECapabilityEnquiry_r8_IEs */
@ -5195,7 +5194,7 @@ static int hf_lte_rrc_condReconfigurationId_r16 = -1; /* CondReconfigurationId_
static int hf_lte_rrc_triggerCondition_r16 = -1; /* SEQUENCE_SIZE_1_2_OF_MeasId */
static int hf_lte_rrc_triggerCondition_r16_item = -1; /* MeasId */
static int hf_lte_rrc_condReconfigurationToApply_r16 = -1; /* T_condReconfigurationToApply_r16 */
static int hf_lte_rrc_triggerConditionSN_r17 = -1; /* OCTET_STRING */
static int hf_lte_rrc_triggerConditionSN_r17 = -1; /* T_triggerConditionSN_r17 */
static int hf_lte_rrc_semiMajorAxis_r17 = -1; /* INTEGER_0_8589934591 */
static int hf_lte_rrc_eccentricity_r17 = -1; /* INTEGER_0_1048575 */
static int hf_lte_rrc_periapsis_r17 = -1; /* INTEGER_0_268435455 */
@ -13214,6 +13213,9 @@ static gint ett_lte_rrc_sl_ParameterNR_r16 = -1;
static gint ett_lte_rrc_v2x_BandParametersNR_r16 = -1;
static gint ett_lte_rrc_ueAssistanceInformationNR_SCG_r16 = -1;
static gint ett_lte_rrc_assistanceDataSIB_Element_r15 = -1;
static gint ett_lte_rrc_overheatingAssistanceForSCG_r16 = -1;
static gint ett_lte_rrc_overheatingAssistanceForSCG_FR2_2_r17 = -1;
static gint ett_lte_rrc_triggerConditionSN_r17 = -1;
static expert_field ei_lte_rrc_number_pages_le15 = EI_INIT;
static expert_field ei_lte_rrc_si_info_value_changed = EI_INIT;
@ -76323,8 +76325,26 @@ dissect_lte_rrc_T_condReconfigurationToApply_r16(tvbuff_t *tvb _U_, int offset _
}
static int
dissect_lte_rrc_T_triggerConditionSN_r17(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
tvbuff_t *cond_reconfig_exec_cond_scg_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &cond_reconfig_exec_cond_scg_tvb);
if (cond_reconfig_exec_cond_scg_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_triggerConditionSN_r17);
dissect_nr_rrc_CondReconfigExecCondSCG_r17_PDU(cond_reconfig_exec_cond_scg_tvb, actx->pinfo, subtree, NULL);
}
return offset;
}
static const per_sequence_t CondReconfigurationAddMod_r16_eag_1_sequence[] = {
{ &hf_lte_rrc_triggerConditionSN_r17, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_OCTET_STRING },
{ &hf_lte_rrc_triggerConditionSN_r17, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_triggerConditionSN_r17 },
{ NULL, 0, 0, NULL }
};
@ -89582,8 +89602,25 @@ dissect_lte_rrc_T_sps_AssistanceInformation_v1530(tvbuff_t *tvb _U_, int offset
}
static int
dissect_lte_rrc_T_overheatingAssistanceForSCG_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
tvbuff_t *overheating_assist_for_scg_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &overheating_assist_for_scg_tvb);
if (overheating_assist_for_scg_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_overheatingAssistanceForSCG_r16);
dissect_nr_rrc_OverheatingAssistance_PDU(overheating_assist_for_scg_tvb, actx->pinfo, subtree, NULL);
}
return offset;
}
static const per_sequence_t OverheatingAssistance_v1610_sequence[] = {
{ &hf_lte_rrc_overheatingAssistanceForSCG_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_lte_rrc_OCTET_STRING },
{ &hf_lte_rrc_overheatingAssistanceForSCG_r16, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_overheatingAssistanceForSCG_r16 },
{ NULL, 0, 0, NULL }
};
@ -89627,8 +89664,25 @@ dissect_lte_rrc_T_scg_DeactivationPreference_r17(tvbuff_t *tvb _U_, int offset _
}
static int
dissect_lte_rrc_T_overheatingAssistanceForSCG_FR2_2_r17(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
tvbuff_t *overheating_assist_for_scg_tvb = NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &overheating_assist_for_scg_tvb);
if (overheating_assist_for_scg_tvb) {
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_overheatingAssistanceForSCG_FR2_2_r17);
dissect_nr_rrc_OverheatingAssistance_r17_PDU(overheating_assist_for_scg_tvb, actx->pinfo, subtree, NULL);
}
return offset;
}
static const per_sequence_t OverheatingAssistance_v1710_sequence[] = {
{ &hf_lte_rrc_overheatingAssistanceForSCG_FR2_2_r17, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_lte_rrc_OCTET_STRING },
{ &hf_lte_rrc_overheatingAssistanceForSCG_FR2_2_r17, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_overheatingAssistanceForSCG_FR2_2_r17 },
{ NULL, 0, 0, NULL }
};
@ -133155,7 +133209,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 3248 "./asn1/lte-rrc/packet-lte-rrc-template.c"
#line 3251 "./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_)
@ -140739,11 +140793,11 @@ void proto_register_lte_rrc(void) {
{ &hf_lte_rrc_overheatingAssistanceForSCG_r16,
{ "overheatingAssistanceForSCG-r16", "lte-rrc.overheatingAssistanceForSCG_r16",
FT_BYTES, BASE_NONE, NULL, 0,
"OCTET_STRING", HFILL }},
NULL, HFILL }},
{ &hf_lte_rrc_overheatingAssistanceForSCG_FR2_2_r17,
{ "overheatingAssistanceForSCG-FR2-2-r17", "lte-rrc.overheatingAssistanceForSCG_FR2_2_r17",
FT_BYTES, BASE_NONE, NULL, 0,
"OCTET_STRING", HFILL }},
NULL, HFILL }},
{ &hf_lte_rrc_criticalExtensions_52,
{ "criticalExtensions", "lte-rrc.criticalExtensions",
FT_UINT32, BASE_DEC, VALS(lte_rrc_T_criticalExtensions_52_vals), 0,
@ -153047,7 +153101,7 @@ void proto_register_lte_rrc(void) {
{ &hf_lte_rrc_triggerConditionSN_r17,
{ "triggerConditionSN-r17", "lte-rrc.triggerConditionSN_r17",
FT_BYTES, BASE_NONE, NULL, 0,
"OCTET_STRING", HFILL }},
NULL, HFILL }},
{ &hf_lte_rrc_semiMajorAxis_r17,
{ "semiMajorAxis-r17", "lte-rrc.semiMajorAxis_r17",
FT_UINT64, BASE_DEC, NULL, 0,
@ -168654,7 +168708,7 @@ void proto_register_lte_rrc(void) {
"CarrierFreq_NB_r13", HFILL }},
/*--- End of included file: packet-lte-rrc-hfarr.c ---*/
#line 3670 "./asn1/lte-rrc/packet-lte-rrc-template.c"
#line 3673 "./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",
@ -173280,7 +173334,7 @@ void proto_register_lte_rrc(void) {
&ett_lte_rrc_PCI_ARFCN_NB_r14,
/*--- End of included file: packet-lte-rrc-ettarr.c ---*/
#line 4429 "./asn1/lte-rrc/packet-lte-rrc-template.c"
#line 4432 "./asn1/lte-rrc/packet-lte-rrc-template.c"
&ett_lte_rrc_featureGroupIndicators,
&ett_lte_rrc_featureGroupIndRel9Add,
@ -173332,7 +173386,10 @@ void proto_register_lte_rrc(void) {
&ett_lte_rrc_sl_ParameterNR_r16,
&ett_lte_rrc_v2x_BandParametersNR_r16,
&ett_lte_rrc_ueAssistanceInformationNR_SCG_r16,
&ett_lte_rrc_assistanceDataSIB_Element_r15
&ett_lte_rrc_assistanceDataSIB_Element_r15,
&ett_lte_rrc_overheatingAssistanceForSCG_r16,
&ett_lte_rrc_overheatingAssistanceForSCG_FR2_2_r17,
&ett_lte_rrc_triggerConditionSN_r17
};
static ei_register_info ei[] = {
@ -173429,7 +173486,7 @@ void proto_register_lte_rrc(void) {
/*--- End of included file: packet-lte-rrc-dis-reg.c ---*/
#line 4539 "./asn1/lte-rrc/packet-lte-rrc-template.c"
#line 4545 "./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);

2
epan/dissectors/packet-lte-rrc.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. Changes will be overwritten. */
/* Generated automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-lte-rrc.h */
/* asn2wrs.py -L -p lte-rrc -c ./lte-rrc.cnf -s ./packet-lte-rrc-template -D . -O ../.. EUTRA-InterNodeDefinitions.asn EUTRA-RRC-Definitions.asn EUTRA-Sidelink-Preconf.asn EUTRA-UE-Variables.asn PC5-RRC-Definitions.asn NBIOT-InterNodeDefinitions.asn NBIOT-RRC-Definitions.asn NBIOT-UE-Variables.asn */
/* asn2wrs.py -L -p lte-rrc -c ./lte-rrc.cnf -s ./packet-lte-rrc-template -D . -O ../.. EUTRA-InterNodeDefinitions.asn EUTRA-RRC-Definitions.asn PC5-RRC-Definitions.asn NBIOT-InterNodeDefinitions.asn NBIOT-RRC-Definitions.asn */
/* Input file: packet-lte-rrc-template.h */

77465
epan/dissectors/packet-nr-rrc.c
View File

File diff suppressed because it is too large Load Diff

5
epan/dissectors/packet-nr-rrc.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. Changes will be overwritten. */
/* Generated automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-nr-rrc.h */
/* asn2wrs.py -L -p nr-rrc -c ./nr-rrc.cnf -s ./packet-nr-rrc-template -D . -O ../.. NR-InterNodeDefinitions.asn NR-RRC-Definitions.asn NR-Sidelink-Preconf.asn NR-UE-Variables.asn PC5-RRC-Definitions.asn */
/* asn2wrs.py -L -p nr-rrc -c ./nr-rrc.cnf -s ./packet-nr-rrc-template -D . -O ../.. NR-InterNodeDefinitions.asn NR-RRC-Definitions.asn PC5-RRC-Definitions.asn */
/* Input file: packet-nr-rrc-template.h */
@ -42,6 +42,8 @@ int dissect_nr_rrc_RRCReconfigurationComplete_PDU(tvbuff_t *tvb _U_, packet_info
int dissect_nr_rrc_SIB1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_SidelinkUEInformationNR_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_UEAssistanceInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_OverheatingAssistance_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_OverheatingAssistance_r17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_RA_ReportList_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_SIB2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_SIB3_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
@ -57,6 +59,7 @@ int dissect_nr_rrc_SIB12_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
int dissect_nr_rrc_SIB13_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_SIB14_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_CellGroupConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_CondReconfigExecCondSCG_r17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_DRX_Config_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_LocationMeasurementInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_nr_rrc_MeasConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);