Commit 1f1a5fee authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'cr/102232-2/0037' into 'meeting/LI62' 

TS 102 232-2 CR037 - Add total recipients and update references

See merge request li/schemas-definitions!60
parents c6b9fef6 3ab6efa1

102232-2/EmailPDU.asn

+25 −28
Original line number Original line Diff line number Diff line 
-- ============================

-- Description of the Email PDU

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



EmailPDU

EmailPDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version19(19)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version19(19)}
@@ -69,9 +65,9 @@ EmailIRI ::= SEQUENCE 
{

{

	emailIRIObjId				[0] RELATIVE-OID,

	emailIRIObjId				[0] RELATIVE-OID,

	eventType					[1] E-mail-Event,

	eventType					[1] E-mail-Event,

	client-Address				[2] IPAddress OPTIONAL,

	client-Address				[2] LI-PS-PDU.IPAddress OPTIONAL,

		-- Provided if available

		-- Provided if available

	server-Address				[3] IPAddress OPTIONAL,

	server-Address				[3] LI-PS-PDU.IPAddress OPTIONAL,

		-- Provided if available

		-- Provided if available

	client-Port					[4] INTEGER OPTIONAL,

	client-Port					[4] INTEGER OPTIONAL,

		-- Provided if available

		-- Provided if available
@@ -234,13 +230,13 @@ MessagingCC ::= SEQUENCE 








MessagingMMCC ::= SEQUENCE

MessagingMMCC ::= SEQUENCE

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

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

{

{

	messaging-mm-cc-obj-id		[0] RELATIVE-OID,

	messaging-mm-cc-obj-id		[0] RELATIVE-OID,

	event-identifier			[1] INTEGER (0..4294967295),

	event-identifier			[1] INTEGER (0..4294967295),

		-- Used to correlate to MessagingIRI within the same CIN

		-- Used to correlate to MessagingIRI within the same CIN

	content-identifier			[2] INTEGER (0..4294967295) OPTIONAL,

	content-identifier			[2] INTEGER (0..4294967295) OPTIONAL,

	content						[3] IPMMCC,

	content						[3] IPMultimediaPDU.IPMMCC,

	...

	...

}

}
@@ -264,7 +260,8 @@ MessagingIRI ::= SEQUENCE 
		-- Used to correlate to MessagingCC or MessagingMMCC 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,

	original-message			[9] OCTET STRING OPTIONAL,

	...,

	...,

	box-identifier				[10] OCTET STRING OPTIONAL

	box-identifier				[10] OCTET STRING OPTIONAL,

	total-recipient-count		[11] INTEGER (0..4294967295) OPTIONAL

}

}





Messaging-System-Type ::= ENUMERATED

Messaging-System-Type ::= ENUMERATED
@@ -398,7 +395,7 @@ Messaging-Party-Identity ::= CHOICE 
	email-address			[2] E-mail-Address-List,

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

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

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

	...,

	...,

	ip-address				[3] IPAddress,

	ip-address				[3] LI-PS-PDU.IPAddress,

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

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

	alphanumeric			[4] UTF8String,

	alphanumeric			[4] UTF8String,

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

	ip-address-and-port	[5] IP-Address-And-Port,
@@ -427,7 +424,7 @@ Messaging-Party-Identity ::= CHOICE 




IP-Address-And-Port ::= SEQUENCE

IP-Address-And-Port ::= SEQUENCE

{

{

	ip-address				[0] IPAddress,

	ip-address				[0] LI-PS-PDU.IPAddress,

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

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

	port-number				[1] INTEGER,

	port-number				[1] INTEGER,

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

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