Update to V9.1.0 (2009-12).

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

7 files changed, 88 insertions, 21 deletions

diff --git a/asn1/ranap/RANAP-CommonDataTypes.asn b/asn1/ranap/RANAP-CommonDataTypes.asn
index d66f87c779..a315747ba7 100644
--- a/asn1/ranap/RANAP-CommonDataTypes.asn
+++ b/asn1/ranap/RANAP-CommonDataTypes.asn
@@ -1,6 +1,6 @@
 -- RANAP-CommonDataTypes.asn
 --
--- 3GPP TS 25.413 V8.4.0 (2009-09)
+-- 3GPP TS 25.413 V9.1.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.5	Common Definitions
@@ -40,3 +40,4 @@ ProtocolIE-ID		::= INTEGER (0..65535)
 TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuccessfull-outcome, outcome }
 
 END
+
diff --git a/asn1/ranap/RANAP-Constants.asn b/asn1/ranap/RANAP-Constants.asn
index ffd709bab1..77d2f23786 100644
--- a/asn1/ranap/RANAP-Constants.asn
+++ b/asn1/ranap/RANAP-Constants.asn
@@ -1,6 +1,6 @@
 -- RANAP-Constants.asn
 --
--- 3GPP TS 25.413 V8.4.0 (2009-09)
+-- 3GPP TS 25.413 V9.1.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.6	Constant Definitions
@@ -352,6 +352,9 @@ id-SRVCC-Operation-Possible								INTEGER ::= 228
 id-CSG-Id-List											INTEGER ::= 229
 id-PSRABtobeReplaced									INTEGER ::= 230
 id-E-UTRAN-Service-Handover								INTEGER ::= 231
+id-UE-AggregateMaximumBitRate							INTEGER ::= 233
+id-CSG-Membership-Status 								INTEGER ::= 234
+id-Cell-Access-Mode										INTEGER ::= 235
 
 
 END
diff --git a/asn1/ranap/RANAP-Containers.asn b/asn1/ranap/RANAP-Containers.asn
index b44cac64f1..6ed2ddee24 100644
--- a/asn1/ranap/RANAP-Containers.asn
+++ b/asn1/ranap/RANAP-Containers.asn
@@ -1,6 +1,6 @@
 -- RANAP-Containers.asn
 --
--- 3GPP TS 25.413 V8.4.0 (2009-09)
+-- 3GPP TS 25.413 V9.1.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.7	Container Definitions
diff --git a/asn1/ranap/RANAP-IEs.asn b/asn1/ranap/RANAP-IEs.asn
index 5e75e7634b..aa5bbf22c8 100644
--- a/asn1/ranap/RANAP-IEs.asn
+++ b/asn1/ranap/RANAP-IEs.asn
@@ -1,6 +1,6 @@
 -- RANAP-IEs.asn
 --
--- 3GPP TS 25.413 V8.4.0 (2009-09)
+-- 3GPP TS 25.413 V9.1.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.4	Information Element Definitions
@@ -86,8 +86,8 @@ IMPORTS
 	id-Requested-RAB-Parameter-SupportedMaxBitrateList,
 	id-Requested-RAB-Parameter-SupportedGuaranteedBitrateList,
 	id-PSRABtobeReplaced,
-    id-SRVCC-Information
-
+    id-SRVCC-Information,
+	id-CSG-Id
 
 
 FROM RANAP-Constants
@@ -425,7 +425,8 @@ CauseRadioNetworkExtension ::= INTEGER {
 	mBMS-no-cell-in-MBMS-service-area(265),
 	no-Iu-CS-UP-relocation(266),
 	successful-MBMS-Session-Start-IP-Multicast-Bearer-established(267),
-	cS-fallback-triggered(268)
+	cS-fallback-triggered(268),
+	invalid-CSG-Id(269)
 } (257..512)
 
 CauseNon-Standard ::= INTEGER (129..256)
