LTE RRC: upgrade dissector to v13.6.0

Change-Id: I0a4288b5044849fa0abe4b58c3c5795e16cee25a
Reviewed-on: https://code.wireshark.org/review/22454
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Pascal Quantin 2017-06-28 23:43:19 +02:00 committed by Michael Mann
parent 563eef4230
commit c27ffaff6d
11 changed files with 1251 additions and 611 deletions

View File

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

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V13.5.0 (2017-03)
-- 3GPP TS 36.331 V13.6.0 (2017-06)
--
EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -363,7 +363,12 @@ InDeviceCoexIndication-v11d0-IEs ::= SEQUENCE {
InDeviceCoexIndication-v1310-IEs ::= SEQUENCE {
affectedCarrierFreqList-v1310 AffectedCarrierFreqList-v1310 OPTIONAL,
affectedCarrierFreqCombList-r13 AffectedCarrierFreqCombList-r13 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension InDeviceCoexIndication-v13yz-IEs OPTIONAL
}
InDeviceCoexIndication-v13yz-IEs ::= SEQUENCE {
hardwareSharingProblem-r13 ENUMERATED {true} OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
AffectedCarrierFreqList-r11 ::= SEQUENCE (SIZE (1..maxFreqIDC-r11)) OF AffectedCarrierFreq-r11
@ -1885,7 +1890,12 @@ SystemInformationBlockType1-v1320-IEs ::= SEQUENCE {
SystemInformationBlockType1-v1350-IEs ::= SEQUENCE {
cellSelectionInfoCE1-r13 CellSelectionInfoCE1-r13 OPTIONAL, -- Need OP
nonCriticalExtension SEQUENCE {} OPTIONAL
nonCriticalExtension SystemInformationBlockType1-v1360-IEs OPTIONAL
}
SystemInformationBlockType1-v1360-IEs ::= SEQUENCE {
cellSelectionInfoCE1-v1360 CellSelectionInfoCE1-v1360 OPTIONAL, -- Cond QrxlevminCE1
nonCriticalExtension SEQUENCE {} OPTIONAL
}
PLMN-IdentityList ::= SEQUENCE (SIZE (1..maxPLMN-r11)) OF PLMN-IdentityInfo
@ -2167,7 +2177,9 @@ RLF-Report-r9 ::= SEQUENCE {
lastServCellRSRQ-Type-r12 RSRQ-Type-r12 OPTIONAL,
measResultListEUTRA-v1250 MeasResultList2EUTRA-v1250 OPTIONAL
]],
[[ drb-EstablishedWithQCI-1-r13 ENUMERATED {qci1} OPTIONAL
[[ drb-EstablishedWithQCI-1-r13 ENUMERATED {qci1} OPTIONAL
]],
[[ measResultLastServCell-v1360 RSRP-Range-v1360 OPTIONAL
]]
}
@ -2243,6 +2255,8 @@ LogMeasInfo-r10 ::= SEQUENCE {
measResultListEUTRA-v1250 MeasResultList2EUTRA-v1250 OPTIONAL
]],
[[ inDeviceCoexDetected-r13 ENUMERATED {true} OPTIONAL
]],
[[ measResultServCell-v1360 RSRP-Range-v1360 OPTIONAL
]]
}
@ -2301,6 +2315,8 @@ ConnEstFailReport-r11 ::= SEQUENCE {
[[ measResultFailedCell-v1250 RSRQ-Range-v1250 OPTIONAL,
failedCellRSRQ-Type-r12 RSRQ-Type-r12 OPTIONAL,
measResultListEUTRA-v1250 MeasResultList2EUTRA-v1250 OPTIONAL
]],
[[ measResultFailedCell-v1360 RSRP-Range-v1360 OPTIONAL
]]
}
@ -2554,6 +2570,8 @@ SystemInformationBlockType3 ::= SEQUENCE {
t-ReselectionEUTRA-CE-r13 T-ReselectionEUTRA-CE-r13 OPTIONAL -- Need OP
]],
[[ cellSelectionInfoCE1-r13 CellSelectionInfoCE1-r13 OPTIONAL -- Need OP
]],
[[ cellSelectionInfoCE1-v1360 CellSelectionInfoCE1-v1360 OPTIONAL -- Cond QrxlevminCE1
]]
}
@ -2610,6 +2628,8 @@ SystemInformationBlockType5 ::= SEQUENCE {
]],
[[ interFreqCarrierFreqList-v1350 InterFreqCarrierFreqList-v1350 OPTIONAL, -- Need OR
interFreqCarrierFreqListExt-v1350 InterFreqCarrierFreqListExt-v1350 OPTIONAL -- Need OR
]],
[[ interFreqCarrierFreqListExt-v1360 InterFreqCarrierFreqListExt-v1360 OPTIONAL -- Need OR
]]
}
@ -2644,6 +2664,8 @@ InterFreqCarrierFreqList-v1350 ::= SEQUENCE (SIZE (1.. maxFreq)) OF InterFreqCar
InterFreqCarrierFreqListExt-v1350 ::= SEQUENCE (SIZE (1.. maxFreq)) OF InterFreqCarrierFreqInfo-v1350
InterFreqCarrierFreqListExt-v1360 ::= SEQUENCE (SIZE (1..maxFreq)) OF InterFreqCarrierFreqInfo-v1360
InterFreqCarrierFreqInfo ::= SEQUENCE {
dl-CarrierFreq ARFCN-ValueEUTRA,
q-RxLevMin Q-RxLevMin,
@ -2727,6 +2749,10 @@ InterFreqCarrierFreqInfo-v1350 ::= SEQUENCE {
cellSelectionInfoCE1-r13 CellSelectionInfoCE1-r13 OPTIONAL -- Need OP
}
InterFreqCarrierFreqInfo-v1360 ::= SEQUENCE {
cellSelectionInfoCE1-v1360 CellSelectionInfoCE1-v1360 OPTIONAL -- Cond QrxlevminCE1
}
InterFreqNeighCellList ::= SEQUENCE (SIZE (1..maxCellInter)) OF InterFreqNeighCellInfo
InterFreqNeighCellInfo ::= SEQUENCE {
@ -3722,7 +3748,7 @@ CSI-RS-ConfigEMIMO-r13 ::= CHOICE {
}
}
CSI-RS-ConfigNonPrecoded-r13 ::= SEQUENCE {
CSI-RS-ConfigNonPrecoded-r13 ::= SEQUENCE {
p-C-AndCBSRList-r13 P-C-AndCBSR-Pair-r13 OPTIONAL, -- Need OR
codebookConfigN1-r13 ENUMERATED {n1, n2, n3, n4, n8},
codebookConfigN2-r13 ENUMERATED {n1, n2, n3, n4, n8},
@ -6022,6 +6048,10 @@ CellSelectionInfoCE1-r13 ::= SEQUENCE {
q-QualMinRSRQ-CE1-r13 Q-QualMin-r9 OPTIONAL -- Need OR
}
CellSelectionInfoCE1-v1360 ::= SEQUENCE {
delta-RxLevMinCE1-v1360 INTEGER (-8..-1)
}
CellReselectionSubPriority-r13 ::= ENUMERATED {oDot2, oDot4, oDot6, oDot8}
@ -6706,8 +6736,12 @@ MeasResults ::= SEQUENCE {
} OPTIONAL,
ul-PDCP-DelayResultList-r13 UL-PDCP-DelayResultList-r13 OPTIONAL,
measResultListWLAN-r13 MeasResultListWLAN-r13 OPTIONAL
]],
[[
measResultPCell-v1360 RSRP-Range-v1360 OPTIONAL
]]
}
MeasResultListEUTRA ::= SEQUENCE (SIZE (1..maxCellReport)) OF MeasResultEUTRA
@ -6734,6 +6768,9 @@ MeasResultEUTRA ::= SEQUENCE {
multiBandInfoList-r13 MultiBandInfoList-r11 OPTIONAL,
freqBandIndicatorPriority-r13 ENUMERATED {true} OPTIONAL
} OPTIONAL
]],
[[
measResult-v1360 RSRP-Range-v1360 OPTIONAL
]]
}
}
@ -6779,7 +6816,11 @@ MeasResultServFreq-r13 ::= SEQUENCE {
rsrqResultNCell-r13 RSRQ-Range-r13,
rs-sinr-Result-r13 RS-SINR-Range-r13 OPTIONAL
} OPTIONAL,
...
...,
[[ measResultBestNeighCell-v1360 SEQUENCE {
rsrpResultNCell-v1360 RSRP-Range-v1360
} OPTIONAL
]]
}
MeasResultCSI-RS-List-r12 ::= SEQUENCE (SIZE (1..maxCellReport)) OF MeasResultCSI-RS-r12
@ -7131,11 +7172,11 @@ ThresholdCDMA2000 ::= INTEGER (0..63)
ReportQuantityWLAN-r13 ::= SEQUENCE {
bandRequestWLAN-r13 ENUMERATED {true} OPTIONAL, -- Need OR
carrierInfoRequestWLAN-r13 ENUMERATED {true} OPTIONAL, -- Need OR
availableAdmissionCapacityRequestWLAN-r13 ENUMERATED {true} OPTIONAL, -- Need ON
availableAdmissionCapacityRequestWLAN-r13 ENUMERATED {true} OPTIONAL, -- Need OR
backhaulDL-BandwidthRequestWLAN-r13 ENUMERATED {true} OPTIONAL, -- Need OR
backhaulUL-BandwidthRequestWLAN-r13 ENUMERATED {true} OPTIONAL, -- Need OR
channelUtilizationRequestWLAN-r13 ENUMERATED {true} OPTIONAL, -- Need OR
stationCountRequestWLAN-r13 ENUMERATED {true} OPTIONAL , -- Need OR
stationCountRequestWLAN-r13 ENUMERATED {true} OPTIONAL, -- Need OR
...
}
@ -7159,6 +7200,8 @@ ReportInterval ::= ENUMERATED {
RSRP-Range ::= INTEGER(0..97)
RSRP-Range-v1360 ::= INTEGER(-17..-1)
RSRP-RangeSL-r12 ::= INTEGER(0..13)
RSRP-RangeSL2-r12 ::= INTEGER(0..7)
@ -7304,6 +7347,8 @@ IDC-Config-r11 ::= SEQUENCE {
} OPTIONAL, -- Need OR
...,
[[ idc-Indication-UL-CA-r11 ENUMERATED {setup} OPTIONAL -- Cond idc-Ind
]],
[[ idc-HardwareSharingIndication-r13 ENUMERATED {setup} OPTIONAL -- Need OR
]]
}
@ -7606,7 +7651,12 @@ 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
nonCriticalExtension UE-EUTRA-Capability-v13yz-IEs OPTIONAL
}
UE-EUTRA-Capability-v13yz-IEs ::= SEQUENCE {
other-Parameters-v13yz Other-Parameters-v13yz OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
UE-EUTRA-CapabilityAddXDD-Mode-r9 ::= SEQUENCE {
@ -8377,6 +8427,10 @@ Other-Parameters-v11d0 ::= SEQUENCE {
inDeviceCoexInd-UL-CA-r11 ENUMERATED {supported} OPTIONAL
}
Other-Parameters-v13yz ::= SEQUENCE {
inDeviceCoexInd-HardwareSharingInd-r13 ENUMERATED {supported} OPTIONAL
}
MBMS-Parameters-r11 ::= SEQUENCE {
mbms-SCell-r11 ENUMERATED {supported} OPTIONAL,
mbms-NonServingCell-r11 ENUMERATED {supported} OPTIONAL

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V13.5.0 (2017-03)
-- 3GPP TS 36.331 V13.6.0 (2017-06)
--
NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -643,6 +643,8 @@ SystemInformationBlockType3-NB-r13 ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
...,
[[ intraFreqCellReselectionInfo-v1350 IntraFreqCellReselectionInfo-NB-v1350 OPTIONAL -- Cond Qrxlevmin
]],
[[ intraFreqCellReselectionInfo-v1360 IntraFreqCellReselectionInfo-NB-v1360 OPTIONAL -- Need OR
]]
}
@ -650,6 +652,9 @@ IntraFreqCellReselectionInfo-NB-v1350 ::= SEQUENCE {
delta-RxLevMin-v1350 INTEGER (-8..-1)
}
IntraFreqCellReselectionInfo-NB-v1360 ::= SEQUENCE {
s-IntraSearchP-v1360 ReselectionThreshold-NB-v1360
}
SystemInformationBlockType4-NB-r13 ::= SEQUENCE {
intraFreqNeighCellList-r13 IntraFreqNeighCellList OPTIONAL, -- Need OR
@ -708,7 +713,7 @@ AB-ConfigPLMN-NB-r13 ::= SEQUENCE {
AB-Config-NB-r13 ::= SEQUENCE {
ab-Category-r13 ENUMERATED {a, b, c},
ab-BarringBitmap-r13 BIT STRING (SIZE(10)),
ab-BarringExceptionData-r13 ENUMERATED {true} OPTIONAL, -- Need OP
ab-BarringForExceptionData-r13 ENUMERATED {true} OPTIONAL, -- Need OP
ab-BarringForSpecialAC-r13 BIT STRING (SIZE(5))
}
@ -958,7 +963,6 @@ PhysicalConfigDedicated-NB-r13 ::= SEQUENCE {
}
RACH-ConfigCommon-NB-r13 ::= SEQUENCE {
preambleTransMax-CE-r13 PreambleTransMax,
powerRampingParameters-r13 PowerRampingParameters,
@ -1133,6 +1137,9 @@ NS-PmaxValue-NB-r13 ::= SEQUENCE {
}
ReselectionThreshold-NB-v1360 ::= INTEGER (32..63)
T-Reselection-NB-r13 ::= ENUMERATED {s0, s3, s6, s9, s12, s15, s18, s21}

View File

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

View File

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

View File

@ -914,6 +914,9 @@ RRCConnectionRelease-v1020-IEs/extendedWaitTime-r10 DISPLAY=BASE_DEC|BASE_UNIT_S
#.TYPE_ATTR
SystemInformationBlockType1/cellSelectionInfo/q-RxLevMinOffset STRINGS=VALS(lte_rrc_q_RxLevMinOffset_vals)
#.TYPE_ATTR
CellSelectionInfoCE1-v1360/delta-RxLevMinCE1-v1360 STRINGS=VALS(lte_rrc_delta_RxLevMin_vals)
#.TYPE_ATTR
CellSelectionInfo-v920/q-QualMinOffset-r9 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
@ -1225,6 +1228,9 @@ ThresholdUTRA/utra-EcN0 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=&lte_rrc_thresh
#.TYPE_ATTR
RSRP-Range DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=&lte_rrc_RSRP_Range_vals_ext
#.TYPE_ATTR
RSRP-Range-v1360 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=&lte_rrc_RSRP_Range_v1360_vals_ext
#.TYPE_ATTR
RSRP-RangeSL-r12 DISPLAY=BASE_DEC STRINGS=VALS(lte_rrc_RSRP_RangeSL_vals)
@ -2312,16 +2318,16 @@ RRCConnectionReject-NB-r13-IEs/extendedWaitTime-r13 DISPLAY=BASE_DEC|BASE_UNIT_S
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)
CellSelectionInfo-NB-v1350/delta-RxLevMin-v1350 STRINGS=VALS(lte_rrc_delta_RxLevMin_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)
IntraFreqCellReselectionInfo-NB-v1350/delta-RxLevMin-v1350 STRINGS=VALS(lte_rrc_delta_RxLevMin_vals)
#.TYPE_ATTR
InterFreqCarrierFreqInfo-NB-r13/eag_1/delta-RxLevMin-v1350 STRINGS=VALS(lte_rrc_delta_RxLevMin_v1350_vals)
InterFreqCarrierFreqInfo-NB-r13/eag_1/delta-RxLevMin-v1350 STRINGS=VALS(lte_rrc_delta_RxLevMin_vals)
#.TYPE_ATTR
AB-Config-NB-r13/ab-Category-r13 STRINGS=VALS(lte_rrc_eab_category_vals)
@ -2404,3 +2410,6 @@ UplinkPowerControlCommon-NB-r13/deltaPreambleMsg3-r13 STRINGS=VALS(lte_rrc_delta
#.TYPE_ATTR
UplinkPowerControlDedicated-NB-r13/p0-UE-NPUSCH-r13 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
#.TYPE_ATTR
ReselectionThreshold-NB-v1360 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=&lte_rrc_ReselectionThreshold_NB_vals_ext

View File

@ -1,7 +1,7 @@
/* 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.5.0 Release 13) packet dissection
* (3GPP TS 36.331 V13.6.0 Release 13) packet dissection
* Copyright 2008, Vincent Helfre
* Copyright 2009-2017, Pascal Quantin
*
@ -827,7 +827,7 @@ static const value_string lte_rrc_q_RxLevMinOffset_vals[] = {
{ 0, NULL}
};
static const value_string lte_rrc_delta_RxLevMin_v1350_vals[] = {
static const value_string lte_rrc_delta_RxLevMin_vals[] = {
{ -8, "-16dBm"},
{ -7, "-14dBm"},
{ -6, "-12dBm"},
@ -1069,6 +1069,43 @@ static const value_string lte_rrc_ReselectionThreshold_vals[] = {
};
static value_string_ext lte_rrc_ReselectionThreshold_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_ReselectionThreshold_vals);
static const value_string lte_rrc_ReselectionThreshold_NB_vals[] = {
{ 32, "64dB"},
{ 33, "66dB"},
{ 34, "68dB"},
{ 35, "70dB"},
{ 36, "72dB"},
{ 37, "74dB"},
{ 38, "76dB"},
{ 39, "78dB"},
{ 40, "80dB"},
{ 41, "82dB"},
{ 42, "84dB"},
{ 43, "86dB"},
{ 44, "88dB"},
{ 45, "90dB"},
{ 46, "92dB"},
{ 47, "94dB"},
{ 48, "96dB"},
{ 49, "98dB"},
{ 50, "100dB"},
{ 51, "102dB"},
{ 52, "104dB"},
{ 53, "106dB"},
{ 54, "108dB"},
{ 55, "110dB"},
{ 56, "112dB"},
{ 57, "114dB"},
{ 58, "116dB"},
{ 59, "118dB"},
{ 60, "120dB"},
{ 61, "122dB"},
{ 62, "124dB"},
{ 63, "126dB"},
{ 0, NULL}
};
static value_string_ext lte_rrc_ReselectionThreshold_NB_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_ReselectionThreshold_NB_vals);
static const value_string lte_rrc_Hysteresis_vals[] = {
{ 0 , "0dB"},
{ 1 , "0.5dB"},
@ -1903,6 +1940,28 @@ static const value_string lte_rrc_RSRP_Range_vals[] = {
};
static value_string_ext lte_rrc_RSRP_Range_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_RSRP_Range_vals);
static const value_string lte_rrc_RSRP_Range_v1360_vals[] = {
{ -17, "RSRP < -156dBm"},
{ -16, "-156dBm <= RSRP < -155dBm"},
{ -15, "-155dBm <= RSRP < -154dBm"},
{ -14, "-154dBm <= RSRP < -153dBm"},
{ -13, "-153dBm <= RSRP < -152dBm"},
{ -12, "-152dBm <= RSRP < -151dBm"},
{ -11, "-151dBm <= RSRP < -150dBm"},
{ -10, "-150dBm <= RSRP < -149dBm"},
{ -9, "-149dBm <= RSRP < -148dBm"},
{ -8, "-148dBm <= RSRP < -147dBm"},
{ -7, "-147dBm <= RSRP < -146dBm"},
{ -6, "-146dBm <= RSRP < -145dBm"},
{ -5, "-145dBm <= RSRP < -144dBm"},
{ -4, "-144dBm <= RSRP < -143dBm"},
{ -3, "-143dBm <= RSRP < -142dBm"},
{ -2, "-142dBm <= RSRP < -141dBm"},
{ -1, "-141dBm <= RSRP < -140dBm"},
{ 0, NULL}
};
static value_string_ext lte_rrc_RSRP_Range_v1360_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_RSRP_Range_v1360_vals);
static const value_string lte_rrc_RSRP_RangeSL_vals[] = {
{ 0, "-infinity"},
{ 1, "-115dBm"},

File diff suppressed because it is too large Load Diff