osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Minor ASN1 update. 

svn path=/trunk/; revision=29975
This commit is contained in:
Anders Broman 2009-09-17 19:45:00 +00:00
parent 988b882948
commit f16502fdfb
7 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
asn1/s1ap/S1AP-CommonDataTypes.asn
View File

@ -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

4
asn1/s1ap/S1AP-Constants.asn
View File

@ -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

8
asn1/s1ap/S1AP-Containers.asn
View File

@ -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

7
asn1/s1ap/S1AP-IEs.asn
View File

@ -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

5
asn1/s1ap/S1AP-PDU-Contents.asn
View File

@ -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

6
asn1/s1ap/S1AP-PDU-Descriptions.asn
View File

@ -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

3
epan/dissectors/packet-s1ap.c
View File

@ -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;
}