@@ -436,6 +437,11 @@ CauseTransmissionNetwork ::= INTEGER {
 	iu-transport-connection-failed-to-establish (66)
 } (65..80)
 
+Cell-Access-Mode::= ENUMERATED {
+	hybrid,
+	... 
+}
+
 Cell-Capacity-Class-Value ::= INTEGER (1..100,...)
 
 CellLoadInformation ::= SEQUENCE {
@@ -560,6 +566,12 @@ CSG-Id		::= BIT STRING (SIZE (27))
 CSG-Id-List ::= SEQUENCE (SIZE (1..maxNrOfCSGs)) OF
 	CSG-Id
 
+CSG-Membership-Status ::= ENUMERATED { 
+	member, 
+	non-member,
+	...
+}
+
 -- D
 
 DataVolumeReference			::= INTEGER (0..255)
@@ -1727,7 +1739,9 @@ SourceRNC-ToTargetRNC-TransparentContainer-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 	{ID id-SubscriberProfileIDforRFP			CRITICALITY ignore		EXTENSION SubscriberProfileIDforRFP				PRESENCE optional}|
 -- Extension for Release 8 to transfer to the Target RNC parameters required for SRVCC operation --
 	{ID id-SRVCC-Information 					CRITICALITY reject		EXTENSION SRVCC-Information							PRESENCE optional}|
-	{ID id-PSRABtobeReplaced 					CRITICALITY reject		EXTENSION RAB-ID										PRESENCE optional},
+	{ID id-PSRABtobeReplaced 					CRITICALITY reject		EXTENSION RAB-ID										PRESENCE optional}|
+-- Extension for Release 9 to transfer to the Target RNC parameters required for CSG ID validation --
+	{ID id-CSG-Id 							CRITICALITY reject 			EXTENSION CSG-Id 										PRESENCE optional},
 	...
 }
 
@@ -1842,7 +1856,9 @@ TargetRNC-ID ::= SEQUENCE {
 
 TargetRNC-ID-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 7 to indicate extended RNC-ID --
-	{ ID id-ExtendedRNC-ID				CRITICALITY reject	EXTENSION ExtendedRNC-ID		PRESENCE optional	},
+	{ ID id-ExtendedRNC-ID				CRITICALITY reject	EXTENSION ExtendedRNC-ID		PRESENCE optional	}|
+-- Extension for Release 9 to transfer to the Target RNC parameters required for access control during inbound CSG mobility --
+	{ID id-CSG-Id 							CRITICALITY reject 			EXTENSION CSG-Id 										PRESENCE optional},
 	...
 }
 
