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

Merge branch 'meeting/LI57e' into 'master' 

Meeting/li57e

See merge request !39
parents c986c007 58e059ae

102232-1/LI-PS-PDU.asn

+19 −22
Changes for 102232-1/LI-PS-PDU.asn: 19 added lines, 22 removed lines.
Original line number Diff line number Diff line 
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 ::=
@@ -11,7 +11,7 @@ IMPORTS 
	-- from ETSI TS 103 280 [44]

	LIID

		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]
@@ -20,12 +20,12 @@ IMPORTS 
	Location,

	Network-Element-Identifier

		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]

	HI1-Operation

		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]

	EmailCC,
@@ -34,7 +34,7 @@ IMPORTS 
	MessagingMMCC,

	MessagingIRI

		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]

	IPCC,
@@ -181,21 +181,10 @@ IMPORTS 
		FROM TS101909202

		{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]

	ILHIPayload

		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.



	-- 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)}



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
@@ -242,7 +231,11 @@ PSHeader ::= SEQUENCE 
	interceptionPointID				[6] PrintableString (SIZE (1..8)) OPTIONAL,

		-- see clause 5.2.11

	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
@@ -336,10 +329,13 @@ PayloadDirection ::= ENUMERATED 
CCContents ::= CHOICE

	-- 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,

	iPCC						[2] IPCC,

	-- tag [3] not used

	uMTSCC						[4] OCTET STRING,

	...,

	-- tag [5] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)

	l2CC						[6] L2CC,

	tTRAFFIC-1					[7] TS101909201.TTRAFFIC,

	cTTRAFFIC-1					[8] TS101909201.CTTRAFFIC,
@@ -347,7 +343,7 @@ CCContents ::= CHOICE 
	cTTRAFFIC-2					[10] TS101909202.CTTRAFFIC,

	pstnIsdnCC					[11] PstnIsdnCC,

	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,

	ePSCC						[15] OCTET STRING,

	uMTSCC-CC-PDU				[16] Umts-HI3-PS.CC-PDU,
@@ -404,6 +400,7 @@ IRIType ::= ENUMERATED 
IRIContents ::= CHOICE

	-- 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,

	iPIRI						[2] IPIRI,

	iPIRIOnly					[3] IPIRIOnly,
@@ -416,8 +413,8 @@ IRIContents ::= CHOICE 
	tARGETACTIVITYMONITOR-2		[9] TS101909202.TARGETACTIVITYMONITOR,

	pstnIsdnIRI					[10] PstnIsdnIRI,

	iPMMIRI						[11] IPMMIRI,

	lAESProtocol				[12] Laesp-j-std-025-b.LAESProtocol,

	cDMA2000LAESMessage			[13] CDMA2000CIIModule.CDMA2000LAESMessage,

	-- tag [12] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)

	-- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)

	messagingIRI				[14] MessagingIRI,

	ePSIRI						[15] EPSIRI,

	confIRI						[16] ConfIRI,

102232-1/portal/LI-PS-PDU,ver31.txt→102232-1/portal/LI-PS-PDU,ver32.txt

+19 −22
Changes for 102232-1/portal/LI-PS-PDU,ver32.txt: 19 added lines, 22 removed lines.
Original line number Diff line number Diff line 
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 ::=
@@ -11,7 +11,7 @@ IMPORTS 
	-- from ETSI TS 103 280 [44]

	LIID

		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]
@@ -20,12 +20,12 @@ IMPORTS 
	Location,

	Network-Element-Identifier

		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]

	HI1-Operation

		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]

	EmailCC,
@@ -34,7 +34,7 @@ IMPORTS 
	MessagingMMCC,

	MessagingIRI

		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]

	IPCC,
@@ -181,21 +181,10 @@ IMPORTS 
		FROM TS101909202

		{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]

	ILHIPayload

		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.



	-- 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)}



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
@@ -242,7 +231,11 @@ PSHeader ::= SEQUENCE 
	interceptionPointID				[6] PrintableString (SIZE (1..8)) OPTIONAL,

		-- see clause 5.2.11

	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
@@ -336,10 +329,13 @@ PayloadDirection ::= ENUMERATED 
CCContents ::= CHOICE

	-- 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,

	iPCC						[2] IPCC,

	-- tag [3] not used

	uMTSCC						[4] OCTET STRING,

	...,

	-- tag [5] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)

	l2CC						[6] L2CC,

	tTRAFFIC-1					[7] TS101909201.TTRAFFIC,

	cTTRAFFIC-1					[8] TS101909201.CTTRAFFIC,
