From 2cbcd1264b17fd7b1deccf8e05c3ab799d189d15 Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Fri, 20 Jan 2023 09:31:37 +1100 Subject: [PATCH 1/2] 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. --- 102232-2/EmailPDU.asn | 53 ++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index 6f8457e..274e026 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,7 +1,3 @@ --- ============================ --- 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)} @@ -28,11 +24,11 @@ IMPORTS emailPDUObjId RELATIVE-OID ::= {li-ps(5) email(2) version19(19)} emailIRIObjId RELATIVE-OID ::= {emailPDUObjId iRI(1)} emailCCObjId RELATIVE-OID ::= {emailPDUObjId cC(2)} -messagingIRIObjId RELATIVE-OID ::= {emailPDUObjId messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {emailPDUObjId messagingCC(4)} +messagingIRIObjId RELATIVE-OID ::= {emailPDUObjId messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {emailPDUObjId messagingCC(4)} messagingMMCCObjId RELATIVE-OID ::= {emailPDUObjId messagingMMCC(5)} - -- definitions are relative to + -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -52,7 +48,7 @@ EmailCC ::= SEQUENCE Email-Format ::= ENUMERATED { ip-packet(1), - -- When this is the email format, the content will contain the bytes of the IP packet from + -- When this is the email format, the content will contain the bytes of the IP packet from -- the IP header through to the end of the IP packet -- Meets requirement E.2.7 application(2) @@ -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 @@ -87,7 +83,7 @@ EmailIRI ::= SEQUENCE -- 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, + total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, message-ID [13] OCTET STRING OPTIONAL, -- Network byte order nationalParameter [14] OCTET STRING OPTIONAL, @@ -148,7 +144,7 @@ National-EM-ASN1parameters ::= SEQUENCE -- the country to which the parameters inserted after the extension marker apply ... -- In case a given country wants to use additional national parameters according to its law, - -- these national parameters should be defined using the ASN.1 syntax and added after the + -- these national parameters should be defined using the ASN.1 syntax and added after the -- extension marker (...) } @@ -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 @@ -376,10 +373,10 @@ Messaging-Party-Qualifier ::= ENUMERATED unknown-party(0), -- In this case the party cannot be classified as either originating or terminating originating-party(1), - -- In this case, the partyInformation parameter provides the identities related to + -- In this case, the partyInformation parameter provides the identities related to -- the originating party and all information provided by this party. terminating-party(2), - -- In this case, the partyInformation parameter provides the identities related to + -- In this case, the partyInformation parameter provides the identities related to -- the terminating party and all information provided by this party. ..., associated-party(3) @@ -393,41 +390,41 @@ Messaging-Party-Identity ::= CHOICE -- MSISDN of the target, encoded in the same format as the AddressString -- parameters defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. e164-format [1] OCTET STRING (SIZE (1..25)), - -- E.164 address of the node in international format. Coded in the same format as + -- 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, + 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, - imsi [6] OCTET STRING (SIZE (3..8)), + imsi [6] OCTET STRING (SIZE (3..8)), -- International Mobile Subscriber Identity of the target, encoded in the same format as the -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. -- It is described in 3GPP TS 23.003 [37] clause 2.2. - imei [7] OCTET STRING (SIZE (8)), + 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 29.002 [36], clause 17.7.8. -- It is defined in 3GPP TS 23.003 [37] clause 6. - fax-url [8] OCTET STRING, + fax-url [8] OCTET STRING, -- see format defined in RFC 2806 [29]. - tel-url [9] OCTET STRING, + tel-url [9] OCTET STRING, -- 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, + sip-uri [11] OCTET STRING, -- see format used in in 3GPP TS 33.108 [5] and defined in RFC 3261 [32]. - sips-uri [12] OCTET STRING, + 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 + nai [13] OCTET STRING + -- Network Access Identity of the party, encoded in the same format as used EPS -- domain in 3GPP TS 33.108 [5] and defined in RFC 7542 [33]. } 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] -- GitLab From c3b0c5c4fe0d1f08dc26bef1e5b665695a3beb52 Mon Sep 17 00:00:00 2001 From: Steije van Schelt <239-svs@users.noreply.forge.etsi.org> Date: Sun, 22 Jan 2023 23:56:05 +0000 Subject: [PATCH 2/2] rename new total-Recipient-Count to match MessagingIRI convention --- 102232-2/EmailPDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index 274e026..48f6455 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -261,7 +261,7 @@ MessagingIRI ::= SEQUENCE original-message [9] OCTET STRING OPTIONAL, ..., box-identifier [10] OCTET STRING OPTIONAL, - total-Recipient-Count [11] INTEGER (0..4294967295) OPTIONAL + total-recipient-count [11] INTEGER (0..4294967295) OPTIONAL } Messaging-System-Type ::= ENUMERATED -- GitLab