@@ -1967,6 +1983,19 @@ TypeOfError ::= ENUMERATED {
 
 -- U
 
+UE-AggregateMaximumBitRate ::= SEQUENCE {
+	uE-AggregateMaximumBitRateDownlink		UE-AggregateMaximumBitRateDownlink	OPTIONAL,
+	uE-AggregateMaximumBitRateUplink		UE-AggregateMaximumBitRateUplink	OPTIONAL,
+	...
+}
+
+UE-AggregateMaximumBitRateDownlink			::= INTEGER (1..1000000000)
+-- Unit is bits per sec
+
+UE-AggregateMaximumBitRateUplink			::= INTEGER (1..1000000000)
+-- Unit is bits per sec
+
+
 UE-History-Information ::= OCTET STRING
 
 UE-ID ::= CHOICE {
diff --git a/asn1/ranap/RANAP-PDU-Contents.asn b/asn1/ranap/RANAP-PDU-Contents.asn
index dcc11b6aeb..ed66739f12 100644
--- a/asn1/ranap/RANAP-PDU-Contents.asn
+++ b/asn1/ranap/RANAP-PDU-Contents.asn
@@ -1,6 +1,6 @@
 -- RANAP-PDU-Contents.asn
 --
--- 3GPP TS 25.413 V8.4.0 (2009-09)
+-- 3GPP TS 25.413 V9.1.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.3	PDU Definitions
@@ -39,6 +39,7 @@ IMPORTS
 	AreaIdentity,
 	CN-DomainIndicator,
 	Cause,
+	Cell-Access-Mode,
 	ClientType,
 	CriticalityDiagnostics,
 	ChosenEncryptionAlgorithm,
@@ -47,6 +48,7 @@ IMPORTS
 	ClassmarkInformation3,
 	CSG-Id,
 	CSG-Id-List,
+	CSG-Membership-Status,
 	DL-GTP-PDU-SequenceNumber,
 	DL-N-PDU-SequenceNumber,
 	DataVolumeReportingIndication,
@@ -147,6 +149,7 @@ IMPORTS
 	UnsuccessfullyTransmittedDataVolume,
 	TransportLayerAddress,
 	TriggerID,
+	UE-AggregateMaximumBitRate,
 	UE-ID,
 	UESBI-Iu,
 	UL-GTP-PDU-SequenceNumber,
@@ -190,6 +193,7 @@ FROM RANAP-Containers
 	id-LocationRelatedDataRequestType,
 	id-CN-DomainIndicator,
 	id-Cause,
+	id-Cell-Access-Mode,
 	id-ChosenEncryptionAlgorithm,
 	id-ChosenIntegrityProtectionAlgorithm,
 	id-ClassmarkInformation2,
@@ -199,6 +203,7 @@ FROM RANAP-Containers
 	id-CriticalityDiagnostics,
 	id-CSG-Id,
 	id-CSG-Id-List,
+	id-CSG-Membership-Status,
 	id-DeltaRAListofIdleModeUEs,
 	id-DRX-CycleLengthCoefficient,
 	id-DirectTransferInformationItem-RANAP-RelocInf,
@@ -271,6 +276,13 @@ FROM RANAP-Containers
 	id-RAB-ContextList,
 	id-RAB-ContextFailedtoTransferItem,
 	id-RAB-ContextFailedtoTransferList,
+	id-PositionDataSpecificToGERANIuMode,
+	id-PositioningPriority,
+	id-ProvidedData,
+	id-RAB-ContextItem,
+	id-RAB-ContextList,
+	id-RAB-ContextFailedtoTransferItem,
+	id-RAB-ContextFailedtoTransferList,
 	id-RAB-ContextItem-RANAP-RelocInf,
 	id-RAB-ContextList-RANAP-RelocInf,
 	id-RAB-DataForwardingItem,
@@ -361,6 +373,7 @@ FROM RANAP-Containers
 	id-TransportLayerAddress,
 	id-TransportLayerInformation,
 	id-TriggerID,
+	id-UE-AggregateMaximumBitRate,
 	id-UE-ID,
 	id-UESBI-Iu,
 	id-UL-GTP-PDU-SequenceNumber,
@@ -515,7 +528,11 @@ RelocationRequiredExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 6 to enable Inter-RAT PS Handover between UTRAN and GERAN A/Gb --
 	{ ID id-SourceBSS-ToTargetBSS-TransparentContainer		CRITICALITY	ignore	EXTENSION SourceBSS-ToTargetBSS-TransparentContainer		PRESENCE optional	}|
 -- Extension for Release 8 for SRVCC operation --
-	{ ID id-SRVCC-HO-Indication					CRITICALITY reject	EXTENSION SRVCC-HO-Indication			PRESENCE optional	},
+	{ ID id-SRVCC-HO-Indication					CRITICALITY reject	EXTENSION SRVCC-HO-Indication			PRESENCE optional	} |
+-- Extension for Release 9 to communicate to the CN the CSG id of the target cell --
+	{ ID id-CSG-Id 								CRITICALITY reject 	EXTENSION CSG-Id 										PRESENCE optional} |
+-- Extension for Release 9 to communicate to the CN the hybrid access status of the target cell --
+	{ ID id-Cell-Access-Mode				CRITICALITY reject	EXTENSION Cell-Access-Mode						PRESENCE optional},
 	...
 }
 
@@ -699,7 +716,12 @@ RelocationRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 6 to convey the selected PLMN id in network sharing mobility scenarios --
 	{ ID id-SelectedPLMN-ID	 	CRITICALITY ignore	EXTENSION PLMNidentity		PRESENCE optional 	}|
 -- Extension for Release 6 to enable MBMS UE linking at relocation --
-	{ ID id-CNMBMSLinkingInformation	CRITICALITY ignore		EXTENSION CNMBMSLinkingInformation	PRESENCE optional},
+	{ ID id-CNMBMSLinkingInformation	CRITICALITY ignore		EXTENSION CNMBMSLinkingInformation	PRESENCE optional} |
+	{ ID id-UE-AggregateMaximumBitRate			CRITICALITY ignore	EXTENSION UE-AggregateMaximumBitRate	PRESENCE optional	} |
+-- Extension for Release 9 to communicate to the target cell the CSG id reported by the source --
+	{ ID id-CSG-Id 								CRITICALITY reject 	EXTENSION CSG-Id 										PRESENCE optional} |
+-- Extension for Release 9 for enabling UE prioritisation during access to hybrid cells --
+	{ ID id-CSG-Membership-Status		CRITICALITY	 ignore		EXTENSION CSG-Membership-Status		PRESENCE optional	},
 	...
 }
 
