diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index eb2ebda00814bfaac2a49b8fb69625714e6e348b..dafb0c4b608a75de79e2cfa9f2c807855732904f 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) version10(10)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version11(11)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -16,10 +16,10 @@ IMPORTS -- Object Identifier Definition -- ============================ -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)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) messagingCC(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -295,7 +295,8 @@ Messaging-Notification-Event ::= ENUMERATED sms-pin-reminder(4), email(5), fax-to-email(6), - ... + ..., + mms(7) } Messaging-Call-Event ::= ENUMERATED @@ -312,14 +313,17 @@ Messaging-Status ::= ENUMERATED operation-succeeded(3), operation-cancelled(4), operation-started(5), - ... + ..., + operation-lost(6) } Messaging-Party-Information ::= SEQUENCE { party-qualifier [0] Messaging-Party-Qualifier, party-identity [1] Messaging-Party-Identity, - ... + ..., + party-validity [2] Messaging-Party-Validity OPTIONAL, + copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL } Messaging-Party-Qualifier ::= ENUMERATED @@ -353,11 +357,12 @@ Messaging-Party-Identity ::= CHOICE 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. + -- 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)), - -- see MAP format in TS 133.108 [5] for International Mobile Equipment Identity number. - -- It is defined in 3GPP TS 22.016 [28]. + -- 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 fax-url [8] OCTET STRING, -- see format defined in RFC 2806 [29]. tel-url [9] OCTET STRING, @@ -382,6 +387,24 @@ IP-Address-And-Port ::= SEQUENCE ... } +Messaging-Party-Validity ::= ENUMERATED +{ + unknown(0), + trusted(1), + untrusted(2), + ... +} + +Messaging-Copy-Qualifier ::= ENUMERATED +{ + unknown(0), + none(1), + cc(2), + bcc(3), + ... +} + + Messaging-Trigger ::= ENUMERATED { unknown(0), @@ -399,8 +422,16 @@ Messaging-Property ::= CHOICE priority [1] Messaging-Property-Priority, greeting-type [2] Messaging-Property-Greeting-Type, notification-type [3] Messaging-Property-Notification-Type, - language [4] OCTET STRING + language [4] OCTET STRING, -- Language according to RFC 3066 [24] + message-identifier [5] OCTET STRING, + subject [6] UTF8String, + user-agent [7] UTF8String, + password [8] OCTET STRING, + message-status [9] Messaging-Property-Message-Status, + requested-reports [10] Messaging-Property-Requested-Reports, + expires [11] GeneralizedTime, + message-date [12] GeneralizedTime } Messaging-Property-Priority ::= ENUMERATED @@ -427,7 +458,36 @@ Messaging-Property-Notification-Type ::= ENUMERATED empty-call(1), lost-call(2), ..., - message-to-email(3) + message-to-email(3), + read-report(4), + delivery-report(5), + allow-delivery-report(6), + deny-delivery-report(7) +} + +Messaging-Property-Message-Status ::= ENUMERATED +{ + indeterminate(0), + expired(1), + retrieved(2), + rejected(3), + deferred(4), + forwarded(5), + unrecognized(6), + unreachable(7), + read(8), + deleted-without-being-read(9), + delivery-condition-not-met(10), + ... +} + +Messaging-Property-Requested-Reports ::= ENUMERATED +{ + none(0), + delivery(1), + read(2), + delivery-and-read(3), + ... } END -- end of EmailPDU diff --git a/102232-2/portal/EmailPDU,ver10.txt b/102232-2/portal/EmailPDU,ver11.txt similarity index 85% rename from 102232-2/portal/EmailPDU,ver10.txt rename to 102232-2/portal/EmailPDU,ver11.txt index eb2ebda00814bfaac2a49b8fb69625714e6e348b..dafb0c4b608a75de79e2cfa9f2c807855732904f 100644 --- a/102232-2/portal/EmailPDU,ver10.txt +++ b/102232-2/portal/EmailPDU,ver11.txt @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version10(10)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version11(11)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -16,10 +16,10 @@ IMPORTS -- Object Identifier Definition -- ============================ -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)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) messagingCC(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -295,7 +295,8 @@ Messaging-Notification-Event ::= ENUMERATED sms-pin-reminder(4), email(5), fax-to-email(6), - ... + ..., + mms(7) } Messaging-Call-Event ::= ENUMERATED @@ -312,14 +313,17 @@ Messaging-Status ::= ENUMERATED operation-succeeded(3), operation-cancelled(4), operation-started(5), - ... + ..., + operation-lost(6) } Messaging-Party-Information ::= SEQUENCE { party-qualifier [0] Messaging-Party-Qualifier, party-identity [1] Messaging-Party-Identity, - ... + ..., + party-validity [2] Messaging-Party-Validity OPTIONAL, + copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL } Messaging-Party-Qualifier ::= ENUMERATED @@ -353,11 +357,12 @@ Messaging-Party-Identity ::= CHOICE 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. + -- 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)), - -- see MAP format in TS 133.108 [5] for International Mobile Equipment Identity number. - -- It is defined in 3GPP TS 22.016 [28]. + -- 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 fax-url [8] OCTET STRING, -- see format defined in RFC 2806 [29]. tel-url [9] OCTET STRING, @@ -382,6 +387,24 @@ IP-Address-And-Port ::= SEQUENCE ... } +Messaging-Party-Validity ::= ENUMERATED +{ + unknown(0), + trusted(1), + untrusted(2), + ... +} + +Messaging-Copy-Qualifier ::= ENUMERATED +{ + unknown(0), + none(1), + cc(2), + bcc(3), + ... +} + + Messaging-Trigger ::= ENUMERATED { unknown(0), @@ -399,8 +422,16 @@ Messaging-Property ::= CHOICE priority [1] Messaging-Property-Priority, greeting-type [2] Messaging-Property-Greeting-Type, notification-type [3] Messaging-Property-Notification-Type, - language [4] OCTET STRING + language [4] OCTET STRING, -- Language according to RFC 3066 [24] + message-identifier [5] OCTET STRING, + subject [6] UTF8String, + user-agent [7] UTF8String, + password [8] OCTET STRING, + message-status [9] Messaging-Property-Message-Status, + requested-reports [10] Messaging-Property-Requested-Reports, + expires [11] GeneralizedTime, + message-date [12] GeneralizedTime } Messaging-Property-Priority ::= ENUMERATED @@ -427,7 +458,36 @@ Messaging-Property-Notification-Type ::= ENUMERATED empty-call(1), lost-call(2), ..., - message-to-email(3) + message-to-email(3), + read-report(4), + delivery-report(5), + allow-delivery-report(6), + deny-delivery-report(7) +} + +Messaging-Property-Message-Status ::= ENUMERATED +{ + indeterminate(0), + expired(1), + retrieved(2), + rejected(3), + deferred(4), + forwarded(5), + unrecognized(6), + unreachable(7), + read(8), + deleted-without-being-read(9), + delivery-condition-not-met(10), + ... +} + +Messaging-Property-Requested-Reports ::= ENUMERATED +{ + none(0), + delivery(1), + read(2), + delivery-and-read(3), + ... } END -- end of EmailPDU