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

LTE RRC: upgrade dissector to v13.5.0 

Change-Id: Ic1c1b2cbf2a9213dbb6d6eadb41c15fcddb0d64a
Reviewed-on: https://code.wireshark.org/review/20672
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Pascal Quantin 2017-03-22 18:35:28 +01:00 committed by Anders Broman
parent 4f1df36cc3
commit 559836a74c
11 changed files with 1334 additions and 669 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V13.4.0 (2016-12)
-- 3GPP TS 36.331 V13.5.0 (2017-03)
--
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=

61
epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V13.4.0 (2016-12)
-- 3GPP TS 36.331 V13.5.0 (2017-03)
--
EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -1572,10 +1572,16 @@ SCGFailureInformation-r12-IEs ::= SEQUENCE {
}
SCGFailureInformation-v1310-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
lateNonCriticalExtension OCTET STRING (CONTAINING SCGFailureInformation-v12d0-IEs) OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
-- Late non-critical extensions:
SCGFailureInformation-v12d0-IEs ::= SEQUENCE {
failureReportSCG-v12d0 FailureReportSCG-v12d0 OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL
}
-- Regular non-critical extensions:
FailureReportSCG-r12 ::= SEQUENCE {
failureType-r12 ENUMERATED {t313-Expiry, randomAccessProblem,
rlc-MaxNumRetx, scg-ChangeFailure },
@ -1588,6 +1594,10 @@ FailureReportSCG-r12 ::= SEQUENCE {
]]
}
FailureReportSCG-v12d0 ::= SEQUENCE {
measResultNeighCells-v12d0 MeasResultList2EUTRA-v9e0 OPTIONAL
}
SCPTMConfiguration-r13 ::= SEQUENCE {
sc-mtch-InfoList-r13 SC-MTCH-InfoList-r13,
@ -1870,7 +1880,12 @@ SystemInformationBlockType1-v1320-IEs ::= SEQUENCE {
} OPTIONAL, -- Need OR
mpdcch-pdsch-HoppingOffset-r13 INTEGER (1..maxAvailNarrowBands-r13) OPTIONAL -- Need OR
} OPTIONAL, -- Cond Hopping
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension SystemInformationBlockType1-v1350-IEs OPTIONAL
}
SystemInformationBlockType1-v1350-IEs ::= SEQUENCE {
cellSelectionInfoCE1-r13 CellSelectionInfoCE1-r13 OPTIONAL, -- Need OP
nonCriticalExtension SEQUENCE {} OPTIONAL
}
PLMN-IdentityList ::= SEQUENCE (SIZE (1..maxPLMN-r11)) OF PLMN-IdentityInfo
@ -2394,13 +2409,13 @@ SystemInformationBlockType2 ::= SEQUENCE {
[[ acdc-BarringForCommon-r13 ACDC-BarringForCommon-r13 OPTIONAL, -- Need OP
acdc-BarringPerPLMN-List-r13 ACDC-BarringPerPLMN-List-r13 OPTIONAL -- Need OP
]],
[[
udt-RestrictingForCommon-r13 UDT-Restricting-r13 OPTIONAL, -- Need OR
[[ udt-RestrictingForCommon-r13 UDT-Restricting-r13 OPTIONAL, -- Need OR
udt-RestrictingPerPLMN-List-r13 UDT-RestrictingPerPLMN-List-r13 OPTIONAL, -- Need OR
cIoT-EPS-OptimisationInfo-r13 CIOT-EPS-OptimisationInfo-r13 OPTIONAL, -- Need OP
useFullResumeID-r13 ENUMERATED {true} OPTIONAL -- Need OP
]],
[[ unicastFreqHoppingInd-r13 ENUMERATED {true} OPTIONAL -- Need OP
]]
}
SystemInformationBlockType2-v8h0-IEs ::= SEQUENCE {
@ -2537,7 +2552,9 @@ SystemInformationBlockType3 ::= SEQUENCE {
redistributionServingInfo-r13 RedistributionServingInfo-r13 OPTIONAL, --Need OR
cellSelectionInfoCE-r13 CellSelectionInfoCE-r13 OPTIONAL, -- Need OP
t-ReselectionEUTRA-CE-r13 T-ReselectionEUTRA-CE-r13 OPTIONAL -- Need OP
]]
]],
[[ cellSelectionInfoCE1-r13 CellSelectionInfoCE1-r13 OPTIONAL -- Need OP
]]
}
RedistributionServingInfo-r13 ::= SEQUENCE {
@ -2590,6 +2607,9 @@ SystemInformationBlockType5 ::= SEQUENCE {
]],
[[ interFreqCarrierFreqList-v1310 InterFreqCarrierFreqList-v1310 OPTIONAL, -- Need OR
interFreqCarrierFreqListExt-v1310 InterFreqCarrierFreqListExt-v1310 OPTIONAL -- Need OR
]],
[[ interFreqCarrierFreqList-v1350 InterFreqCarrierFreqList-v1350 OPTIONAL, -- Need OR
interFreqCarrierFreqListExt-v1350 InterFreqCarrierFreqListExt-v1350 OPTIONAL -- Need OR
]]
}
@ -2620,6 +2640,10 @@ InterFreqCarrierFreqList-v1310 ::= SEQUENCE (SIZE (1.. maxFreq)) OF InterFreqCar
InterFreqCarrierFreqListExt-v1310 ::= SEQUENCE (SIZE (1.. maxFreq)) OF InterFreqCarrierFreqInfo-v1310
InterFreqCarrierFreqList-v1350 ::= SEQUENCE (SIZE (1.. maxFreq)) OF InterFreqCarrierFreqInfo-v1350
InterFreqCarrierFreqListExt-v1350 ::= SEQUENCE (SIZE (1.. maxFreq)) OF InterFreqCarrierFreqInfo-v1350
InterFreqCarrierFreqInfo ::= SEQUENCE {
dl-CarrierFreq ARFCN-ValueEUTRA,
q-RxLevMin Q-RxLevMin,
@ -2699,6 +2723,10 @@ InterFreqCarrierFreqInfo-v1310 ::= SEQUENCE {
t-ReselectionEUTRA-CE-r13 T-ReselectionEUTRA-CE-r13 OPTIONAL -- Need OP
}
InterFreqCarrierFreqInfo-v1350 ::= SEQUENCE {
cellSelectionInfoCE1-r13 CellSelectionInfoCE1-r13 OPTIONAL -- Need OP
}
InterFreqNeighCellList ::= SEQUENCE (SIZE (1..maxCellInter)) OF InterFreqNeighCellInfo
InterFreqNeighCellInfo ::= SEQUENCE {
@ -5989,6 +6017,12 @@ CellSelectionInfoCE-r13 ::= SEQUENCE {
}
CellSelectionInfoCE1-r13 ::= SEQUENCE {
q-RxLevMinCE1-r13 Q-RxLevMin,
q-QualMinRSRQ-CE1-r13 Q-QualMin-r9 OPTIONAL -- Need OR
}
CellReselectionSubPriority-r13 ::= ENUMERATED {oDot2, oDot4, oDot6, oDot8}
@ -7565,7 +7599,14 @@ UE-EUTRA-Capability-v1330-IEs ::= SEQUENCE {
UE-EUTRA-Capability-v1340-IEs ::= SEQUENCE {
ue-CategoryUL-v1340 INTEGER (15) OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension UE-EUTRA-Capability-v1350-IEs OPTIONAL
}
UE-EUTRA-Capability-v1350-IEs ::= SEQUENCE {
ue-CategoryDL-v1350 ENUMERATED {oneBis} OPTIONAL,
ue-CategoryUL-v1350 ENUMERATED {oneBis} OPTIONAL,
ce-Parameters-v1350 CE-Parameters-v1350,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
UE-EUTRA-CapabilityAddXDD-Mode-r9 ::= SEQUENCE {
@ -8364,6 +8405,10 @@ CE-Parameters-v1320 ::= SEQUENCE {
intraFreqHO-CE-ModeB-r13 ENUMERATED {supported} OPTIONAL
}
CE-Parameters-v1350 ::= SEQUENCE {
unicastFrequencyHopping-r13 ENUMERATED {supported} OPTIONAL
}
LAA-Parameters-r13 ::= SEQUENCE {
crossCarrierSchedulingLAA-DL-r13 ENUMERATED {supported} OPTIONAL,
csi-RS-DRS-RRM-MeasurementsLAA-r13 ENUMERATED {supported} OPTIONAL,

2
epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V13.4.0 (2016-12)
-- 3GPP TS 36.331 V13.5.0 (2017-03)
--
EUTRA-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V13.4.0 (2016-12)
-- 3GPP TS 36.331 V13.5.0 (2017-03)
--
EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V13.4.0 (2016-12)
-- 3GPP TS 36.331 V13.5.0 (2017-03)
--
NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=

36
epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V13.4.0 (2016-12)
-- 3GPP TS 36.331 V13.5.0 (2017-03)
--
NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -518,7 +518,12 @@ SystemInformationBlockType1-NB ::= SEQUENCE {
si-RadioFrameOffset-r13 INTEGER (1..15) OPTIONAL, -- Need OP
systemInfoValueTagList-r13 SystemInfoValueTagList-NB-r13 OPTIONAL, -- Need OR
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension SystemInformationBlockType1-NB-v1350-IEs OPTIONAL
}
SystemInformationBlockType1-NB-v1350-IEs ::= SEQUENCE {
cellSelectionInfo-v1350 CellSelectionInfo-NB-v1350 OPTIONAL, -- Cond Qrxlevmin
nonCriticalExtension SEQUENCE {} OPTIONAL
}
PLMN-IdentityList-NB-r13 ::= SEQUENCE (SIZE (1..maxPLMN-r11)) OF PLMN-IdentityInfo-NB-r13
@ -549,6 +554,9 @@ SIB-Type-NB-r13 ::= ENUMERATED {
sibType3-NB-r13, sibType4-NB-r13, sibType5-NB-r13,
sibType14-NB-r13, sibType16-NB-r13, spare3, spare2, spare1}
CellSelectionInfo-NB-v1350 ::= SEQUENCE {
delta-RxLevMin-v1350 INTEGER (-8..-1)
}
UECapabilityEnquiry-NB ::= SEQUENCE {
@ -633,7 +641,13 @@ SystemInformationBlockType3-NB-r13 ::= SEQUENCE {
multiBandInfoList-r13 SEQUENCE (SIZE (1..maxMultiBands)) OF
NS-PmaxList-NB-r13 OPTIONAL, -- Need OR
lateNonCriticalExtension OCTET STRING OPTIONAL,
...
...,
[[ intraFreqCellReselectionInfo-v1350 IntraFreqCellReselectionInfo-NB-v1350 OPTIONAL -- Cond Qrxlevmin
]]
}
IntraFreqCellReselectionInfo-NB-v1350 ::= SEQUENCE {
delta-RxLevMin-v1350 INTEGER (-8..-1)
}
@ -666,7 +680,9 @@ InterFreqCarrierFreqInfo-NB-r13 ::= SEQUENCE {
interFreqNeighCellList-r13 InterFreqNeighCellList-NB-r13 OPTIONAL, -- Need OR
interFreqBlackCellList-r13 InterFreqBlackCellList-NB-r13 OPTIONAL, -- Need OR
multiBandInfoList-r13 MultiBandInfoList-NB-r13 OPTIONAL, -- Need OR
...
...,
[[ delta-RxLevMin-v1350 INTEGER (-8..-1) OPTIONAL -- Cond Qrxlevmin
]]
}
InterFreqNeighCellList-NB-r13 ::= SEQUENCE (SIZE (1..maxCellInter)) OF PhysCellId
@ -1077,7 +1093,11 @@ RLF-TimersAndConstants-NB-r13 ::= CHOICE {
ms20000, ms30000},
n311-r13 ENUMERATED {
n1, n2, n3, n4, n5, n6, n8, n10},
...
...,
[[ t311-v1350 ENUMERATED {
ms40000, ms60000, ms90000, ms120000}
OPTIONAL -- Need OR
]]
}
}
@ -1188,7 +1208,11 @@ UE-TimersAndConstants-NB-r13 ::= SEQUENCE {
ms20000, ms30000},
n311-r13 ENUMERATED {
n1, n2, n3, n4, n5, n6, n8, n10},
...
...,
[[ t311-v1350 ENUMERATED {
ms40000, ms60000, ms90000, ms120000}
OPTIONAL -- Need OR
]]
}

2
epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V13.4.0 (2016-12)
-- 3GPP TS 36.331 V13.5.0 (2017-03)
--
NBIOT-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V13.4.0 (2016-09)
-- 3GPP TS 36.331 V13.5.0 (2017-03)
--
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=

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

@ -1,6 +1,6 @@
# lte-rrc.cnf
# lte-rrc conformation file
# Copyright 2008 Vincent Helfre, 2009-2016 Pascal Quantin
# Copyright 2008 Vincent Helfre, 2009-2017 Pascal Quantin
#.OPT
PER
@ -2296,9 +2296,18 @@ RRCConnectionReject-NB-r13-IEs/extendedWaitTime-r13 DISPLAY=BASE_DEC|BASE_UNIT_S
#.TYPE_ATTR
RRCConnectionRelease-NB-r13-IEs/extendedWaitTime-r13 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.TYPE_ATTR
CellSelectionInfo-NB-v1350/delta-RxLevMin-v1350 STRINGS=VALS(lte_rrc_delta_RxLevMin_v1350_vals)
#.TYPE_RENAME
SystemInformationBlockType2-NB-r13/multiBandInfoList-r13 AdditionalSpectrumEmission_r13
#.TYPE_ATTR
IntraFreqCellReselectionInfo-NB-v1350/delta-RxLevMin-v1350 STRINGS=VALS(lte_rrc_delta_RxLevMin_v1350_vals)
#.TYPE_ATTR
InterFreqCarrierFreqInfo-NB-r13/eag_1/delta-RxLevMin-v1350 STRINGS=VALS(lte_rrc_delta_RxLevMin_v1350_vals)
#.TYPE_ATTR
AB-Config-NB-r13/ab-Category-r13 STRINGS=VALS(lte_rrc_eab_category_vals)

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

@ -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 V13.4.0 Release 13) packet dissection
* (3GPP TS 36.331 V13.5.0 Release 13) packet dissection
* Copyright 2008, Vincent Helfre
* Copyright 2009-2016, Pascal Quantin
* Copyright 2009-2017, Pascal Quantin
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -827,6 +827,18 @@ static const value_string lte_rrc_q_RxLevMinOffset_vals[] = {
{ 0, NULL}
};
static const value_string lte_rrc_delta_RxLevMin_v1350_vals[] = {
{ -8, "-16dBm"},
{ -7, "-14dBm"},
{ -6, "-12dBm"},
{ -5, "-10dBm"},
{ -4, "-8dBm"},
{ -3, "-6dBm"},
{ -2, "-4dBm"},
{ -1, "-2dBm"},
{ 0, NULL}
};
static void
lte_rrc_timeConnFailure_r10_fmt(gchar *s, guint32 v)
{

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

File diff suppressed because it is too large Load Diff