Commit f1cbc8c8 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

TS 102 232-1 v3.24.1

parent 82730b76
Loading
Loading
Loading
Loading
Loading
+22 −25
Original line number Original line Diff line number Diff line
LI-PS-PDU
LI-PS-PDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version31(31)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version32(32)}


DEFINITIONS IMPLICIT TAGS ::=
DEFINITIONS IMPLICIT TAGS ::=


@@ -11,7 +11,7 @@ IMPORTS
	-- from ETSI TS 103 280 [44]
	-- from ETSI TS 103 280 [44]
	LIID
	LIID
		FROM Common-Parameters
		FROM Common-Parameters
		{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}
		{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)}




	-- from ETSI TS 101 671 [4]
	-- from ETSI TS 101 671 [4]
@@ -20,12 +20,12 @@ IMPORTS
	Location,
	Location,
	Network-Element-Identifier
	Network-Element-Identifier
		FROM HI2Operations
		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) version18(18)}


	-- from ETSI TS 101 671 [4]
	-- from ETSI TS 101 671 [4]
	HI1-Operation
	HI1-Operation
		FROM HI1NotificationOperations
		FROM HI1NotificationOperations
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version7(7)}


	-- from ETSI TS 102 232-2 [5]
	-- from ETSI TS 102 232-2 [5]
	EmailCC,
	EmailCC,
@@ -34,7 +34,7 @@ IMPORTS
	MessagingMMCC,
	MessagingMMCC,
	MessagingIRI
	MessagingIRI
		FROM EmailPDU
		FROM EmailPDU
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)}


	-- from ETSI TS 102 232-3 [6]
	-- from ETSI TS 102 232-3 [6]
	IPCC,
	IPCC,
@@ -181,21 +181,10 @@ IMPORTS
		FROM TS101909202
		FROM TS101909202
		{itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)}
		{itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)}


	-- from J-STD-025-B [39]
	LAESProtocol
		FROM Laesp-j-std-025-b 
		{iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)}
	CDMA2000LAESMessage
		FROM CDMA2000CIIModule 
		{iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)}
	CCIPPacketHeader
		FROM CDMA2000CCModule 
		{iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)}

	-- from ETSI TS 103 462 [45]
	-- from ETSI TS 103 462 [45]
	ILHIPayload
	ILHIPayload
		FROM ILHIPDU
		FROM ILHIPDU
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version2(2)}
		-- This import is only used for the handover between LEMFs.
		-- This import is only used for the handover between LEMFs.


	-- from 3GPP TS 33.128 [46]
	-- from 3GPP TS 33.128 [46]
@@ -215,7 +204,7 @@ IMPORTS


lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
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) version31(31)}
li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version32(32)}


-- ====================
-- ====================
-- Top-level definition
-- Top-level definition
@@ -242,7 +231,11 @@ PSHeader ::= SEQUENCE
	interceptionPointID				[6] PrintableString (SIZE (1..8)) OPTIONAL,
	interceptionPointID				[6] PrintableString (SIZE (1..8)) OPTIONAL,
		-- see clause 5.2.11
		-- see clause 5.2.11
	microSecondTimeStamp			[7] MicroSecondTimeStamp OPTIONAL,
	microSecondTimeStamp			[7] MicroSecondTimeStamp OPTIONAL,
	timeStampQualifier				[8] TimeStampQualifier OPTIONAL
	timeStampQualifier				[8] TimeStampQualifier OPTIONAL,
	extendedInterceptionPointID		[9] OCTET STRING (SIZE (1..65535)) OPTIONAL,
		-- see clause 5.2.13
	networkFunctionIdentifier		[10] OCTET STRING (SIZE (1..65535)) OPTIONAL
		-- see clause 5.2.14
}
}


Payload ::= CHOICE
Payload ::= CHOICE
@@ -336,10 +329,13 @@ PayloadDirection ::= ENUMERATED
CCContents ::= CHOICE
CCContents ::= CHOICE
	-- Any of these choices may be commented out if they are not being used, see clause A.3
	-- Any of these choices may be commented out if they are not being used, see clause A.3
{
{
	-- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)
	emailCC						[1] EmailCC,
	emailCC						[1] EmailCC,
	iPCC						[2] IPCC,
	iPCC						[2] IPCC,
	-- tag [3] not used
	uMTSCC						[4] OCTET STRING,
	uMTSCC						[4] OCTET STRING,
	...,
	...,
	-- tag [5] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)
	l2CC						[6] L2CC,
	l2CC						[6] L2CC,
	tTRAFFIC-1					[7] TS101909201.TTRAFFIC,
	tTRAFFIC-1					[7] TS101909201.TTRAFFIC,
	cTTRAFFIC-1					[8] TS101909201.CTTRAFFIC,
	cTTRAFFIC-1					[8] TS101909201.CTTRAFFIC,
