Update to 8.5.1 - "Minor corrections before freezing of ASN.1"

svn path=/trunk/; revision=28421

8 files changed, 24 insertions, 19 deletions

diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn
index ce9b6d7cce..505ec121c0 100644
--- a/asn1/s1ap/S1AP-CommonDataTypes.asn
+++ b/asn1/s1ap/S1AP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.5.0 (2009-03)
+-- 3GPP TS 36.413 version 8.5.1 (2009-04)
 -- 9.3.5	Common Definitions
 -- **************************************************************
 --
@@ -34,3 +34,4 @@ TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuc
 
 END
 
+
diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn
index 0866cbd19b..9defdbc5a9 100644
--- a/asn1/s1ap/S1AP-Constants.asn
+++ b/asn1/s1ap/S1AP-Constants.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.5.0 (2009-03)
+-- 3GPP TS 36.413 version 8.5.1 (2009-04)
 -- 9.3.6	Constant Definitions
 -- **************************************************************
 --
diff --git a/asn1/s1ap/S1AP-Containers.asn b/asn1/s1ap/S1AP-Containers.asn
index 40b57d079b..f5ca56d586 100644
--- a/asn1/s1ap/S1AP-Containers.asn
+++ b/asn1/s1ap/S1AP-Containers.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.5.0 (2009-03)
+-- 3GPP TS 36.413 version 8.5.1 (2009-04)
 -- 9.3.7	Container Definitions
 -- **************************************************************
 --
@@ -203,3 +203,4 @@ END
 
 
 
+
diff --git a/asn1/s1ap/S1AP-IEs.asn b/asn1/s1ap/S1AP-IEs.asn
index d6a5b9b11c..79d4cadaed 100644
--- a/asn1/s1ap/S1AP-IEs.asn
+++ b/asn1/s1ap/S1AP-IEs.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.5.0 (2009-03)
+-- 3GPP TS 36.413 version 8.5.1 (2009-04)
 -- 9.3.4	Information Element Definitions
 -- **************************************************************
 --
@@ -731,7 +731,7 @@ RIMRoutingAddress ::= CHOICE {
 	...
 }
 
-ReportArea	::= ENUMERATED {
+ReportArea ::= ENUMERATED {
 	ecgi,
 	...
 }
@@ -1184,3 +1184,4 @@ X2TNLConfigurationInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 END
 
 
+
diff --git a/asn1/s1ap/S1AP-PDU-Contents.asn b/asn1/s1ap/S1AP-PDU-Contents.asn
index dc38a382c3..440b201e8c 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.5.0 (2009-03)
+-- 3GPP TS 36.413 version 8.5.1 (2009-04)
 -- 9.3.3	PDU Definitions
 -- **************************************************************
 --
@@ -146,12 +146,13 @@ FROM S1AP-Containers
 	id-HandoverRestrictionList,
 	id-HandoverType,
 	id-InitialContextSetup,
-	id-Inter-SystemInformationTransferTypeEDT,	id-Inter-SystemInformationTransferTypeMDT,
+	id-Inter-SystemInformationTransferTypeEDT,
+	id-Inter-SystemInformationTransferTypeMDT,
 	id-NAS-DownlinkCount,
 	id-MMEname,
 	id-MME-UE-S1AP-ID,
-id-MSClassmark2,
-id-MSClassmark3,
+	id-MSClassmark2,
+	id-MSClassmark3,
 	id-NAS-PDU,
 	id-NASSecurityParametersfromE-UTRAN,
 	id-NASSecurityParameterstoE-UTRAN,
@@ -520,7 +521,7 @@ HandoverNotifyIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID			PRESENCE mandatory	} |
 	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID			PRESENCE mandatory	} |
 	{ ID id-EUTRAN-CGI				CRITICALITY ignore	TYPE EUTRAN-CGI				PRESENCE mandatory}|
-	{ ID id-TAI						CRITICALITY ignore	TYPE TAI					PRESENCE mandatory}|
+	{ ID id-TAI						CRITICALITY ignore	TYPE TAI					PRESENCE mandatory},
 	...
 }
 
@@ -1081,7 +1082,7 @@ PagingIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-pagingDRX					CRITICALITY ignore	TYPE PagingDRX			PRESENCE optional	} |
 	{ ID id-CNDomain					CRITICALITY ignore		TYPE CNDomain		PRESENCE mandatory	} |
 	{ ID id-TAIList					CRITICALITY ignore	TYPE TAIList		 	PRESENCE mandatory	}|
