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

NR RRC: upgrade dissector to v16.2.0

This commit is contained in:
Pascal Quantin 2020-10-08 10:24:28 +02:00
parent 39744b8edf
commit 21c3bdff06
11 changed files with 10752 additions and 3971 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,8 +86,6 @@ UL-ConfigCommonListTDD-NB-r15_PDU
UL-DCCH-Message_PDU
V2X-BandParameters-r14_PDU
V2X-BandParameters-v1530_PDU
V2X-SupportedBandCombination-r14_PDU
V2X-SupportedBandCombination-v1530_PDU
VisitedCellInfo-r12_PDU
VisitedCellInfoList-r12_PDU
#.END
@ -134,8 +132,6 @@ UL-ConfigCommonList-NB-v1530
UL-ConfigCommonListTDD-NB-r15
V2X-BandParameters-r14
V2X-BandParameters-v1530
V2X-SupportedBandCombination-r14
V2X-SupportedBandCombination-v1530
VisitedCellInfo-r12
VisitedCellInfoList-r12
BCCH-BCH-Message @bcch.bch

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V16.1.0 (2020-07)
-- 3GPP TS 38.331 V16.2.0 (2020-09)
NR-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
@ -112,23 +112,23 @@ AS-Config ::= SEQUENCE {
}
AS-Context ::= SEQUENCE {
reestablishmentInfo ReestablishmentInfo OPTIONAL,
configRestrictInfo ConfigRestrictInfoSCG OPTIONAL,
reestablishmentInfo ReestablishmentInfo OPTIONAL,
configRestrictInfo ConfigRestrictInfoSCG OPTIONAL,
...,
[[ ran-NotificationAreaInfo RAN-NotificationAreaInfo OPTIONAL
[[ ran-NotificationAreaInfo RAN-NotificationAreaInfo OPTIONAL
]],
[[ ueAssistanceInformation OCTET STRING (CONTAINING UEAssistanceInformation) OPTIONAL -- Cond HO2
[[ ueAssistanceInformation OCTET STRING (CONTAINING UEAssistanceInformation) OPTIONAL -- Cond HO2
]],
[[
selectedBandCombinationSN BandCombinationInfoSN OPTIONAL
selectedBandCombinationSN BandCombinationInfoSN OPTIONAL
]],
[[
configRestrictInfoDAPS-r16 ConfigRestrictInfoDAPS-r16 OPTIONAL,
sidelinkUEInformationNR-r16 OCTET STRING OPTIONAL,
sidelinkUEInformationEUTRA-r16 OCTET STRING OPTIONAL,
ueAssistanceInformationEUTRA-r16 OCTET STRING OPTIONAL,
ueAssistanceInformationSCG-r16 OCTET STRING (CONTAINING UEAssistanceInformation) OPTIONAL, -- Cond HO2
needForGapsInfoNR-r16 NeedForGapsInfoNR-r16 OPTIONAL
configRestrictInfoDAPS-r16 ConfigRestrictInfoDAPS-r16 OPTIONAL,
sidelinkUEInformationNR-r16 OCTET STRING OPTIONAL,
sidelinkUEInformationEUTRA-r16 OCTET STRING OPTIONAL,
ueAssistanceInformationEUTRA-r16 OCTET STRING OPTIONAL,
ueAssistanceInformationSCG-r16 OCTET STRING (CONTAINING UEAssistanceInformation) OPTIONAL, -- Cond HO2
needForGapsInfoNR-r16 NeedForGapsInfoNR-r16 OPTIONAL
]]
}
@ -137,7 +137,7 @@ ConfigRestrictInfoDAPS-r16 ::= SEQUENCE {
p-DAPS-Source-r16 P-Max,
p-DAPS-Target-r16 P-Max,
uplinkPowerSharingDAPS-Mode-r16 ENUMERATED {semi-static-mode1, semi-static-mode2, dynamic }
} OPTIONAL
} OPTIONAL
}
ReestablishmentInfo ::= SEQUENCE {
@ -234,7 +234,12 @@ CG-Config-v1590-IEs ::= SEQUENCE {
CG-Config-v1610-IEs ::= SEQUENCE {
drx-InfoSCG2 DRX-Info2 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension CG-Config-v1620-IEs OPTIONAL
}
CG-Config-v1620-IEs ::= SEQUENCE {
ueAssistanceInformationSCG-r16 OCTET STRING (CONTAINING UEAssistanceInformation) OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
PH-TypeListSCG ::= SEQUENCE (SIZE (1..maxNrofServingCells)) OF PH-InfoSCG
@ -272,7 +277,8 @@ ConfigRestrictModReqSCG ::= SEQUENCE {
[[
requestedP-MaxFR2-r16 P-Max OPTIONAL,
requestedMaxInterFreqMeasIdSCG-r16 INTEGER(1..maxMeasIdentitiesMN) OPTIONAL,
requestedMaxIntraFreqMeasIdSCG-r16 INTEGER(1..maxMeasIdentitiesMN) OPTIONAL
requestedMaxIntraFreqMeasIdSCG-r16 INTEGER(1..maxMeasIdentitiesMN) OPTIONAL,
requestedToffset-r16 T-Offset-r16 OPTIONAL
]]
}
@ -294,6 +300,8 @@ CandidateServingFreqListNR ::= SEQUENCE (SIZE (1.. maxFreqIDC-MRDC)) OF ARFCN-Va
CandidateServingFreqListEUTRA ::= SEQUENCE (SIZE (1.. maxFreqIDC-MRDC)) OF ARFCN-ValueEUTRA
T-Offset-r16 ::= ENUMERATED {ms0dot5, ms0dot75, ms1, ms1dot5, ms2, ms2dot5, ms3, spare1}
-- TAG-CG-CONFIG-STOP
-- TAG-CG-CONFIG-INFO-START
@ -340,95 +348,102 @@ CG-ConfigInfo-v1540-IEs ::= SEQUENCE {
}
CG-ConfigInfo-v1560-IEs ::= SEQUENCE {
candidateCellInfoListMN-EUTRA OCTET STRING OPTIONAL,
candidateCellInfoListSN-EUTRA OCTET STRING OPTIONAL,
sourceConfigSCG-EUTRA OCTET STRING OPTIONAL,
candidateCellInfoListMN-EUTRA OCTET STRING OPTIONAL,
candidateCellInfoListSN-EUTRA OCTET STRING OPTIONAL,
sourceConfigSCG-EUTRA OCTET STRING OPTIONAL,
scgFailureInfoEUTRA SEQUENCE {
failureTypeEUTRA ENUMERATED { t313-Expiry, randomAccessProblem,
rlc-MaxNumRetx, scg-ChangeFailure},
measResultSCG-EUTRA OCTET STRING
} OPTIONAL,
drx-ConfigMCG DRX-Config OPTIONAL,
} OPTIONAL,
drx-ConfigMCG DRX-Config OPTIONAL,
measResultReportCGI-EUTRA SEQUENCE {
eutraFrequency ARFCN-ValueEUTRA,
cellForWhichToReportCGI-EUTRA EUTRA-PhysCellId,
cgi-InfoEUTRA CGI-InfoEUTRA
} OPTIONAL,
measResultCellListSFTD-EUTRA MeasResultCellListSFTD-EUTRA OPTIONAL,
fr-InfoListMCG FR-InfoList OPTIONAL,
nonCriticalExtension CG-ConfigInfo-v1570-IEs OPTIONAL
} OPTIONAL,
measResultCellListSFTD-EUTRA MeasResultCellListSFTD-EUTRA OPTIONAL,
fr-InfoListMCG FR-InfoList OPTIONAL,
nonCriticalExtension CG-ConfigInfo-v1570-IEs OPTIONAL
}
CG-ConfigInfo-v1570-IEs ::= SEQUENCE {
sftdFrequencyList-NR SFTD-FrequencyList-NR OPTIONAL,
sftdFrequencyList-EUTRA SFTD-FrequencyList-EUTRA OPTIONAL,
nonCriticalExtension CG-ConfigInfo-v1590-IEs OPTIONAL
sftdFrequencyList-NR SFTD-FrequencyList-NR OPTIONAL,
sftdFrequencyList-EUTRA SFTD-FrequencyList-EUTRA OPTIONAL,
nonCriticalExtension CG-ConfigInfo-v1590-IEs OPTIONAL
}
CG-ConfigInfo-v1590-IEs ::= SEQUENCE {
servFrequenciesMN-NR SEQUENCE (SIZE (1.. maxNrofServingCells-1)) OF ARFCN-ValueNR OPTIONAL,
nonCriticalExtension CG-ConfigInfo-v1610-IEs OPTIONAL
servFrequenciesMN-NR SEQUENCE (SIZE (1.. maxNrofServingCells-1)) OF ARFCN-ValueNR OPTIONAL,
nonCriticalExtension CG-ConfigInfo-v1610-IEs OPTIONAL
}
CG-ConfigInfo-v1610-IEs ::= SEQUENCE {
drx-InfoMCG2 DRX-Info2 OPTIONAL,
alignedDRX-Indication ENUMERATED {true} OPTIONAL,
drx-InfoMCG2 DRX-Info2 OPTIONAL,
alignedDRX-Indication ENUMERATED {true} OPTIONAL,
scgFailureInfo-r16 SEQUENCE {
failureType-r16 ENUMERATED { scg-lbtFailure-r16, beamFailureRecoveryFailure-r16,
t312-Expiry-r16, bh-RLF-r16,
spare4, spare3, spare2, spare1},
measResultSCG-r16 OCTET STRING (CONTAINING MeasResultSCG-Failure)
} OPTIONAL,
} OPTIONAL,
scgFailureInfoEUTRA-r16 SEQUENCE {
failureTypeEUTRA-r16 ENUMERATED { scg-lbtFailure-r16, beamFailureRecoveryFailure-r16,
t312-Expiry-r16, bh-RLF-r16,
spare4, spare3, spare2, spare1},
measResultSCG-EUTRA-r16 OCTET STRING
} OPTIONAL,
sidelinkUEInformationNR-r16 OCTET STRING (CONTAINING SidelinkUEInformationNR-r16) OPTIONAL,
sidelinkUEInformationEUTRA-r16 OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
} OPTIONAL,
sidelinkUEInformationNR-r16 OCTET STRING (CONTAINING SidelinkUEInformationNR-r16) OPTIONAL,
sidelinkUEInformationEUTRA-r16 OCTET STRING OPTIONAL,
nonCriticalExtension CG-ConfigInfo-v1620-IEs OPTIONAL
}
CG-ConfigInfo-v1620-IEs ::= SEQUENCE {
ueAssistanceInformationSourceSCG-r16 OCTET STRING (CONTAINING UEAssistanceInformation) OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
SFTD-FrequencyList-NR ::= SEQUENCE (SIZE (1..maxCellSFTD)) OF ARFCN-ValueNR
SFTD-FrequencyList-EUTRA ::= SEQUENCE (SIZE (1..maxCellSFTD)) OF ARFCN-ValueEUTRA
ConfigRestrictInfoSCG ::= SEQUENCE {
allowedBC-ListMRDC BandCombinationInfoList OPTIONAL,
allowedBC-ListMRDC BandCombinationInfoList OPTIONAL,
powerCoordination-FR1 SEQUENCE {
p-maxNR-FR1 P-Max OPTIONAL,
p-maxEUTRA P-Max OPTIONAL,
p-maxUE-FR1 P-Max OPTIONAL
} OPTIONAL,
p-maxNR-FR1 P-Max OPTIONAL,
p-maxEUTRA P-Max OPTIONAL,
p-maxUE-FR1 P-Max OPTIONAL
} OPTIONAL,
servCellIndexRangeSCG SEQUENCE {
lowBound ServCellIndex,
upBound ServCellIndex
} OPTIONAL, -- Cond SN-AddMod
maxMeasFreqsSCG INTEGER(1..maxMeasFreqsMN) OPTIONAL,
dummy INTEGER(1..maxMeasIdentitiesMN) OPTIONAL,
} OPTIONAL, -- Cond SN-AddMod
maxMeasFreqsSCG INTEGER(1..maxMeasFreqsMN) OPTIONAL,
dummy INTEGER(1..maxMeasIdentitiesMN) OPTIONAL,
...,
[[
selectedBandEntriesMNList SEQUENCE (SIZE (1..maxBandComb)) OF SelectedBandEntriesMN OPTIONAL,
pdcch-BlindDetectionSCG INTEGER (1..15) OPTIONAL,
maxNumberROHC-ContextSessionsSN INTEGER(0.. 16384) OPTIONAL
selectedBandEntriesMNList SEQUENCE (SIZE (1..maxBandComb)) OF SelectedBandEntriesMN OPTIONAL,
pdcch-BlindDetectionSCG INTEGER (1..15) OPTIONAL,
maxNumberROHC-ContextSessionsSN INTEGER(0.. 16384) OPTIONAL
]],
[[
maxIntraFreqMeasIdentitiesSCG INTEGER(1..maxMeasIdentitiesMN) OPTIONAL,
maxInterFreqMeasIdentitiesSCG INTEGER(1..maxMeasIdentitiesMN) OPTIONAL
maxIntraFreqMeasIdentitiesSCG INTEGER(1..maxMeasIdentitiesMN) OPTIONAL,
maxInterFreqMeasIdentitiesSCG INTEGER(1..maxMeasIdentitiesMN) OPTIONAL
]],
[[
p-maxNR-FR1-MCG-r16 P-Max OPTIONAL,
p-maxNR-FR1-MCG-r16 P-Max OPTIONAL,
powerCoordination-FR2-r16 SEQUENCE {
p-maxNR-FR2-MCG-r16 P-Max OPTIONAL,
p-maxNR-FR2-SCG-r16 P-Max OPTIONAL,
p-maxUE-FR2-r16 P-Max OPTIONAL
} OPTIONAL,
nrdc-PC-mode-FR1-r16 ENUMERATED {semi-static-mode1, semi-static-mode2, dynamic} OPTIONAL,
nrdc-PC-mode-FR2-r16 ENUMERATED {semi-static-mode1, semi-static-mode2, dynamic} OPTIONAL,
maxMeasSRS-ResourceSCG-r16 INTEGER(0..maxNrofCLI-SRS-Resources-r16) OPTIONAL,
maxMeasCLI-ResourceSCG-r16 INTEGER(0..maxNrofCLI-RSSI-Resources-r16) OPTIONAL,
maxNumberEHC-ContextsSN-r16 INTEGER(0..65536) OPTIONAL,
allowedReducedConfigForOverheating-r16 OverheatingAssistance OPTIONAL
p-maxNR-FR2-MCG-r16 P-Max OPTIONAL,
p-maxNR-FR2-SCG-r16 P-Max OPTIONAL,
p-maxUE-FR2-r16 P-Max OPTIONAL
} OPTIONAL,
nrdc-PC-mode-FR1-r16 ENUMERATED {semi-static-mode1, semi-static-mode2, dynamic} OPTIONAL,
nrdc-PC-mode-FR2-r16 ENUMERATED {semi-static-mode1, semi-static-mode2, dynamic} OPTIONAL,
maxMeasSRS-ResourceSCG-r16 INTEGER(0..maxNrofCLI-SRS-Resources-r16) OPTIONAL,
maxMeasCLI-ResourceSCG-r16 INTEGER(0..maxNrofCLI-RSSI-Resources-r16) OPTIONAL,
maxNumberEHC-ContextsSN-r16 INTEGER(0..65536) OPTIONAL,
allowedReducedConfigForOverheating-r16 OverheatingAssistance OPTIONAL,
maxToffset-r16 T-Offset-r16 OPTIONAL
]]
}
@ -441,7 +456,7 @@ PH-TypeListMCG ::= SEQUENCE (SIZE (1..maxNrofServingCells)) OF PH-I
PH-InfoMCG ::= SEQUENCE {
servCellIndex ServCellIndex,
ph-Uplink PH-UplinkCarrierMCG,
ph-SupplementaryUplink PH-UplinkCarrierMCG OPTIONAL,
ph-SupplementaryUplink PH-UplinkCarrierMCG OPTIONAL,
...
}
@ -506,7 +521,8 @@ MeasConfigMN ::= SEQUENCE {
measGapConfig CHOICE {release NULL, setup GapConfig } OPTIONAL,
gapPurpose ENUMERATED {perUE, perFR1} OPTIONAL,
...,
[[ measGapConfigFR2 CHOICE {release NULL, setup GapConfig } OPTIONAL
[[
measGapConfigFR2 CHOICE {release NULL, setup GapConfig } OPTIONAL
]]
}
@ -555,8 +571,8 @@ MeasurementTimingConfiguration ::= SEQUENCE {
}
MeasurementTimingConfiguration-IEs ::= SEQUENCE {
measTiming MeasTimingList OPTIONAL,
nonCriticalExtension MeasurementTimingConfiguration-v1550-IEs OPTIONAL
measTiming MeasTimingList OPTIONAL,
nonCriticalExtension MeasurementTimingConfiguration-v1550-IEs OPTIONAL
}
MeasurementTimingConfiguration-v1550-IEs ::= SEQUENCE {
@ -571,7 +587,7 @@ MeasurementTimingConfiguration-v1610-IEs ::= SEQUENCE {
csi-RS-CellMobility-r16 CSI-RS-CellMobility,
refSSBFreq-r16 ARFCN-ValueNR
},
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension SEQUENCE {} OPTIONAL
}
MeasTimingList ::= SEQUENCE (SIZE (1..maxMeasFreqsMN)) OF MeasTiming
@ -581,12 +597,12 @@ MeasTiming ::= SEQUENCE {
carrierFreq ARFCN-ValueNR,
ssbSubcarrierSpacing SubcarrierSpacing,
ssb-MeasurementTimingConfiguration SSB-MTC,
ss-RSSI-Measurement SS-RSSI-Measurement OPTIONAL
} OPTIONAL,
...,
[[
ssb-ToMeasure SSB-ToMeasure OPTIONAL,
physCellId PhysCellId OPTIONAL
ss-RSSI-Measurement SS-RSSI-Measurement OPTIONAL
} OPTIONAL,
...,
[[
ssb-ToMeasure SSB-ToMeasure OPTIONAL,
physCellId PhysCellId OPTIONAL
]]
}

1979
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-Preconf.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V16.1.0 (2020-07)
-- 3GPP TS 38.331 V16.2.0 (2020-09)
NR-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V16.1.0 (2020-07)
-- 3GPP TS 38.331 V16.2.0 (2020-09)
NR-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
@ -95,7 +95,7 @@ VarLogMeasConfig-r16-IEs ::= SEQUENCE {
-- TAG-VARLOGMEAREPORT-START
VarLogMeasReport-r16 ::= SEQUENCE {
absoluteTimeStamp-r16 AbsoluteTimeInfo-r16,
absoluteTimeInfo-r16 AbsoluteTimeInfo-r16,
traceReference-r16 TraceReference-r16,
traceRecordingSessionRef-r16 OCTET STRING (SIZE (2)),
tce-Id-r16 OCTET STRING (SIZE (1)),
@ -115,7 +115,6 @@ VarMeasConfig ::= SEQUENCE {
reportConfigList ReportConfigToAddModList OPTIONAL,
-- Other parameters
quantityConfig QuantityConfig OPTIONAL,
s-MeasureConfig CHOICE {
ssb-RSRP RSRP-Range,
csi-RSRP RSRP-Range
@ -144,7 +143,7 @@ VarMeasIdleConfig-r16 ::= SEQUENCE {
measIdleCarrierListNR-r16 SEQUENCE (SIZE (1..maxFreqIdle-r16)) OF MeasIdleCarrierNR-r16 OPTIONAL,
measIdleCarrierListEUTRA-r16 SEQUENCE (SIZE (1..maxFreqIdle-r16)) OF MeasIdleCarrierEUTRA-r16 OPTIONAL,
measIdleDuration-r16 ENUMERATED {sec10, sec30, sec60, sec120, sec180, sec240, sec300, spare},
validityAreaList-r16 ValidityAreaList-r16 OPTIONAL
validityAreaList-r16 ValidityAreaList-r16 OPTIONAL
}
-- TAG-VARMEASIDLECONFIG-STOP
@ -166,7 +165,7 @@ 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
}
CellsTriggeredList ::= SEQUENCE (SIZE (1..maxNrofCellMeas)) OF CHOICE {
@ -233,7 +232,7 @@ VarResumeMAC-Input ::= SEQUENCE {
VarRLF-Report-r16 ::= SEQUENCE {
rlf-Report-r16 RLF-Report-r16,
plmn-IdentityList-r16 PLMN-IdentityList-r16
plmn-IdentityList-r16 PLMN-IdentityList2-r16
}
-- TAG-VARRLF-REPORT-STOP

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

@ -1,4 +1,4 @@
-- 3GPP TS 38.331 V16.1.0 (2020-07)
-- 3GPP TS 38.331 V16.2.0 (2020-09)
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -17,7 +17,11 @@ IMPORTS
SL-MeasConfig-r16,
SL-MeasId-r16,
FreqBandList,
SupportedBandCombinationListSidelink-r16
FreqBandIndicatorNR,
maxSimultaneousBands,
maxBandComb,
maxBands,
BandParametersSidelink-r16
FROM NR-RRC-Definitions;
@ -133,29 +137,30 @@ SLRB-Config-r16::= SEQUENCE {
SLRB-PC5-ConfigIndex-r16 ::= INTEGER (1..maxNrofSLRB-r16)
SL-SDAP-ConfigPC5-r16 ::= SEQUENCE {
sl-MappedQoS-FlowsToAddList-r16 SEQUENCE (SIZE (1.. maxNrofSL-QFIsPerDest-r16)) OF SL-PFI-r16 OPTIONAL, -- Need N
sl-MappedQoS-FlowsToReleaseList-r16 SEQUENCE (SIZE (1.. maxNrofSL-QFIsPerDest-r16)) OF SL-PFI-r16 OPTIONAL, -- Need N
sl-MappedQoS-FlowsToAddList-r16 SEQUENCE (SIZE (1.. maxNrofSL-QFIsPerDest-r16)) OF SL-PQFI-r16 OPTIONAL, -- Need N
sl-MappedQoS-FlowsToReleaseList-r16 SEQUENCE (SIZE (1.. maxNrofSL-QFIsPerDest-r16)) OF SL-PQFI-r16 OPTIONAL, -- Need N
sl-SDAP-Header-r16 ENUMERATED {present, absent},
...
}
SL-PDCP-ConfigPC5-r16 ::= SEQUENCE {
sl-PDCP-SN-Size-r16 ENUMERATED {len12bits, len18bits} OPTIONAL, -- Need M
sl-OutOfOrderDelivery ENUMERATED { true } OPTIONAL, -- Need R
sl-OutOfOrderDelivery-r16 ENUMERATED { true } OPTIONAL, -- Need R
...
}
SL-RLC-ConfigPC5-r16 ::= CHOICE {
sl-AM-RLC-r16 SEQUENCE {
sl-SN-FieldLengthAM-r16 SN-FieldLengthAM OPTIONAL, -- Need M
...
...
},
sl-UM-Bi-Directional-RLC-r16 SEQUENCE {
sl-SN-FieldLengthUM-r16 SN-FieldLengthUM OPTIONAL, -- Need M
...
...
},
sl-UM-Uni-Directional-RLC-r16 SEQUENCE {
sl-SN-FieldLengthUM-r16 SN-FieldLengthUM OPTIONAL, -- Need M
...
...
}
}
@ -164,7 +169,7 @@ SL-LogicalChannelConfigPC5-r16 ::= SEQUENCE {
...
}
SL-PFI-r16 ::= INTEGER (1..64)
SL-PQFI-r16 ::= INTEGER (1..64)
SL-CSI-RS-Config-r16 ::= SEQUENCE {
sl-CSI-RS-FreqAllocation-r16 CHOICE {
@ -219,8 +224,8 @@ UECapabilityEnquirySidelink ::= SEQUENCE {
}
UECapabilityEnquirySidelink-IEs-r16 ::= SEQUENCE {
ueCapabilityRequestFilterSidelink-r16 UE-CapabilityRequestFilterSidelink-r16 OPTIONAL, -- Need N
ue-CapabilityInformationSidelink-r16 OCTET STRING OPTIONAL,
frequencyBandListFilterSidelink-r16 FreqBandList OPTIONAL, -- Need N
ue-CapabilityInformationSidelink-r16 OCTET STRING OPTIONAL,
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE{} OPTIONAL
}
@ -239,9 +244,12 @@ UECapabilityInformationSidelink ::= SEQUENCE {
UECapabilityInformationSidelink-IEs-r16 ::= SEQUENCE {
accessStratumReleaseSidelink-r16 AccessStratumReleaseSidelink-r16,
pdcp-ParametersSidelink-r16 PDCP-ParametersSidelink-r16 OPTIONAL,
-- WS modification: rename to avoid conflict with NR-RRC-DEfintions.asn
-- WS modification: rename to avoid conflict with NR-RRC-Definitions.asn
rlc-ParametersSidelink-r16 PC5-RLC-ParametersSidelink-r16 OPTIONAL,
supportedBandCombinationListSidelink-r16 SupportedBandCombinationListSidelink-r16 OPTIONAL,
supportedBandCombinationListSidelinkNR-r16 BandCombinationListSidelinkNR-r16 OPTIONAL,
-- WS modification: rename to avoid conflict with NR-RRC-Definitions.asn
supportedBandListSidelink-r16 SEQUENCE (SIZE (1..maxBands)) OF PC5-BandSidelink-r16 OPTIONAL,
appliedFreqBandListFilter-r16 FreqBandList OPTIONAL,
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE{} OPTIONAL
}
@ -253,21 +261,44 @@ PDCP-ParametersSidelink-r16 ::= SEQUENCE {
...
}
-- WS modification: rename to avoid conflict with NR-RRC-DEfintions.asn
-- WS modification: rename to avoid conflict with NR-RRC-Definitions.asn
PC5-RLC-ParametersSidelink-r16 ::= SEQUENCE {
am-WithLongSN-Sidelink-r16 ENUMERATED {supported} OPTIONAL,
um-WithLongSN-Sidelink-r16 ENUMERATED {supported} OPTIONAL,
...
}
-- TAG-UECAPABILITYINFORMATIONSIDELINK-STOP
-- TAG-UE-CAPABILITYREQUESTFILTERSIDELINK-START
BandCombinationListSidelinkNR-r16 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombinationParametersSidelinkNR-r16
UE-CapabilityRequestFilterSidelink-r16 ::= SEQUENCE {
frequencyBandListFilterSidelink-r16 FreqBandList OPTIONAL, -- Need N
nonCriticalExtension SEQUENCE {} OPTIONAL
BandCombinationParametersSidelinkNR-r16 ::= SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParametersSidelink-r16
-- WS modification: rename to avoid conflict with NR-RRC-Definitions.asn
PC5-BandSidelink-r16 ::= SEQUENCE {
freqBandSidelink-r16 FreqBandIndicatorNR,
--15-1
sl-Reception-r16 SEQUENCE {
harq-RxProcessSidelink-r16 ENUMERATED {n16, n24, n32, n64},
pscch-RxSidelink-r16 ENUMERATED {value1, value2},
scs-CP-PatternRxSidelink-r16 CHOICE {
fr1-r16 SEQUENCE {
scs-15kHz-r16 BIT STRING (SIZE (16)) OPTIONAL,
scs-30kHz-r16 BIT STRING (SIZE (16)) OPTIONAL,
scs-60kHz-r16 BIT STRING (SIZE (16)) OPTIONAL
},
fr2-r16 SEQUENCE {
scs-60kHz-r16 BIT STRING (SIZE (16)) OPTIONAL,
scs-120kHz-r16 BIT STRING (SIZE (16)) OPTIONAL
}
} OPTIONAL,
extendedCP-RxSidelink-r16 ENUMERATED {supported} OPTIONAL
} OPTIONAL,
--15-10
sl-Tx-256QAM-r16 ENUMERATED {supported} OPTIONAL,
--15-12
lowSE-64QAM-MCS-TableSidelink-r16 ENUMERATED {supported} OPTIONAL,
...
}
-- TAG-UE-CAPABILITYREQUESTFILTERSIDELINK-STOP
-- TAG-UECAPABILITYINFORMATIONSIDELINK-STOP
END

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

@ -190,7 +190,6 @@ VisitedCellInfoList-r16
CellsTriggeredList
CLI-RSSI-TriggeredList-r16
CLI-TriggeredList-r16
MeasResultLogging2NR-r16
PLMN-IdentityList-r16
SIB12-IEs-r16
SidelinkPreconfigNR-r16
@ -982,7 +981,10 @@ SIB9/timeInfo/leapSeconds DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_secon
SIB9/timeInfo/localTimeOffset DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_localTimeOffset_fmt)
#.TYPE_ATTR
CLI-RSSI-Range-r16 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_CLI_RSSI_Range_r16_fmt)
CLI-RSSI-Range-r16 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_RSSI_Range_r16_fmt)
#.TYPE_ATTR
RSSI-Range-r16 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_RSSI_Range_r16_fmt)
#.FN_BODY CommonLocationInfo-r16/locationTimestamp-r16 VAL_PTR = &location_timestamp_tvb
tvbuff_t *location_timestamp_tvb = NULL;
@ -1191,24 +1193,6 @@ SRS-RSRP-Range-r16 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_SRS_RSRP_r16_fmt)
#.TYPE_ATTR
T-Reselection DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.FN_BODY SupportedBandCombinationListSidelinkEUTRA-r16/bandCombinationListEUTRA1-r16 VAL_PTR = &band_comb_list_tvb
tvbuff_t *band_comb_list_tvb = NULL;
%(DEFAULT_BODY)s
if (band_comb_list_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_bandCombinationListEUTRA1_r16);
dissect_lte_rrc_V2X_SupportedBandCombination_r14_PDU(band_comb_list_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY SupportedBandCombinationListSidelinkEUTRA-r16/bandCombinationListEUTRA2-r16 VAL_PTR = &band_comb_list_tvb
tvbuff_t *band_comb_list_tvb = NULL;
%(DEFAULT_BODY)s
if (band_comb_list_tvb) {
proto_tree *subtree;
subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_bandCombinationListEUTRA2_r16);
dissect_lte_rrc_V2X_SupportedBandCombination_v1530_PDU(band_comb_list_tvb, actx->pinfo, subtree, NULL);
}
#.FN_BODY BandParametersSidelinkEUTRA-NR-r16/eutra/bandParametersSidelinkEUTRA1-r16 VAL_PTR = &band_params_sl_tvb
tvbuff_t *band_params_sl_tvb = NULL;
%(DEFAULT_BODY)s

14
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 V15.9.0 Release 15) packet dissection
* (3GPP TS 38.331 V16.2.0 Release 16) packet dissection
* Copyright 2018-2020, Pascal Quantin
*
* Wireshark - Network traffic analyzer
@ -140,8 +140,6 @@ static gint ett_nr_rrc_locationSource_r16 = -1;
static gint ett_nr_rrc_velocityEstimate_r16 = -1;
static gint ett_nr_rrc_sensor_MeasurementInformation_r16 = -1;
static gint ett_nr_rrc_sensor_MotionInformation_r16 = -1;
static gint ett_nr_rrc_bandCombinationListEUTRA1_r16 = -1;
static gint ett_nr_rrc_bandCombinationListEUTRA2_r16 = -1;
static gint ett_nr_rrc_bandParametersSidelinkEUTRA1_r16 = -1;
static gint ett_nr_rrc_bandParametersSidelinkEUTRA2_r16 = -1;
static gint ett_nr_rrc_sl_ParametersEUTRA1_r16 = -1;
@ -418,14 +416,14 @@ nr_rrc_timeConnFailure_r16_fmt(gchar *s, guint32 v)
}
static void
nr_rrc_CLI_RSSI_Range_r16_fmt(gchar *s, guint32 v)
nr_rrc_RSSI_Range_r16_fmt(gchar *s, guint32 v)
{
if (v == 0) {
g_snprintf(s, ITEM_LABEL_LENGTH, "CLI-RSSI < -100dBm (0)");
g_snprintf(s, ITEM_LABEL_LENGTH, "RSSI < -100dBm (0)");
} else if (v < 76) {
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= CLI-RSSI < %ddBm (%u)", v-101, v-100, v);
g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm <= RSSI < %ddBm (%u)", v-101, v-100, v);
} else {
g_snprintf(s, ITEM_LABEL_LENGTH, "-25dBm <= CLI-RSSI (76)");
g_snprintf(s, ITEM_LABEL_LENGTH, "-25dBm <= RSSI (76)");
}
}
@ -722,8 +720,6 @@ proto_register_nr_rrc(void) {
&ett_nr_rrc_velocityEstimate_r16,
&ett_nr_rrc_sensor_MeasurementInformation_r16,
&ett_nr_rrc_sensor_MotionInformation_r16,
&ett_nr_rrc_bandCombinationListEUTRA1_r16,
&ett_nr_rrc_bandCombinationListEUTRA2_r16,
&ett_nr_rrc_bandParametersSidelinkEUTRA1_r16,
&ett_nr_rrc_bandParametersSidelinkEUTRA2_r16,
&ett_nr_rrc_sl_ParametersEUTRA1_r16,

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

@ -363,8 +363,6 @@ static int hf_lte_rrc_lte_rrc_V2X_BandParameters_v1530_PDU = -1; /* V2X_BandPar
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 */
@ -126111,26 +126109,6 @@ int dissect_lte_rrc_SL_Parameters_v1540_PDU(tvbuff_t *tvb _U_, packet_info *pinf
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);
@ -127200,14 +127178,6 @@ void proto_register_lte_rrc(void) {
{ "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,

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

@ -54,8 +54,6 @@ int dissect_lte_rrc_V2X_BandParameters_v1530_PDU(tvbuff_t *tvb _U_, packet_info
int dissect_lte_rrc_SL_Parameters_v1430_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_SL_Parameters_v1530_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_SL_Parameters_v1540_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_V2X_SupportedBandCombination_r14_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_V2X_SupportedBandCombination_v1530_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_VisitedCellInfoList_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_VisitedCellInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
int dissect_lte_rrc_HandoverPreparationInformation_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);

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

File diff suppressed because it is too large Load Diff