Merge branch 'meeting/LI#56e' into 'master'

	IPIRI,

	IPIRIOnly

		FROM IPAccessPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)}

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)}

	-- from ETSI TS 102 232-4 [32]

	L2CC,

	IPMMCC,

	IPMMIRI

		FROM IPMultimediaPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version12(12)}

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)}

	-- from ETSI TS 102 232-6 [36]

	PstnIsdnCC,

		FROM PstnIsdnPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)}

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	UmtsIRIsContent,

	CorrelationValues,

			-- The relevant module (including the 3GPP release and version number) needs

			-- to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	UmtsCS-IRIsContent

		FROM UmtsCS-HI2Operations

			-- The relevant module (including the 3GPP release and version number) needs

			-- to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	EpsIRIsContent,

	EPSLocation

			-- The relevant module (including the 3GPP release and version number) needs

			-- to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	ConfIRIsContent

		FROM CONFHI2Operations

			-- The relevant module (including the 3GPP release and version number) needs

			-- to be chosen when compiling the application.	

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	ProSeIRIsContent

		FROM ProSeHI2Operations

			-- The relevant module (including the 3GPP release and version number) needs

			-- to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	GcseIRIsContent

		FROM GCSEHI2Operations

			-- The relevant module (including the 3GPP release and version number) needs

			-- to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

    CC-PDU

        FROM Umts-HI3-PS

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

            -- The relevant module (including the 3GPP release and version number)

            -- needs to be chosen when compiling the application.

    -- from ETSI TS 133 108 [9]

    -- from 3GPP TS 33.108 [9]

    CC-PDU

        FROM Eps-HI3-PS

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

            -- The relevant module (including the 3GPP release and version number)

            -- needs to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

    Conf-CC-PDU

        FROM CONF-HI3-IMS

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

            -- The relevant module (including the 3GPP release and version number)

            -- needs to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

    Voip-CC-PDU

        FROM VoIP-HI3-IMS

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

            -- The relevant module (including the 3GPP release and version number)

            -- needs to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

    Gcse-CC-PDU

        FROM GCSE-HI3

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

            -- The relevant module (including the 3GPP release and version number)

            -- needs to be chosen when compiling the application.

    -- from ETSI TS 133 108 [9]

    -- from 3GPP TS 33.108 [9]

    ThreeGPP-HI1-Operation

        FROM ThreeGPP-HI1NotificationOperations

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)}

			-- The implementation depends of national regulations or LEA/CSP negotiations. 

			-- 3GPP HI1 may be used with other services/networks than 3GPP's one.

    -- from ETSI TS 133 108 [9]

    -- from 3GPP TS 33.108 [9]

    CSvoice-CC-PDU

        FROM CSvoice-HI3-IP

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18)}

            -- The relevant module (including the 3GPP release and version number)

            -- needs to be chosen when compiling the application.

            -- The implementation of the CS domain delivery in IP have to be based on ETSI TS 133 108 [9].

            -- The implementation of the CS domain delivery in IP have to be based on 3GPP TS 33.108 [9].

	-- from ETSI TS 101 909-20-1 [33]

	TARGETACTIVITYMONITOR-1,

		-- Network byte order

		-- If checkValue contains a signature, the octet string field space may be

		-- used to insert the appropriate ASN.1 DER or BER encoded structure for the 

		-- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43].

		-- DSS/DSA signature as described in IETF RFC 3279 [43], clause 2.2.2.

	...,

	hashAlgorithm				[4] HashAlgorithm OPTIONAL

		-- Clarifies the hash function if checkType is hash(1).

LI-PS-PDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version30(30)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version31(31)}