@@ -347,7 +343,7 @@ CCContents ::= CHOICE 
	cTTRAFFIC-2					[10] TS101909202.CTTRAFFIC,

	pstnIsdnCC					[11] PstnIsdnCC,

	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,

	ePSCC						[15] OCTET STRING,

	uMTSCC-CC-PDU				[16] Umts-HI3-PS.CC-PDU,
@@ -404,6 +400,7 @@ IRIType ::= ENUMERATED 
IRIContents ::= CHOICE

	-- 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,

	iPIRI						[2] IPIRI,

	iPIRIOnly					[3] IPIRIOnly,
@@ -416,8 +413,8 @@ IRIContents ::= CHOICE 
	tARGETACTIVITYMONITOR-2		[9] TS101909202.TARGETACTIVITYMONITOR,

	pstnIsdnIRI					[10] PstnIsdnIRI,

	iPMMIRI						[11] IPMMIRI,

	lAESProtocol				[12] Laesp-j-std-025-b.LAESProtocol,

	cDMA2000LAESMessage			[13] CDMA2000CIIModule.CDMA2000LAESMessage,

	-- tag [12] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)

	-- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)

	messagingIRI				[14] MessagingIRI,

	ePSIRI						[15] EPSIRI,

	confIRI						[16] ConfIRI,

102232-2/EmailPDU.asn

+39 −24
Changes for 102232-2/EmailPDU.asn: 39 added lines, 24 removed lines.
Original line number Diff line number Diff line 
-- ============================

-- Description of the Email PDU

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



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)}



DEFINITIONS IMPLICIT TAGS ::=

BEGIN



IMPORTS



	-- from TS 102 232-1 [3]

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

	IPAddress

		FROM LI-PS-PDU

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



	-- from TS 102 232-5 [38]

	-- from ETSI 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) version8(8)};
@@ -21,11 +25,12 @@ IMPORTS 
-- Object Identifier Definition

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



emailIRIObjId RELATIVE-OID		::= {li-ps(5) email(2) version17(17) iRI(1)}

emailCCObjId RELATIVE-OID		::= {li-ps(5) email(2) version17(17) cC(2)}

messagingIRIObjId RELATIVE-OID 	::= {li-ps(5) email(2) version17(17) messagingIRI(3)}

messagingCCObjId RELATIVE-OID 	::= {li-ps(5) email(2) version17(17) messagingCC(4)}

messagingMMCCObjId RELATIVE-OID	::= {li-ps(5) email(2) version17(17) messagingMMCC(5)}

emailPDUObjId RELATIVE-OID			::= {li-ps(5) email(2) version18(18)}

emailIRIObjId RELATIVE-OID			::= {emailPDUObjId iRI(1)}

emailCCObjId RELATIVE-OID			::= {emailPDUObjId cC(2)}

messagingIRIObjId RELATIVE-OID 		::= {emailPDUObjId messagingIRI(3)}

messagingCCObjId RELATIVE-OID	 	::= {emailPDUObjId messagingCC(4)}

messagingMMCCObjId RELATIVE-OID		::= {emailPDUObjId messagingMMCC(5)}



	-- definitions are relative to 

	-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}
@@ -76,9 +81,11 @@ EmailIRI ::= SEQUENCE 
	client-Octets-Sent			[7] INTEGER,

	protocol-ID					[8] E-mail-Protocol,

	e-mail-Sender				[9] UTF8String (SIZE (0..255)) OPTIONAL,

		-- Not available in some cases; if a value is available, it must be provided

		-- Not available in some cases; if a value is available, it shall be provided.

		-- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses.

	e-mail-Recipients			[10] E-mail-Address-List OPTIONAL,

		-- Not available in some cases; if a value is available, it must be provided

		-- Not available in some cases; if a value is available, it shall be provided

		-- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses.

	status						[11] E-mail-Status,

	total-Recipient-Count 		[12] INTEGER (0..4294967295) OPTIONAL,

	message-ID					[13] OCTET STRING OPTIONAL,
@@ -225,6 +232,7 @@ MessagingCC ::= SEQUENCE 
		-- Refer to IETF RFC 2045 [20]

}





