- Dissect Target-ToSource-TransparentContainer.

- Update to 3GPP TS 25.413 V8.4.0 (2009-09).

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

9 files changed, 318 insertions, 177 deletions

diff --git a/asn1/ranap/RANAP-CommonDataTypes.asn b/asn1/ranap/RANAP-CommonDataTypes.asn
index ff5357f000..d66f87c779 100644
--- a/asn1/ranap/RANAP-CommonDataTypes.asn
+++ b/asn1/ranap/RANAP-CommonDataTypes.asn
@@ -1,7 +1,7 @@
 -- RANAP-CommonDataTypes.asn
 --
--- Taken from 3GPP TS 25.413 V8.2.1 (2009-03)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-821.zip
+-- 3GPP TS 25.413 V8.4.0 (2009-09)
+-- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.5	Common Definitions
 --
@@ -15,10 +15,10 @@
 -- **************************************************************
 
 RANAP-CommonDataTypes {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 umts-Access (20) modules (3) ranap (0) version1 (1) ranap-CommonDataTypes (3) }
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
@@ -40,6 +40,3 @@ 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 c8df218b29..ffd709bab1 100644
--- a/asn1/ranap/RANAP-Constants.asn
+++ b/asn1/ranap/RANAP-Constants.asn
@@ -1,7 +1,7 @@
 -- RANAP-Constants.asn
 --
--- Taken from 3GPP TS 25.413 V8.2.1 (2009-03)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-821.zip
+-- 3GPP TS 25.413 V8.4.0 (2009-09)
+-- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.6	Constant Definitions
 --
@@ -13,11 +13,11 @@
 --
 -- **************************************************************
 
-RANAP-Constants { 
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
-umts-Access (20) modules (3) ranap (0) version1 (1) ranap-Constants (4) } 
+RANAP-Constants {
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
+umts-Access (20) modules (3) ranap (0) version1 (1) ranap-Constants (4) }
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
@@ -70,9 +70,9 @@ id-MBMSCNDe-Registration-Procedure	INTEGER ::= 40
 id-MBMSRABEstablishmentIndication	INTEGER ::= 41
 id-MBMSRABRelease					INTEGER ::= 42
 id-enhancedRelocationComplete		INTEGER ::= 43
-id-enhancedRelocationCompleteConfirm		INTEGER ::= 44
+id-enhancedRelocationCompleteConfirm	INTEGER ::= 44
 id-RANAPenhancedRelocation			INTEGER ::= 45
-id-SRVCCPreparation					INTEGER ::= 256
+id-SRVCCPreparation					INTEGER ::= 46
 
 
 
@@ -101,7 +101,7 @@ maxNrOfRABs							INTEGER ::= 256
 maxNrOfSeparateTrafficDirections	INTEGER ::= 2
 maxNrOfSRBs							INTEGER ::= 8
 maxNrOfVol							INTEGER ::= 2
-maxNrOfLevels						INTEGER ::= 256 
+maxNrOfLevels						INTEGER ::= 256
 maxNrOfAltValues					INTEGER ::= 16
 maxNrOfPLMNsSN						INTEGER ::= 32
 maxNrOfLAs							INTEGER ::= 65536
@@ -118,6 +118,7 @@ maxMBMSSA							INTEGER ::= 256
 maxMBMSRA							INTEGER ::= 65536
 maxNrOfEDCHMACdFlows-1				INTEGER ::= 7
 maxGANSSSet							INTEGER ::= 9
+maxNrOfCSGs							INTEGER ::= 256
 
 -- **************************************************************
 --
@@ -184,9 +185,9 @@ id-RequestType 									INTEGER ::= 57
 id-SAI 											INTEGER ::= 58
 id-SAPI 										INTEGER ::= 59
 id-SourceID 									INTEGER ::= 60
-id-Source-ToTarget-TransparentContainer 	INTEGER ::= 61
+id-Source-ToTarget-TransparentContainer 		INTEGER ::= 61
 id-TargetID 									INTEGER ::= 62
-id-Target-ToSource-TransparentContainer 	INTEGER ::= 63
+id-Target-ToSource-TransparentContainer 		INTEGER ::= 63
 id-TemporaryUE-ID 								INTEGER ::= 64
 id-TraceReference 								INTEGER ::= 65
 id-TraceType 									INTEGER ::= 66
@@ -348,8 +349,9 @@ id-IntegrityProtectionKey								INTEGER ::= 225
 id-SRVCC-HO-Indication									INTEGER ::= 226
 id-SRVCC-Information									INTEGER ::= 227
 id-SRVCC-Operation-Possible								INTEGER ::= 228
-
-END
-
+id-CSG-Id-List											INTEGER ::= 229
+id-PSRABtobeReplaced									INTEGER ::= 230
+id-E-UTRAN-Service-Handover								INTEGER ::= 231
 
 
+END
diff --git a/asn1/ranap/RANAP-Containers.asn b/asn1/ranap/RANAP-Containers.asn
index 5168fa6917..b44cac64f1 100644
--- a/asn1/ranap/RANAP-Containers.asn
+++ b/asn1/ranap/RANAP-Containers.asn
@@ -1,7 +1,7 @@
 -- RANAP-Containers.asn
 --
--- Taken from 3GPP TS 25.413 V8.2.1 (2009-03)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-821.zip
+-- 3GPP TS 25.413 V8.4.0 (2009-09)
+-- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.7	Container Definitions
 --