DEFINITIONS IMPLICIT TAGS ::=

	IPIRI,

	IPIRIOnly

		FROM IPAccessPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)}

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)}

	-- from ETSI TS 102 232-4 [32]

	L2CC,

	IPMMCC,

	IPMMIRI

		FROM IPMultimediaPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)}

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)}

	-- from ETSI TS 102 232-6 [36]

	PstnIsdnCC,

		FROM PstnIsdnPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)}

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	UmtsIRIsContent,

	CorrelationValues,

			-- The relevant module (including the 3GPP release and version number) needs

			-- to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	UmtsCS-IRIsContent

		FROM UmtsCS-HI2Operations

			-- The relevant module (including the 3GPP release and version number) needs

			-- to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	EpsIRIsContent,

	EPSLocation

			-- The relevant module (including the 3GPP release and version number) needs

			-- to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	ConfIRIsContent

		FROM CONFHI2Operations

			-- The relevant module (including the 3GPP release and version number) needs

			-- to be chosen when compiling the application.	

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	ProSeIRIsContent

		FROM ProSeHI2Operations

			-- The relevant module (including the 3GPP release and version number) needs

			-- to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	GcseIRIsContent

		FROM GCSEHI2Operations

			-- The relevant module (including the 3GPP release and version number) needs

			-- to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

    CC-PDU

        FROM Umts-HI3-PS

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

            -- The relevant module (including the 3GPP release and version number)

            -- needs to be chosen when compiling the application.

    -- from ETSI TS 133 108 [9]

    -- from 3GPP TS 33.108 [9]

    CC-PDU

        FROM Eps-HI3-PS

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

            -- The relevant module (including the 3GPP release and version number)

            -- needs to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

    Conf-CC-PDU

        FROM CONF-HI3-IMS

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

            -- The relevant module (including the 3GPP release and version number)

            -- needs to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

    Voip-CC-PDU

        FROM VoIP-HI3-IMS

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

            -- The relevant module (including the 3GPP release and version number)

            -- needs to be chosen when compiling the application.

	-- from ETSI TS 133 108 [9]

	-- from 3GPP TS 33.108 [9]

    Gcse-CC-PDU

        FROM GCSE-HI3

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

            -- The relevant module (including the 3GPP release and version number)

            -- needs to be chosen when compiling the application.

    -- from ETSI TS 133 108 [9]

    -- from 3GPP TS 33.108 [9]

    ThreeGPP-HI1-Operation

        FROM ThreeGPP-HI1NotificationOperations

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)}

			-- The implementation depends of national regulations or LEA/CSP negotiations. 

			-- 3GPP HI1 may be used with other services/networks than 3GPP's one.

    -- from ETSI TS 133 108 [9]

    -- from 3GPP TS 33.108 [9]

    CSvoice-CC-PDU

        FROM CSvoice-HI3-IP

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18)}

            -- The relevant module (including the 3GPP release and version number)

            -- needs to be chosen when compiling the application.

            -- The implementation of the CS domain delivery in IP have to be based on ETSI TS 133 108 [9].

            -- The implementation of the CS domain delivery in IP have to be based on 3GPP TS 33.108 [9].

	-- from ETSI TS 101 909-20-1 [33]

	TARGETACTIVITYMONITOR-1,

		-- This import is only used for the handover between LEMFs.

	-- from 3GPP TS 33.128 [46]

	LINotificationPayload

	LINotificationPayload,

	IRIPayload,

	CCPayload

		FROM TS33128Payloads

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)};

		-- The relevant module (including the 3GPP release and version number)

lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}

li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version30(30)}

li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version31(31)}

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

-- Top-level definition

HI4Payload ::= CHOICE

{

	threeGPP-LI-Notification [1] TS33128Payloads.LiNotificationPayload,

	threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload,

	... 

}

	voipCC-CC-PDU				[20] VoIP-HI3-IMS.Voip-CC-PDU,

	gcseCC-CC-PDU				[21] GCSE-HI3.Gcse-CC-PDU,

	cSvoice-CC-PDU				[22] CSvoice-HI3-IP.CSvoice-CC-PDU,

	threeGPP33128DefinedCC		[23] OCTET STRING }

	threeGPP33128DefinedCC		[23] OCTET STRING (CONTAINING TS33128Payloads.CCPayload)

}

MicroSecondTimeStamp ::= SEQUENCE

{

	confIRI						[16] ConfIRI,

	proseIRI					[17] ProSeIRI,

	gcseIRI						[18] GcseIRI,

	threeGPP33128DefinedIRI	[19] OCTET STRING}

	threeGPP33128DefinedIRI		[19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload)

}

UMTSIRI ::= CHOICE

	-- This structure may be commented out if not used

		-- Network byte order

		-- If checkValue contains a signature, the octet string field space may be

		-- used to insert the appropriate ASN.1 DER or BER encoded structure for the 

		-- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43].

		-- DSS/DSA signature as described in IETF RFC 3279 [43], clause 2.2.2.

	...,

	hashAlgorithm				[4] HashAlgorithm OPTIONAL

		-- Clarifies the hash function if checkType is hash(1).

BEGIN

IMPORTS

	-- from ETSI TS 102 232-1 [2]

    IPAddress,

	Location

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

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

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

-- IP Communications Contents

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

{

	accessEventType			[0] AccessEventType,

	targetUsername			[1] OCTET STRING,

		-- in ASCII characters

		-- in ASCII-characters

	internetAccessType		[2] InternetAccessType,

	iPVersion				[3] IPVersion,

	targetIPAddress			[4] IPAddress OPTIONAL,

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

		-- If it is available, it shall 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 

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

	targetNetworkID			[5] UTF8String (SIZE (1..20)) OPTIONAL,

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

		-- This parameter shall be populated with the RADIUS value.

	framedRoutes			[26] SEQUENCE OF FramedRoute OPTIONAL

		-- It is used to list all the available Framed Route and Framed IPv6 Route informationX

		-- It is used to list all the available Framed Route and Framed IPv6 Route information

}

AccessEventType ::= ENUMERATED

	endOfInterceptionWithSessionActive(9),

	 	-- LI is ended on a target who still has an active session

	unknown(10)

}

InternetAccessType ::= ENUMERATED

	printableIDType			[0] UTF8String (SIZE (1..128)),

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

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

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

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

	ipAddressType			[2] IPAddress,

		-- For IP address types

	...

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

		-- may be required in future.

	iPAddress		[0] IPAddress,

		-- IPAddress imported from ETSI 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 

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

	...

}

