diff options
author | Anders Broman <anders.broman@ericsson.com> | 2009-09-17 19:45:00 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2009-09-17 19:45:00 +0000 |
commit | f16502fdfb86f35a431c83891cb38e313cfecb87 (patch) | |
tree | 7f771cfc549b607830c19a6037a3ba71094557ba | |
parent | 988b882948fbb1f8cf346ccd96c10c718c3e9305 (diff) |
Minor ASN1 update.
svn path=/trunk/; revision=29975
-rw-r--r-- | asn1/s1ap/S1AP-CommonDataTypes.asn | 5 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-Constants.asn | 4 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-Containers.asn | 8 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-IEs.asn | 7 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-PDU-Contents.asn | 5 | ||||
-rw-r--r-- | asn1/s1ap/S1AP-PDU-Descriptions.asn | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-s1ap.c | 3 |
7 files changed, 7 insertions, 31 deletions
diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn index f08907557a..3ddbf35a2f 100644 --- 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 ada265d7f7..ff4e8779cd 100644 --- 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 5d85c9045f..63883f424c 100644 --- 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 46ea9fea6d..719bf1359b 100644 --- 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 836e233798..e9762a2b62 100644 --- 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 d746bae502..46667cac2d 100644 --- 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 18f710e24e..a05ea56f53 100644 --- 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; } |