MessagingMMCC ::= SEQUENCE

	-- MessagingMMCC is the PDU sent for the captured IPMMCC content

{
@@ -307,7 +315,6 @@ Messaging-Box-Event ::= ENUMERATED 
	connect(17),

	...,

	unknown(0),

	

	greeting-play(18),

	language-change(19),

	pin-security-enable(20),
@@ -317,7 +324,11 @@ Messaging-Box-Event ::= ENUMERATED 
	personal-operator-remove(24),

	additional-destination-add(25),

	additional-destination-change(26),

	additional-destination-remove(27),	auto-play-enable(28),	auto-play-disable(29),	header-play-enable(30),	header-play-disable(31)

	additional-destination-remove(27),

	auto-play-enable(28),

	auto-play-disable(29),

	header-play-enable(30),

	header-play-disable(31)

}



Messaging-Notification-Event ::= ENUMERATED
@@ -372,8 +383,8 @@ Messaging-Party-Qualifier ::= ENUMERATED 
		-- the terminating party and all information provided by this party.

	...,

	associated-party(3)

		-- In this case, the partyInformation parameter provides the identites related to

		-- an associated party and all information provided by this party

		-- In this case, the partyInformation parameter provides the identities related to

		-- an associated party and all information provided by this party.

}



Messaging-Party-Identity ::= CHOICE
@@ -385,9 +396,10 @@ Messaging-Party-Identity ::= CHOICE 
		-- E.164 address of the node in international format. Coded in the same format as 

		-- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23])

	email-address			[2] E-mail-Address-List,

		-- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses.

	...,

	ip-address				[3] IPAddress,

		--IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34]

		-- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34]

	alphanumeric			[4] UTF8String,

	ip-address-and-port	[5] IP-Address-And-Port,

	imsi 					[6] OCTET STRING (SIZE (3..8)),
@@ -396,28 +408,29 @@ Messaging-Party-Identity ::= CHOICE 
		-- It is described in 3GPP TS 23.003 [37] clause 2.2.

	imei 					[7] OCTET STRING (SIZE (8)),

		-- International Mobile Equipment Identity of the target, encoded in the same format as the

		-- TBCD-STRING parameter defined in MAP format 3GPP TS 23.003 [37] clause 6

		-- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8.

		-- It is defined in 3GPP TS 23.003 [37] clause 6.

	fax-url 				[8] OCTET STRING,

		-- see format defined in RFC 2806 [29].

	tel-url 				[9] OCTET STRING,

		-- see format used in TS 133.108 [5], TS 24 229[30] and defined in RFC 2806 [29].

		-- see format used in 3GPP TS 33.108 [5], 3GPP TS 24.229 [30] and defined in RFC 2806 [29].

	modem-url				[10] OCTET STRING,

		-- see format defined in RFC 2806 [29].

	sip-uri 				[11] OCTET STRING,

		-- see format used in in TS 133.108 [5] and defined in RFC 3261 [32].

		-- see format used in in 3GPP TS 33.108 [5] and defined in RFC 3261 [32].

	sips-uri 				[12] OCTET STRING,

		-- see format defined in RFC 3261 [32].

	nai 					[13] OCTET STRING 

		-- Network Access Identity of the party, encoded in the same format as used EPS 

		-- domain in TS 133.108 [5] and defined in RFC 4282 [33].

		-- domain in 3GPP TS 33.108 [5] and defined in RFC 7542 [33].

}



IP-Address-And-Port ::= SEQUENCE

{

	ip-address				[0] IPAddress,

		-- IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34]

		-- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34]

	port-number				[1] INTEGER,

		-- port-number is defined by IETF RFC 6533 [35]

		-- port-number is defined by IETF RFC 6335 [35]

	...

}
@@ -438,7 +451,6 @@ Messaging-Copy-Qualifier ::= ENUMERATED 
	...

}





Messaging-Trigger ::= ENUMERATED