@@ -1534,6 +1556,7 @@ RAB-ToBeReleasedItem-EnhancedRelocCompleteRes-ExtIEs RANAP-PROTOCOL-EXTENSION ::
 }
 
 EnhancedRelocationCompleteResponseExtensions RANAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-UE-AggregateMaximumBitRate			CRITICALITY ignore	EXTENSION UE-AggregateMaximumBitRate	PRESENCE optional	},
 	...
 }
 
@@ -1651,7 +1674,9 @@ CommonIDExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 8 to indicate the Subscriber Profile ID for RAT/Frequency Selection Priority --
 	{ID id-SubscriberProfileIDforRFP		CRITICALITY ignore		EXTENSION SubscriberProfileIDforRFP					PRESENCE optional}|
 -- Extension for Release 8 for SRVCC operation --
-	{ ID id-SRVCC-Operation-Possible		CRITICALITY ignore	EXTENSION SRVCC-Operation-Possible			PRESENCE optional	},
+	{ ID id-SRVCC-Operation-Possible		CRITICALITY ignore	EXTENSION SRVCC-Operation-Possible			PRESENCE optional	}|
+-- Extension for Release 9 to allow for UE prioritisation during access to hybrid cells --
+	{ ID id-CSG-Membership-Status		CRITICALITY	 ignore		EXTENSION CSG-Membership-Status		PRESENCE optional	},
 	...
 }
 
@@ -1844,7 +1869,9 @@ InitialUE-MessageExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 7 to indicate extended RNC-ID --
 	{ ID id-ExtendedRNC-ID					CRITICALITY reject	EXTENSION ExtendedRNC-ID			PRESENCE optional	} |
 -- Extension for Release 8 to support CSG --
-	{ ID id-CSG-Id							CRITICALITY reject	EXTENSION CSG-Id					PRESENCE optional	},
+	{ ID id-CSG-Id							CRITICALITY reject	EXTENSION CSG-Id					PRESENCE optional	} |
+-- Extension for Release 9 to allow communication of the cell access mode -- 
+	{ ID id-Cell-Access-Mode				CRITICALITY reject	EXTENSION Cell-Access-Mode						PRESENCE optional},
 	...
 }
 
@@ -2100,6 +2127,7 @@ RAB-SetupOrModifyItemSecond-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 }
 
 RAB-AssignmentRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-UE-AggregateMaximumBitRate			CRITICALITY ignore	EXTENSION UE-AggregateMaximumBitRate	PRESENCE optional	},
 	...
 }
 
@@ -2385,7 +2413,8 @@ TNLInformationEnhRelInfoReq-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 
 RANAP-EnhancedRelocationInformationRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-IntegrityProtectionInformation		CRITICALITY ignore	EXTENSION IntegrityProtectionInformation 		PRESENCE optional	} |
