Update HNBAP to V10.1.0 (2011-06)

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

7 files changed, 389 insertions, 40 deletions

diff --git a/asn1/hnbap/HNBAP-CommonDataTypes.asn b/asn1/hnbap/HNBAP-CommonDataTypes.asn
index c053cc4e14..16a69a2584 100644
--- a/asn1/hnbap/HNBAP-CommonDataTypes.asn
+++ b/asn1/hnbap/HNBAP-CommonDataTypes.asn
@@ -1,6 +1,6 @@
 -- HNBAP-CommonDataTypes.asn
 --
--- 3GPP TS 25.469 V9.1.0 (2010-03)
+-- 3GPP TS 25.469 V10.1.0 (2011-06)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.5	Common Definitions
diff --git a/asn1/hnbap/HNBAP-Constants.asn b/asn1/hnbap/HNBAP-Constants.asn
index 347e1ff3fe..22f466ec9b 100644
--- a/asn1/hnbap/HNBAP-Constants.asn
+++ b/asn1/hnbap/HNBAP-Constants.asn
@@ -1,6 +1,6 @@
 -- HNBAP-Constants.asn
 --
--- 3GPP TS 25.469 V9.1.0 (2010-03)
+-- 3GPP TS 25.469 V10.1.0 (2011-06)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.6	Constant Definitions
@@ -38,7 +38,9 @@ id-UEDe-Register					ProcedureCode ::= 4
 id-ErrorIndication					ProcedureCode ::= 5
 id-privateMessage					ProcedureCode ::= 6 
 id-CSGMembershipUpdate				ProcedureCode ::= 7
- 
+id-TNLUpdate						ProcedureCode ::= 9
+id-HNBConfigTransfer				ProcedureCode ::= 10
+id-RelocationComplete				ProcedureCode ::= 11
 
 
 -- **************************************************************
@@ -47,7 +49,9 @@ id-CSGMembershipUpdate				ProcedureCode ::= 7
 --
 -- **************************************************************
 maxNrOfErrors						INTEGER ::= 256
-
+maxnoofRABs							INTEGER ::= 256
+maxnoofNeighbours					INTEGER ::= 32
+maxnoofIurhAddresses				INTEGER ::= 3
 
 -- **************************************************************
 --
@@ -73,10 +77,18 @@ id-CSG-ID										ProtocolIE-ID ::= 15
 id-BackoffTimer									ProtocolIE-ID ::= 16
 id-HNB-Internet-Information						ProtocolIE-ID ::= 17
 id-HNB-Cell-Access-Mode							ProtocolIE-ID ::= 18
-id-MuxPortNumber                                ProtocolIE-ID ::= 19
+id-MuxPortNumber								ProtocolIE-ID ::= 19
 id-Service-Area-For-Broadcast					ProtocolIE-ID ::= 20
 id-CSGMembershipStatus							ProtocolIE-ID ::= 21
-
+id-RABList										ProtocolIE-ID ::= 22
+id-HNBConfigInfo								ProtocolIE-ID ::= 23
+id-AccessResult									ProtocolIE-ID ::= 25
+id-Update-cause									ProtocolIE-ID ::= 26
+id-NeighbourInfoList							ProtocolIE-ID ::= 27
+id-NeighbourInfoRequestList						ProtocolIE-ID ::= 28
+id-Iurh-Signalling-TNL-Address					ProtocolIE-ID ::= 29
+id-PSC											ProtocolIE-ID ::= 30
+id-HNB-Cell-Identifier							ProtocolIE-ID ::= 31
 
 
 END
diff --git a/asn1/hnbap/HNBAP-Containers.asn b/asn1/hnbap/HNBAP-Containers.asn
index 27d3913c37..bac98f07fd 100644
--- a/asn1/hnbap/HNBAP-Containers.asn
+++ b/asn1/hnbap/HNBAP-Containers.asn
@@ -1,6 +1,6 @@
 -- HNBAP-Containers.asn
 --
--- 3GPP TS 25.469 V9.1.0 (2010-03)
+-- 3GPP TS 25.469 V10.1.0 (2011-06)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.7	Container Definitions
diff --git a/asn1/hnbap/HNBAP-IEs.asn b/asn1/hnbap/HNBAP-IEs.asn
index 3f5eaaa24d..e281d5cd52 100644
--- a/asn1/hnbap/HNBAP-IEs.asn
+++ b/asn1/hnbap/HNBAP-IEs.asn
@@ -1,6 +1,6 @@
 -- HNBAP-IEs.asn
 --
