osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

NR RRC: upgrade dissector to v17.2.0

This commit is contained in:
Pascal Quantin 2022-10-05 08:50:43 +02:00
parent 9de534b8c6
commit 4dcafcf976
9 changed files with 6516 additions and 950 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V17.1.0 (2022-06)
-- 3GPP TS 38.331 V17.2.0 (2022-09)
NR-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
@ -24,10 +24,11 @@ IMPORTS
maxBandsEUTRA,
maxCellSFTD,
maxFeatureSetsPerBand,
maxFreq,
maxFreqIDC-MRDC,
maxNrofCombIDC,
maxNrofCondCells-r16,
ffsUpperLimit, -- to be removed later
maxNrofCondCells-1-r17,
maxNrofPhysicalResourceBlocks,
maxNrofSCells,
maxNrofServingCells,
@ -405,17 +406,16 @@ 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
CandidateCellInfoListCPC-r17 ::= SEQUENCE (SIZE (1..maxFreq)) OF CandidateCellInfo-r17
CandidateCellInfo-r17 ::= SEQUENCE {
ssbFrequency-r17 ARFCN-ValueNR,
candidateList-r17 SEQUENCE (SIZE (1..ffsUpperLimit)) OF CandidateCell-r17 -- FFS
candidateList-r17 SEQUENCE (SIZE (1..maxNrofCondCells-r16)) OF CandidateCell-r17
}
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
@ -527,7 +527,7 @@ CG-ConfigInfo-v1640-IEs ::= SEQUENCE {
CG-ConfigInfo-v1700-IEs ::= SEQUENCE {
candidateCellListCPC-r17 CandidateCellListCPC-r17 OPTIONAL,
twoPHRModeSCG-r17 ENUMERATED {enabled} OPTIONAL,
twoPHRModeMCG-r17 ENUMERATED {enabled} OPTIONAL,
lowMobilityEvaluationConnectedInPCell-r17 ENUMERATED {enabled} OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -581,9 +581,8 @@ ConfigRestrictInfoSCG ::= SEQUENCE {
[[
allowedReducedConfigForOverheating-r17 OverheatingAssistance-r17 OPTIONAL,
maxNumberUDC-DRB-r17 INTEGER(0..2) OPTIONAL,
maxNumberCPCCandidates-r17 INTEGER(1..maxNrofCondCells-r16) OPTIONAL
maxNumberCPCCandidates-r17 INTEGER(0..maxNrofCondCells-1-r17) 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
@ -702,11 +701,11 @@ AffectedCarrierFreqCombEUTRA ::= SEQUENCE (SIZE (1..maxNrofServingCellsEUTRA)) O
AffectedCarrierFreqCombNR ::= SEQUENCE (SIZE (1..maxNrofServingCells)) OF ARFCN-ValueNR
CandidateCellListCPC-r17 ::= SEQUENCE (SIZE (1..ffsUpperLimit)) OF CandidateCellCPC-r17 -- FFS
CandidateCellListCPC-r17 ::= SEQUENCE (SIZE (1..maxFreq)) OF CandidateCellCPC-r17
CandidateCellCPC-r17 ::= SEQUENCE {
ssbFrequency-r17 ARFCN-ValueNR,
candidateCellList-r17 SEQUENCE (SIZE (1..ffsUpperLimit)) OF PhysCellId -- FFS
candidateCellList-r17 SEQUENCE (SIZE (1..maxNrofCondCells-r16)) OF PhysCellId
}
-- TAG-CG-CONFIG-INFO-STOP
@ -792,7 +791,7 @@ 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,
halfDuplexFDD-TypeA-RedCap-r17 SEQUENCE (SIZE (1..maxBands)) OF FreqBandIndicatorNR OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}

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

File diff suppressed because it is too large Load Diff

2
epan/dissectors/asn1/nr-rrc/NR-Sidelink-DiscoveryMessage.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V17.1.0 (2022-06)
-- 3GPP TS 38.331 V17.2.0 (2022-09)
NR-Sidelink-DiscoveryMessage DEFINITIONS AUTOMATIC TAGS ::=

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V17.1.0 (2022-06)
-- 3GPP TS 38.331 V17.2.0 (2022-09)
NR-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=
@ -6,8 +6,7 @@ BEGIN
IMPORTS
SL-RemoteUE-Config-r17,
SL-DRX-Config-GC-BC-r17,
ffsUpperLimit, -- to be removed later
SL-DRX-ConfigGC-BC-r17,
SL-FreqConfigCommon-r16,
SL-RadioBearerConfig-r16,
SL-RLC-BearerConfig-r16,
@ -47,7 +46,7 @@ SidelinkPreconfigNR-r16 ::= SEQUENCE {
sl-MaxCID-r16 INTEGER (1..16383) DEFAULT 15,
...,
[[
sl-DRX-PreConfig-GC-BC-r17 SL-DRX-Config-GC-BC-r17 OPTIONAL,
sl-DRX-PreConfigGC-BC-r17 SL-DRX-ConfigGC-BC-r17 OPTIONAL,
sl-TxProfileList-r17 SL-TxProfileList-r17 OPTIONAL,
sl-PreconfigDiscConfig-r17 SL-RemoteUE-Config-r17 OPTIONAL
]]

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V17.1.0 (2022-06)
-- 3GPP TS 38.331 V17.2.0 (2022-09)
NR-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
@ -63,7 +63,8 @@ IMPORTS
maxNrofCLI-RSSI-Resources-r16,
maxNrofCLI-SRS-Resources-r16,
RSSI-ResourceId-r16,
SRS-ResourceId
SRS-ResourceId,
VisitedPSCellInfoList-r17
FROM NR-RRC-Definitions;
-- NR-UE-VARIABLES-STOP
@ -101,7 +102,6 @@ VarLogMeasConfig-r16-IEs ::= SEQUENCE {
periodical LoggedPeriodicalReportConfig-r16,
eventTriggered LoggedEventTriggerConfig-r16
},
sigLoggedMeasType-r17 ENUMERATED {true} OPTIONAL,
earlyMeasIndication-r17 ENUMERATED {true} OPTIONAL,
areaConfiguration-v1700 AreaConfiguration-v1700 OPTIONAL
}
@ -217,6 +217,11 @@ VarMeasReportSL-r16 ::= SEQUENCE {
VarMobilityHistoryReport-r16 ::= VisitedCellInfoList-r16
VarMobilityHistoryReport-r17 ::= SEQUENCE {
visitedCellInfoList-r16 VisitedCellInfoList-r16,
visitedPSCellInfoListReport-r17 VisitedPSCellInfoList-r17 OPTIONAL
}
-- TAG-VARMOBILITYHISTORYREPORT-STOP
-- TAG-VARPENDINGRNA-UPDATE-START

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V17.1.0 (2022-06)
-- 3GPP TS 38.331 V17.2.0 (2022-09)
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -129,7 +129,7 @@ SL-MeasResultListRelay-r17 ::= SEQUENCE (SIZE (1..maxNrofRelayM
SL-MeasResultRelay-r17 ::= SEQUENCE {
cellIdentity-r17 CellAccessRelatedInfo,
sl-RelayUEIdentity-r17 SL-SourceIdentity-r17,
sl-RelayUE-Identity-r17 SL-SourceIdentity-r17,
sl-MeasResult-r17 SL-MeasResult-r16,
...
}
@ -292,7 +292,13 @@ RRCReconfigurationCompleteSidelink-r16-IEs ::= SEQUENCE {
}
RRCReconfigurationCompleteSidelink-v1710-IEs ::= SEQUENCE {
sl-DRX-ConfigReject-r17 ENUMERATED {true},
dummy ENUMERATED {true},
nonCriticalExtension RRCReconfigurationCompleteSidelink-v1720-IEs OPTIONAL
}
RRCReconfigurationCompleteSidelink-v1720-IEs ::= SEQUENCE {
sl-DRX-ConfigReject-v1720 ENUMERATED {true} OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}

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

@ -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

2
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 V17.1.0 Release 17) packet dissection
* (3GPP TS 38.331 V17.2.0 Release 17) packet dissection
* Copyright 2018-2022, Pascal Quantin
*
* Wireshark - Network traffic analyzer

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

File diff suppressed because it is too large Load Diff