@@ -347,7 +343,7 @@ CCContents ::= CHOICE
	cTTRAFFIC-2					[10] TS101909202.CTTRAFFIC,
	cTTRAFFIC-2					[10] TS101909202.CTTRAFFIC,
	pstnIsdnCC					[11] PstnIsdnCC,
	pstnIsdnCC					[11] PstnIsdnCC,
	iPMMCC						[12] IPMMCC,
	iPMMCC						[12] IPMMCC,
	cCIPPacketHeader			[13] CDMA2000CCModule.CCIPPacketHeader,
	-- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)
	messagingCC					[14] MessagingCC,
	messagingCC					[14] MessagingCC,
	ePSCC						[15] OCTET STRING,
	ePSCC						[15] OCTET STRING,
	uMTSCC-CC-PDU				[16] Umts-HI3-PS.CC-PDU,
	uMTSCC-CC-PDU				[16] Umts-HI3-PS.CC-PDU,
@@ -404,6 +400,7 @@ IRIType ::= ENUMERATED
IRIContents ::= CHOICE
IRIContents ::= CHOICE
	-- Any of these choices may be commented out if they are not being used (see clause A.3)
	-- Any of these choices may be commented out if they are not being used (see clause A.3)
{
{
	-- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)
	emailIRI					[1] EmailIRI,
	emailIRI					[1] EmailIRI,
	iPIRI						[2] IPIRI,
	iPIRI						[2] IPIRI,
	iPIRIOnly					[3] IPIRIOnly,
	iPIRIOnly					[3] IPIRIOnly,
@@ -416,8 +413,8 @@ IRIContents ::= CHOICE
	tARGETACTIVITYMONITOR-2		[9] TS101909202.TARGETACTIVITYMONITOR,
	tARGETACTIVITYMONITOR-2		[9] TS101909202.TARGETACTIVITYMONITOR,
	pstnIsdnIRI					[10] PstnIsdnIRI,
	pstnIsdnIRI					[10] PstnIsdnIRI,
	iPMMIRI						[11] IPMMIRI,
	iPMMIRI						[11] IPMMIRI,
	lAESProtocol				[12] Laesp-j-std-025-b.LAESProtocol,
	-- tag [12] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)
	cDMA2000LAESMessage			[13] CDMA2000CIIModule.CDMA2000LAESMessage,
	-- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)
	messagingIRI				[14] MessagingIRI,
	messagingIRI				[14] MessagingIRI,
	ePSIRI						[15] EPSIRI,
	ePSIRI						[15] EPSIRI,
	confIRI						[16] ConfIRI,
	confIRI						[16] ConfIRI,
+21 −24
Original line number Original line Diff line number Diff line
LI-PS-PDU
LI-PS-PDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version31(31)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version32(32)}


DEFINITIONS IMPLICIT TAGS ::=
DEFINITIONS IMPLICIT TAGS ::=


@@ -11,7 +11,7 @@ IMPORTS
	-- from ETSI TS 103 280 [44]
	-- from ETSI TS 103 280 [44]
	LIID
	LIID
		FROM Common-Parameters
		FROM Common-Parameters
		{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}
		{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)}




	-- from ETSI TS 101 671 [4]
	-- from ETSI TS 101 671 [4]
@@ -20,12 +20,12 @@ IMPORTS
	Location,
	Location,
	Network-Element-Identifier
	Network-Element-Identifier
		FROM HI2Operations
		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) version18(18)}


	-- from ETSI TS 101 671 [4]
	-- from ETSI TS 101 671 [4]
	HI1-Operation
	HI1-Operation
		FROM HI1NotificationOperations
		FROM HI1NotificationOperations
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version7(7)}


	-- from ETSI TS 102 232-2 [5]
	-- from ETSI TS 102 232-2 [5]
	EmailCC,
	EmailCC,
@@ -34,7 +34,7 @@ IMPORTS
	MessagingMMCC,
	MessagingMMCC,
	MessagingIRI
	MessagingIRI
		FROM EmailPDU
		FROM EmailPDU
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)}


	-- from ETSI TS 102 232-3 [6]
	-- from ETSI TS 102 232-3 [6]
	IPCC,
	IPCC,
@@ -181,21 +181,10 @@ IMPORTS
		FROM TS101909202
		FROM TS101909202
		{itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)}
		{itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)}


	-- from J-STD-025-B [39]
	LAESProtocol
		FROM Laesp-j-std-025-b 
		{iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)}
	CDMA2000LAESMessage
		FROM CDMA2000CIIModule 
		{iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)}
	CCIPPacketHeader
		FROM CDMA2000CCModule 
		{iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)}

	-- from ETSI TS 103 462 [45]
	-- from ETSI TS 103 462 [45]
	ILHIPayload
	ILHIPayload
		FROM ILHIPDU
		FROM ILHIPDU
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version2(2)}
		-- This import is only used for the handover between LEMFs.
		-- This import is only used for the handover between LEMFs.


	-- from 3GPP TS 33.128 [46]
	-- from 3GPP TS 33.128 [46]