-	{ ID id-EncryptionInformation			CRITICALITY ignore	EXTENSION EncryptionInformation 			PRESENCE optional	},
+	{ ID id-EncryptionInformation			CRITICALITY ignore	EXTENSION EncryptionInformation 			PRESENCE optional	}|
+	{ ID id-UE-AggregateMaximumBitRate			CRITICALITY ignore	EXTENSION UE-AggregateMaximumBitRate	PRESENCE optional	},
 	...
 }
 
diff --git a/asn1/ranap/RANAP-PDU-Descriptions.asn b/asn1/ranap/RANAP-PDU-Descriptions.asn
index d7f657cee3..d2f510099d 100644
--- a/asn1/ranap/RANAP-PDU-Descriptions.asn
+++ b/asn1/ranap/RANAP-PDU-Descriptions.asn
@@ -1,6 +1,6 @@
 -- RANAP-PDU-Descriptions.asn
 --
--- 3GPP TS 25.413 V8.4.0 (2009-09)
+-- 3GPP TS 25.413 V9.1.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.2	Elementary Procedure Definitions
@@ -614,7 +614,3 @@ sRVCCPreparation RANAP-ELEMENTARY-PROCEDURE ::= {
 }
 
 END
-
-
-
-
diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf
index 7f6d929888..c472b323de 100644
--- a/asn1/ranap/ranap.cnf
+++ b/asn1/ranap/ranap.cnf
@@ -37,7 +37,6 @@ LastVisitedUTRANCell-Item
 UTRAN-CellID
 CellType
 Time-UE-StayedInCell
-SRVCC-Operation-Possible
 SourceeNodeB-ToTargeteNodeB-TransparentContainer
 TargeteNodeB-ToSourceeNodeB-TransparentContainer
 #.TYPE_RENAME
@@ -317,6 +316,10 @@ dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer(tvb , offset, actx ,tre
 # Application Protocol (S1AP)".
 
 dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer(tvb , offset, actx ,tree , hf_ranap_TargetRNC_ToSourceRNC_TransparentContainer_PDU );
+
+# Handle 64 bit constraint
+#.FN_PARS UE-AggregateMaximumBitRateDownlink FN_VARIANT = _64b
+#.FN_PARS UE-AggregateMaximumBitRateUplink FN_VARIANT = _64b
     
 #.TYPE_ATTR
 ProtocolExtensionID TYPE = FT_UINT8  DISPLAY = BASE_DEC STRINGS = VALS(ranap_ProtocolIE_ID_vals)
@@ -597,6 +600,9 @@ id-SRVCC-Operation-Possible									ProtocolIE-ID
 id-CSG-Id-List												ProtocolIE-ID
 id-PSRABtobeReplaced										ProtocolIE-ID
 id-E-UTRAN-Service-Handover									ProtocolIE-ID
+id-UE-AggregateMaximumBitRate								ProtocolIE-ID
+id-CSG-Membership-Status 									ProtocolIE-ID
+id-Cell-Access-Mode											ProtocolIE-ID
 #.END
 
 #.REGISTER_NEW
@@ -838,6 +844,9 @@ SRVCC-Operation-Possible								N ranap.extension id-SRVCC-Operation-Possible
 CSG-Id-List												N ranap.extension id-CSG-Id-List
 RAB-ID													N ranap.extension id-PSRABtobeReplaced
 E-UTRAN-Service-Handover								N ranap.extension id-E-UTRAN-Service-Handover
+UE-AggregateMaximumBitRate								N ranap.extension id-UE-AggregateMaximumBitRate
+CSG-Membership-Status									N ranap.extension id-CSG-Membership-Status
+Cell-Access-Mode										N ranap.extension id-Cell-Access-Mode
 
 #RANAP-ELEMENTARY-PROCEDURE
 Iu-ReleaseCommand							N ranap.proc.imsg id-Iu-Release