{

	unknown(0),
@@ -457,7 +469,7 @@ Messaging-Property ::= CHOICE 
	greeting-type		[2] Messaging-Property-Greeting-Type,

	notification-type	[3] Messaging-Property-Notification-Type,

	language			[4] OCTET STRING,

		-- Language according to RFC 3066 [24]

		-- Language according to RFC 4646 [24]

	message-identifier	[5] OCTET STRING,

	subject				[6] UTF8String,

	user-agent			[7] UTF8String,
@@ -498,7 +510,10 @@ Messaging-Property-Notification-Type ::= ENUMERATED 
	allow-delivery-report(6),

	deny-delivery-report(7),

	message-wait-indication(8),

	voice-to-text(9),	new-message-sms(10),	new-message-outcall(11),	new-message-reminder(12)

	voice-to-text(9),

	new-message-sms(10),

	new-message-outcall(11),

	new-message-reminder(12)

}



Messaging-Property-Message-Status ::= ENUMERATED

102232-2/portal/EmailPDU,ver17.txt→102232-2/portal/EmailPDU,ver18.txt

+39 −24
Changes for 102232-2/portal/EmailPDU,ver18.txt: 39 added lines, 24 removed lines.
Original line number Diff line number Diff line 
-- ============================

-- Description of the Email PDU

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



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)}



DEFINITIONS IMPLICIT TAGS ::=

BEGIN



IMPORTS



	-- from TS 102 232-1 [3]

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

	IPAddress

		FROM LI-PS-PDU

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



	-- from TS 102 232-5 [38]

	-- from ETSI 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) version8(8)};
@@ -21,11 +25,12 @@ IMPORTS 
-- Object Identifier Definition

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



emailIRIObjId RELATIVE-OID		::= {li-ps(5) email(2) version17(17) iRI(1)}

emailCCObjId RELATIVE-OID		::= {li-ps(5) email(2) version17(17) cC(2)}

messagingIRIObjId RELATIVE-OID 	::= {li-ps(5) email(2) version17(17) messagingIRI(3)}

messagingCCObjId RELATIVE-OID 	::= {li-ps(5) email(2) version17(17) messagingCC(4)}

messagingMMCCObjId RELATIVE-OID	::= {li-ps(5) email(2) version17(17) messagingMMCC(5)}

emailPDUObjId RELATIVE-OID			::= {li-ps(5) email(2) version18(18)}

emailIRIObjId RELATIVE-OID			::= {emailPDUObjId iRI(1)}

emailCCObjId RELATIVE-OID			::= {emailPDUObjId cC(2)}

messagingIRIObjId RELATIVE-OID 		::= {emailPDUObjId messagingIRI(3)}

messagingCCObjId RELATIVE-OID	 	::= {emailPDUObjId messagingCC(4)}

messagingMMCCObjId RELATIVE-OID		::= {emailPDUObjId messagingMMCC(5)}



	-- definitions are relative to 

	-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}
@@ -76,9 +81,11 @@ EmailIRI ::= SEQUENCE 
	client-Octets-Sent			[7] INTEGER,

	protocol-ID					[8] E-mail-Protocol,

	e-mail-Sender				[9] UTF8String (SIZE (0..255)) OPTIONAL,

		-- Not available in some cases; if a value is available, it must be provided

		-- Not available in some cases; if a value is available, it shall be provided.

		-- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses.

	e-mail-Recipients			[10] E-mail-Address-List OPTIONAL,

		-- Not available in some cases; if a value is available, it must be provided

		-- Not available in some cases; if a value is available, it shall be provided

		-- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses.

	status						[11] E-mail-Status,

	total-Recipient-Count 		[12] INTEGER (0..4294967295) OPTIONAL,

	message-ID					[13] OCTET STRING OPTIONAL,
@@ -225,6 +232,7 @@ MessagingCC ::= SEQUENCE 
		-- Refer to IETF RFC 2045 [20]

}





MessagingMMCC ::= SEQUENCE

	-- MessagingMMCC is the PDU sent for the captured IPMMCC content

{
@@ -307,7 +315,6 @@ Messaging-Box-Event ::= ENUMERATED 
	connect(17),

	...,

	unknown(0),

	

	greeting-play(18),

	language-change(19),

	pin-security-enable(20),
@@ -317,7 +324,11 @@ Messaging-Box-Event ::= ENUMERATED 
	personal-operator-remove(24),

	additional-destination-add(25),

	additional-destination-change(26),

	additional-destination-remove(27),	auto-play-enable(28),	auto-play-disable(29),	header-play-enable(30),	header-play-disable(31)

	additional-destination-remove(27),

	auto-play-enable(28),

	auto-play-disable(29),

	header-play-enable(30),

	header-play-disable(31)

}