-	{ ID id-CSG-Id-List				CRITICALITY ignore	TYPE CSG-Id-List		PRESENCE optional },
+	{ ID id-CSG-IdList				CRITICALITY ignore	TYPE CSG-IdList		PRESENCE optional },
 	...
 }
 
@@ -1269,7 +1270,7 @@ InitialUEMessage-IEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-EUTRAN-CGI					CRITICALITY ignore	TYPE EUTRAN-CGI						PRESENCE mandatory} |
 	{ ID id-RRC-Establishment-Cause		CRITICALITY ignore	TYPE RRC-Establishment-Cause		PRESENCE mandatory} |
 	{ ID id-S-TMSI						CRITICALITY reject	TYPE S-TMSI							PRESENCE optional} |
-	{ ID id-CSG-Id						CRITICALITY reject	TYPE CSG-Id							PRESENCE optional}.
+	{ ID id-CSG-Id						CRITICALITY reject	TYPE CSG-Id							PRESENCE optional},
 	...
 }
 
@@ -1975,7 +1976,7 @@ ENBDirectInformationTransfer ::= SEQUENCE {
 }
 
 ENBDirectInformationTransferIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Inter-SystemInformationTransferTypeEDT		CRITICALITY reject	TYPE Inter-SystemInformationTransferType				PRESENCE mandatory}  ,
+	{ ID id-Inter-SystemInformationTransferTypeEDT		CRITICALITY reject	TYPE Inter-SystemInformationTransferType			PRESENCE mandatory}  ,
 	...
 }
 
@@ -2002,7 +2003,7 @@ MMEDirectInformationTransfer ::= SEQUENCE {
 }
 
 MMEDirectInformationTransferIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Inter-SystemInformationTransferTypeMDT		CRITICALITY reject	TYPE Inter-SystemInformationTransferType				PRESENCE mandatory}  ,
+	{ ID id-Inter-SystemInformationTransferTypeMDT		CRITICALITY reject	TYPE Inter-SystemInformationTransferType			PRESENCE mandatory}  ,
 	...
 }
 -- **************************************************************
@@ -2072,3 +2073,4 @@ PrivateMessageIEs S1AP-PRIVATE-IES ::= {
 
 END
 
+
diff --git a/asn1/s1ap/S1AP-PDU-Descriptions.asn b/asn1/s1ap/S1AP-PDU-Descriptions.asn
index 2429fc6237..049d33de43 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.5.0 (2009-03)
+-- 3GPP TS 36.413 version 8.5.1 (2009-04)
 -- 9.3.2	Elementary Procedure Definitions
 -- **************************************************************
 --
@@ -244,7 +244,7 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
 	deactivateTrace					|
 	traceStart						|
 	traceFailureIndication			|
-	CellTrafficTrace				|
+	cellTrafficTrace				|
 	locationReportingControl		|
 	locationReportingFailureIndication	|
 	locationReport					|
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index 52b5e2a7da..3ff13c5f2d 100644
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -24,7 +24,7 @@
  *
  * Based on the RANAP dissector
  *
- * References: 3GPP TS 25.413 version 6.6.0 Release
+ * References: 3GPP TS 36.413 V8.5.0 (2009-03)
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index c5997a019c..daf25350fe 100644
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-s1ap.c                                                              */
-/* ../../tools/asn2wrs.py -p s1ap -c ./s1ap.cnf -s ./packet-s1ap-template -D . S1AP-CommonDataTypes.asn S1AP-Constants.asn S1AP-Containers.asn S1AP-IEs.asn S1AP-PDU-Contents.asn S1AP-PDU-Descriptions.asn */
+/* ../../tools/asn2wrs.py -p s1ap -c s1ap.cnf -s packet-s1ap-template S1AP-CommonDataTypes.asn S1AP-Constants.asn S1AP-Containers.asn S1AP-IEs.asn S1AP-PDU-Contents.asn S1AP-PDU-Descriptions.asn */
 
 /* Input file: packet-s1ap-template.c */
 
@@ -32,7 +32,7 @@
  *
  * Based on the RANAP dissector
  *
- * References: 3GPP TS 25.413 version 6.6.0 Release
+ * References: 3GPP TS 36.413 V8.5.0 (2009-03)
  */
 
 #ifdef HAVE_CONFIG_H