forked from osmocom/wireshark
LTE RRC: upgrade dissector to v15.4.0
Change-Id: I90b3a5afe782992eac98b37336cc9267ba73dbc0 Reviewed-on: https://code.wireshark.org/review/31595 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin
parent
10ef540405
commit
94daef786a
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.3.0 (2018-09)
|
||||
-- 3GPP TS 36.331 V15.4.0 (2018-12)
|
||||
--
|
||||
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -43,6 +43,8 @@ IMPORTS
|
|||
SL-CommConfig-r12,
|
||||
SL-DiscConfig-r12,
|
||||
RadioResourceConfigDedicated,
|
||||
RadioResourceConfigDedicated-v13c0,
|
||||
RadioResourceConfigDedicated-v1370,
|
||||
RAN-NotificationAreaInfo-r15,
|
||||
RCLWI-Configuration-r13,
|
||||
RSRP-Range,
|
||||
|
|
@ -50,8 +52,11 @@ IMPORTS
|
|||
RSRQ-Range-v1250,
|
||||
RS-SINR-Range-r13,
|
||||
SCellToAddModList-r10,
|
||||
SCellToAddModList-v13c0,
|
||||
SCellToAddModListExt-r13,
|
||||
SCellToAddModListExt-v13c0,
|
||||
SCG-ConfigPartSCG-r12,
|
||||
SCG-ConfigPartSCG-v13c0,
|
||||
SecurityAlgorithmConfig,
|
||||
SCellIndex-r10,
|
||||
SCellIndex-r13,
|
||||
|
|
@ -134,8 +139,19 @@ HandoverPreparationInformation-v9j0-IEs ::= SEQUENCE {
|
|||
|
||||
HandoverPreparationInformation-v10j0-IEs ::= SEQUENCE {
|
||||
as-Config-v10j0 AS-Config-v10j0 OPTIONAL,
|
||||
-- Following field is only for late non-critical extensions from REL-10
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
nonCriticalExtension HandoverPreparationInformation-v10x0-IEs OPTIONAL
|
||||
}
|
||||
|
||||
HandoverPreparationInformation-v10x0-IEs ::= SEQUENCE {
|
||||
-- Following field is only for late non-critical extensions from REL-10 to REL-12
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
nonCriticalExtension HandoverPreparationInformation-v13c0-IEs OPTIONAL
|
||||
}
|
||||
|
||||
HandoverPreparationInformation-v13c0-IEs ::= SEQUENCE {
|
||||
as-Config-v13c0 AS-Config-v13c0 OPTIONAL,
|
||||
-- Following field is only for late non-critical extensions from REL-13
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
-- Regular non-critical extensions:
|
||||
|
|
@ -164,12 +180,17 @@ HandoverPreparationInformation-v1320-IEs ::= SEQUENCE {
|
|||
HandoverPreparationInformation-v1430-IEs ::= SEQUENCE {
|
||||
as-Config-v1430 AS-Config-v1430 OPTIONAL, -- Cond HO2
|
||||
makeBeforeBreakReq-r14 ENUMERATED {true} OPTIONAL, -- Cond HO2
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
nonCriticalExtension HandoverPreparationInformation-v1530-IEs OPTIONAL
|
||||
}
|
||||
|
||||
HandoverPreparationInformation-v1530-IEs ::= SEQUENCE {
|
||||
ran-NotificationAreaInfo-r15 RAN-NotificationAreaInfo-r15 OPTIONAL,
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
nonCriticalExtension HandoverPreparationInformation-v1540-IEs OPTIONAL
|
||||
}
|
||||
|
||||
HandoverPreparationInformation-v1540-IEs ::= SEQUENCE {
|
||||
sourceRB-ConfigIntra5GC-r15 OCTET STRING OPTIONAL, --Cond HO4
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -187,6 +208,19 @@ SCG-Config-r12 ::= SEQUENCE {
|
|||
|
||||
SCG-Config-r12-IEs ::= SEQUENCE {
|
||||
scg-RadioConfig-r12 SCG-ConfigPartSCG-r12 OPTIONAL,
|
||||
nonCriticalExtension SCG-Config-v12x0-IEs OPTIONAL
|
||||
}
|
||||
|
||||
SCG-Config-v12x0-IEs ::= SEQUENCE {
|
||||
-- Following field is only for late non-critical extensions from REL-12
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
nonCriticalExtension SCG-Config-v13c0-IEs OPTIONAL
|
||||
}
|
||||
|
||||
SCG-Config-v13c0-IEs ::= SEQUENCE {
|
||||
scg-RadioConfig-v13c0 SCG-ConfigPartSCG-v13c0 OPTIONAL,
|
||||
|
||||
-- Following field is only for late non-critical extensions from REL-13 onwards
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
||||
|
|
@ -417,6 +451,13 @@ AS-Config-v1320 ::= SEQUENCE {
|
|||
sourceRCLWI-Configuration-r13 RCLWI-Configuration-r13 OPTIONAL
|
||||
}
|
||||
|
||||
AS-Config-v13c0 ::= SEQUENCE {
|
||||
radioResourceConfigDedicated-v13c01 RadioResourceConfigDedicated-v1370 OPTIONAL,
|
||||
radioResourceConfigDedicated-v13c02 RadioResourceConfigDedicated-v13c0 OPTIONAL,
|
||||
sCellToAddModList-v13c0 SCellToAddModList-v13c0 OPTIONAL,
|
||||
sCellToAddModListExt-v13c0 SCellToAddModListExt-v13c0 OPTIONAL
|
||||
}
|
||||
|
||||
AS-Config-v1430 ::= SEQUENCE {
|
||||
sourceSL-V2X-CommConfig-r14 SL-V2X-ConfigDedicated-r14 OPTIONAL,
|
||||
sourceLWA-Config-r14 LWA-Config-r13 OPTIONAL,
|
||||
|
|
@ -446,6 +487,8 @@ AS-Context-v1130 ::= SEQUENCE {
|
|||
SidelinkUEInformation-r12) OPTIONAL -- Cond HO2
|
||||
]],
|
||||
[[ sourceContextEN-DC-r15 OCTET STRING OPTIONAL -- Cond HO2
|
||||
]],
|
||||
[[ selectedbandCombinationInfoEN-DC-v1540 OCTET STRING OPTIONAL -- Cond HO2
|
||||
]]
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.3.0 (2018-09)
|
||||
-- 3GPP TS 36.331 V15.4.0 (2018-12)
|
||||
--
|
||||
EUTRA-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -24,6 +24,7 @@ IMPORTS
|
|||
maxSL-V2X-TxConfig2-r14,
|
||||
maxSL-V2X-TxConfig2-1-r14,
|
||||
maxSL-V2X-TxPoolPreconf-r14,
|
||||
MCS-PSSCH-Range-r15,
|
||||
P-Max,
|
||||
ReselectionInfoRelay-r13,
|
||||
SL-AnchorCarrierFreqList-V2X-r14,
|
||||
|
|
@ -168,7 +169,6 @@ SL-V2X-Preconfiguration-r14 ::= SEQUENCE {
|
|||
slss-TxMultiFreq-r15 ENUMERATED {true} OPTIONAL,
|
||||
v2x-TxProfileList-r15 SL-V2X-TxProfileList-r15 OPTIONAL
|
||||
]]
|
||||
|
||||
}
|
||||
|
||||
SL-CBR-PreconfigTxConfigList-r14 ::= SEQUENCE {
|
||||
|
|
@ -217,7 +217,7 @@ SL-V2X-PreconfigCommPool-r14 ::= SEQUENCE {
|
|||
cbr-pssch-TxConfigList-r14 SL-CBR-PPPP-TxPreconfigList-r14 OPTIONAL,
|
||||
resourceSelectionConfigP2X-r14 SL-P2X-ResourceSelectionConfig-r14 OPTIONAL,
|
||||
syncAllowed-r14 SL-SyncAllowed-r14 OPTIONAL,
|
||||
restrictResourceReservationPeriod-r14 SL-RestrictResourceReservationPeriodList-r14 OPTIONAL, -- Need OR
|
||||
restrictResourceReservationPeriod-r14 SL-RestrictResourceReservationPeriodList-r14 OPTIONAL,
|
||||
...,
|
||||
[[ sl-MinT2ValueList-r15 SL-MinT2ValueList-r15 OPTIONAL,
|
||||
cbr-pssch-TxConfigList-v1530 SL-CBR-PPPP-TxPreconfigList-v1530 OPTIONAL
|
||||
|
|
@ -256,15 +256,9 @@ Tx-PreconfigIndex-r14 ::= INTEGER(0..maxSL-V2X-TxConfig2-1-r14)
|
|||
SL-CBR-PPPP-TxPreconfigList-v1530 ::= SEQUENCE (SIZE (1..8)) OF SL-PPPP-TxPreconfigIndex-v1530
|
||||
|
||||
SL-PPPP-TxPreconfigIndex-v1530 ::= SEQUENCE {
|
||||
mcs-PSSCH-Range-r15 SEQUENCE (SIZE (1..maxCBR-Level-r14)) OF MCS-PSSCH-Range-r15 OPTIONAL --Need OR
|
||||
mcs-PSSCH-Range-r15 SEQUENCE (SIZE (1..maxCBR-Level-r14)) OF MCS-PSSCH-Range-r15 OPTIONAL
|
||||
}
|
||||
|
||||
-- WS modification: already defined in EUTRA-RRC-Definitions.asn
|
||||
-- MCS-PSSCH-Range-r15 ::= SEQUENCE{
|
||||
-- minMCS-PSSCH-r15 INTEGER (0..31),
|
||||
-- maxMCS-PSSCH-r15 INTEGER (0..31)
|
||||
-- }
|
||||
|
||||
SL-V2X-TxProfileList-r15 ::= SEQUENCE (SIZE (1..256)) OF SL-V2X-TxProfile-r15
|
||||
|
||||
SL-V2X-TxProfile-r15 ::= ENUMERATED {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.3.0 (2018-09)
|
||||
-- 3GPP TS 36.331 V15.4.0 (2018-12)
|
||||
--
|
||||
EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -204,8 +204,8 @@ SSB-IndexList-r15::= SEQUENCE (SIZE (1..maxRS-Index-r15)) OF RS-IndexNR-r15
|
|||
VarMobilityHistoryReport-r12 ::= VisitedCellInfoList-r12
|
||||
|
||||
|
||||
VarPendingRnaProcedure-r15 ::= SEQUENCE {
|
||||
pendingRnaProcedure BOOLEAN OPTIONAL
|
||||
VarPendingRnaUpdate-r15 ::= SEQUENCE {
|
||||
pendingRnaUpdate BOOLEAN OPTIONAL
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.3.0 (2018-09)
|
||||
-- 3GPP TS 36.331 V15.4.0 (2018-12)
|
||||
--
|
||||
NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.3.0 (2018-09)
|
||||
-- 3GPP TS 36.331 V15.4.0 (2018-12)
|
||||
--
|
||||
NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -719,8 +719,8 @@ SystemInformationBlockType1-NB ::= SEQUENCE {
|
|||
dB6, dB7, dB8,
|
||||
dB9} OPTIONAL, -- Cond inband-SamePCI
|
||||
schedulingInfoList-r13 SchedulingInfoList-NB-r13,
|
||||
si-WindowLength-r13 ENUMERATED {ms160, ms320, ms480, ms640,
|
||||
ms960, ms1280, ms1600, spare1},
|
||||
si-WindowLength-r13 ENUMERATED {ms160, ms320, ms480, ms640,
|
||||
ms960, ms1280, ms1600, spare1},
|
||||
si-RadioFrameOffset-r13 INTEGER (1..15) OPTIONAL, -- Need OP
|
||||
systemInfoValueTagList-r13 SystemInfoValueTagList-NB-r13 OPTIONAL, -- Need OR
|
||||
lateNonCriticalExtension OCTET STRING OPTIONAL,
|
||||
|
|
@ -1160,41 +1160,6 @@ UL-ConfigCommonTDD-NB-r15 ::= SEQUENCE {
|
|||
...
|
||||
}
|
||||
|
||||
NPRACH-ParametersList-NB-r14 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF
|
||||
NPRACH-Parameters-NB-r14
|
||||
|
||||
|
||||
NPRACH-Parameters-NB-r14 ::= SEQUENCE {
|
||||
nprach-Parameters-r14 SEQUENCE {
|
||||
nprach-Periodicity-r14 ENUMERATED {ms40, ms80, ms160, ms240,
|
||||
ms320, ms640, ms1280, ms2560}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-StartTime-r14 ENUMERATED {ms8, ms16, ms32, ms64,
|
||||
ms128, ms256, ms512, ms1024}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-SubcarrierOffset-r14 ENUMERATED {n0, n12, n24, n36, n2, n18, n34, spare1}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-NumSubcarriers-r14 ENUMERATED {n12, n24, n36, n48}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-SubcarrierMSG3-RangeStart-r14 ENUMERATED {zero, oneThird, twoThird, one}
|
||||
OPTIONAL, -- NEED OP
|
||||
npdcch-NumRepetitions-RA-r14 ENUMERATED {r1, r2, r4, r8, r16, r32, r64, r128,
|
||||
r256, r512, r1024, r2048,
|
||||
spare4, spare3, spare2, spare1}
|
||||
OPTIONAL, -- NEED OP
|
||||
npdcch-StartSF-CSS-RA-r14 ENUMERATED {v1dot5, v2, v4, v8, v16, v32, v48, v64}
|
||||
OPTIONAL, -- NEED OP
|
||||
npdcch-Offset-RA-r14 ENUMERATED {zero, oneEighth, oneFourth, threeEighth}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-NumCBRA-StartSubcarriers-r14 ENUMERATED {n8, n10, n11, n12, n20, n22, n23, n24,
|
||||
n32, n34, n35, n36, n40, n44, n46, n48}
|
||||
OPTIONAL, -- NEED OP
|
||||
npdcch-CarrierIndex-r14 INTEGER (1..maxNonAnchorCarriers-NB-r14)
|
||||
OPTIONAL, -- Need OP
|
||||
...
|
||||
} OPTIONAL -- Need OR
|
||||
}
|
||||
|
||||
NPRACH-ProbabilityAnchorList-NB-r14 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF
|
||||
NPRACH-ProbabilityAnchor-NB-r14
|
||||
|
||||
|
|
@ -1316,7 +1281,7 @@ DL-CarrierConfigCommon-NB-r14 ::= SEQUENCE {
|
|||
nrs-PowerOffsetNonAnchor-r14 ENUMERATED {dB-12, dB-10, dB-8, dB-6,
|
||||
dB-4, dB-2, dB0, dB3} DEFAULT dB0,
|
||||
...,
|
||||
[[ dl-GapNonAnchor-v1530 DL-GapConfig-NB-v1530 OPTIONAL -- Cond TDD
|
||||
[[ dl-GapNonAnchor-v1530 DL-GapConfig-NB-v1530 OPTIONAL -- Cond TDD
|
||||
]]
|
||||
}
|
||||
|
||||
|
|
@ -1367,7 +1332,7 @@ MAC-MainConfig-NB-r13 ::= SEQUENCE {
|
|||
[[ drx-Cycle-v1430 ENUMERATED {
|
||||
sf1280, sf2560, sf5120, sf10240} OPTIONAL -- Need ON
|
||||
]],
|
||||
[[ ra-CFRA-Config-r14 ENUMERATED {true} OPTIONAL -- Need ON
|
||||
[[ ra-CFRA-Config-r14 ENUMERATED {true} OPTIONAL -- Need ON
|
||||
]]
|
||||
}
|
||||
|
||||
|
|
@ -1452,7 +1417,7 @@ NPRACH-ConfigSIB-NB-v1530 ::= SEQUENCE {
|
|||
edt-SmallTBS-Subset-r15 ENUMERATED {true} OPTIONAL, -- Need OR
|
||||
edt-TBS-InfoList-r15 EDT-TBS-InfoList-NB-r15,
|
||||
nprach-ParametersListEDT-r15 NPRACH-ParametersList-NB-r14 OPTIONAL -- Need OR
|
||||
} OPTIONAL -- Cond EDT
|
||||
} OPTIONAL -- Cond EDT1
|
||||
}
|
||||
|
||||
NPRACH-ParametersList-NB-r13 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF NPRACH-Parameters-NB-r13
|
||||
|
|
@ -1481,6 +1446,40 @@ NPRACH-Parameters-NB-v1330 ::= SEQUENCE {
|
|||
n32, n34, n35, n36, n40, n44, n46, n48}
|
||||
}
|
||||
|
||||
NPRACH-ParametersList-NB-r14 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF
|
||||
NPRACH-Parameters-NB-r14
|
||||
|
||||
NPRACH-Parameters-NB-r14 ::= SEQUENCE {
|
||||
nprach-Parameters-r14 SEQUENCE {
|
||||
nprach-Periodicity-r14 ENUMERATED {ms40, ms80, ms160, ms240,
|
||||
ms320, ms640, ms1280, ms2560}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-StartTime-r14 ENUMERATED {ms8, ms16, ms32, ms64,
|
||||
ms128, ms256, ms512, ms1024}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-SubcarrierOffset-r14 ENUMERATED {n0, n12, n24, n36, n2, n18, n34, spare1}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-NumSubcarriers-r14 ENUMERATED {n12, n24, n36, n48}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-SubcarrierMSG3-RangeStart-r14 ENUMERATED {zero, oneThird, twoThird, one}
|
||||
OPTIONAL, -- NEED OP
|
||||
npdcch-NumRepetitions-RA-r14 ENUMERATED {r1, r2, r4, r8, r16, r32, r64, r128,
|
||||
r256, r512, r1024, r2048,
|
||||
spare4, spare3, spare2, spare1}
|
||||
OPTIONAL, -- NEED OP
|
||||
npdcch-StartSF-CSS-RA-r14 ENUMERATED {v1dot5, v2, v4, v8, v16, v32, v48, v64}
|
||||
OPTIONAL, -- NEED OP
|
||||
npdcch-Offset-RA-r14 ENUMERATED {zero, oneEighth, oneFourth, threeEighth}
|
||||
OPTIONAL, -- NEED OP
|
||||
nprach-NumCBRA-StartSubcarriers-r14 ENUMERATED {n8, n10, n11, n12, n20, n22, n23, n24,
|
||||
n32, n34, n35, n36, n40, n44, n46, n48}
|
||||
OPTIONAL, -- NEED OP
|
||||
npdcch-CarrierIndex-r14 INTEGER (1..maxNonAnchorCarriers-NB-r14)
|
||||
OPTIONAL, -- Need OP
|
||||
...
|
||||
} OPTIONAL -- Need OR
|
||||
}
|
||||
|
||||
NPRACH-ParametersListTDD-NB-r15 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF
|
||||
NPRACH-ParametersTDD-NB-r15
|
||||
|
||||
|
|
@ -1556,7 +1555,7 @@ EDT-TBS-InfoList-NB-r15 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF
|
|||
|
||||
EDT-TBS-NB-r15 ::= SEQUENCE {
|
||||
edt-SmallTBS-Enabled-r15 BOOLEAN,
|
||||
edt-TBS-r15 ENUMERATED {b328, b408, b504, b584, b680, b808, b936, b1000}
|
||||
edt-TBS-r15 ENUMERATED {b328, b408, b504, b584, b680, b808, b936, b1000}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1628,6 +1627,8 @@ PhysicalConfigDedicated-NB-r13 ::= SEQUENCE {
|
|||
[[ interferenceRandomisationConfig-r14 ENUMERATED {true} OPTIONAL -- Need OR
|
||||
]],
|
||||
[[ npdcch-ConfigDedicated-v1530 NPDCCH-ConfigDedicated-NB-v1530 OPTIONAL -- Cond TDD
|
||||
]],
|
||||
[[ additionalTxSIB1-Config-v1540 ENUMERATED {true} OPTIONAL -- Cond additionalSIB1
|
||||
]]
|
||||
}
|
||||
|
||||
|
|
@ -1679,8 +1680,8 @@ PowerRampingParameters-NB-v1450 ::= SEQUENCE {
|
|||
|
||||
RadioResourceConfigCommonSIB-NB-r13 ::= SEQUENCE {
|
||||
rach-ConfigCommon-r13 RACH-ConfigCommon-NB-r13,
|
||||
bcch-Config-r13 BCCH-Config-NB-r13,
|
||||
pcch-Config-r13 PCCH-Config-NB-r13,
|
||||
bcch-Config-r13 BCCH-Config-NB-r13,
|
||||
pcch-Config-r13 PCCH-Config-NB-r13,
|
||||
nprach-Config-r13 NPRACH-ConfigSIB-NB-r13,
|
||||
npdsch-ConfigCommon-r13 NPDSCH-ConfigCommon-NB-r13,
|
||||
npusch-ConfigCommon-r13 NPUSCH-ConfigCommon-NB-r13,
|
||||
|
|
@ -1769,10 +1770,9 @@ RLC-Config-NB-r13 ::= CHOICE {
|
|||
dl-AM-RLC-r13 DL-AM-RLC-NB-r13
|
||||
},
|
||||
...,
|
||||
[[ um-Bi-Directional-r15 NULL,
|
||||
um-Uni-Directional-UL-r15 NULL,
|
||||
um-Uni-Directional-DL-r15 NULL
|
||||
]]
|
||||
um-Bi-Directional-r15 NULL,
|
||||
um-Uni-Directional-UL-r15 NULL,
|
||||
um-Uni-Directional-DL-r15 NULL
|
||||
}
|
||||
|
||||
RLC-Config-NB-v1430 ::= SEQUENCE {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.3.0 (2018-09)
|
||||
-- 3GPP TS 36.331 V15.4.0 (2018-12)
|
||||
--
|
||||
NBIOT-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V15.3.0 (2018-09)
|
||||
-- 3GPP TS 36.331 V15.4.0 (2018-12)
|
||||
--
|
||||
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# lte-rrc.cnf
|
||||
# lte-rrc conformation file
|
||||
# Copyright 2008 Vincent Helfre, 2009-2018 Pascal Quantin
|
||||
# Copyright 2008 Vincent Helfre, 2009-2019 Pascal Quantin
|
||||
|
||||
#.OPT
|
||||
PER
|
||||
|
|
@ -8,21 +8,28 @@ UNALIGNED
|
|||
#.END
|
||||
|
||||
#.USE_VALS_EXT
|
||||
AUL-Config-r15/setup/aul-RetransmissionTimer-r15
|
||||
BandclassCDMA2000
|
||||
CarrierFreq-NB-r13/carrierFreqOffset-r13
|
||||
DelayBudgetReport-r14/type1
|
||||
DelayBudgetReport-r14/type2
|
||||
DRX-Config/setup/drx-InactivityTimer
|
||||
DRX-Config-r13/drx-ULRetransmissionTimer-r13
|
||||
DRX-Config-r15/drx-UL-RetransmissionTimerShortTTI-r15
|
||||
DRX-Config-NB-r13/setup/drx-ULRetransmissionTimer-r13
|
||||
MeasGapConfig/setup/gapOffset
|
||||
MeasGapConfigDensePRS-r15/setup/gapOffsetDensePRS-r15
|
||||
PDCP-Config/eag_3/t-Reordering-r12
|
||||
PDCP-Config/eag_4/statusFeedback-r13/setup/statusPDU-Periodicity-Type1-r13
|
||||
PDCP-Config/eag_4/statusFeedback-r13/setup/statusPDU-Periodicity-Type2-r13
|
||||
PollByte-r14
|
||||
PosSIB-Type-r15/posSibType-r15
|
||||
#PosSystemInformation-r15-IEs/posSIB-TypeAndInfo-r15
|
||||
PowerRampingParameters-NB-v1450/powerRampingParametersCE1-r14/preambleInitialReceivedTargetPowerCE1-r14
|
||||
Q-OffsetRange
|
||||
RRM-Config/ue-InactiveTime
|
||||
RRM-Config-NB/ue-InactiveTime
|
||||
RSTD-InterFreqInfo-r10/eag_2/measPRS-Offset-r15
|
||||
SIB-Type
|
||||
SL-CommResourcePoolV2X-r14/sizeSubchannel-r14
|
||||
SL-PeriodComm-r12
|
||||
|
|
@ -98,9 +105,7 @@ BCCH-DL-SCH-Message-MBMS @bcch.dl.sch.mbms
|
|||
# Get rid of unused code warnings
|
||||
CellsTriggeredList
|
||||
CSI-RS-TriggeredList-r12
|
||||
HandoverPreparationInformation-v1530-IEs
|
||||
LogMeasInfoList2-r10
|
||||
N1SPUCCH-AN-PersistentList-r15
|
||||
RSRP-RangeSL3-r12
|
||||
SL-CBR-PPPP-TxPreconfigList-r14
|
||||
SL-CBR-PPPP-TxPreconfigList-v1530
|
||||
|
|
@ -128,7 +133,6 @@ SL-V2X-Preconfiguration-r14
|
|||
SL-V2X-SyncOffsetIndicators-r14
|
||||
SL-V2X-TxProfile-r15
|
||||
SL-V2X-TxProfileList-r15
|
||||
SPS-ConfigDL-STTI-r15
|
||||
SSB-IndexList-r15
|
||||
Tx-PreconfigIndex-r14
|
||||
VarConnEstFailReport-r11
|
||||
|
|
@ -145,7 +149,7 @@ VarMeasReportList
|
|||
VarMeasReportList-r12
|
||||
VarMeasReport
|
||||
VarMobilityHistoryReport-r12
|
||||
VarPendingRnaProcedure-r15
|
||||
VarPendingRnaUpdate-r15
|
||||
VarRLF-Report-r10
|
||||
VarRLF-Report-r11
|
||||
VarShortINACTIVE-MAC-Input-r15
|
||||
|
|
@ -524,6 +528,24 @@ MasterInformationBlock/schedulingInfoSIB1-BR-r13 TYPE=FT_UINT32 DISPLAY=BASE_DEC
|
|||
de_emm_sec_par_to_eutra(nas_sec_param_to_eutra_tvb, subtree, actx->pinfo, 0, length, NULL, 0);
|
||||
}
|
||||
|
||||
#.FN_BODY SecurityConfigHO-v1530/handoverType-v1530/intra5GC-r15/nas-Container-r15 VAL_PTR = &nas_cont_tvb
|
||||
tvbuff_t *nas_cont_tvb = NULL;
|
||||
|
||||
%(DEFAULT_BODY)s
|
||||
if (nas_cont_tvb) {
|
||||
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_nas_Container_r15);
|
||||
de_nas_5gs_intra_n1_mode_nas_transparent_cont(nas_cont_tvb, subtree, actx->pinfo);
|
||||
}
|
||||
|
||||
#.FN_BODY SecurityConfigHO-v1530/handoverType-v1530/epc-To5GC-r15/nas-Container-r15 VAL_PTR = &nas_cont_tvb
|
||||
tvbuff_t *nas_cont_tvb = NULL;
|
||||
|
||||
%(DEFAULT_BODY)s
|
||||
if (nas_cont_tvb) {
|
||||
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_nas_Container_r15);
|
||||
de_nas_5gs_s1_mode_to_n1_mode_nas_transparent_cont(nas_cont_tvb, subtree, actx->pinfo);
|
||||
}
|
||||
|
||||
#.FN_BODY SI-OrPSI-GERAN/si
|
||||
private_data_set_si_or_psi_geran(actx, (guint8)SI_OrPSI_GERAN_si); /* SI message */
|
||||
%(DEFAULT_BODY)s
|
||||
|
|
@ -1019,6 +1041,9 @@ RRCConnectionReject-v1020-IEs/extendedWaitTime-r10 DISPLAY=BASE_DEC|BASE_UNIT_ST
|
|||
#.TYPE_ATTR
|
||||
RRCConnectionRelease-v1020-IEs/extendedWaitTime-r10 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
|
||||
|
||||
#.TYPE_ATTR
|
||||
RRCConnectionRelease-v1540-IEs/waitTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
|
||||
|
||||
#.TYPE_ATTR
|
||||
RRCEarlyDataComplete-r15-IEs/extendedWaitTime-r15 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/* packet-lte-rrc-template.c
|
||||
* Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
|
||||
* Radio Resource Control (RRC) protocol specification
|
||||
* (3GPP TS 36.331 V15.3.0 Release 15) packet dissection
|
||||
* (3GPP TS 36.331 V15.4.0 Release 15) packet dissection
|
||||
* Copyright 2008, Vincent Helfre
|
||||
* Copyright 2009-2018, Pascal Quantin
|
||||
* Copyright 2009-2019, Pascal Quantin
|
||||
*
|
||||
* Wireshark - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@wireshark.org>
|
||||
|
|
@ -306,6 +306,7 @@ static gint ett_lte_rrc_sourceOtherConfigSN_NR_r15 = -1;
|
|||
static gint ett_lte_rrc_sourceContextEN_DC_r15 = -1;
|
||||
static gint ett_lte_rrc_requestedFreqBandsNR_MRDC_r15 = -1;
|
||||
static gint ett_lte_rrc_measGapPatterns_v1520 = -1;
|
||||
static gint ett_lte_rrc_nas_Container_r15 = -1;
|
||||
|
||||
static expert_field ei_lte_rrc_number_pages_le15 = EI_INIT;
|
||||
static expert_field ei_lte_rrc_si_info_value_changed = EI_INIT;
|
||||
|
|
@ -4301,7 +4302,8 @@ void proto_register_lte_rrc(void) {
|
|||
&ett_lte_rrc_sourceOtherConfigSN_NR_r15,
|
||||
&ett_lte_rrc_sourceContextEN_DC_r15,
|
||||
&ett_lte_rrc_requestedFreqBandsNR_MRDC_r15,
|
||||
&ett_lte_rrc_measGapPatterns_v1520
|
||||
&ett_lte_rrc_measGapPatterns_v1520,
|
||||
&ett_lte_rrc_nas_Container_r15
|
||||
};
|
||||
|
||||
static ei_register_info ei[] = {
|
||||
|
|
|
|||
|
|
@ -790,6 +790,9 @@ void nas_esm_pdn_con_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gu
|
|||
guint16 de_nas_5gs_cmn_s_nssai(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_);
|
||||
guint16 de_nas_5gs_sm_qos_rules(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_);
|
||||
guint16 de_nas_5gs_sm_session_ambr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_);
|
||||
void de_nas_5gs_intra_n1_mode_nas_transparent_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_);
|
||||
void de_nas_5gs_n1_mode_to_s1_mode_nas_transparent_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_);
|
||||
void de_nas_5gs_s1_mode_to_n1_mode_nas_transparent_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_);
|
||||
|
||||
void dtap_rr_ho_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len);
|
||||
void dtap_rr_cip_mode_cpte(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -262,6 +262,9 @@ static int hf_nas_5gs_mm_tal_t_li = -1;
|
|||
static int hf_nas_5gs_mm_tal_num_e = -1;
|
||||
static int hf_nas_5gs_sm_mapd_eps_b_cont_eps_param_cont = -1;
|
||||
|
||||
static int hf_nas_5gs_kacf = -1;
|
||||
static int hf_nas_5gs_ncc = -1;
|
||||
|
||||
static expert_field ei_nas_5gs_extraneous_data = EI_INIT;
|
||||
static expert_field ei_nas_5gs_unknown_pd = EI_INIT;
|
||||
static expert_field ei_nas_5gs_mm_unknown_msg_type = EI_INIT;
|
||||
|
|
@ -1717,7 +1720,7 @@ de_nas_5gs_mm_ue_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
|
|||
*/
|
||||
|
||||
static true_false_string tfs_nas_5gs_ul_data_sts_psi = {
|
||||
"uplink data are pending ",
|
||||
"uplink data are pending",
|
||||
"no uplink data are pending"
|
||||
};
|
||||
|
||||
|
|
@ -4717,6 +4720,121 @@ dissect_nas_5gs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
|||
return dissect_nas_5gs_common(tvb, pinfo, tree, offset, data);
|
||||
}
|
||||
|
||||
static true_false_string nas_5gs_kacf_tfs = {
|
||||
"A new K_AMF has been calculated by the network",
|
||||
"A new K_AMF has not been calculated by the network"
|
||||
};
|
||||
|
||||
void
|
||||
de_nas_5gs_intra_n1_mode_nas_transparent_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_)
|
||||
{
|
||||
int offset = 0;
|
||||
|
||||
static const int * flags[] = {
|
||||
&hf_nas_5gs_spare_b7,
|
||||
&hf_nas_5gs_spare_b6,
|
||||
&hf_nas_5gs_spare_b5,
|
||||
&hf_nas_5gs_kacf,
|
||||
&hf_nas_5gs_mm_tsc,
|
||||
&hf_nas_5gs_mm_nas_key_set_id,
|
||||
NULL
|
||||
};
|
||||
|
||||
proto_tree_add_item(tree, hf_nas_5gs_msg_auth_code, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(tree, hf_nas_5gs_mm_nas_sec_algo_enc, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_nas_5gs_mm_nas_sec_algo_ip, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_bitmask_list(tree, tvb, offset, 1, flags, ENC_NA);
|
||||
offset++;
|
||||
proto_tree_add_item(tree, hf_nas_5gs_seq_no, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
void
|
||||
de_nas_5gs_n1_mode_to_s1_mode_nas_transparent_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_)
|
||||
{
|
||||
proto_tree_add_item(tree, hf_nas_5gs_seq_no, tvb, 0, 1, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
void
|
||||
de_nas_5gs_s1_mode_to_n1_mode_nas_transparent_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_)
|
||||
{
|
||||
int offset = 0;
|
||||
|
||||
static const int * oct8_flags[] = {
|
||||
&hf_nas_5gs_spare_b7,
|
||||
&hf_nas_5gs_ncc,
|
||||
&hf_nas_5gs_mm_tsc,
|
||||
&hf_nas_5gs_mm_nas_key_set_id,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const int * oct9_flags[] = {
|
||||
&hf_nas_5gs_mm_5g_ea0,
|
||||
&hf_nas_5gs_mm_128_5g_ea1,
|
||||
&hf_nas_5gs_mm_128_5g_ea2,
|
||||
&hf_nas_5gs_mm_128_5g_ea3,
|
||||
&hf_nas_5gs_mm_5g_ea4,
|
||||
&hf_nas_5gs_mm_5g_ea5,
|
||||
&hf_nas_5gs_mm_5g_ea6,
|
||||
&hf_nas_5gs_mm_5g_ea7,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const int * oct10_flags[] = {
|
||||
&hf_nas_5gs_mm_5g_ia0,
|
||||
&hf_nas_5gs_mm_5g_128_ia1,
|
||||
&hf_nas_5gs_mm_5g_128_ia2,
|
||||
&hf_nas_5gs_mm_5g_128_ia3,
|
||||
&hf_nas_5gs_mm_5g_ia4,
|
||||
&hf_nas_5gs_mm_5g_ia5,
|
||||
&hf_nas_5gs_mm_5g_ia6,
|
||||
&hf_nas_5gs_mm_5g_ia7,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const int * oct11_flags[] = {
|
||||
&hf_nas_5gs_mm_eea0,
|
||||
&hf_nas_5gs_mm_128eea1,
|
||||
&hf_nas_5gs_mm_128eea2,
|
||||
&hf_nas_5gs_mm_eea3,
|
||||
&hf_nas_5gs_mm_eea4,
|
||||
&hf_nas_5gs_mm_eea5,
|
||||
&hf_nas_5gs_mm_eea6,
|
||||
&hf_nas_5gs_mm_eea7,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const int * oct12_flags[] = {
|
||||
&hf_nas_5gs_mm_eia0,
|
||||
&hf_nas_5gs_mm_128eia1,
|
||||
&hf_nas_5gs_mm_128eia2,
|
||||
&hf_nas_5gs_mm_eia3,
|
||||
&hf_nas_5gs_mm_eia4,
|
||||
&hf_nas_5gs_mm_eia5,
|
||||
&hf_nas_5gs_mm_eia6,
|
||||
&hf_nas_5gs_mm_eia7,
|
||||
NULL
|
||||
};
|
||||
|
||||
proto_tree_add_item(tree, hf_nas_5gs_msg_auth_code, tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
proto_tree_add_item(tree, hf_nas_5gs_mm_nas_sec_algo_enc, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_nas_5gs_mm_nas_sec_algo_ip, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
proto_tree_add_bitmask_list(tree, tvb, offset, 1, oct8_flags, ENC_NA);
|
||||
offset++;
|
||||
proto_tree_add_bitmask_list(tree, tvb, offset, 1, oct9_flags, ENC_NA);
|
||||
offset++;
|
||||
proto_tree_add_bitmask_list(tree, tvb, offset, 1, oct10_flags, ENC_NA);
|
||||
offset++;
|
||||
if (tvb_reported_length_remaining(tvb, offset) > 0) {
|
||||
proto_tree_add_bitmask_list(tree, tvb, offset, 1, oct11_flags, ENC_NA);
|
||||
offset++;
|
||||
proto_tree_add_bitmask_list(tree, tvb, offset, 1, oct12_flags, ENC_NA);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
proto_register_nas_5gs(void)
|
||||
{
|
||||
|
|
@ -5699,6 +5817,16 @@ proto_register_nas_5gs(void)
|
|||
FT_BYTES, BASE_NONE, NULL, 0x0,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_nas_5gs_kacf,
|
||||
{ "K_AMF change flag", "nas_5gs.kacf",
|
||||
FT_BOOLEAN, 8, TFS(&nas_5gs_kacf_tfs), 0x10,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_nas_5gs_ncc,
|
||||
{ "NCC", "nas_5gs.ncc",
|
||||
FT_UINT8, BASE_DEC, NULL, 0x70,
|
||||
NULL, HFILL }
|
||||
},
|
||||
};
|
||||
|
||||
guint i;
|
||||
|
|
|
|||
Loading…
Reference in New Issue