@@ -215,7 +204,7 @@ IMPORTS


lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
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) version31(31)}
li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version32(32)}


-- ====================
-- ====================
-- Top-level definition
-- Top-level definition
@@ -242,7 +231,11 @@ PSHeader ::= SEQUENCE
	interceptionPointID				[6] PrintableString (SIZE (1..8)) OPTIONAL,
	interceptionPointID				[6] PrintableString (SIZE (1..8)) OPTIONAL,
		-- see clause 5.2.11
		-- see clause 5.2.11
	microSecondTimeStamp			[7] MicroSecondTimeStamp OPTIONAL,
	microSecondTimeStamp			[7] MicroSecondTimeStamp OPTIONAL,
	timeStampQualifier				[8] TimeStampQualifier OPTIONAL
	timeStampQualifier				[8] TimeStampQualifier OPTIONAL,
	extendedInterceptionPointID		[9] OCTET STRING (SIZE (1..65535)) OPTIONAL,
		-- see clause 5.2.13
	networkFunctionIdentifier		[10] OCTET STRING (SIZE (1..65535)) OPTIONAL
		-- see clause 5.2.14
}
}


Payload ::= CHOICE
Payload ::= CHOICE
@@ -336,10 +329,13 @@ PayloadDirection ::= ENUMERATED
CCContents ::= CHOICE
CCContents ::= CHOICE
	-- Any of these choices may be commented out if they are not being used, see clause A.3
	-- Any of these choices may be commented out if they are not being used, see clause A.3
{
{
	-- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)
	emailCC						[1] EmailCC,
	emailCC						[1] EmailCC,
	iPCC						[2] IPCC,
	iPCC						[2] IPCC,
	-- tag [3] not used
	uMTSCC						[4] OCTET STRING,
	uMTSCC						[4] OCTET STRING,
	...,
	...,
	-- tag [5] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)
	l2CC						[6] L2CC,
	l2CC						[6] L2CC,
	tTRAFFIC-1					[7] TS101909201.TTRAFFIC,
	tTRAFFIC-1					[7] TS101909201.TTRAFFIC,
	cTTRAFFIC-1					[8] TS101909201.CTTRAFFIC,
	cTTRAFFIC-1					[8] TS101909201.CTTRAFFIC,
@@ -347,7 +343,7 @@ CCContents ::= CHOICE
	cTTRAFFIC-2					[10] TS101909202.CTTRAFFIC,
	cTTRAFFIC-2					[10] TS101909202.CTTRAFFIC,
	pstnIsdnCC					[11] PstnIsdnCC,
	pstnIsdnCC					[11] PstnIsdnCC,
	iPMMCC						[12] IPMMCC,
	iPMMCC						[12] IPMMCC,
	cCIPPacketHeader			[13] CDMA2000CCModule.CCIPPacketHeader,
	-- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)
	messagingCC					[14] MessagingCC,
	messagingCC					[14] MessagingCC,
	ePSCC						[15] OCTET STRING,
	ePSCC						[15] OCTET STRING,
	uMTSCC-CC-PDU				[16] Umts-HI3-PS.CC-PDU,
	uMTSCC-CC-PDU				[16] Umts-HI3-PS.CC-PDU,
@@ -404,6 +400,7 @@ IRIType ::= ENUMERATED
IRIContents ::= CHOICE
IRIContents ::= CHOICE
	-- Any of these choices may be commented out if they are not being used (see clause A.3)
	-- Any of these choices may be commented out if they are not being used (see clause A.3)
{
{
	-- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)
	emailIRI					[1] EmailIRI,
	emailIRI					[1] EmailIRI,
	iPIRI						[2] IPIRI,
	iPIRI						[2] IPIRI,
	iPIRIOnly					[3] IPIRIOnly,
	iPIRIOnly					[3] IPIRIOnly,
@@ -416,8 +413,8 @@ IRIContents ::= CHOICE
	tARGETACTIVITYMONITOR-2		[9] TS101909202.TARGETACTIVITYMONITOR,
	tARGETACTIVITYMONITOR-2		[9] TS101909202.TARGETACTIVITYMONITOR,
	pstnIsdnIRI					[10] PstnIsdnIRI,
	pstnIsdnIRI					[10] PstnIsdnIRI,
	iPMMIRI						[11] IPMMIRI,
	iPMMIRI						[11] IPMMIRI,
	lAESProtocol				[12] Laesp-j-std-025-b.LAESProtocol,
	-- tag [12] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)
	cDMA2000LAESMessage			[13] CDMA2000CIIModule.CDMA2000LAESMessage,
	-- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)
	messagingIRI				[14] MessagingIRI,
	messagingIRI				[14] MessagingIRI,
	ePSIRI						[15] EPSIRI,
	ePSIRI						[15] EPSIRI,
	confIRI						[16] ConfIRI,
	confIRI						[16] ConfIRI,