Commit 44f79f5a authored by Mark Canterbury's avatar Mark Canterbury
Browse files

TS 102 232-2 v3.6.1 (2013-10-22) agreed at LI#34 (Edinburgh, 2013-09-24)

parent e6f9dd8c
Loading
Loading
Loading
Loading
+25 −7
Original line number Diff line number Diff line
EmailPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version11(11)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)}

DEFINITIONS IMPLICIT TAGS ::=
BEGIN
@@ -9,17 +9,23 @@ IMPORTS
	-- from TS 101 671 [4]
	IPAddress
		FROM HI2Operations
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)};
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)}

	-- from TS 102 232-5 [38]
	IPMMCC
		FROM IPMultimediaPDU
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)};


-- ============================
-- Object Identifier Definition
-- ============================

emailIRIObjId RELATIVE-OID		::= {li-ps(5) email(2) version11(11) iRI(1)}
emailCCObjId RELATIVE-OID		::= {li-ps(5) email(2) version11(11) cC(2)}
messagingIRIObjId RELATIVE-OID 	::= {li-ps(5) email(2) version11(11) messagingIRI(3)}
messagingCCObjId RELATIVE-OID 	::= {li-ps(5) email(2) version11(11) messagingCC(4)}
emailIRIObjId RELATIVE-OID		::= {li-ps(5) email(2) version12(12) iRI(1)}
emailCCObjId RELATIVE-OID		::= {li-ps(5) email(2) version12(12) cC(2)}
messagingIRIObjId RELATIVE-OID 	::= {li-ps(5) email(2) version12(12) messagingIRI(3)}
messagingCCObjId RELATIVE-OID 	::= {li-ps(5) email(2) version12(12) messagingCC(4)}
messagingMMCCObjId RELATIVE-OID	::= {li-ps(5) email(2) version12(12) messagingMMCC(5)}

	-- definitions are relative to 
	-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}
@@ -214,6 +220,18 @@ MessagingCC ::= SEQUENCE
	...
}

MessagingMMCC ::= SEQUENCE
	-- MessagingMMCC is the PDU sent for the captured IPMMCC content
{
	messaging-mm-cc-obj-id		[0] RELATIVE-OID,
	event-identifier			[1] INTEGER (0..4294967295),
		-- Used to correlate to MessagingIRI within the same CIN
	content-identifier			[2] INTEGER (0..4294967295) OPTIONAL,
	content						[3] IPMMCC,
	...
}


-- ===========================================
-- Intercept-related information for Messaging
-- ===========================================
@@ -230,7 +248,7 @@ MessagingIRI ::= SEQUENCE
	trigger						[6] Messaging-Trigger,
	properties					[7] SEQUENCE OF Messaging-Property OPTIONAL,
	event-identifier			[8] INTEGER (0..4294967295) OPTIONAL,
		-- Used to correlate to MessagingCC within the same CIN. Mandatory when CC is also sent
		-- Used to correlate to MessagingCC or MessagingMMCC within the same CIN. Mandatory when CC is also sent
	original-message			[9] OCTET STRING OPTIONAL,
	...,
	box-identifier				[10] OCTET STRING OPTIONAL
+25 −7
Original line number Diff line number Diff line
EmailPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version11(11)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)}

DEFINITIONS IMPLICIT TAGS ::=
BEGIN
@@ -9,17 +9,23 @@ IMPORTS
	-- from TS 101 671 [4]
	IPAddress
		FROM HI2Operations
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)};
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)}

	-- from TS 102 232-5 [38]
	IPMMCC
		FROM IPMultimediaPDU
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)};


-- ============================
-- Object Identifier Definition
-- ============================

emailIRIObjId RELATIVE-OID		::= {li-ps(5) email(2) version11(11) iRI(1)}
emailCCObjId RELATIVE-OID		::= {li-ps(5) email(2) version11(11) cC(2)}
messagingIRIObjId RELATIVE-OID 	::= {li-ps(5) email(2) version11(11) messagingIRI(3)}
messagingCCObjId RELATIVE-OID 	::= {li-ps(5) email(2) version11(11) messagingCC(4)}
emailIRIObjId RELATIVE-OID		::= {li-ps(5) email(2) version12(12) iRI(1)}
emailCCObjId RELATIVE-OID		::= {li-ps(5) email(2) version12(12) cC(2)}
messagingIRIObjId RELATIVE-OID 	::= {li-ps(5) email(2) version12(12) messagingIRI(3)}
messagingCCObjId RELATIVE-OID 	::= {li-ps(5) email(2) version12(12) messagingCC(4)}
messagingMMCCObjId RELATIVE-OID	::= {li-ps(5) email(2) version12(12) messagingMMCC(5)}

	-- definitions are relative to 
	-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}
@@ -214,6 +220,18 @@ MessagingCC ::= SEQUENCE
	...
}

MessagingMMCC ::= SEQUENCE
	-- MessagingMMCC is the PDU sent for the captured IPMMCC content
{
	messaging-mm-cc-obj-id		[0] RELATIVE-OID,
	event-identifier			[1] INTEGER (0..4294967295),
		-- Used to correlate to MessagingIRI within the same CIN
	content-identifier			[2] INTEGER (0..4294967295) OPTIONAL,
	content						[3] IPMMCC,
	...
}


-- ===========================================
-- Intercept-related information for Messaging
-- ===========================================
@@ -230,7 +248,7 @@ MessagingIRI ::= SEQUENCE
	trigger						[6] Messaging-Trigger,
	properties					[7] SEQUENCE OF Messaging-Property OPTIONAL,
	event-identifier			[8] INTEGER (0..4294967295) OPTIONAL,
		-- Used to correlate to MessagingCC within the same CIN. Mandatory when CC is also sent
		-- Used to correlate to MessagingCC or MessagingMMCC within the same CIN. Mandatory when CC is also sent
	original-message			[9] OCTET STRING OPTIONAL,
	...,
	box-identifier				[10] OCTET STRING OPTIONAL