Merge branch 'cr/102232-3/0042' into 'meeting/LI62'

iPIRIObjId RELATIVE-OID						::= {iPAccessPDUObjId iRI(1)}

iPIRIObjId RELATIVE-OID						::= {iPAccessPDUObjId iRI(1)}

iPCCObjId RELATIVE-OID						::= {iPAccessPDUObjId cC(2)}

iPCCObjId RELATIVE-OID						::= {iPAccessPDUObjId cC(2)}

iPIRIOnlyObjId RELATIVE-OID					::= {iPAccessPDUObjId iRIOnly(3)}

iPIRIOnlyObjId RELATIVE-OID					::= {iPAccessPDUObjId iRIOnly(3)}

		-- all four definitions relative to {itu-t(0) identified-organization(4)

		-- etsi(0) securityDomain(2) lawfulintercept(2)}

	-- definitions are relative to

	-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}

-- ==========================

-- ==========================

		-- in ASCII-characters

		-- in ASCII-characters

	internetAccessType		[2] InternetAccessType,

	internetAccessType		[2] InternetAccessType,

	iPVersion				[3] IPVersion,

	iPVersion				[3] IPVersion,

	targetIPAddress			[4] IPAddress OPTIONAL,

	targetIPAddress			[4] LI-PS-PDU.IPAddress OPTIONAL,

		-- IP address may not be available in case of failed logon attempts.

		-- IP address may not be available in case of failed logon attempts.

		-- If it is available, it must be sent.

		-- If it is available, it must be sent.

		-- This field will carry the first IPv4 or IPv6 target IP address with or without

		-- This field will carry the first IPv4 or IPv6 target IP address with or without

		-- The phone number dialed by the target for dial-up

		-- The phone number dialed by the target for dial-up

	pOPIdentifier			[18] IPIRIIDType OPTIONAL,

	pOPIdentifier			[18] IPIRIIDType OPTIONAL,

		-- The identifier or name of the POP

		-- The identifier or name of the POP

	pOPIPAddress			[19] IPAddress OPTIONAL,

	pOPIPAddress			[19] LI-PS-PDU.IPAddress OPTIONAL,

		-- The IP address of the POP

		-- The IP address of the POP

	nationalIPIRIParameters	[20] NationalIPIRIParameters OPTIONAL,

	nationalIPIRIParameters	[20] NationalIPIRIParameters OPTIONAL,

		-- National IP IRI Parameters

		-- National IP IRI Parameters

	additionalIPAddress		[21] IPAddress OPTIONAL,

	additionalIPAddress		[21] LI-PS-PDU.IPAddress OPTIONAL,

		-- This field will carry the first IPv6 target IP address with or without prefix when the

		-- This field will carry the first IPv6 target IP address with or without prefix when the

		-- iPVersion parameter is set to iPV4andV6.

		-- iPVersion parameter is set to iPV4andV6.

		-- Use of this field is fully described in section 6.2.1

		-- Use of this field is fully described in section 6.2.1

		-- This parameter will carry the second and subsequent IPv4 or IPv6 target IP addresses

		-- This parameter will carry the second and subsequent IPv4 or IPv6 target IP addresses

		-- It is used when multiple subnet/prefix ranges are assigned to a target service.

		-- It is used when multiple subnet/prefix ranges are assigned to a target service.

		-- Use of this field is fully described in section 6.2.1

		-- Use of this field is fully described in section 6.2.1

	location				[24] Location OPTIONAL,

	location				[24] LI-PS-PDU.Location OPTIONAL,

		-- The location associated with the target

		-- The location associated with the target

	pOPPortID				[25] OCTET STRING OPTIONAL,

	pOPPortID				[25] OCTET STRING OPTIONAL,

		-- This field will carry the NAS-Port-ID as defined in RFC 2869 [17]:

		-- This field will carry the NAS-Port-ID as defined in RFC 2869 [17]:

		-- For printable userIDs, such as the Radius username, phonenumbers

		-- For printable userIDs, such as the Radius username, phonenumbers

	macAddressType			[1] OCTET STRING (SIZE (6)),

	macAddressType			[1] OCTET STRING (SIZE (6)),

		-- For MAC address types, raw binary format as in RFC 2132 [15]

		-- For MAC address types, raw binary format as in RFC 2132 [15]

	ipAddressType			[2] IPAddress,

	ipAddressType			[2] LI-PS-PDU.IPAddress,

		-- For IP address types

		-- For IP address types

	...

	...

}

}

		-- Additional target identifiers associated with the target service

		-- Additional target identifiers associated with the target service

		-- This list is extensible to accommodate other target identifiers which

		-- This list is extensible to accommodate other target identifiers which

		-- may be required in future.

		-- may be required in future.

	iPAddress		[0] IPAddress,

	iPAddress		[0] LI-PS-PDU.IPAddress,

		-- IPAddress imported from TS 102 232 [2].

		-- IPAddress imported from TS 102 232 [2].

		-- This can be an IPv4 address (with or without a subnet range defined) or

		-- This can be an IPv4 address (with or without a subnet range defined) or

		-- an IPv6 address (with or without a prefix range defined).

		-- an IPv6 address (with or without a prefix range defined).

END -- end of IPAccessPDU

END -- end of IPAccessPDU