FramedRoute ::= CHOICE

{

		-- Additional Framed Route prefix information associated with the target service

	protocolInformation			[2] ProtocolInformation,

	iPAggregatedNbrOfPackets	[3] INTEGER OPTIONAL,

	iPAggregatedNbrOfBytes		[4] INTEGER OPTIONAL,

    pDSRInformation             [5] PDSRInformation OPTIONAL,

	...

	...,

	pDSRInformation				[5] PDSRInformation OPTIONAL

}

IPInformation ::= CHOICE

}

END -- end of IPAccessPDU

IPAccessPDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)}

DEFINITIONS IMPLICIT TAGS ::=

BEGIN

IMPORTS

	-- from ETSI TS 102 232-1 [2]

    IPAddress

    IPAddress,

	Location

		FROM LI-PS-PDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)};

-- Object Identifier Definition

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

iPIRIObjId RELATIVE-OID				::= {li-ps(5) iPAccess(3) version13(13) iRI(1)}

iPCCObjId RELATIVE-OID				::= {li-ps(5) iPAccess(3) version13(13) cC(2)}

iPIRIOnlyObjId RELATIVE-OID			::= {li-ps(5) iPAccess(3) version13(13) iRIOnly(3)}

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

iPAccessPDUObjId RELATIVE-OID				::= {li-ps(5) iPAccess(3) version14(14)}

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

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

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

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

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

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

-- IP Communications Contents

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

{

	accessEventType			[0] AccessEventType,

	targetUsername			[1] OCTET STRING,

		-- in ASCIIcharacters

		-- in ASCII-characters

	internetAccessType		[2] InternetAccessType,

	iPVersion				[3] IPVersion,

	targetIPAddress			[4] IPAddress OPTIONAL,

	accessReject(2),

		-- IAS access is refused to the target

	accessFailed(3),

		-- The Access_attempt timed-out or failed otherwise

		-- The accessAttempt timed-out or failed otherwise

	sessionStart(4),

		-- A target starts using the IAS; not in use anymore from version 4(4)

	sessionEnd(5),

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

		-- may be required in future.

	iPAddress		[0] IPAddress,

		-- IPAddress imported from TS 101 671 [1].

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

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

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

	...

	protocolInformation			[2] ProtocolInformation,

	iPAggregatedNbrOfPackets	[3] INTEGER OPTIONAL,

	iPAggregatedNbrOfBytes		[4] INTEGER OPTIONAL,

	...

	...,

	pDSRInformation				[5] PDSRInformation OPTIONAL

}

IPInformation ::= CHOICE

	checkSum			[3] OCTET STRING (SIZE (2))OPTIONAL

}

PDSRInformation::= SEQUENCE

{

	summaryTrigger			[0] PDSRSummaryTrigger,

	firstPacketTimestamp	[1] GeneralizedTime,

	lastPacketTimestamp		[2] GeneralizedTime,

	packetCount	 			[3] INTEGER,

	byteCount				[4] INTEGER,

	...

}

PDSRSummaryTrigger ::= ENUMERATED

{

	startOfFlow(0),

	timerExpiry(1),

	packetCount(2),

	byteCount(3),

	endOfFlow(4),

	...

}

END -- end of IPAccessPDU

IPMultimediaPDU 

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version12(12)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)}

DEFINITIONS IMPLICIT TAGS ::=

BEGIN

-- Object Identifier Definition

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

iPMMIRIObjId RELATIVE-OID			::= {li-ps(5) iPMultimedia(5) version12(12) iRI(1)}

iPMMCCObjId RELATIVE-OID			::= {li-ps(5) iPMultimedia(5) version12(12) cC(2)}

iPMMIRIObjId RELATIVE-OID			::= {li-ps(5) iPMultimedia(5) version13(13) iRI(1)}

iPMMCCObjId RELATIVE-OID			::= {li-ps(5) iPMultimedia(5) version13(13) cC(2)}

	-- both definitions relative to: 

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

	originalIPMMMessage			[0] OCTET STRING,

		-- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers

	sIPMessage					[1] SIPMessage,

		-- Copy of the SIP content and the source and destination IP address

		-- Copy of the SIP content and the source and destination IP address  of the intercepted

        -- SIP message as transmitted on the network layer (see clause 5.2.7).

	h323Message					[2] H323Message,

		-- Copy of the H.323 content and the source and destination IP address

		-- Copy of the H.323 content and the source and destination IP address of the intercepted

        -- H.323 message as transmitted on the network layer (see clause 5.2.7).

	...,

	nationalIPMMIRIParameters	[3] NationalIPMMIRIParameters,

		-- This parameter is used according to national regulations

		-- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers

		-- see clause 5.2.6.

	iRIOnlySIPMessage			[6] SIPMessage

		-- Copy of the SIP content and the source and destination IP address

		-- see clause 5.2.6.

		-- Copy of the SIP content and the source and destination IP address of the intercepted

		-- SIP message as transmitted on the network layer.

		-- (see clause 5.2.6 and 5.2.7).

}

SIPMessage ::= SEQUENCE