Minor ASN1 update.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29975 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn
index f08907557a78c16e8475dfdc2e70eb9f49006a02..3ddbf35a2f4f324842212a647f6499d6e74d480b 100644 (file)
--- a/asn1/s1ap/S1AP-CommonDataTypes.asn
+++ b/asn1/s1ap/S1AP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.6.0 (2009-06)
+-- 3GPP TS 36.413 V8.6.1 (2009-06)
 -- 9.3.5       Common Definitions
 -- **************************************************************
 --
@@ -33,6 +33,3 @@ ProtocolIE-ID         ::= INTEGER (0..65535)
 TriggeringMessage      ::= ENUMERATED { initiating-message, successful-outcome, unsuccessfull-outcome }
 
 END
-
-
-

diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn
index ada265d7f7e6fbb1bf1d4fda745ad506a74e9bca..ff4e8779cd83806aa5ea5a0d09718caf5cc3beab 100644 (file)
--- a/asn1/s1ap/S1AP-Constants.asn
+++ b/asn1/s1ap/S1AP-Constants.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.6.0 (2009-06)
+-- 3GPP TS 36.413 V8.6.1 (2009-06)
 -- 9.3.6       Constant Definitions
 -- **************************************************************
 --
@@ -249,5 +249,3 @@ id-DefaultPagingDRX                                                         ProtocolIE-ID ::= 137
 id-Source-ToTarget-TransparentContainer-Secondary                      ProtocolIE-ID ::= 138
 id-Target-ToSource-TransparentContainer-Secondary                      ProtocolIE-ID ::= 139
 END
-
-

diff --git a/asn1/s1ap/S1AP-Containers.asn b/asn1/s1ap/S1AP-Containers.asn
index 5d85c9045f4e5d6f53724f99a9b0a3c055a86b35..63883f424c293411577be8de96fa0f2a2ed08cbf 100644 (file)
--- a/asn1/s1ap/S1AP-Containers.asn
+++ b/asn1/s1ap/S1AP-Containers.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.6.0 (2009-06)
+-- 3GPP TS 36.413 V8.6.1 (2009-06)
 -- 9.3.7       Container Definitions
 -- **************************************************************
 --
@@ -199,9 +199,3 @@ PrivateIE-Field {S1AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 }
 
 END
-
-
-
-
-
-

diff --git a/asn1/s1ap/S1AP-IEs.asn b/asn1/s1ap/S1AP-IEs.asn
index 46ea9fea6d0b172aea8684fe2c62c37568754245..719bf1359b6e35dd39e3574b447bf0ecaba93237 100644 (file)
--- a/asn1/s1ap/S1AP-IEs.asn
+++ b/asn1/s1ap/S1AP-IEs.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.6.0 (2009-06)
+-- 3GPP TS 36.413 V8.6.1 (2009-06)
 -- 9.3.4       Information Element Definitions
 -- **************************************************************
 --
@@ -287,7 +287,6 @@ CNDomain ::= ENUMERATED {
 
 CSFallbackIndicator ::= ENUMERATED { 
        cs-fallback-required,
-       cs-fallback-high-priority, 
        ...,
        cs-fallback-high-priority 
 }
@@ -1177,7 +1176,3 @@ X2TNLConfigurationInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 -- Z
 
 END
-
-
-
-

diff --git a/asn1/s1ap/S1AP-PDU-Contents.asn b/asn1/s1ap/S1AP-PDU-Contents.asn
index 836e233798dea6c8f037edb8f13e8104a3db4945..e9762a2b62b32b212cb1553ba9e875c80d0fdf35 100644 (file)
--- a/asn1/s1ap/S1AP-PDU-Contents.asn
+++ b/asn1/s1ap/S1AP-PDU-Contents.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.6.0 (2009-06)
+-- 3GPP TS 36.413 V8.6.1 (2009-06)
 -- 9.3.3       PDU Definitions
 -- **************************************************************
 --
@@ -2081,6 +2081,3 @@ PrivateMessageIEs S1AP-PRIVATE-IES ::= {
 }
 
 END
-
-
-

diff --git a/asn1/s1ap/S1AP-PDU-Descriptions.asn b/asn1/s1ap/S1AP-PDU-Descriptions.asn
index d746bae502e997b8f4fffe54239244e22b64c6fa..46667cac2db77014e8d8f1b448750d4dcc4822dd 100644 (file)
--- a/asn1/s1ap/S1AP-PDU-Descriptions.asn
+++ b/asn1/s1ap/S1AP-PDU-Descriptions.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.6.0 (2009-06)
+-- 3GPP TS 36.413 V8.6.1 (2009-06)
 -- 9.3.2       Elementary Procedure Definitions
 -- **************************************************************
 --
@@ -546,7 +546,3 @@ privateMessage S1AP-ELEMENTARY-PROCEDURE ::= {
 }
 
 END
-
-
-
-

diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index 18f710e24e1b2399300e23c8db57ef552c61c95d..a05ea56f53cb3f5cdc04da0272b0c3729c5a81b7 100644 (file)
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -2113,7 +2113,6 @@ dissect_s1ap_CNDomain(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
 static const value_string s1ap_CSFallbackIndicator_vals[] = {
   {   0, "cs-fallback-required" },
   {   1, "cs-fallback-high-priority" },
-  {   2, "cs-fallback-high-priority" },
   { 0, NULL }
 };
 
@@ -2121,7 +2120,7 @@ static const value_string s1ap_CSFallbackIndicator_vals[] = {
 static int
 dissect_s1ap_CSFallbackIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
-                                     2, NULL, TRUE, 1, NULL);
+                                     1, NULL, TRUE, 1, NULL);
 
   return offset;
 }