diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index 284c1e60b51c7956dc2316a05b952a609343a796..eb2ebda00814bfaac2a49b8fb69625714e6e348b 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version9(9)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version10(10)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -16,10 +16,10 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) messagingCC(4)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) messagingCC(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -171,7 +171,7 @@ ASMTPAAAInformation ::= SEQUENCE } IMAPAAAInformation ::= SEQUENCE - --- The iMAPAAAInformation field contains the IMAP username & optionally the password + -- The iMAPAAAInformation field contains the IMAP username & optionally the password { username [0] UTF8String (SIZE (0..64)), password [1] UTF8String (SIZE (0..64)) OPTIONAL, @@ -349,7 +349,37 @@ Messaging-Party-Identity ::= CHOICE email-address [2] E-mail-Address-List, ..., ip-address [3] IPAddress, - alphanumeric [4] UTF8String + --IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] + alphanumeric [4] UTF8String, + ip-address-and-port [5] IP-Address-And-Port, + imsi [6] OCTET STRING (SIZE (3..8)), + -- see MAP format in TS 133.108 [5] for International Mobile Station Identity + -- ITU-T E 212 [27] number beginning with Mobile Country Code. + imei [7] OCTET STRING (SIZE (8)), + -- see MAP format in TS 133.108 [5] for International Mobile Equipment Identity number. + -- It is defined in 3GPP TS 22.016 [28]. + 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]. + 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]. + 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]. +} + +IP-Address-And-Port ::= SEQUENCE +{ + ip-address [0] IPAddress, + -- IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] + port-number [1] INTEGER, + -- port-number is defined by IETF RFC 6533 [35] + ... } Messaging-Trigger ::= ENUMERATED @@ -396,7 +426,8 @@ Messaging-Property-Notification-Type ::= ENUMERATED { empty-call(1), lost-call(2), - ... + ..., + message-to-email(3) } END -- end of EmailPDU diff --git a/102232-2/portal/EmailPDU,ver9.txt b/102232-2/portal/EmailPDU,ver10.txt similarity index 84% rename from 102232-2/portal/EmailPDU,ver9.txt rename to 102232-2/portal/EmailPDU,ver10.txt index 284c1e60b51c7956dc2316a05b952a609343a796..eb2ebda00814bfaac2a49b8fb69625714e6e348b 100644 --- a/102232-2/portal/EmailPDU,ver9.txt +++ b/102232-2/portal/EmailPDU,ver10.txt @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version9(9)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version10(10)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -16,10 +16,10 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) messagingCC(4)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) messagingCC(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -171,7 +171,7 @@ ASMTPAAAInformation ::= SEQUENCE } IMAPAAAInformation ::= SEQUENCE - --- The iMAPAAAInformation field contains the IMAP username & optionally the password + -- The iMAPAAAInformation field contains the IMAP username & optionally the password { username [0] UTF8String (SIZE (0..64)), password [1] UTF8String (SIZE (0..64)) OPTIONAL, @@ -349,7 +349,37 @@ Messaging-Party-Identity ::= CHOICE email-address [2] E-mail-Address-List, ..., ip-address [3] IPAddress, - alphanumeric [4] UTF8String + --IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] + alphanumeric [4] UTF8String, + ip-address-and-port [5] IP-Address-And-Port, + imsi [6] OCTET STRING (SIZE (3..8)), + -- see MAP format in TS 133.108 [5] for International Mobile Station Identity + -- ITU-T E 212 [27] number beginning with Mobile Country Code. + imei [7] OCTET STRING (SIZE (8)), + -- see MAP format in TS 133.108 [5] for International Mobile Equipment Identity number. + -- It is defined in 3GPP TS 22.016 [28]. + 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]. + 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]. + 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]. +} + +IP-Address-And-Port ::= SEQUENCE +{ + ip-address [0] IPAddress, + -- IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] + port-number [1] INTEGER, + -- port-number is defined by IETF RFC 6533 [35] + ... } Messaging-Trigger ::= ENUMERATED @@ -396,7 +426,8 @@ Messaging-Property-Notification-Type ::= ENUMERATED { empty-call(1), lost-call(2), - ... + ..., + message-to-email(3) } END -- end of EmailPDU