From b357353f35f90445ef7532f86f4f324a03638c37 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Fri, 13 Jan 2017 11:38:17 +0100 Subject: LTE RRC: upgrade dissector to v13.4.0 Change-Id: I5f7de78f0be320781091e17ec8c471a3fd482b14 Reviewed-on: https://code.wireshark.org/review/19625 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- .../asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn | 2 +- .../asn1/lte-rrc/EUTRA-RRC-Definitions.asn | 48 ++++++++++++++-------- .../asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn | 2 +- .../dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn | 2 +- .../asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn | 2 +- .../asn1/lte-rrc/NBIOT-RRC-Definitions.asn | 2 +- .../dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn | 2 +- .../asn1/lte-rrc/PC5-RRC-Definitions.asn | 2 +- epan/dissectors/asn1/lte-rrc/lte-rrc.cnf | 1 - .../asn1/lte-rrc/packet-lte-rrc-template.c | 2 +- 10 files changed, 38 insertions(+), 27 deletions(-) (limited to 'epan/dissectors/asn1/lte-rrc') diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn index 1d67f416f8..2c9a4877a6 100644 --- a/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn +++ b/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V13.3.0 (2016-09) +-- 3GPP TS 36.331 V13.4.0 (2016-12) -- EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::= diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn index 85abebf772..1d14757a8c 100644 --- a/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn +++ b/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V13.3.0 (2016-09) +-- 3GPP TS 36.331 V13.4.0 (2016-12) -- EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::= @@ -1593,7 +1593,12 @@ SCPTMConfiguration-r13 ::= SEQUENCE { sc-mtch-InfoList-r13 SC-MTCH-InfoList-r13, scptm-NeighbourCellList-r13 SCPTM-NeighbourCellList-r13 OPTIONAL, -- Need OP lateNonCriticalExtension OCTET STRING OPTIONAL, - nonCriticalExtension SEQUENCE {} OPTIONAL + nonCriticalExtension SCPTMConfiguration-v1340 OPTIONAL +} + +SCPTMConfiguration-v1340 ::= SEQUENCE { + p-b-r13 INTEGER (0..3) OPTIONAL, -- Need ON + nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -1864,7 +1869,7 @@ SystemInformationBlockType1-v1320-IEs ::= SEQUENCE { interval-TDD-r13 ENUMERATED { int5, int10, int20, int40} } OPTIONAL, -- Need OR mpdcch-pdsch-HoppingOffset-r13 INTEGER (1..maxAvailNarrowBands-r13) OPTIONAL -- Need OR - } OPTIONAL, -- Cond SI-Hopping + } OPTIONAL, -- Cond Hopping nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -3694,7 +3699,7 @@ CSI-RS-ConfigNonPrecoded-r13 ::= SEQUENCE { codebookConfigN1-r13 ENUMERATED {n1, n2, n3, n4, n8}, codebookConfigN2-r13 ENUMERATED {n1, n2, n3, n4, n8}, codebookOverSamplingRateConfig-O1-r13 ENUMERATED {n4, n8} OPTIONAL, -- Need OR - codebookOverSamplingRateConfig-O2-r13 ENUMERATED {n4,n8} OPTIONAL, -- Need OR + codebookOverSamplingRateConfig-O2-r13 ENUMERATED {n4, n8} OPTIONAL, -- Need OR codebookConfig-r13 INTEGER (1..4), csi-IM-ConfigIdList-r13 SEQUENCE (SIZE (1..2)) OF CSI-IM-ConfigId-r13 OPTIONAL, -- Need OR csi-RS-ConfigNZP-EMIMO-r13 CSI-RS-ConfigNZP-EMIMO-r13 OPTIONAL -- Need ON @@ -4119,11 +4124,11 @@ PDCCH-CandidateReductionValue-r13 ::= ENUMERATED {n0, n33, n66, n100} PDCCH-CandidateReductions-r13 ::= CHOICE { release NULL, setup SEQUENCE { - pdcch-candidateReductionAL1 PDCCH-CandidateReductionValue-r13, - pdcch-candidateReductionAL2 PDCCH-CandidateReductionValue-r13, - pdcch-candidateReductionAL3 PDCCH-CandidateReductionValue-r13, - pdcch-candidateReductionAL4 PDCCH-CandidateReductionValue-r13, - pdcch-candidateReductionAL5 PDCCH-CandidateReductionValue-r13 + pdcch-candidateReductionAL1-r13 PDCCH-CandidateReductionValue-r13, + pdcch-candidateReductionAL2-r13 PDCCH-CandidateReductionValue-r13, + pdcch-candidateReductionAL3-r13 PDCCH-CandidateReductionValue-r13, + pdcch-candidateReductionAL4-r13 PDCCH-CandidateReductionValue-r13, + pdcch-candidateReductionAL5-r13 PDCCH-CandidateReductionValue-r13 } } @@ -5058,11 +5063,11 @@ FreqHoppingParameters-r13 ::= SEQUENCE { interval-ULHoppingConfigCommonModeA-r13 CHOICE { interval-FDD-r13 ENUMERATED {int1, int2, int4, int8}, interval-TDD-r13 ENUMERATED {int1, int5, int10, int20} - } OPTIONAL, -- Need OR + } OPTIONAL, -- Cond MP-A interval-ULHoppingConfigCommonModeB-r13 CHOICE { interval-FDD-r13 ENUMERATED {int2, int4, int8, int16}, interval-TDD-r13 ENUMERATED { int5, int10, int20, int40} - } OPTIONAL, -- Need OR + } OPTIONAL, -- Cond MP-B mpdcch-pdsch-HoppingOffset-r13 INTEGER (1..maxAvailNarrowBands-r13) OPTIONAL -- Cond HO } @@ -6852,8 +6857,8 @@ UL-PDCP-DelayResult-r13 ::= SEQUENCE { MeasResultSSTD-r13 ::= SEQUENCE { sfn-OffsetResult-r13 INTEGER (0..1023), - frameBoundaryOffsetResult-r13 INTEGER (-4..5), - subframeBoundaryOffsetResult-r13 INTEGER (0..63) + frameBoundaryOffsetResult-r13 INTEGER (-5..4), + subframeBoundaryOffsetResult-r13 INTEGER (0..127) } @@ -7552,10 +7557,15 @@ UE-EUTRA-Capability-v1320-IEs ::= SEQUENCE { } UE-EUTRA-Capability-v1330-IEs ::= SEQUENCE { - ue-CategoryDL-v13xy INTEGER (18..19) OPTIONAL, + ue-CategoryDL-v1330 INTEGER (18..19) OPTIONAL, phyLayerParameters-v1330 PhyLayerParameters-v1330 OPTIONAL, ue-CE-NeedULGaps-r13 ENUMERATED {true} OPTIONAL, - nonCriticalExtension SEQUENCE {} OPTIONAL + nonCriticalExtension UE-EUTRA-Capability-v1340-IEs OPTIONAL +} + +UE-EUTRA-Capability-v1340-IEs ::= SEQUENCE { + ue-CategoryUL-v1340 INTEGER (15) OPTIONAL, + nonCriticalExtension SEQUENCE {} OPTIONAL } UE-EUTRA-CapabilityAddXDD-Mode-r9 ::= SEQUENCE { @@ -8632,7 +8642,11 @@ SC-MTCH-Info-r13 ::= SEQUENCE { g-RNTI-r13 BIT STRING(SIZE(16)), sc-mtch-schedulingInfo-r13 SC-MTCH-SchedulingInfo-r13 OPTIONAL, -- Need OP sc-mtch-neighbourCell-r13 BIT STRING (SIZE(maxNeighCell-SCPTM-r13)) OPTIONAL, -- Need OP - ... + ..., + [[ p-a-r13 ENUMERATED { + dB-6, dB-4dot77, dB-3, dB-1dot77, + dB0, dB1, dB2, dB3} OPTIONAL -- Need ON + ]] } MBMSSessionInfo-r13 ::= SEQUENCE { @@ -9136,8 +9150,6 @@ SL-TxPoolIdentity-r12 ::= INTEGER (1.. maxSL-TxPool-r12) SL-TxPoolIdentity-v1310 ::= INTEGER (maxSL-TxPool-r12Plus1-r13.. maxSL-TxPool-r13) -SL-TxPoolIdentity-r13 ::= INTEGER (1.. maxSL-TxPool-r13) - SL-TxPoolToReleaseList-r12 ::= SEQUENCE (SIZE (1..maxSL-TxPool-r12)) OF SL-TxPoolIdentity-r12 diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn index 3bc5942983..96f6162f09 100644 --- a/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn +++ b/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V13.3.0 (2016-09) +-- 3GPP TS 36.331 V13.4.0 (2016-12) -- EUTRA-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::= diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn index 16e87bc682..2bd40a8689 100644 --- a/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn +++ b/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V13.3.0 (2016-09) +-- 3GPP TS 36.331 V13.4.0 (2016-12) -- EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::= diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn index 4fdce40921..171eaf1a76 100644 --- a/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn +++ b/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V13.3.0 (2016-09) +-- 3GPP TS 36.331 V13.4.0 (2016-12) -- NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::= diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn index 5ebabec39d..e0e96fbb20 100644 --- a/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn +++ b/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V13.3.0 (2016-09) +-- 3GPP TS 36.331 V13.4.0 (2016-12) -- NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::= diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn index b07e4ea2ee..029881059c 100644 --- a/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn +++ b/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V13.3.0 (2016-09) +-- 3GPP TS 36.331 V13.4.0 (2016-12) -- NBIOT-UE-Variables DEFINITIONS AUTOMATIC TAGS ::= diff --git a/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn index 2e0db02da1..ae1f50a6e1 100644 --- a/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn +++ b/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V13.3.0 (2016-09) +-- 3GPP TS 36.331 V13.4.0 (2016-09) -- PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::= diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf index 2b86f6923b..b666535e6c 100644 --- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf +++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf @@ -91,7 +91,6 @@ SL-PreconfigGeneral-r12 SL-PreconfigRelay-r13 SL-PreconfigSync-r12 SL-Preconfiguration-r12 -SL-TxPoolIdentity-r13 VarConnEstFailReport-r11 VarLogMeasConfig-r10 VarLogMeasConfig-r11 diff --git a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c index 1667df7659..6a19690971 100644 --- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c @@ -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.3.0 Release 13) packet dissection + * (3GPP TS 36.331 V13.4.0 Release 13) packet dissection * Copyright 2008, Vincent Helfre * Copyright 2009-2016, Pascal Quantin * -- cgit v1.2.3