--- 3GPP TS 25.469 V9.1.0 (2010-03)
+-- 3GPP TS 25.469 V10.1.0 (2011-06)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.4	Information Element Definitions
@@ -24,7 +24,11 @@ BEGIN
 
 IMPORTS
 	maxNrOfErrors,
-	id-HNB-Internet-Information
+	maxnoofRABs,
+	maxnoofNeighbours,
+	maxnoofIurhAddresses,
+	id-HNB-Internet-Information,
+	id-HNB-Cell-Identifier
 	
 FROM HNBAP-Constants
 
@@ -44,6 +48,8 @@ Access-stratum-release-indicator ::=	ENUMERATED {r99,
 										rel-4, rel-5, rel-6, rel-7, rel-8-and-beyond,
 										...}
 
+AccessResult	::=		ENUMERATED {allowed, notAllowed, ...}
+
 AltitudeAndDirection ::= SEQUENCE {
 	directionOfAltitude		ENUMERATED {height, depth},
 	altitude		INTEGER (0..32767),
@@ -53,6 +59,8 @@ AltitudeAndDirection ::= SEQUENCE {
 --B
 BackoffTimer ::= INTEGER(0..3600)
 
+BindingID	::= OCTET STRING(SIZE(1..4,...))
+
 --C
 Cause ::= CHOICE {
 	radioNetwork			CauseRadioNetwork,
@@ -136,7 +144,7 @@ CriticalityDiagnostics-ExtIEs HNBAP-PROTOCOL-EXTENSION ::= {
 
 CSG-ID			::=	BIT STRING (SIZE (27))
 
-CSG-Indicator	::=	ENUMERATED {
+CSG-Capability	::=	ENUMERATED {
 				csg-capable,
 				not-csg-capable,
 				...
@@ -194,6 +202,8 @@ GeographicalCoordinates-ExtIEs HNBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+GTP-TEI					::= OCTET STRING (SIZE (4))
+
 --H
 
 HNB-Cell-Access-Mode::= ENUMERATED {
@@ -203,6 +213,63 @@ HNB-Cell-Access-Mode::= ENUMERATED {
 	... 
 }
 
+HNB-Cell-Identifier	::= 	SEQUENCE	{
+	pLMNidentity			PLMNidentity,
+	cellIdentity			CellIdentity,
+	iE-Extensions			ProtocolExtensionContainer { { HNB-Cell-Identifier-ExtIEs } }		OPTIONAL,
+	...
+}
+
+HNB-Cell-Identifier-ExtIEs HNBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+HNB-RNL-Identity	::= 	CHOICE	{
+	hNB-Identity-as-Cell-Identifier	HNB-Cell-Identifier,
+	...
+}
+
+HNBConfigInfo	::= 	SEQUENCE	{
+	hnb-RNL-Identity					HNB-RNL-Identity,
+	configurationInformation			ConfigurationInformation,
+	iE-Extensions						ProtocolExtensionContainer { { HNBConfigInfo-ExtIEs } }		OPTIONAL,
+	...
+}
+
+HNBConfigInfo-ExtIEs HNBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+ConfigurationInformation ::= CHOICE {
+	provided	HNBConfigurationInformationProvided,
+	missing		HNBConfigurationInformationMissing,
+	...
+}
+
+HNBConfigurationInformationProvided ::= SEQUENCE {
+
+	psc									PSC				OPTIONAL,
+	cSG-ID								CSG-ID				OPTIONAL,
+	hNB-Cell-Access-Mode				HNB-Cell-Access-Mode,
+	iurh-Signalling-TNL-AddressList		Iurh-Signalling-TNL-AddressList,
+	iE-Extensions						ProtocolExtensionContainer { { HNBConfigurationInformationProvided-ExtIEs } }		OPTIONAL,
+	...
+}
+
+HNBConfigurationInformationProvided-ExtIEs HNBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+HNBConfigurationInformationMissing ::= SEQUENCE {
+	cause					Cause,
+	iE-Extensions			ProtocolExtensionContainer { { HNBConfigurationInformationMissing-ExtIEs } }		OPTIONAL,
+	...
+}
+
+HNBConfigurationInformationMissing-ExtIEs HNBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 HNB-Location-Information	::=	SEQUENCE	{
 	macroCoverageInfo		MacroCoverageInformation	OPTIONAL,
 	geographicalCoordinates	GeographicalLocation	OPTIONAL,
@@ -247,9 +314,9 @@ IMSIESN				::= SEQUENCE {
 
 IP-Address		::=SEQUENCE {
 		ipaddress		CHOICE {
-			ipv4info		Ipv4Address,
-			ipv6info		Ipv6Address,
-			...
+		ipv4info		Ipv4Address,
+		ipv6info		Ipv6Address,
+		...
 		},
 	iE-Extensions		ProtocolExtensionContainer { { IP-Address-ExtIEs } }		OPTIONAL,
 		...
@@ -263,7 +330,7 @@ Ipv4Address		::= OCTET STRING (SIZE (4))
 
 Ipv6Address		::= OCTET STRING (SIZE (16))
 
-
+Iurh-Signalling-TNL-AddressList ::= SEQUENCE (SIZE(1..maxnoofIurhAddresses)) OF	IP-Address
 
 
 --J
@@ -298,10 +365,27 @@ MacroCellID ::= CHOICE {
 MuxPortNumber ::= INTEGER (1024..65535)
 
 --N
+
+NeighbourInfoList	::=	SEQUENCE (SIZE(1..maxnoofNeighbours)) OF	HNBConfigInfo
+
+NeighbourInfoRequestList	::=	SEQUENCE (SIZE(1..maxnoofNeighbours)) OF	NeighbourInfoRequestItem
+
+NeighbourInfoRequestItem ::= SEQUENCE {
+	hnb-RNL-Identity	HNB-RNL-Identity,
+	iE-Extensions		ProtocolExtensionContainer { { NeighbourInfoRequestItem-ExtIEs } }		OPTIONAL,
+	...
+}
+
+NeighbourInfoRequestItem-ExtIEs HNBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 --O
 --P
 PLMNidentity 				::= OCTET STRING (SIZE (3))
 
+PSC			::= BIT STRING (SIZE(9))
+
 PTMSI		::=	BIT STRING (SIZE(32))
 
 PTMSIRAI		::= SEQUENCE {
@@ -313,6 +397,24 @@ PTMSIRAI		::= SEQUENCE {
 
 --Q
 --R
+
+RAB-ID		::= BIT STRING (SIZE (8))
+
+RABList		::= SEQUENCE (SIZE(1..maxnoofRABs)) OF RABListItem
+
+RABListItem	::= SEQUENCE {
+	rAB-ID						RAB-ID,
+	old-transport-Info			TransportInfo,
+	new-transport-Info			TransportInfo,
+	cn-domain-indicator			CN-DomainIndicator,
+	iE-Extensions		ProtocolExtensionContainer { { RABListItem-ExtIEs } }		OPTIONAL,
+...
+}
+
+RABListItem-ExtIEs HNBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 RAC			::= OCTET STRING(SIZE(1))
 
 RAI			::= SEQUENCE {
@@ -325,7 +427,8 @@ RAI			::= SEQUENCE {
 Registration-Cause	::= ENUMERATED {
 				emergency-call,
 				normal,
-				...
+				...,
+				ue-relocation
 			}
 
 RNC-ID	::=	INTEGER(0..65535)
@@ -342,6 +445,23 @@ TMSILAI		::=	SEQUENCE {
 
 TMSIDS41	::=		OCTET STRING (SIZE (2..17))
 
+TransportInfo	::= SEQUENCE {
+	transportLayerAddress		TransportLayerAddress,
+	transportAssociation		CHOICE	{
+	gtp-TEI						GTP-TEI,
+	bindingID					BindingID,
+	...
+	},
+	iE-Extensions		ProtocolExtensionContainer { { TransportInfo-ExtIEs } }		OPTIONAL,
+...
+}
+
+TransportInfo-ExtIEs HNBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+TransportLayerAddress	::= BIT STRING(SIZE(1..160,...))
+
 TypeOfError ::= ENUMERATED {
 	not-understood,
 	missing,
@@ -350,7 +470,7 @@ TypeOfError ::= ENUMERATED {
 --U
 UE-Capabilities ::= SEQUENCE {
 	access-stratum-release-indicator	Access-stratum-release-indicator,
-	csg-indicator						CSG-Indicator,
+	csg-capability						CSG-Capability,
 	iE-Extensions		ProtocolExtensionContainer { { UE-Capabilities-ExtIEs } }		OPTIONAL,
 ...
 }
@@ -385,7 +505,11 @@ UE-Identity	::=	CHOICE {
 	...
 }
 
-	
+Update-cause ::=	ENUMERATED {
+	relocation-preparation,
+	...
+}
+
 --V
 --W
 --X
diff --git a/asn1/hnbap/HNBAP-PDU-Contents.asn b/asn1/hnbap/HNBAP-PDU-Contents.asn
index df5db8041a..de1de669a6 100644
--- a/asn1/hnbap/HNBAP-PDU-Contents.asn
+++ b/asn1/hnbap/HNBAP-PDU-Contents.asn
@@ -1,6 +1,6 @@
 -- HNBAP-PDU-Contents.asn
 --
--- 3GPP TS 25.469 V9.1.0 (2010-03)
+-- 3GPP TS 25.469 V10.1.0 (2011-06)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.3	PDU Definitions
@@ -8,12 +8,6 @@
 -- $Id$
 --
 
--- **************************************************************
---
--- PDU definitions for HNBAP.
---
--- **************************************************************
-
 HNBAP-PDU-Contents {
 itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
 umts-Access (20) modules (3) hnbap(6) version1 (1) hnbap-PDU-Contents (1) }
@@ -49,7 +43,14 @@ IMPORTS
 	CSG-ID,
 	HNB-Cell-Access-Mode,
 	BackoffTimer,
-	MuxPortNumber
+	MuxPortNumber,
+	RABList,
+	HNBConfigInfo,
+	AccessResult,
+	Update-cause,
+	NeighbourInfoList,
+	NeighbourInfoRequestList,
+	PSC
 
 
 
@@ -86,7 +87,15 @@ FROM HNBAP-Containers
 	id-HNB-Cell-Access-Mode,
 	id-BackoffTimer,
 	id-Service-Area-For-Broadcast,
-	id-MuxPortNumber
+	id-MuxPortNumber,
+	id-RABList,
+	id-HNBConfigInfo,
+	id-AccessResult,
+	id-Update-cause,
+	id-NeighbourInfoList,
+	id-NeighbourInfoRequestList,
+	id-Iurh-Signalling-TNL-Address,
+	id-PSC
 
 
 FROM HNBAP-Constants;
@@ -116,8 +125,10 @@ HNBRegisterRequestIEs HNBAP-PROTOCOL-IES ::= {
 }
 
 HNBRegisterRequestExtensions HNBAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-Service-Area-For-Broadcast		CRITICALITY ignore	EXTENSION SAC	PRESENCE optional }|
-	{ ID id-HNB-Cell-Access-Mode			CRITICALITY reject	EXTENSION HNB-Cell-Access-Mode				PRESENCE optional},
+	{ ID id-Service-Area-For-Broadcast		CRITICALITY ignore	EXTENSION SAC								PRESENCE optional }|
+	{ ID id-HNB-Cell-Access-Mode			CRITICALITY reject	EXTENSION HNB-Cell-Access-Mode				PRESENCE optional }|
+	{ ID id-PSC								CRITICALITY ignore	EXTENSION PSC								PRESENCE optional }|
+	{ ID id-Iurh-Signalling-TNL-Address		CRITICALITY ignore	EXTENSION IP-Address						PRESENCE optional },
 	...
 }
 
@@ -128,20 +139,20 @@ HNBRegisterRequestExtensions HNBAP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 HNBRegisterAccept ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {HNBRegisterResponseIEs} },
-	protocolExtensions	ProtocolExtensionContainer { {HNBRegisterResponseExtensions} } 	OPTIONAL,
+	protocolIEs			ProtocolIE-Container		{ {HNBRegisterResponseIEs} },
+	protocolExtensions	ProtocolExtensionContainer	{ {HNBRegisterResponseExtensions} }	OPTIONAL,
 	...
 }
 
 HNBRegisterResponseIEs HNBAP-PROTOCOL-IES ::= {
-	{ ID id-RNC-ID					CRITICALITY reject	TYPE RNC-ID		PRESENCE mandatory },
+	{ ID id-RNC-ID						CRITICALITY reject	TYPE RNC-ID				PRESENCE mandatory },
 	...
 }
 
-
 HNBRegisterResponseExtensions HNBAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 9 to support CS Multiplexing --
-    {ID id-MuxPortNumber           CRITICALITY ignore	EXTENSION MuxPortNumber      PRESENCE optional},
+	{ ID id-MuxPortNumber				CRITICALITY ignore	EXTENSION MuxPortNumber		PRESENCE optional}|
+	{ ID id-Iurh-Signalling-TNL-Address	CRITICALITY ignore	EXTENSION IP-Address		PRESENCE optional},
 	...
 }
 
@@ -310,7 +321,136 @@ CSGMembershipUpdateExtensions HNBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+-- **************************************************************
+--
+-- TNL Update Request
+--
+-- **************************************************************
+
+TNLUpdateRequest ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container		{ {TNLUpdateRequestIEs} },
+	protocolExtensions	ProtocolExtensionContainer	{ {TNLUpdateExtensions} } 	OPTIONAL,
+	...
+}
+
+TNLUpdateRequestIEs HNBAP-PROTOCOL-IES ::= {
+	{ ID id-Context-ID					CRITICALITY reject	TYPE Context-ID					PRESENCE mandatory } |
+	{ ID id-RABList						CRITICALITY reject	TYPE RABList					PRESENCE mandatory } |
+	{ ID id-Update-cause				CRITICALITY reject	TYPE Update-cause				PRESENCE mandatory } ,
+		...
+}
+
+TNLUpdateExtensions HNBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- TNL UPDATE RESPONSE
+--
+-- **************************************************************
+
+TNLUpdateResponse ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container		{ { TNLUpdateResponseIEs} },
+	protocolExtensions	ProtocolExtensionContainer	{ { TNLUpdateResponseExtensions} } 	OPTIONAL,
+	...
+}
+
+TNLUpdateResponseIEs HNBAP-PROTOCOL-IES ::= {
+	{ ID id-Context-ID					CRITICALITY reject	TYPE Context-ID				PRESENCE mandatory } ,
+		...
+}
+
+TNLUpdateResponseExtensions HNBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- TNL UPDATE FAILURE
+--
+-- **************************************************************
+
+TNLUpdateFailure ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container		{ {TNLUpdateFailureIEs} },
+	protocolExtensions	ProtocolExtensionContainer	{ {TNLUpdateFailureExtensions} } 	OPTIONAL,
+	...
+}
+
+TNLUpdateFailureIEs HNBAP-PROTOCOL-IES ::= {
+	{ ID id-Context-ID					CRITICALITY reject	TYPE Context-ID					PRESENCE mandatory } |
+	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory } |
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional } ,
+		...
+}
+
+TNLUpdateFailureExtensions HNBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- HNB Configuration Transfer Request
+--
+-- **************************************************************
+
+HNBConfigTransferRequest ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {HNBConfigTransferRequestIEs} },
+	protocolExtensions	ProtocolExtensionContainer { {HNBConfigTransferRequestExtensions} } 	OPTIONAL,
+	...
+}
+
+HNBConfigTransferRequestIEs HNBAP-PROTOCOL-IES ::= {
+	{ ID id-NeighbourInfoRequestList		CRITICALITY reject	TYPE NeighbourInfoRequestList			PRESENCE mandatory } ,
+	...
+}
+
+HNBConfigTransferRequestExtensions HNBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- HNB Configuration Transfer Response
+--
+-- **************************************************************
+
+HNBConfigTransferResponse ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { { HNBConfigTransferResponseIEs} },
+	protocolExtensions	ProtocolExtensionContainer { { HNBConfigTransferResponseExtensions} } 	OPTIONAL,
+	...
+}
+
+HNBConfigTransferResponseIEs HNBAP-PROTOCOL-IES ::= {
+	{ ID id-NeighbourInfoList			CRITICALITY reject	TYPE NeighbourInfoList				PRESENCE mandatory } ,
+	...
+}
+
+HNBConfigTransferResponseExtensions HNBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
+-- **************************************************************
+--
+-- RELOCATION COMPLETE
+--
+-- **************************************************************
+
+RelocationComplete ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container		{ { RelocationCompleteIEs} },
+	protocolExtensions	ProtocolExtensionContainer	{ { RelocationCompleteExtensions} } 	OPTIONAL,
+	...
+}
+
+RelocationCompleteIEs HNBAP-PROTOCOL-IES ::= {
+	{ ID id-Context-ID					CRITICALITY ignore	TYPE Context-ID			PRESENCE mandatory } ,
+	...
+}
+
+
+RelocationCompleteExtensions HNBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 -- **************************************************************
 --
diff --git a/asn1/hnbap/HNBAP-PDU-Descriptions.asn b/asn1/hnbap/HNBAP-PDU-Descriptions.asn
index bfba5c7652..f5d2e544c3 100644
--- a/asn1/hnbap/HNBAP-PDU-Descriptions.asn
+++ b/asn1/hnbap/HNBAP-PDU-Descriptions.asn
@@ -1,6 +1,6 @@
 -- HNBAP-PDU-Descriptions.asn
 --
--- 3GPP TS 25.469 V9.1.0 (2010-03)
+-- 3GPP TS 25.469 V10.1.0 (2011-06)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.2	Elementary Procedure definitions
@@ -14,6 +14,11 @@
 --
 -- **************************************************************
 -- **************************************************************
+-- **************************************************************
+--
+-- Elementary Procedure definitions
+--
+-- **************************************************************
 HNBAP-PDU-Descriptions  { 
 itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
 umts-Access (20) modules (3) hnbap(6) version1 (1) hnbap-PDU-Descriptions (0)}
@@ -42,8 +47,14 @@ FROM HNBAP-CommonDataTypes
 	UERegisterReject,
 	UEDe-Register,
 	ErrorIndication,
-	 PrivateMessage,
-    CSGMembershipUpdate
+	PrivateMessage,
+	CSGMembershipUpdate,
+	TNLUpdateRequest,
+	TNLUpdateResponse,
+	TNLUpdateFailure,
+	HNBConfigTransferRequest,
+	HNBConfigTransferResponse,
+	RelocationComplete
 
 
 FROM HNBAP-PDU-Contents
@@ -53,7 +64,10 @@ FROM HNBAP-PDU-Contents
 	id-HNBDe-Register,
 	id-ErrorIndication,
 	id-privateMessage,
-	id-CSGMembershipUpdate
+	id-CSGMembershipUpdate,
+	id-TNLUpdate,
+	id-HNBConfigTransfer,
+	id-RelocationComplete
 
 FROM HNBAP-Constants;
 
@@ -126,7 +140,9 @@ HNBAP-ELEMENTARY-PROCEDURES HNBAP-ELEMENTARY-PROCEDURE ::= {
 HNBAP-ELEMENTARY-PROCEDURES-CLASS-1 HNBAP-ELEMENTARY-PROCEDURE ::= {
 	hNBRegister|
 	uERegister,
-	...
+	...,
+	tnlUpdate			|
+	hNBConfigTransfer
 }
 
 
@@ -136,7 +152,8 @@ HNBAP-ELEMENTARY-PROCEDURES-CLASS-2 HNBAP-ELEMENTARY-PROCEDURE ::= {
 	errorIndication	|
 	privateMessage,
 	...,
-	csg-membership-update
+	csg-membership-update|
+	relocationComplete
 }
 
 -- **************************************************************
@@ -186,6 +203,27 @@ csg-membership-update HNBAP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				ignore
 }
 
+tnlUpdate HNBAP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		TNLUpdateRequest
+	SUCCESSFUL OUTCOME		TNLUpdateResponse
+	UNSUCCESSFUL OUTCOME	TNLUpdateFailure
+	PROCEDURE CODE			id-TNLUpdate
+	CRITICALITY				reject
+}
+
+hNBConfigTransfer HNBAP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		HNBConfigTransferRequest
+	SUCCESSFUL OUTCOME		HNBConfigTransferResponse
+	PROCEDURE CODE			id-HNBConfigTransfer
+	CRITICALITY				reject
+}
+
+relocationComplete HNBAP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		RelocationComplete
+	PROCEDURE CODE			id-RelocationComplete
+	CRITICALITY				ignore
+}
+
 privateMessage HNBAP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE		PrivateMessage
 	PROCEDURE CODE			id-privateMessage
diff --git a/asn1/hnbap/hnbap.cnf b/asn1/hnbap/hnbap.cnf
index e48949ed4d..2369909a19 100644
--- a/asn1/hnbap/hnbap.cnf
+++ b/asn1/hnbap/hnbap.cnf
@@ -40,7 +40,6 @@ HNB-Location-Information/geographicalCoordinates hnb_location_information_geogra
 Presence
 ProtocolIE-ContainerList
 ProtocolIE-Single-Container
-CN-DomainIndicator
 #.END
 
 #.FN_PARS ProtocolIE-ID  VAL_PTR = &ProtocolIE_ID
@@ -134,6 +133,10 @@ id-UERegister                                   ProcedureCode
 id-UEDe-Register                                ProcedureCode
 id-ErrorIndication                              ProcedureCode
 id-privateMessage                               ProcedureCode
+id-CSGMembershipUpdate                          ProcedureCode
+id-TNLUpdate                                    ProcedureCode
+id-HNBConfigTransfer                            ProcedureCode
+id-RelocationComplete                           ProcedureCode
 
 # ProtocolIE-ID
 id-Cause                                        ProtocolIE-ID
@@ -153,6 +156,19 @@ id-RNC-ID                                       ProtocolIE-ID
 id-CSG-ID                                       ProtocolIE-ID
 id-BackoffTimer                                 ProtocolIE-ID
 id-HNB-Internet-Information                     ProtocolIE-ID
+id-HNB-Cell-Access-Mode                         ProtocolIE-ID
+id-MuxPortNumber                                ProtocolIE-ID
+id-Service-Area-For-Broadcast                   ProtocolIE-ID
+id-CSGMembershipStatus                          ProtocolIE-ID
+id-RABList                                      ProtocolIE-ID
+id-HNBConfigInfo                                ProtocolIE-ID
+id-AccessResult                                 ProtocolIE-ID
+id-Update-cause                                 ProtocolIE-ID
+id-NeighbourInfoList                            ProtocolIE-ID
+id-NeighbourInfoRequestList                     ProtocolIE-ID
+id-Iurh-Signalling-TNL-Address                  ProtocolIE-ID
+id-PSC                                          ProtocolIE-ID
+id-HNB-Cell-Identifier                          ProtocolIE-ID
 #.END
 
 
@@ -177,11 +193,21 @@ CSG-ID								N hnbap.ies id-CSG-ID
 BackoffTimer						N hnbap.ies id-BackoffTimer
 CSGMembershipStatus					N hnbap.ies id-CSGMembershipStatus
 
+RABList                             N hnbap.ies id-RABList
+# id-HNBConfigInfo
+# id-AccessResult
+Update-cause                        N hnbap.ies id-Update-cause
+NeighbourInfoList                   N hnbap.ies id-NeighbourInfoList
+NeighbourInfoRequestList            N hnbap.ies id-NeighbourInfoRequestList
+# id-HNB-Cell-Identifier
+
 #HNBAP-PROTOCOL-EXTENSION
 IP-Address							N hnbap.extension id-HNB-Internet-Information
 HNB-Cell-Access-Mode				N hnbap.extension id-HNB-Cell-Access-Mode
 MuxPortNumber						N hnbap.extension id-MuxPortNumber
 CSGMembershipStatus					N hnbap.extension id-CSGMembershipStatus
+IP-Address                          N hnbap.extension id-Iurh-Signalling-TNL-Address
+PSC                                 N hnbap.extension id-PSC
 
 #HNBAP-ELEMENTARY-PROCEDURE
 #CLASS 1
@@ -192,6 +218,15 @@ UERegisterRequest					N hnbap.proc.imsg id-UERegister
 UERegisterAccept					N hnbap.proc.sout id-UERegister
 UERegisterReject					N hnbap.proc.uout id-UERegister
 
+TNLUpdateRequest					N hnbap.proc.imsg id-TNLUpdate
+TNLUpdateResponse					N hnbap.proc.sout id-TNLUpdate
+TNLUpdateFailure					N hnbap.proc.uout id-TNLUpdate
+
+HNBConfigTransferRequest			N hnbap.proc.imsg id-HNBConfigTransfer
+HNBConfigTransferResponse			N hnbap.proc.sout id-HNBConfigTransfer
+
+RelocationComplete					N hnbap.proc.imsg id-RelocationComplete
+
 #CLASS 2
 UEDe-Register						N hnbap.proc.imsg id-UEDe-Register
 HNBDe-Register						N hnbap.proc.imsg id-HNBDe-Register