From f8279429efd641ecf700f851f02a0d564b1a7751 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:31 +0100 Subject: [PATCH] TS 102 232-2 v3.2.1 (2012-06-28) agreed at LI#30 (Amsterdam, 2012-05-14) --- 102232-2/EmailPDU.asn | 44 +++++++++++-------- .../{EmailPDU,ver7.txt => EmailPDU,ver8.txt} | 44 +++++++++++-------- 2 files changed, 50 insertions(+), 38 deletions(-) rename 102232-2/portal/{EmailPDU,ver7.txt => EmailPDU,ver8.txt} (90%) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index f607fe0..f3a73f5 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) version7(7)} +EmailPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version8(8)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,17 +9,17 @@ IMPORTS -- from TS 101 671 [4] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; -- ============================ -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingCC(4)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingCC(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -43,7 +43,7 @@ Email-Format ::= ENUMERATED ip-packet(1), -- 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. + -- Meets requirement E.2.7 application(2) -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) -- Meets requirement E.2.8 @@ -205,9 +205,12 @@ MessagingCC ::= SEQUENCE messaging-cc-obj-id [0] RELATIVE-OID, event-identifier [1] INTEGER (0..4294967295), -- Used to correlate to MessagingIRI within the same CIN - content-type [2] OCTET STRING, + content-identifier [2] INTEGER (0..4294967295) OPTIONAL, + sequence-number [3] INTEGER (0..4294967295) OPTIONAL, + end-of-sequence [4] BOOLEAN DEFAULT FALSE, + content-type [5] OCTET STRING, -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA - content [3] OCTET STRING, + content [6] OCTET STRING, ... } @@ -253,6 +256,7 @@ Messaging-Event ::= ENUMERATED retrieve(2), delete(3), save(4), + slamdown(5), ... } @@ -274,6 +278,7 @@ Messaging-Box-Event ::= ENUMERATED notification-enable(14), notification-disable(15), disconnect(16), + connect(17), ... } @@ -296,16 +301,18 @@ Messaging-Call-Event ::= ENUMERATED Messaging-Status ::= ENUMERATED { - status-unknown(1), + unknown(0), + not-applicable(1), operation-failed(2), operation-succeeded(3), operation-cancelled(4), + operation-started(5), ... } Messaging-Party-Information ::= SEQUENCE { - party-qualifier [0] Messaging-Party-Qualifier, + party-qualifier [0] Messaging-Party-Qualifier, party-identity [1] Messaging-Party-Identity, ... } @@ -327,10 +334,10 @@ Messaging-Party-Identity ::= CHOICE { msisdn [0] OCTET STRING (SIZE (1..9)), -- MSISDN of the target, encoded in the same format as the AddressString - -- parameters defined in MAP format TS GSM 09.02 [32], clause 14.7.8. + -- parameters defined in MAP format 3GPP TS 09.02 [22], 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 - -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [5]) + -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) email-address [2] E-mail-Address-List, ... } @@ -338,11 +345,10 @@ Messaging-Party-Identity ::= CHOICE Messaging-Trigger ::= ENUMERATED { unknown(0), - fixed-device(1), - mobile-device(2), - mobile-application(3), - web-application(4), - network-operator(5), + user(1), + user-agent(2), + system(3), + system-operator(4), ... } diff --git a/102232-2/portal/EmailPDU,ver7.txt b/102232-2/portal/EmailPDU,ver8.txt similarity index 90% rename from 102232-2/portal/EmailPDU,ver7.txt rename to 102232-2/portal/EmailPDU,ver8.txt index f607fe0..f3a73f5 100644 --- a/102232-2/portal/EmailPDU,ver7.txt +++ b/102232-2/portal/EmailPDU,ver8.txt @@ -1,5 +1,5 @@ -EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version7(7)} +EmailPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version8(8)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,17 +9,17 @@ IMPORTS -- from TS 101 671 [4] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; -- ============================ -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingCC(4)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingCC(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -43,7 +43,7 @@ Email-Format ::= ENUMERATED ip-packet(1), -- 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. + -- Meets requirement E.2.7 application(2) -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) -- Meets requirement E.2.8 @@ -205,9 +205,12 @@ MessagingCC ::= SEQUENCE messaging-cc-obj-id [0] RELATIVE-OID, event-identifier [1] INTEGER (0..4294967295), -- Used to correlate to MessagingIRI within the same CIN - content-type [2] OCTET STRING, + content-identifier [2] INTEGER (0..4294967295) OPTIONAL, + sequence-number [3] INTEGER (0..4294967295) OPTIONAL, + end-of-sequence [4] BOOLEAN DEFAULT FALSE, + content-type [5] OCTET STRING, -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA - content [3] OCTET STRING, + content [6] OCTET STRING, ... } @@ -253,6 +256,7 @@ Messaging-Event ::= ENUMERATED retrieve(2), delete(3), save(4), + slamdown(5), ... } @@ -274,6 +278,7 @@ Messaging-Box-Event ::= ENUMERATED notification-enable(14), notification-disable(15), disconnect(16), + connect(17), ... } @@ -296,16 +301,18 @@ Messaging-Call-Event ::= ENUMERATED Messaging-Status ::= ENUMERATED { - status-unknown(1), + unknown(0), + not-applicable(1), operation-failed(2), operation-succeeded(3), operation-cancelled(4), + operation-started(5), ... } Messaging-Party-Information ::= SEQUENCE { - party-qualifier [0] Messaging-Party-Qualifier, + party-qualifier [0] Messaging-Party-Qualifier, party-identity [1] Messaging-Party-Identity, ... } @@ -327,10 +334,10 @@ Messaging-Party-Identity ::= CHOICE { msisdn [0] OCTET STRING (SIZE (1..9)), -- MSISDN of the target, encoded in the same format as the AddressString - -- parameters defined in MAP format TS GSM 09.02 [32], clause 14.7.8. + -- parameters defined in MAP format 3GPP TS 09.02 [22], 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 - -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [5]) + -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) email-address [2] E-mail-Address-List, ... } @@ -338,11 +345,10 @@ Messaging-Party-Identity ::= CHOICE Messaging-Trigger ::= ENUMERATED { unknown(0), - fixed-device(1), - mobile-device(2), - mobile-application(3), - web-application(4), - network-operator(5), + user(1), + user-agent(2), + system(3), + system-operator(4), ... } -- GitLab