diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-09-11 10:08:41 +0000 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-09-11 10:08:41 +0000 |
commit | 1bdf9a891209cd8f042e9932407843437d4bbf18 (patch) | |
tree | 93653b37b0c35449eab93395482078d3e6aafdba | |
parent | a406bb1a50cbd4c7cd42e83ef97365e6d6f8aa6f (diff) |
Upgrade LTE RRC dissector to v11.0.0
svn path=/trunk/; revision=44875
-rw-r--r-- | asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn | 2 | ||||
-rw-r--r-- | asn1/lte-rrc/EUTRA-RRC-Definitions.asn | 8 | ||||
-rw-r--r-- | asn1/lte-rrc/EUTRA-UE-Variables.asn | 2 | ||||
-rw-r--r-- | asn1/lte-rrc/packet-lte-rrc-template.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-lte-rrc.c | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn b/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn index 1b310c9101..b65e9eb565 100644 --- a/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn +++ b/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V10.6.0 (2012-06) +-- 3GPP TS 36.331 V11.0.0 (2012-06) -- $Id$ -- EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::= diff --git a/asn1/lte-rrc/EUTRA-RRC-Definitions.asn b/asn1/lte-rrc/EUTRA-RRC-Definitions.asn index 474cc2e028..6fcc9482d8 100644 --- a/asn1/lte-rrc/EUTRA-RRC-Definitions.asn +++ b/asn1/lte-rrc/EUTRA-RRC-Definitions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V10.6.0 (2012-06) +-- 3GPP TS 36.331 V11.0.0 (2012-06) -- $Id$ -- EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::= @@ -1585,7 +1585,7 @@ SystemInformationBlockType5 ::= SEQUENCE { } SystemInformationBlockType5-v8h0-IEs ::= SEQUENCE { - interFreqCarrierFreqList-v8h0 SEQUENCE (SIZE (1..maxFreq)) OF InterFreqCarrierFreqInfo-v8h0 OPTIONAL, -- Need OP + interFreqCarrierFreqList-v8h0 SEQUENCE (SIZE (1..maxFreq)) OF InterFreqCarrierFreqInfo-v8h0 OPTIONAL, -- Need OP nonCriticalExtension SEQUENCE {} OPTIONAL -- Need OP } @@ -2923,10 +2923,10 @@ NextHopChainingCount ::= INTEGER (0..7) SecurityAlgorithmConfig ::= SEQUENCE { cipheringAlgorithm ENUMERATED { - eea0, eea1, eea2, spare5, spare4, spare3, + eea0, eea1, eea2, eea3-v11xy, spare4, spare3, spare2, spare1, ...}, integrityProtAlgorithm ENUMERATED { - eia0-v920, eia1, eia2, spare5, spare4, spare3, + eia0-v920, eia1, eia2, eia3-v11xy, spare4, spare3, spare2, spare1, ...} } diff --git a/asn1/lte-rrc/EUTRA-UE-Variables.asn b/asn1/lte-rrc/EUTRA-UE-Variables.asn index 746aa958d6..664c9d5ef1 100644 --- a/asn1/lte-rrc/EUTRA-UE-Variables.asn +++ b/asn1/lte-rrc/EUTRA-UE-Variables.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V10.6.0 (2012-06) +-- 3GPP TS 36.331 V11.0.0 (2012-06) -- $Id$ -- EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::= diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c index 7a5e2aadda..ad38a288ca 100644 --- a/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/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 V10.6.0 Release 10) packet dissection + * (3GPP TS 36.331 V11.0.0 Release 11) packet dissection * Copyright 2008, Vincent Helfre * * $Id$ diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index 1f69ce9a5f..af1680564a 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -9,7 +9,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 V10.6.0 Release 10) packet dissection + * (3GPP TS 36.331 V11.0.0 Release 11) packet dissection * Copyright 2008, Vincent Helfre * * $Id$ @@ -17725,7 +17725,7 @@ static const value_string lte_rrc_T_cipheringAlgorithm_vals[] = { { 0, "eea0" }, { 1, "eea1" }, { 2, "eea2" }, - { 3, "spare5" }, + { 3, "eea3-v11xy" }, { 4, "spare4" }, { 5, "spare3" }, { 6, "spare2" }, @@ -17747,7 +17747,7 @@ static const value_string lte_rrc_T_integrityProtAlgorithm_vals[] = { { 0, "eia0-v920" }, { 1, "eia1" }, { 2, "eia2" }, - { 3, "spare5" }, + { 3, "eia3-v11xy" }, { 4, "spare4" }, { 5, "spare3" }, { 6, "spare2" }, |