@@ -15,10 +15,10 @@
 -- **************************************************************
 
 RANAP-Containers {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 umts-Access (20) modules (3) ranap (0) version1 (1) ranap-Containers (5) }
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
@@ -127,7 +127,7 @@ WITH SYNTAX {
 --
 -- **************************************************************
 
-ProtocolIE-Container {RANAP-PROTOCOL-IES : IEsSetParam} ::= 
+ProtocolIE-Container {RANAP-PROTOCOL-IES : IEsSetParam} ::=
 	SEQUENCE (SIZE (0..maxProtocolIEs)) OF
 	ProtocolIE-Field {{IEsSetParam}}
 
@@ -143,7 +143,7 @@ ProtocolIE-Field {RANAP-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
 --
 -- **************************************************************
 
-ProtocolIE-ContainerPair {RANAP-PROTOCOL-IES-PAIR : IEsSetParam} ::= 
+ProtocolIE-ContainerPair {RANAP-PROTOCOL-IES-PAIR : IEsSetParam} ::=
 	SEQUENCE (SIZE (0..maxProtocolIEs)) OF
 	ProtocolIE-FieldPair {{IEsSetParam}}
 
@@ -175,7 +175,7 @@ ProtocolIE-ContainerPairList {INTEGER : lowerBound, INTEGER : upperBound, RANAP-
 --
 -- **************************************************************
 
-ProtocolExtensionContainer {RANAP-PROTOCOL-EXTENSION : ExtensionSetParam} ::= 
+ProtocolExtensionContainer {RANAP-PROTOCOL-EXTENSION : ExtensionSetParam} ::=
 	SEQUENCE (SIZE (1..maxProtocolExtensions)) OF
 	ProtocolExtensionField {{ExtensionSetParam}}
 
@@ -191,7 +191,7 @@ ProtocolExtensionField {RANAP-PROTOCOL-EXTENSION : ExtensionSetParam} ::= SEQUEN
 --
 -- **************************************************************
 
-PrivateIE-Container {RANAP-PRIVATE-IES : IEsSetParam } ::= 
+PrivateIE-Container {RANAP-PRIVATE-IES : IEsSetParam } ::=
 	SEQUENCE (SIZE (1.. maxPrivateIEs)) OF
 	PrivateIE-Field {{IEsSetParam}}
 
@@ -202,5 +202,3 @@ PrivateIE-Field {RANAP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 }
 
 END
-
-
diff --git a/asn1/ranap/RANAP-IEs.asn b/asn1/ranap/RANAP-IEs.asn
index 351dad436b..5e75e7634b 100644
--- a/asn1/ranap/RANAP-IEs.asn
+++ b/asn1/ranap/RANAP-IEs.asn
@@ -1,7 +1,7 @@
 -- RANAP-IEs.asn
 --
--- Taken from 3GPP TS 25.413 V8.2.1 (2009-03)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-821.zip
+-- 3GPP TS 25.413 V8.4.0 (2009-09)
+-- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.4	Information Element Definitions
 --
@@ -14,15 +14,16 @@
 --
 -- **************************************************************
 
-RANAP-IEs { 
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+RANAP-IEs {
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 umts-Access (20) modules (3) ranap (0) version1 (1) ranap-IEs (2) }
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
 IMPORTS
+	maxNrOfCSGs,
 	maxNrOfErrors,
 	maxNrOfPDPDirections,
 	maxNrOfPoints,
@@ -83,7 +84,10 @@ IMPORTS
 	id-RAB-Parameter-SupportedGuaranteedBitrateList,
 	id-RAB-Parameter-SupportedMaxBitrateList,
 	id-Requested-RAB-Parameter-SupportedMaxBitrateList,
-	id-Requested-RAB-Parameter-SupportedGuaranteedBitrateList
+	id-Requested-RAB-Parameter-SupportedGuaranteedBitrateList,
+	id-PSRABtobeReplaced,
+    id-SRVCC-Information
+
 
 
 FROM RANAP-Constants
@@ -375,9 +379,9 @@ CauseRadioNetwork ::= INTEGER {
 	invalid-RAB-ID (30),
 	no-remaining-rab (31),
 	interaction-with-other-procedure (32),
-	requested-maximum-bit-rate-for-dl-not-available (33), 
-	requested-maximum-bit-rate-for-ul-not-available (34), 
-	requested-guaranteed-bit-rate-for-dl-not-available (35), 
+	requested-maximum-bit-rate-for-dl-not-available (33),
+	requested-maximum-bit-rate-for-ul-not-available (34),
+	requested-guaranteed-bit-rate-for-dl-not-available (35),
 	requested-guaranteed-bit-rate-for-ul-not-available (36),
 	repeated-integrity-checking-failure (37),
 	requested-request-type-not-supported (38),
@@ -459,10 +463,10 @@ CellLoadInformationGroup-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-CellType ::= ENUMERATED{ 
-	macro, 
-	micro, 
-	pico, 
+CellType ::= ENUMERATED{
+	macro,
+	micro,
+	pico,
 	femto,
 	...
 }
@@ -510,7 +514,7 @@ CriticalityDiagnostics-IE-List-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 }
 
 MessageStructure ::= SEQUENCE (SIZE (1..maxNrOfLevels)) OF
-	SEQUENCE { 
+	SEQUENCE {
 		iE-ID					ProtocolIE-ID,
 		repetitionNumber		RepetitionNumber1		OPTIONAL,
 		iE-Extensions			ProtocolExtensionContainer { {MessageStructure-ExtIEs} } OPTIONAL,
@@ -544,15 +548,17 @@ ClassmarkInformation2			::= OCTET STRING
 
 ClassmarkInformation3			::= OCTET STRING
 
-CN-DomainIndicator ::= ENUMERATED { 
-	cs-domain, 
-	ps-domain 
+CN-DomainIndicator ::= ENUMERATED {
+	cs-domain,
+	ps-domain
 }
 
 CN-ID				::= INTEGER (0..4095)
 
 CSG-Id		::= BIT STRING (SIZE (27))
 
+CSG-Id-List ::= SEQUENCE (SIZE (1..maxNrOfCSGs)) OF
+	CSG-Id
 
 -- D
 
@@ -565,9 +571,9 @@ DataVolumeReportingIndication ::= ENUMERATED {
 
 DCH-ID ::= INTEGER (0..255)
 
-DeliveryOfErroneousSDU ::= ENUMERATED { 
-	yes, 
-	no, 
+DeliveryOfErroneousSDU ::= ENUMERATED {
+	yes,
+	no,
 	no-error-detection-consideration
 }
 
@@ -657,14 +663,19 @@ EquipmentsToBeTraced ::= CHOICE {
 	...
 }
 
-Event ::= ENUMERATED { 
-	stop-change-of-service-area, 
-	direct, 
-	change-of-servicearea, 
+E-UTRAN-Service-Handover ::= ENUMERATED {
+	handover-to-E-UTRAN-shall-not-be-performed,
+	...
+}
+
+Event ::= ENUMERATED {
+	stop-change-of-service-area,
+	direct,
+	change-of-servicearea,
 	...,
 	stop-direct,
 	periodic,
-	stop-periodic 
+	stop-periodic
 }
 
 ExtendedGuaranteedBitrate			::= INTEGER (16000001..256000000)
@@ -677,7 +688,7 @@ ExtendedRNC-ID					::= INTEGER (4096..65535)
 
 -- F
 
-FrequenceLayerConvergenceFlag ::= ENUMERATED { 
+FrequenceLayerConvergenceFlag ::= ENUMERATED {
 	no-FLC-flag,
 	...
 }
@@ -813,7 +824,7 @@ GERAN-BSC-Container				::= OCTET STRING
 
 GERAN-Cell-ID ::= SEQUENCE {
 	lAI				LAI,
-	rAC				RAC, 
+	rAC				RAC,
 	cI				CI,
 	iE-Extensions			ProtocolExtensionContainer { {GERAN-Cell-ID-ExtIEs} } OPTIONAL
 }
@@ -887,10 +898,10 @@ IncludeVelocity		::= ENUMERATED {
 
 InformationExchangeID ::= INTEGER (0.. 1048575)
 
-InformationExchangeType ::= ENUMERATED { 
+InformationExchangeType ::= ENUMERATED {
 	transfer,
 	request,
-	... 
+	...
 }
 
 InformationRequested ::= CHOICE {
@@ -913,7 +924,7 @@ InformationTransferType ::= CHOICE {
 	...
 }
 
-IntegrityProtectionAlgorithm		::= INTEGER { 
+IntegrityProtectionAlgorithm		::= INTEGER {
 	standard-UMTS-integrity-algorithm-UIA1 (0), standard-UMTS-integrity-algorithm-UIA2 (1),
 	no-value (15)
 } (0..15)
@@ -1038,11 +1049,11 @@ LocationRelatedDataRequestType	::= SEQUENCE {
 	...
 }
 
-LocationRelatedDataRequestTypeSpecificToGERANIuMode	::= ENUMERATED { 
+LocationRelatedDataRequestTypeSpecificToGERANIuMode	::= ENUMERATED {
 	decipheringKeysEOTD,
 	dedicatedMobileAssistedEOTDAssistanceData,
-	dedicatedMobileBasedEOTDAssistanceData, 
-	... 
+	dedicatedMobileBasedEOTDAssistanceData,
+	...
 }
 
 L3-Information				::= OCTET STRING
@@ -1077,10 +1088,10 @@ MBMSCountingInformation ::= ENUMERATED {
 	...
 }
 
-MBMSHCIndicator ::= ENUMERATED { 
-	uncompressed-header, 
-	compressed-header, 
-	... 
+MBMSHCIndicator ::= ENUMERATED {
+	uncompressed-header,
+	compressed-header,
+	...
 }
 
 MBMSIPMulticastAddressandAPNRequest ::= SEQUENCE (SIZE (1..maxnoofMulticastServicesPerRNC)) OF
@@ -1097,7 +1108,7 @@ MBMSRegistrationRequestType ::= ENUMERATED {
 	...
 }
 
-MBMSServiceArea ::= OCTET STRING 
+MBMSServiceArea ::= OCTET STRING
 
 MBMSSessionDuration ::= OCTET STRING (SIZE (3))
 
@@ -1146,13 +1157,13 @@ PagingAreaID ::= CHOICE {
 	...
 }
 
-PagingCause ::= ENUMERATED { 
-	terminating-conversational-call, 
-	terminating-streaming-call, 
-	terminating-interactive-call, 
-	terminating-background-call, 
+PagingCause ::= ENUMERATED {
+	terminating-conversational-call,
+	terminating-streaming-call,
+	terminating-interactive-call,
+	terminating-background-call,
 	terminating-low-priority-signalling,
-	..., 
+	...,
 	terminating-high-priority-signalling
 }
 
@@ -1230,7 +1241,7 @@ PositionData-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-PositionDataSpecificToGERANIuMode ::= OCTET STRING 
+PositionDataSpecificToGERANIuMode ::= OCTET STRING
 
 Pre-emptionCapability ::= ENUMERATED {
 	shall-not-trigger-pre-emption,
@@ -1246,7 +1257,7 @@ PriorityLevel				::= INTEGER { spare (0), highest (1), lowest (14), no-priority
 
 ProvidedData ::= CHOICE {
 	shared-network-information				Shared-Network-Information,
-	... 
+	...
 }
 
 P-TMSI					::= OCTET STRING (SIZE (4))
@@ -1317,7 +1328,7 @@ RAB-Parameters-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 
 RAB-SubflowCombinationBitRate 	::= INTEGER (0..16000000)
 
-RAB-TrCH-Mapping ::=	SEQUENCE ( SIZE (1..maxNrOfRABs)) OF 
+RAB-TrCH-Mapping ::=	SEQUENCE ( SIZE (1..maxNrOfRABs)) OF
 	RAB-TrCH-MappingItem
 
 RAB-TrCH-MappingItem ::= SEQUENCE {
@@ -1369,7 +1380,7 @@ NotEmptyRAListofIdleModeUEs-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 LAListofIdleModeUEs ::= SEQUENCE (SIZE (1..maxMBMSRA)) OF
 	LAI
 
-RAT-Type ::= ENUMERATED { 
+RAT-Type ::= ENUMERATED {
 	utran,
 	geran,
 	...
@@ -1387,7 +1398,7 @@ RedirectionCompleted	::= ENUMERATED {
 	...
 }
 
-RejectCauseValue ::= ENUMERATED { 
+RejectCauseValue ::= ENUMERATED {
 	pLMN-Not-Allowed,
 	location-Area-Not-Allowed,
 	roaming-Not-Allowed-In-This-Location-Area,
@@ -1405,21 +1416,21 @@ RelocationRequirement ::= ENUMERATED {
 	realtime
 }
 
-RelocationType ::= ENUMERATED { 
+RelocationType ::= ENUMERATED {
 	ue-not-involved,
 	ue-involved,
 	...
 }
 
-RepetitionNumber0 ::= INTEGER (0..255) 
+RepetitionNumber0 ::= INTEGER (0..255)
 
 RepetitionNumber1 ::= INTEGER (1..256)
 
 
-ReportArea ::= ENUMERATED { 
-	service-area, 
-	geographical-area, 
-	... 
+ReportArea ::= ENUMERATED {
+	service-area,
+	geographical-area,
+	...
 }
 
 RequestedGPSAssistanceData 	::= OCTET STRING (SIZE (1 .. 38 ))
@@ -1428,12 +1439,12 @@ RequestedGPSAssistanceData 	::= OCTET STRING (SIZE (1 .. 38 ))
 RequestedGANSSAssistanceData 	::= OCTET STRING (SIZE (1 .. 201 ))
 	-- ganssAssistanceData as defined in 24.080 --
 
-RequestedLocationRelatedDataType ::= ENUMERATED { 
+RequestedLocationRelatedDataType ::= ENUMERATED {
 	decipheringKeysUEBasedOTDOA,
 	decipheringKeysAssistedGPS,
 	dedicatedAssistanceDataUEBasedOTDOA,
-	dedicatedAssistanceDataAssistedGPS, 
-	..., 
+	dedicatedAssistanceDataAssistedGPS,
+	...,
 -- Release 7 extension elements --
 	decipheringKeysAssistedGANSS,
 	dedicatedAssistanceDataAssistedGANSS,
@@ -1513,7 +1524,7 @@ ResponseTime	::= ENUMERATED {
 ...
 }
 
-RIMInformation					::= OCTET STRING 
+RIMInformation					::= OCTET STRING
 
 RIM-Transfer ::= SEQUENCE {
 	rIMInformation				RIMInformation,
@@ -1586,9 +1597,9 @@ Shared-Network-Information-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-SignallingIndication ::= ENUMERATED { 
-	signalling, 
-	... 
+SignallingIndication ::= ENUMERATED {
+	signalling,
+	...
 }
 
 SDU-ErrorRatio ::= SEQUENCE {
@@ -1649,15 +1660,15 @@ Service-Handover ::= ENUMERATED {
 
 Source-ToTarget-TransparentContainer ::= OCTET STRING
 -- This IE is a transparent container, the IE shall be encoded not as an OCTET STRING but according to the type specifications of the target system.
--- Note: In the current version of this specification, this IE may either carry the Source RNC to 
--- Target RNC Transparent Container or the Source eNB to Target eNB Transparent Container IE as 
+-- Note: In the current version of this specification, this IE may either carry the Source RNC to
+-- Target RNC Transparent Container or the Source eNB to Target eNB Transparent Container IE as
 -- defined in [49]
 
 SourceeNodeB-ToTargeteNodeB-TransparentContainer ::= OCTET STRING
 
 
 SourceCellID ::= CHOICE {
-	sourceUTRANCellID			SourceUTRANCellID, 
+	sourceUTRANCellID			SourceUTRANCellID,
 	sourceGERANCellID			CGI,
 	...
 }
@@ -1665,7 +1676,7 @@ SourceCellID ::= CHOICE {
 SourceBSS-ToTargetBSS-TransparentContainer		::= OCTET STRING
 
 SourceID ::= CHOICE {
-	sourceRNC-ID			SourceRNC-ID, 
+	sourceRNC-ID			SourceRNC-ID,
 	sAI				SAI,
 	...
 }
@@ -1713,16 +1724,19 @@ SourceRNC-ToTargetRNC-TransparentContainer-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 	{ID id-MBMSLinkingInformation				CRITICALITY ignore		EXTENSION MBMSLinkingInformation					PRESENCE optional}|
 	{ID id-d-RNTI-for-NoIuCSUP					CRITICALITY reject		EXTENSION D-RNTI										PRESENCE optional}|
 	{ID id-UE-History-Information				CRITICALITY ignore		EXTENSION UE-History-Information					PRESENCE optional}|
-	{ID id-SubscriberProfileIDforRFP			CRITICALITY ignore		EXTENSION SubscriberProfileIDforRFP				PRESENCE optional},
+	{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},
 	...
 }
 
-SubscriberProfileIDforRFP ::= INTEGER (1..256) 
+SubscriberProfileIDforRFP ::= INTEGER (1..256)
 
-SourceStatisticsDescriptor ::= ENUMERATED { 
-	speech, 
-	unknown, 
-	... 
+SourceStatisticsDescriptor ::= ENUMERATED {
+	speech,
+	unknown,
+	...
 }
 
 SupportedRAB-ParameterBitrateList ::= SEQUENCE (SIZE (1..maxNrOfSeparateTrafficDirections)) OF SupportedBitrate
@@ -1732,6 +1746,7 @@ SupportedBitrate ::= INTEGER (1..1000000000, ...)
 
 SourceUTRANCellID ::= SEQUENCE {
 	pLMNidentity			PLMNidentity,
+	uTRANcellID				TargetCellId,
 	iE-Extensions			ProtocolExtensionContainer { {SourceUTRANCellID-ExtIEs} } OPTIONAL
 }
 
@@ -1741,7 +1756,7 @@ SourceUTRANCellID-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 
 SRB-ID ::= INTEGER (1..32)
 
-SRB-TrCH-Mapping ::=	SEQUENCE ( SIZE (1..maxNrOfSRBs)) OF 
+SRB-TrCH-Mapping ::=	SEQUENCE ( SIZE (1..maxNrOfSRBs)) OF
 	SRB-TrCH-MappingItem
 
 SRB-TrCH-MappingItem ::= SEQUENCE {
@@ -1797,9 +1812,9 @@ TAI-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 
 Target-ToSource-TransparentContainer ::= OCTET STRING
 -- This IE is a transparent container, the IE shall be encoded not as an OCTET STRING but according to the type specifications of the target system.
--- Note: In the current version of this specification, this IE may either carry the Target RNC to 
--- Source RNC Transparent Container or the Target eNB to Source eNB Transparent Container IE as 
--- defined in [49] 
+-- Note: In the current version of this specification, this IE may either carry the Target RNC to
+-- Source RNC Transparent Container or the Target eNB to Source eNB Transparent Container IE as
+-- defined in [49]
 
 TargeteNodeB-ToSourceeNodeB-TransparentContainer ::= OCTET STRING
 
@@ -1868,7 +1883,7 @@ TMGI-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 
 TMSI					::= OCTET STRING (SIZE (4))
 
-TraceDepth ::= ENUMERATED { 
+TraceDepth ::= ENUMERATED {
 	minimum,
 	medium,
 	maximum,
@@ -1905,10 +1920,10 @@ TraceReference				::= OCTET STRING (SIZE (2..3))
 TraceType				::= OCTET STRING (SIZE (1))
 -- Reference: GSM TS 12.08
 
-TrafficClass ::= ENUMERATED { 
-	conversational, 
-	streaming, 
-	interactive, 
+TrafficClass ::= ENUMERATED {
+	conversational,
+	streaming,
+	interactive,
 	background,
 	...
 }
@@ -1938,10 +1953,10 @@ TrCH-ID-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-TrCH-ID-List ::= SEQUENCE (SIZE (1..maxRAB-Subflows)) OF 
+TrCH-ID-List ::= SEQUENCE (SIZE (1..maxRAB-Subflows)) OF
 	TrCH-ID
 
-TriggerID				::= OCTET STRING (SIZE (3..22)) 
+TriggerID				::= OCTET STRING (SIZE (3..22))
 
 TypeOfError ::= ENUMERATED {
 	not-understood,
@@ -1986,10 +2001,10 @@ UP-ModeVersions				::= BIT STRING (SIZE (16))
 
 USCH-ID						::= INTEGER (0..255)
 
-UserPlaneMode ::= ENUMERATED { 
-	transparent-mode, 
-	support-mode-for-predefined-SDU-sizes, 
-	... 
+UserPlaneMode ::= ENUMERATED {
+	transparent-mode,
+	support-mode-for-predefined-SDU-sizes,
+	...
 }
 
 UTRAN-CellID ::= SEQUENCE {
@@ -2077,5 +2092,3 @@ VerticalSpeedDirection ::= ENUMERATED {
 VerticalAccuracyCode			::= INTEGER (0..127)
 
 END
-
-
diff --git a/asn1/ranap/RANAP-PDU-Contents.asn b/asn1/ranap/RANAP-PDU-Contents.asn
index c83f60f13e..dcc11b6aeb 100644
--- a/asn1/ranap/RANAP-PDU-Contents.asn
+++ b/asn1/ranap/RANAP-PDU-Contents.asn
@@ -1,7 +1,7 @@
 -- RANAP-PDU-Contents.asn
 --
--- Taken from 3GPP TS 25.413 V8.2.1 (2009-03)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-821.zip
+-- 3GPP TS 25.413 V8.4.0 (2009-09)
+-- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.3	PDU Definitions
 --
@@ -14,11 +14,11 @@
 --
 -- **************************************************************
 
-RANAP-PDU-Contents { 
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+RANAP-PDU-Contents {
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 umts-Access (20) modules (3) ranap (0) version1 (1) ranap-PDU-Contents (1) }
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
@@ -46,6 +46,7 @@ IMPORTS
 	ClassmarkInformation2,
 	ClassmarkInformation3,
 	CSG-Id,
+	CSG-Id-List,
 	DL-GTP-PDU-SequenceNumber,
 	DL-N-PDU-SequenceNumber,
 	DataVolumeReportingIndication,
@@ -53,6 +54,7 @@ IMPORTS
 	DRX-CycleLengthCoefficient,
 	EncryptionInformation,
 	EncryptionKey,
+	E-UTRAN-Service-Handover,
 	ExtendedRNC-ID,
 	FrequenceLayerConvergenceFlag,
 	GERAN-BSC-Container,
@@ -116,7 +118,7 @@ IMPORTS
 	RejectCauseValue,
 	RelocationType,
 	RequestedGANSSAssistanceData,
-	RequestType, 
+	RequestType,
 	Requested-RAB-Parameter-Values,
 	ResponseTime,
 	RRC-Container,
@@ -181,7 +183,7 @@ FROM RANAP-Containers
 
 	id-AccuracyFulfilmentIndicator,
 	id-APN,
-	id-AreaIdentity, 
+	id-AreaIdentity,
 	id-Alt-RAB-Parameters,
 	id-Ass-RAB-Parameters,
 	id-BroadcastAssistanceDataDecipheringKeys,
@@ -196,6 +198,7 @@ FROM RANAP-Containers
 	id-CNMBMSLinkingInformation,
 	id-CriticalityDiagnostics,
 	id-CSG-Id,
+	id-CSG-Id-List,
 	id-DeltaRAListofIdleModeUEs,
 	id-DRX-CycleLengthCoefficient,
 	id-DirectTransferInformationItem-RANAP-RelocInf,
@@ -257,7 +260,7 @@ FROM RANAP-Containers
 	id-OMC-ID,
 	id-OldBSS-ToNewBSS-Information,
 	id-PagingAreaID,
-	id-PagingCause, 
+	id-PagingCause,
 	id-PDP-TypeInformation,
 	id-PermanentNAS-UE-ID,
 	id-PositionData,
@@ -284,7 +287,7 @@ FROM RANAP-Containers
 	id-RAB-FailedItem-EnhRelocInfoRes,
 	id-RAB-FailedtoReportItem,
 	id-RAB-FailedtoReportList,
-	id-RAB-ID, 
+	id-RAB-ID,
 	id-RAB-ModifyList,
 	id-RAB-ModifyItem,
 	id-RAB-Parameters,
@@ -366,7 +369,9 @@ FROM RANAP-Containers
 	id-VerticalAccuracyCode,
 	id-PeriodicLocationInfo,
 	id-BroadcastGANSSAssistanceDataDecipheringKeys,
-	id-SubscriberProfileIDforRFP
+	id-SubscriberProfileIDforRFP,
+	id-E-UTRAN-Service-Handover
+
 FROM RANAP-Constants;
 
 -- **************************************************************
@@ -579,7 +584,9 @@ RelocationCommandExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 5 to enable Inter RAN Load Information Exchange over Iu --
 	{ ID id-InterSystemInformation-TransparentContainer		CRITICALITY ignore	EXTENSION InterSystemInformation-TransparentContainer					PRESENCE optional	} |
 -- Extension for Release 6 to enable Inter-RAT PS Handover between UTRAN and GERAN A/Gb --
-	{ ID id-TargetBSS-ToSourceBSS-TransparentContainer		CRITICALITY	ignore	EXTENSION TargetBSS-ToSourceBSS-TransparentContainer		PRESENCE optional	},
+	{ ID id-TargetBSS-ToSourceBSS-TransparentContainer		CRITICALITY	ignore	EXTENSION TargetBSS-ToSourceBSS-TransparentContainer		PRESENCE optional	}|
+-- Extension for Release 8 for SRVCC operation --
+	{ ID id-SRVCC-Information					CRITICALITY reject	EXTENSION SRVCC-Information			PRESENCE optional	},
 	...
 }
 
@@ -640,7 +647,7 @@ RelocationRequestIEs RANAP-PROTOCOL-IES ::= {
 
 RAB-SetupList-RelocReq 					::= RAB-IE-ContainerList { {RAB-SetupItem-RelocReq-IEs} }
 
-RAB-SetupItem-RelocReq-IEs RANAP-PROTOCOL-IES ::= { 
+RAB-SetupItem-RelocReq-IEs RANAP-PROTOCOL-IES ::= {
 	{ ID id-RAB-SetupItem-RelocReq			CRITICALITY reject	TYPE RAB-SetupItem-RelocReq			PRESENCE mandatory 	},
 	...
 }
@@ -665,7 +672,9 @@ RAB-SetupItem-RelocReq-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 4 to enable RAB Quality of Service negotiation over Iu --
 	{ID id-Alt-RAB-Parameters	CRITICALITY ignore		EXTENSION Alt-RAB-Parameters		PRESENCE optional} |
 -- Extension for Release 5 to enable GERAN support over Iu-cs --
-	{ ID id-GERAN-BSC-Container					CRITICALITY ignore	EXTENSION GERAN-BSC-Container			PRESENCE optional	},
+	{ ID id-GERAN-BSC-Container					CRITICALITY ignore	EXTENSION GERAN-BSC-Container			PRESENCE optional	}|
+-- Extension for Release 8 to enable handover restriction to E-UTRAN --
+	{ ID id-E-UTRAN-Service-Handover			CRITICALITY ignore	EXTENSION E-UTRAN-Service-Handover			PRESENCE optional	},
 	...
 }
 
@@ -741,7 +750,7 @@ RelocationRequestAcknowledgeIEs RANAP-PROTOCOL-IES ::= {
 
 RAB-SetupList-RelocReqAck 				::= RAB-IE-ContainerList { {RAB-SetupItem-RelocReqAck-IEs} }
 
-RAB-SetupItem-RelocReqAck-IEs RANAP-PROTOCOL-IES ::= { 
+RAB-SetupItem-RelocReqAck-IEs RANAP-PROTOCOL-IES ::= {
 	{ ID id-RAB-SetupItem-RelocReqAck		CRITICALITY reject	TYPE RAB-SetupItem-RelocReqAck			PRESENCE mandatory 	},
 	...
 }
@@ -1441,7 +1450,7 @@ EnhancedRelocationCompleteRequestIEs RANAP-PROTOCOL-IES ::= {
 
 RAB-SetupList-EnhancedRelocCompleteReq 				::= RAB-IE-ContainerList { { RAB-SetupItem-EnhancedRelocCompleteReq-IEs} }
 
-RAB-SetupItem-EnhancedRelocCompleteReq-IEs RANAP-PROTOCOL-IES ::= { 
+RAB-SetupItem-EnhancedRelocCompleteReq-IEs RANAP-PROTOCOL-IES ::= {
 	{ ID id-RAB-SetupItem-EnhancedRelocCompleteReq		CRITICALITY reject	TYPE RAB-SetupItem-EnhancedRelocCompleteReq			PRESENCE mandatory 	},
 	...
 }
@@ -1460,6 +1469,8 @@ RAB-SetupItem-EnhancedRelocCompleteReq-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 }
 
 EnhancedRelocationCompleteRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-ChosenIntegrityProtectionAlgorithm	CRITICALITY ignore	EXTENSION ChosenIntegrityProtectionAlgorithm		PRESENCE optional	} |
+	{ ID id-ChosenEncryptionAlgorithm		CRITICALITY ignore	EXTENSION ChosenEncryptionAlgorithm			PRESENCE optional	},
 	...
 }
 
@@ -1484,7 +1495,7 @@ EnhancedRelocationCompleteResponseIEs RANAP-PROTOCOL-IES ::= {
 
 RAB-SetupList-EnhancedRelocCompleteRes ::= RAB-IE-ContainerList { {RAB-SetupItem-EnhancedRelocCompleteRes-IEs} }
 
-RAB-SetupItem-EnhancedRelocCompleteRes-IEs RANAP-PROTOCOL-IES ::= { 
+RAB-SetupItem-EnhancedRelocCompleteRes-IEs RANAP-PROTOCOL-IES ::= {
 	{ ID id-RAB-SetupItem-EnhancedRelocCompleteRes		CRITICALITY reject	TYPE RAB-SetupItem-EnhancedRelocCompleteRes		PRESENCE mandatory 	},
 	...
 }
@@ -1506,7 +1517,7 @@ RAB-SetupItem-EnhancedRelocCompleteRes-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 
 RAB-ToBeReleasedList-EnhancedRelocCompleteRes ::= RAB-IE-ContainerList { {RAB-ToBeReleasedItem-EnhancedRelocCompleteRes-IEs} }
 
-RAB-ToBeReleasedItem-EnhancedRelocCompleteRes-IEs RANAP-PROTOCOL-IES ::= { 
+RAB-ToBeReleasedItem-EnhancedRelocCompleteRes-IEs RANAP-PROTOCOL-IES ::= {
 	{ ID id-RAB-ToBeReleasedItem-EnhancedRelocCompleteRes		CRITICALITY ignore	TYPE RAB-ToBeReleasedItem-EnhancedRelocCompleteRes		PRESENCE mandatory 	},
 	...
 }
@@ -1601,7 +1612,9 @@ PagingIEs RANAP-PROTOCOL-IES ::= {
 
 PagingExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 5 to enable NNSF --
-	{ ID id-GlobalCN-ID				CRITICALITY ignore	EXTENSION GlobalCN-ID				PRESENCE optional	} ,
+	{ ID id-GlobalCN-ID				CRITICALITY ignore	EXTENSION GlobalCN-ID				PRESENCE optional	} |
+-- Extension for Release 8 to support CSG --
+	{ ID id-CSG-Id-List				CRITICALITY ignore	EXTENSION CSG-Id-List				PRESENCE optional	},
 	...
 }
 
@@ -1636,7 +1649,9 @@ CommonIDExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 6 to indicate the selected plmn in GWCN configuration for network sharing non-supporting UEs --
 	{ ID id-SelectedPLMN-ID	 	CRITICALITY ignore	EXTENSION PLMNidentity		PRESENCE optional 	}|
 -- Extension for Release 8 to indicate the Subscriber Profile ID for RAT/Frequency Selection Priority --
-	{ID id-SubscriberProfileIDforRFP		CRITICALITY ignore		EXTENSION SubscriberProfileIDforRFP					PRESENCE optional},
+	{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	},
 	...
 }
 
@@ -1827,7 +1842,7 @@ InitialUE-MessageExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 6 to indicate rerouting in MOCN configuration for network sharing non-supporting UEs --
 	{ ID id-RedirectAttemptFlag				CRITICALITY ignore	EXTENSION RedirectAttemptFlag		PRESENCE optional	} |
 -- 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 8 to support CSG --
 	{ ID id-CSG-Id							CRITICALITY reject	EXTENSION CSG-Id					PRESENCE optional	},
 	...
@@ -2060,6 +2075,8 @@ TransportLayerInformation-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 }
 
 RAB-SetupOrModifyItemFirst-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+-- Extension for Release 8 to enable handover restriction to E-UTRAN --
+	{ ID id-E-UTRAN-Service-Handover			CRITICALITY ignore	EXTENSION E-UTRAN-Service-Handover			PRESENCE optional	},
 	...
 }
 
@@ -2314,7 +2331,7 @@ RANAP-EnhancedRelocationInformationRequestIEs RANAP-PROTOCOL-IES ::= {
 	{ ID id-OldIuSigConIdCS	CRITICALITY ignore TYPE IuSignallingConnectionIdentifier	PRESENCE optional } |
 	{ ID id-GlobalCN-IDCS				CRITICALITY reject		TYPE GlobalCN-ID				PRESENCE optional} |
 	{ ID id-OldIuSigConIdPS	CRITICALITY ignore TYPE IuSignallingConnectionIdentifier	PRESENCE optional } |
-	{ ID id-GlobalCN-IDCS				CRITICALITY reject		TYPE GlobalCN-ID				PRESENCE optional} |
+	{ ID id-GlobalCN-IDPS				CRITICALITY reject		TYPE GlobalCN-ID				PRESENCE optional} |
 	{ ID id-RAB-SetupList-EnhRelocInfoReq			CRITICALITY reject	TYPE RAB-SetupList-EnhRelocInfoReq			PRESENCE optional	} |
 	{ ID id-SNA-Access-Information	CRITICALITY ignore		TYPE SNA-Access-Information	PRESENCE optional} |
 	{ ID id-UESBI-Iu	CRITICALITY ignore		TYPE UESBI-Iu	PRESENCE optional}|
@@ -2325,7 +2342,7 @@ RANAP-EnhancedRelocationInformationRequestIEs RANAP-PROTOCOL-IES ::= {
 
 RAB-SetupList-EnhRelocInfoReq 					::= RAB-IE-ContainerList { { RAB-SetupItem-EnhRelocInfoReq-IEs} }
 
-RAB-SetupItem-EnhRelocInfoReq-IEs RANAP-PROTOCOL-IES ::= { 
+RAB-SetupItem-EnhRelocInfoReq-IEs RANAP-PROTOCOL-IES ::= {
 	{ ID id-RAB-SetupItem-EnhRelocInfoReq			CRITICALITY reject	TYPE RAB-SetupItem-EnhRelocInfoReq			PRESENCE mandatory 	},
 	...
 }
@@ -2349,6 +2366,8 @@ RAB-SetupItem-EnhRelocInfoReq ::= SEQUENCE {
 }
 
 RAB-SetupItem-EnhRelocInfoReq-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+-- Extension for Release 8 to enable handover restriction to E-UTRAN --
+	{ ID id-E-UTRAN-Service-Handover			CRITICALITY ignore	EXTENSION E-UTRAN-Service-Handover			PRESENCE optional	},
 	...
 }
 
@@ -2365,6 +2384,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	},
 	...
 }
 
@@ -2381,7 +2402,7 @@ RANAP-EnhancedRelocationInformationResponse ::= SEQUENCE {
 }
 
 RANAP-EnhancedRelocationInformationResponseIEs RANAP-PROTOCOL-IES ::= {
-	{ ID id-Target-ToSource-TransparentContainer 
+	{ ID id-Target-ToSource-TransparentContainer
 							CRITICALITY ignore	TYPE TargetRNC-ToSourceRNC-TransparentContainer PRESENCE optional	} |
 	{ ID id-RAB-SetupList-EnhRelocInfoRes		CRITICALITY ignore	TYPE RAB-SetupList-EnhRelocInfoRes			PRESENCE optional} |
 	{ ID id-RAB-FailedList-EnhRelocInfoRes		CRITICALITY ignore	TYPE RAB-FailedList-EnhRelocInfoRes			PRESENCE optional }|
@@ -2391,7 +2412,7 @@ RANAP-EnhancedRelocationInformationResponseIEs RANAP-PROTOCOL-IES ::= {
 
 RAB-SetupList-EnhRelocInfoRes 				::= RAB-IE-ContainerList { { RAB-SetupItem-EnhRelocInfoRes-IEs} }
 
-RAB-SetupItem-EnhRelocInfoRes-IEs RANAP-PROTOCOL-IES ::= { 
+RAB-SetupItem-EnhRelocInfoRes-IEs RANAP-PROTOCOL-IES ::= {
 	{ ID id-RAB-SetupItem-EnhRelocInfoRes		CRITICALITY reject	TYPE RAB-SetupItem-EnhRelocInfoRes			PRESENCE mandatory 	},
 	...
 }
@@ -2411,7 +2432,7 @@ RAB-SetupItem-EnhRelocInfoRes-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 
 RAB-FailedList-EnhRelocInfoRes 				::= RAB-IE-ContainerList { { RAB-FailedItem-EnhRelocInfoRes-IEs} }
 
-RAB-FailedItem-EnhRelocInfoRes-IEs RANAP-PROTOCOL-IES ::= { 
+RAB-FailedItem-EnhRelocInfoRes-IEs RANAP-PROTOCOL-IES ::= {
 	{ ID id-RAB-FailedItem-EnhRelocInfoRes		CRITICALITY reject	TYPE RAB-FailedItem-EnhRelocInfoRes			PRESENCE mandatory 	},
 	...
 }
@@ -2936,7 +2957,7 @@ MBMSSessionUpdateResponse ::= SEQUENCE {
 
 MBMSSessionUpdateResponseIEs RANAP-PROTOCOL-IES ::= {
 	{ ID id-SessionUpdateID					CRITICALITY ignore	TYPE SessionUpdateID				PRESENCE mandatory	} |
-	{ ID id-TransportLayerInformation		CRITICALITY ignore	TYPE TransportLayerInformation		PRESENCE optional		} | 
+	{ ID id-TransportLayerInformation		CRITICALITY ignore	TYPE TransportLayerInformation		PRESENCE optional		} |
 	{ ID id-Cause							CRITICALITY ignore	TYPE Cause							PRESENCE optional		} |
 	{ ID id-CriticalityDiagnostics			CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional		} ,
 	...
@@ -3378,6 +3399,3 @@ SRVCC-CSKeysResponseExtensions RANAP-PROTOCOL-EXTENSION ::= {
 
 
 END
-
-
-
diff --git a/asn1/ranap/RANAP-PDU-Descriptions.asn b/asn1/ranap/RANAP-PDU-Descriptions.asn
index a7f4aded76..d7f657cee3 100644
--- a/asn1/ranap/RANAP-PDU-Descriptions.asn
+++ b/asn1/ranap/RANAP-PDU-Descriptions.asn
@@ -1,7 +1,7 @@
 -- RANAP-PDU-Descriptions.asn
 --
--- Taken from 3GPP TS 25.413 V8.2.1 (2009-03)
--- http://www.3gpp.org/ftp/Specs/archive/25_series/25.413/25413-821.zip
+-- 3GPP TS 25.413 V8.4.0 (2009-09)
+-- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.2	Elementary Procedure Definitions
 --
@@ -14,11 +14,11 @@
 --
 -- **************************************************************
 
-RANAP-PDU-Descriptions { 
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+RANAP-PDU-Descriptions {
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 umts-Access (20) modules (3) ranap (0) version1 (1) ranap-PDU-Descriptions (0)}
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
@@ -73,7 +73,7 @@ FROM RANAP-CommonDataTypes
 	SRNS-DataForwardCommand,
 	ForwardSRNS-Context,
 	RAB-AssignmentRequest,
-	RAB-AssignmentResponse, 
+	RAB-AssignmentResponse,
 	RAB-ModifyRequest,
 	PrivateMessage,
 	ResetResource,
@@ -133,7 +133,7 @@ FROM RANAP-PDU-Contents
 	id-Paging,
 	id-privateMessage,
 	id-RAB-Assignment,
-	id-RAB-ReleaseRequest, 
+	id-RAB-ReleaseRequest,
 	id-RAB-ModifyRequest,
 	id-RANAP-Relocation,
 	id-RANAPenhancedRelocation,
@@ -617,3 +617,4 @@ END
 
 
 
+
diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c
index 1f219c40ec..f55de113ef 100644
--- a/asn1/ranap/packet-ranap-template.c
+++ b/asn1/ranap/packet-ranap-template.c
@@ -134,6 +134,7 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
 static int dissect_OutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 
 static int dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index);
+static int dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index);
 
 void proto_reg_handoff_ranap(void);
 
diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf
index 71dd62c251..04e2e8048a 100644
--- a/asn1/ranap/ranap.cnf
+++ b/asn1/ranap/ranap.cnf
@@ -283,6 +283,16 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 # Application Protocol (S1AP)".
 
 dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer(tvb , offset, actx ,tree , hf_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU );
+
+#.FN_BODY Target-ToSource-TransparentContainer VAL_PTR = &parameter_tvb
+#-- This IE is a transparent container, the IE shall be encoded not as an OCTET STRING but according to the type specifications of the target system.
+#-- Note: In the current version of this specification, this IE may either carry the Target RNC to
+#-- Source RNC Transparent Container or the Target eNB to Source eNB Transparent Container IE as
+#-- defined in [49]
+# [49] 3GPP TS 36.413: "Evolved Universal Terrestrial Radio Access Network (E-UTRAN); S1
+# Application Protocol (S1AP)".
+
+dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer(tvb , offset, actx ,tree , hf_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU );
     
 #.TYPE_ATTR
 ProtocolExtensionID TYPE = FT_UINT8  DISPLAY = BASE_DEC STRINGS = VALS(ranap_ProtocolIE_ID_vals)
@@ -560,6 +570,9 @@ id-IntegrityProtectionKey									ProtocolIE-ID
 id-SRVCC-HO-Indication										ProtocolIE-ID
 id-SRVCC-Information										ProtocolIE-ID
 id-SRVCC-Operation-Possible									ProtocolIE-ID
+id-CSG-Id-List												ProtocolIE-ID
+id-PSRABtobeReplaced										ProtocolIE-ID
+id-E-UTRAN-Service-Handover									ProtocolIE-ID
 #.END
 
 #.REGISTER_NEW
@@ -797,9 +810,12 @@ SupportedRAB-ParameterBitrateList						N ranap.extension id-RAB-Parameter-Suppor
 SupportedRAB-ParameterBitrateList						N ranap.extension id-Requested-RAB-Parameter-SupportedMaxBitrateList
 SupportedRAB-ParameterBitrateList						N ranap.extension id-Requested-RAB-Parameter-SupportedGuaranteedBitrateList
 SRVCC-HO-Indication										N ranap.extension id-SRVCC-HO-Indication
-#N ranap.extension id-SRVCC-Operation-Possible
+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
 
-#NBAP-ELEMENTARY-PROCEDURE
+#RANAP-ELEMENTARY-PROCEDURE
 Iu-ReleaseCommand							N ranap.proc.imsg id-Iu-Release
 Iu-ReleaseComplete							N ranap.proc.sout id-Iu-Release
 RelocationRequired							N ranap.proc.imsg id-RelocationPreparation
diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c
index 9228fbf01a..d1c141e70b 100644
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -100,6 +100,7 @@
 #define maxMBMSRA                      65536
 #define maxNrOfEDCHMACdFlows_1         7
 #define maxGANSSSet                    9
+#define maxNrOfCSGs                    256
 #define id_170_not_to_be_used_for_IE_ids 170
 #define id_183_not_to_be_used_for_IE_ids 183
 
@@ -149,7 +150,7 @@ typedef enum _ProcedureCode_enum {
   id_enhancedRelocationComplete =  43,
   id_enhancedRelocationCompleteConfirm =  44,
   id_RANAPenhancedRelocation =  45,
-  id_SRVCCPreparation = 256
+  id_SRVCCPreparation =  46
 } ProcedureCode_enum;
 
 typedef enum _ProtocolIE_ID_enum {
@@ -373,7 +374,10 @@ typedef enum _ProtocolIE_ID_enum {
   id_IntegrityProtectionKey = 225,
   id_SRVCC_HO_Indication = 226,
   id_SRVCC_Information = 227,
-  id_SRVCC_Operation_Possible = 228
+  id_SRVCC_Operation_Possible = 228,
+  id_CSG_Id_List = 229,
+  id_PSRABtobeReplaced = 230,
+  id_E_UTRAN_Service_Handover = 231
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-ranap-val.h ---*/
@@ -416,11 +420,13 @@ static int hf_ranap_ClassmarkInformation2_PDU = -1;  /* ClassmarkInformation2 */
 static int hf_ranap_ClassmarkInformation3_PDU = -1;  /* ClassmarkInformation3 */
 static int hf_ranap_CN_DomainIndicator_PDU = -1;  /* CN_DomainIndicator */
 static int hf_ranap_CSG_Id_PDU = -1;              /* CSG_Id */
+static int hf_ranap_CSG_Id_List_PDU = -1;         /* CSG_Id_List */
 static int hf_ranap_DeltaRAListofIdleModeUEs_PDU = -1;  /* DeltaRAListofIdleModeUEs */
 static int hf_ranap_DRX_CycleLengthCoefficient_PDU = -1;  /* DRX_CycleLengthCoefficient */
 static int hf_ranap_E_DCH_MAC_d_Flow_ID_PDU = -1;  /* E_DCH_MAC_d_Flow_ID */
 static int hf_ranap_EncryptionInformation_PDU = -1;  /* EncryptionInformation */
 static int hf_ranap_EncryptionKey_PDU = -1;       /* EncryptionKey */
+static int hf_ranap_E_UTRAN_Service_Handover_PDU = -1;  /* E_UTRAN_Service_Handover */
 static int hf_ranap_ExtendedRNC_ID_PDU = -1;      /* ExtendedRNC_ID */
 static int hf_ranap_FrequenceLayerConvergenceFlag_PDU = -1;  /* FrequenceLayerConvergenceFlag */
 static int hf_ranap_GANSS_PositioningDataSet_PDU = -1;  /* GANSS_PositioningDataSet */
@@ -475,6 +481,7 @@ static int hf_ranap_PositioningPriority_PDU = -1;  /* PositioningPriority */
 static int hf_ranap_PositionData_PDU = -1;        /* PositionData */
 static int hf_ranap_PositionDataSpecificToGERANIuMode_PDU = -1;  /* PositionDataSpecificToGERANIuMode */
 static int hf_ranap_ProvidedData_PDU = -1;        /* ProvidedData */
+static int hf_ranap_RAB_ID_PDU = -1;              /* RAB_ID */
 static int hf_ranap_RAB_Parameter_ExtendedGuaranteedBitrateList_PDU = -1;  /* RAB_Parameter_ExtendedGuaranteedBitrateList */
 static int hf_ranap_RAB_Parameter_ExtendedMaxBitrateList_PDU = -1;  /* RAB_Parameter_ExtendedMaxBitrateList */
 static int hf_ranap_RAB_Parameters_PDU = -1;      /* RAB_Parameters */
@@ -762,6 +769,7 @@ static int hf_ranap_MessageStructure_item = -1;   /* MessageStructure_item */
 static int hf_ranap_item_repetitionNumber = -1;   /* RepetitionNumber1 */
 static int hf_ranap_lAC = -1;                     /* LAC */
 static int hf_ranap_cI = -1;                      /* CI */
+static int hf_ranap_CSG_Id_List_item = -1;        /* CSG_Id */
 static int hf_ranap_newRAListofIdleModeUEs = -1;  /* NewRAListofIdleModeUEs */
 static int hf_ranap_rAListwithNoIdleModeUEsAnyMore = -1;  /* RAListwithNoIdleModeUEsAnyMore */
 static int hf_ranap_NewRAListofIdleModeUEs_item = -1;  /* RAC */
@@ -920,6 +928,7 @@ static int hf_ranap_d_RNTI = -1;                  /* D_RNTI */
 static int hf_ranap_targetCellId = -1;            /* TargetCellId */
 static int hf_ranap_rAB_TrCH_Mapping = -1;        /* RAB_TrCH_Mapping */
 static int hf_ranap_SupportedRAB_ParameterBitrateList_item = -1;  /* SupportedBitrate */
+static int hf_ranap_uTRANcellID = -1;             /* TargetCellId */
 static int hf_ranap_SRB_TrCH_Mapping_item = -1;   /* SRB_TrCH_MappingItem */
 static int hf_ranap_sRB_ID = -1;                  /* SRB_ID */
 static int hf_ranap_trCH_ID = -1;                 /* TrCH_ID */
@@ -1073,6 +1082,7 @@ static gint ett_ranap_CriticalityDiagnostics_IE_List_item = -1;
 static gint ett_ranap_MessageStructure = -1;
 static gint ett_ranap_MessageStructure_item = -1;
 static gint ett_ranap_CGI = -1;
+static gint ett_ranap_CSG_Id_List = -1;
 static gint ett_ranap_DeltaRAListofIdleModeUEs = -1;
 static gint ett_ranap_NewRAListofIdleModeUEs = -1;
 static gint ett_ranap_RAListwithNoIdleModeUEsAnyMore = -1;
@@ -1375,6 +1385,7 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
 static int dissect_OutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 
 static int dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index);
+static int dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index);
 
 void proto_reg_handoff_ranap(void);
 
@@ -1738,6 +1749,9 @@ static const value_string ranap_ProtocolIE_ID_vals[] = {
   { id_SRVCC_HO_Indication, "id-SRVCC-HO-Indication" },
   { id_SRVCC_Information, "id-SRVCC-Information" },
   { id_SRVCC_Operation_Possible, "id-SRVCC-Operation-Possible" },
+  { id_CSG_Id_List, "id-CSG-Id-List" },
+  { id_PSRABtobeReplaced, "id-PSRABtobeReplaced" },
+  { id_E_UTRAN_Service_Handover, "id-E-UTRAN-Service-Handover" },
   { 0, NULL }
 };
 
@@ -3275,8 +3289,19 @@ dissect_ranap_CellLoadInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
+
+static int
+dissect_ranap_TargetCellId(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+                                                            0U, 268435455U, NULL, FALSE);
+
+  return offset;
+}
+
+
 static const per_sequence_t SourceUTRANCellID_sequence[] = {
   { &hf_ranap_pLMNidentity  , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_ranap_PLMNidentity },
+  { &hf_ranap_uTRANcellID   , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_ranap_TargetCellId },
   { &hf_ranap_iE_Extensions , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_ranap_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
 };
@@ -3585,6 +3610,20 @@ dissect_ranap_CSG_Id(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
 }
 
 
+static const per_sequence_t CSG_Id_List_sequence_of[1] = {
+  { &hf_ranap_CSG_Id_List_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_ranap_CSG_Id },
+};
+
+static int
+dissect_ranap_CSG_Id_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+                                                  ett_ranap_CSG_Id_List, CSG_Id_List_sequence_of,
+                                                  1, maxNrOfCSGs, FALSE);
+
+  return offset;
+}
+
+
 
 static int
 dissect_ranap_DataVolumeReference(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -4009,6 +4048,21 @@ dissect_ranap_EquipmentsToBeTraced(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
+static const value_string ranap_E_UTRAN_Service_Handover_vals[] = {
+  {   0, "handover-to-E-UTRAN-shall-not-be-performed" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_ranap_E_UTRAN_Service_Handover(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,
+                                     1, NULL, TRUE, 0, NULL);
+
+  return offset;
+}
+
+
 static const value_string ranap_Event_vals[] = {
   {   0, "stop-change-of-service-area" },
   {   1, "direct" },
@@ -6194,7 +6248,7 @@ dissect_ranap_Source_ToTarget_TransparentContainer(tvbuff_t *tvb _U_, int offset
 #line 284 "ranap.cnf"
 
 dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer(tvb , offset, actx ,tree , hf_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU );
-    
+
 
 
   return offset;
@@ -6249,16 +6303,6 @@ dissect_ranap_SourceID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 }
 
 
-
-static int
-dissect_ranap_TargetCellId(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
-                                                            0U, 268435455U, NULL, FALSE);
-
-  return offset;
-}
-
-
 static const per_sequence_t SourceRNC_ToTargetRNC_TransparentContainer_sequence[] = {
   { &hf_ranap_rRC_Container , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_ranap_RRC_Container },
   { &hf_ranap_numberOfIuInstances, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_ranap_NumberOfIuInstances },
@@ -6379,8 +6423,11 @@ dissect_ranap_SRVCC_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
 
 static int
 dissect_ranap_Target_ToSource_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
-                                       NO_BOUND, NO_BOUND, FALSE, NULL);
+#line 294 "ranap.cnf"
+
+dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer(tvb , offset, actx ,tree , hf_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU );
+    
+
 
   return offset;
 }
@@ -9505,6 +9552,14 @@ static int dissect_CSG_Id_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_CSG_Id_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_ranap_CSG_Id_List(tvb, offset, &asn1_ctx, tree, hf_ranap_CSG_Id_List_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_DeltaRAListofIdleModeUEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -9545,6 +9600,14 @@ static int dissect_EncryptionKey_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_E_UTRAN_Service_Handover_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_ranap_E_UTRAN_Service_Handover(tvb, offset, &asn1_ctx, tree, hf_ranap_E_UTRAN_Service_Handover_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_ExtendedRNC_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -9977,6 +10040,14 @@ static int dissect_ProvidedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_RAB_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_ranap_RAB_ID(tvb, offset, &asn1_ctx, tree, hf_ranap_RAB_ID_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_RAB_Parameter_ExtendedGuaranteedBitrateList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -11564,7 +11635,7 @@ static int dissect_RANAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
 
 
 /*--- End of included file: packet-ranap-fn.c ---*/
-#line 141 "packet-ranap-template.c"
+#line 142 "packet-ranap-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
@@ -11819,6 +11890,10 @@ void proto_register_ranap(void) {
       { "CSG-Id", "ranap.CSG_Id",
         FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.CSG_Id", HFILL }},
+    { &hf_ranap_CSG_Id_List_PDU,
+      { "CSG-Id-List", "ranap.CSG_Id_List",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "ranap.CSG_Id_List", HFILL }},
     { &hf_ranap_DeltaRAListofIdleModeUEs_PDU,
       { "DeltaRAListofIdleModeUEs", "ranap.DeltaRAListofIdleModeUEs",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -11839,6 +11914,10 @@ void proto_register_ranap(void) {
       { "EncryptionKey", "ranap.EncryptionKey",
         FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.EncryptionKey", HFILL }},
+    { &hf_ranap_E_UTRAN_Service_Handover_PDU,
+      { "E-UTRAN-Service-Handover", "ranap.E_UTRAN_Service_Handover",
+        FT_UINT32, BASE_DEC, VALS(ranap_E_UTRAN_Service_Handover_vals), 0,
+        "ranap.E_UTRAN_Service_Handover", HFILL }},
     { &hf_ranap_ExtendedRNC_ID_PDU,
       { "ExtendedRNC-ID", "ranap.ExtendedRNC_ID",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -12055,6 +12134,10 @@ void proto_register_ranap(void) {
       { "ProvidedData", "ranap.ProvidedData",
         FT_UINT32, BASE_DEC, VALS(ranap_ProvidedData_vals), 0,
         "ranap.ProvidedData", HFILL }},
+    { &hf_ranap_RAB_ID_PDU,
+      { "RAB-ID", "ranap.RAB_ID",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "ranap.RAB_ID", HFILL }},
     { &hf_ranap_RAB_Parameter_ExtendedGuaranteedBitrateList_PDU,
       { "RAB-Parameter-ExtendedGuaranteedBitrateList", "ranap.RAB_Parameter_ExtendedGuaranteedBitrateList",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -13203,6 +13286,10 @@ void proto_register_ranap(void) {
       { "cI", "ranap.cI",
         FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.CI", HFILL }},
+    { &hf_ranap_CSG_Id_List_item,
+      { "CSG-Id", "ranap.CSG_Id",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "ranap.CSG_Id", HFILL }},
     { &hf_ranap_newRAListofIdleModeUEs,
       { "newRAListofIdleModeUEs", "ranap.newRAListofIdleModeUEs",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -13835,6 +13922,10 @@ void proto_register_ranap(void) {
       { "SupportedBitrate", "ranap.SupportedBitrate",
         FT_UINT32, BASE_DEC, NULL, 0,
         "ranap.SupportedBitrate", HFILL }},
+    { &hf_ranap_uTRANcellID,
+      { "uTRANcellID", "ranap.uTRANcellID",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "ranap.TargetCellId", HFILL }},
     { &hf_ranap_SRB_TrCH_Mapping_item,
       { "SRB-TrCH-MappingItem", "ranap.SRB_TrCH_MappingItem",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -14213,7 +14304,7 @@ void proto_register_ranap(void) {
         "ranap.T_value", HFILL }},
 
 /*--- End of included file: packet-ranap-hfarr.c ---*/
-#line 297 "packet-ranap-template.c"
+#line 298 "packet-ranap-template.c"
   };
 
   /* List of subtrees */
@@ -14271,6 +14362,7 @@ void proto_register_ranap(void) {
     &ett_ranap_MessageStructure,
     &ett_ranap_MessageStructure_item,
     &ett_ranap_CGI,
+    &ett_ranap_CSG_Id_List,
     &ett_ranap_DeltaRAListofIdleModeUEs,
     &ett_ranap_NewRAListofIdleModeUEs,
     &ett_ranap_RAListwithNoIdleModeUEsAnyMore,
@@ -14517,7 +14609,7 @@ void proto_register_ranap(void) {
     &ett_ranap_Outcome,
 
 /*--- End of included file: packet-ranap-ettarr.c ---*/
-#line 304 "packet-ranap-template.c"
+#line 305 "packet-ranap-template.c"
   };
 
 
@@ -14787,6 +14879,9 @@ proto_reg_handoff_ranap(void)
   dissector_add("ranap.extension", id_Requested_RAB_Parameter_SupportedMaxBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap));
   dissector_add("ranap.extension", id_Requested_RAB_Parameter_SupportedGuaranteedBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap));
   dissector_add("ranap.extension", id_SRVCC_HO_Indication, new_create_dissector_handle(dissect_SRVCC_HO_Indication_PDU, proto_ranap));
+  dissector_add("ranap.extension", id_CSG_Id_List, new_create_dissector_handle(dissect_CSG_Id_List_PDU, proto_ranap));
+  dissector_add("ranap.extension", id_PSRABtobeReplaced, new_create_dissector_handle(dissect_RAB_ID_PDU, proto_ranap));
+  dissector_add("ranap.extension", id_E_UTRAN_Service_Handover, new_create_dissector_handle(dissect_E_UTRAN_Service_Handover_PDU, proto_ranap));
   dissector_add("ranap.proc.imsg", id_Iu_Release, new_create_dissector_handle(dissect_Iu_ReleaseCommand_PDU, proto_ranap));
   dissector_add("ranap.proc.sout", id_Iu_Release, new_create_dissector_handle(dissect_Iu_ReleaseComplete_PDU, proto_ranap));
   dissector_add("ranap.proc.imsg", id_RelocationPreparation, new_create_dissector_handle(dissect_RelocationRequired_PDU, proto_ranap));
@@ -14870,7 +14965,7 @@ proto_reg_handoff_ranap(void)
 
 
 /*--- End of included file: packet-ranap-dis-tab.c ---*/
-#line 348 "packet-ranap-template.c"
+#line 349 "packet-ranap-template.c"
 	} else {
 		dissector_delete("sccp.ssn", local_ranap_sccp_ssn, ranap_handle);
 	}