Messaging-Notification-Event ::= ENUMERATED
@@ -372,8 +383,8 @@ Messaging-Party-Qualifier ::= ENUMERATED 
		-- the terminating party and all information provided by this party.

	...,

	associated-party(3)

		-- In this case, the partyInformation parameter provides the identites related to

		-- an associated party and all information provided by this party

		-- In this case, the partyInformation parameter provides the identities related to

		-- an associated party and all information provided by this party.

}



Messaging-Party-Identity ::= CHOICE
@@ -385,9 +396,10 @@ Messaging-Party-Identity ::= CHOICE 
		-- E.164 address of the node in international format. Coded in the same format as 

		-- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23])

	email-address			[2] E-mail-Address-List,

		-- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses.

	...,

	ip-address				[3] IPAddress,

		--IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34]

		–-IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34]

	alphanumeric			[4] UTF8String,

	ip-address-and-port	[5] IP-Address-And-Port,

	imsi 					[6] OCTET STRING (SIZE (3..8)),
@@ -396,28 +408,29 @@ Messaging-Party-Identity ::= CHOICE 
		-- It is described in 3GPP TS 23.003 [37] clause 2.2.

	imei 					[7] OCTET STRING (SIZE (8)),

		-- International Mobile Equipment Identity of the target, encoded in the same format as the

		-- TBCD-STRING parameter defined in MAP format 3GPP TS 23.003 [37] clause 6

		-- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8.

		–- It is defined in 3GPP TS 23.003 [37] clause 6.

	fax-url 				[8] OCTET STRING,

		-- see format defined in RFC 2806 [29].

	tel-url 				[9] OCTET STRING,

		-- see format used in TS 133.108 [5], TS 24 229[30] and defined in RFC 2806 [29].

		-- see format used in 3GPP TS 33.108 [5], 3GPP TS 24.229 [30] and defined in RFC 2806 [29].

	modem-url				[10] OCTET STRING,

		-- see format defined in RFC 2806 [29].

	sip-uri 				[11] OCTET STRING,

		-- see format used in in TS 133.108 [5] and defined in RFC 3261 [32].

		-- see format used in in 3GPP TS 33.108 [5] and defined in RFC 3261 [32].

	sips-uri 				[12] OCTET STRING,

		-- see format defined in RFC 3261 [32].

	nai 					[13] OCTET STRING 

		-- Network Access Identity of the party, encoded in the same format as used EPS 

		-- domain in TS 133.108 [5] and defined in RFC 4282 [33].

		–- domain in 3GPP TS 33.108 [5] and defined in RFC 7542 [33].

}



IP-Address-And-Port ::= SEQUENCE

{

	ip-address				[0] IPAddress,

		-- IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34]

		–- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34]

	port-number				[1] INTEGER,

		-- port-number is defined by IETF RFC 6533 [35]

		–- port-number is defined by IETF RFC 6335 [35]

	...

}
@@ -438,7 +451,6 @@ Messaging-Copy-Qualifier ::= ENUMERATED 
	...

}





Messaging-Trigger ::= ENUMERATED

{

	unknown(0),
@@ -457,7 +469,7 @@ Messaging-Property ::= CHOICE 
	greeting-type		[2] Messaging-Property-Greeting-Type,

	notification-type	[3] Messaging-Property-Notification-Type,

	language			[4] OCTET STRING,

		-- Language according to RFC 3066 [24]

		-- Language according to RFC 4646 [24]

	message-identifier	[5] OCTET STRING,

	subject				[6] UTF8String,

	user-agent			[7] UTF8String,
@@ -498,7 +510,10 @@ Messaging-Property-Notification-Type ::= ENUMERATED 
	allow-delivery-report(6),

	deny-delivery-report(7),

	message-wait-indication(8),

	voice-to-text(9),	new-message-sms(10),	new-message-outcall(11),	new-message-reminder(12)

	voice-to-text(9),

	new-message-sms(10),

	new-message-outcall(11),

	new-message-reminder(12)

}



Messaging-Property-Message-Status ::= ENUMERATED

103120/dictionaries/ts_103120_Dictionaries.xsd

+0 −1
Changes for 103120/dictionaries/ts_103120_Dictionaries.xsd: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -29,4 +29,3 @@ 
		</xs:sequence>

	</xs:complexType>

</xs:schema>