Commit 2cbcd126 authored by mewburn's avatar mewburn Committed by Mark Canterbury
Browse files

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

Add MessagingIRI.total-Recipient-Count per requirement [E.1.5].

Fully qualify type names by prefixing with the module name
that they're imported from.

Remove trailing spaces and tabs.
Consistently use a 4 character tab instead of spaces.

Remove leading comment block for consistency with
the other 102 232 ASN.1.
parent c6b9fef6
Loading
Loading
Loading
Loading
+25 −28
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) version19(19)}

@@ -69,9 +65,9 @@ EmailIRI ::= SEQUENCE
{
	emailIRIObjId				[0] RELATIVE-OID,
	eventType					[1] E-mail-Event,
	client-Address				[2] IPAddress OPTIONAL,
	client-Address				[2] LI-PS-PDU.IPAddress OPTIONAL,
		-- Provided if available
	server-Address				[3] IPAddress OPTIONAL,
	server-Address				[3] LI-PS-PDU.IPAddress OPTIONAL,
		-- Provided if available
	client-Port					[4] INTEGER OPTIONAL,
		-- Provided if available
@@ -234,13 +230,13 @@ MessagingCC ::= 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,
	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,
	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
	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
@@ -398,7 +395,7 @@ Messaging-Party-Identity ::= CHOICE
	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,
	ip-address				[3] LI-PS-PDU.IPAddress,
		-- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34]
	alphanumeric			[4] UTF8String,
	ip-address-and-port	[5] IP-Address-And-Port,
@@ -427,7 +424,7 @@ Messaging-Party-Identity ::= CHOICE

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]
	port-number				[1] INTEGER,
		-- port-number is defined by IETF RFC 6335 [35]