Commit f8279429 authored by markc's avatar markc

TS 102 232-2 v3.2.1 (2012-06-28) agreed at LI#30 (Amsterdam, 2012-05-14)

parent 79cd4a05
Pipeline #4006 passed with stage
in 6 seconds
EmailPDU EmailPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version7(7)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version8(8)}
DEFINITIONS IMPLICIT TAGS ::= DEFINITIONS IMPLICIT TAGS ::=
BEGIN BEGIN
...@@ -9,17 +9,17 @@ IMPORTS ...@@ -9,17 +9,17 @@ IMPORTS
-- from TS 101 671 [4] -- from TS 101 671 [4]
IPAddress IPAddress
FROM HI2Operations 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 -- Object Identifier Definition
-- ============================ -- ============================
emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) iRI(1)} emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) iRI(1)}
emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) cC(2)} emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) cC(2)}
messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingIRI(3)} messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingIRI(3)}
messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingCC(4)} messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingCC(4)}
-- definitions are relative to -- definitions are relative to
-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}
...@@ -43,7 +43,7 @@ Email-Format ::= ENUMERATED ...@@ -43,7 +43,7 @@ Email-Format ::= ENUMERATED
ip-packet(1), 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 -- the IP header through to the end of the IP packet
-- Meets requirement E.2.7. -- Meets requirement E.2.7
application(2) application(2)
-- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers)
-- Meets requirement E.2.8 -- Meets requirement E.2.8
...@@ -205,9 +205,12 @@ MessagingCC ::= SEQUENCE ...@@ -205,9 +205,12 @@ MessagingCC ::= SEQUENCE
messaging-cc-obj-id [0] RELATIVE-OID, messaging-cc-obj-id [0] RELATIVE-OID,
event-identifier [1] INTEGER (0..4294967295), event-identifier [1] INTEGER (0..4294967295),
-- Used to correlate to MessagingIRI within the same CIN -- 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 -- 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 ...@@ -253,6 +256,7 @@ Messaging-Event ::= ENUMERATED
retrieve(2), retrieve(2),
delete(3), delete(3),
save(4), save(4),
slamdown(5),
... ...
} }
...@@ -274,6 +278,7 @@ Messaging-Box-Event ::= ENUMERATED ...@@ -274,6 +278,7 @@ Messaging-Box-Event ::= ENUMERATED
notification-enable(14), notification-enable(14),
notification-disable(15), notification-disable(15),
disconnect(16), disconnect(16),
connect(17),
... ...
} }
...@@ -296,16 +301,18 @@ Messaging-Call-Event ::= ENUMERATED ...@@ -296,16 +301,18 @@ Messaging-Call-Event ::= ENUMERATED
Messaging-Status ::= ENUMERATED Messaging-Status ::= ENUMERATED
{ {
status-unknown(1), unknown(0),
not-applicable(1),
operation-failed(2), operation-failed(2),
operation-succeeded(3), operation-succeeded(3),
operation-cancelled(4), operation-cancelled(4),
operation-started(5),
... ...
} }
Messaging-Party-Information ::= SEQUENCE Messaging-Party-Information ::= SEQUENCE
{ {
party-qualifier [0] Messaging-Party-Qualifier, party-qualifier [0] Messaging-Party-Qualifier,
party-identity [1] Messaging-Party-Identity, party-identity [1] Messaging-Party-Identity,
... ...
} }
...@@ -327,10 +334,10 @@ Messaging-Party-Identity ::= CHOICE ...@@ -327,10 +334,10 @@ Messaging-Party-Identity ::= CHOICE
{ {
msisdn [0] OCTET STRING (SIZE (1..9)), msisdn [0] OCTET STRING (SIZE (1..9)),
-- MSISDN of the target, encoded in the same format as the AddressString -- 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)), 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 [5]) -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23])
email-address [2] E-mail-Address-List, email-address [2] E-mail-Address-List,
... ...
} }
...@@ -338,11 +345,10 @@ Messaging-Party-Identity ::= CHOICE ...@@ -338,11 +345,10 @@ Messaging-Party-Identity ::= CHOICE
Messaging-Trigger ::= ENUMERATED Messaging-Trigger ::= ENUMERATED
{ {
unknown(0), unknown(0),
fixed-device(1), user(1),
mobile-device(2), user-agent(2),
mobile-application(3), system(3),
web-application(4), system-operator(4),
network-operator(5),
... ...
} }
......
EmailPDU EmailPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version7(7)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version8(8)}
DEFINITIONS IMPLICIT TAGS ::= DEFINITIONS IMPLICIT TAGS ::=
BEGIN BEGIN
...@@ -9,17 +9,17 @@ IMPORTS ...@@ -9,17 +9,17 @@ IMPORTS
-- from TS 101 671 [4] -- from TS 101 671 [4]
IPAddress IPAddress
FROM HI2Operations 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 -- Object Identifier Definition
-- ============================ -- ============================
emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) iRI(1)} emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) iRI(1)}
emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) cC(2)} emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) cC(2)}
messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingIRI(3)} messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingIRI(3)}
messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingCC(4)} messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingCC(4)}
-- definitions are relative to -- definitions are relative to
-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}
...@@ -43,7 +43,7 @@ Email-Format ::= ENUMERATED ...@@ -43,7 +43,7 @@ Email-Format ::= ENUMERATED
ip-packet(1), 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 -- the IP header through to the end of the IP packet
-- Meets requirement E.2.7. -- Meets requirement E.2.7
application(2) application(2)
-- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers)
-- Meets requirement E.2.8 -- Meets requirement E.2.8
...@@ -205,9 +205,12 @@ MessagingCC ::= SEQUENCE ...@@ -205,9 +205,12 @@ MessagingCC ::= SEQUENCE
messaging-cc-obj-id [0] RELATIVE-OID, messaging-cc-obj-id [0] RELATIVE-OID,
event-identifier [1] INTEGER (0..4294967295), event-identifier [1] INTEGER (0..4294967295),
-- Used to correlate to MessagingIRI within the same CIN -- 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 -- 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 ...@@ -253,6 +256,7 @@ Messaging-Event ::= ENUMERATED
retrieve(2), retrieve(2),
delete(3), delete(3),
save(4), save(4),
slamdown(5),
... ...
} }
...@@ -274,6 +278,7 @@ Messaging-Box-Event ::= ENUMERATED ...@@ -274,6 +278,7 @@ Messaging-Box-Event ::= ENUMERATED
notification-enable(14), notification-enable(14),
notification-disable(15), notification-disable(15),
disconnect(16), disconnect(16),
connect(17),
... ...
} }
...@@ -296,16 +301,18 @@ Messaging-Call-Event ::= ENUMERATED ...@@ -296,16 +301,18 @@ Messaging-Call-Event ::= ENUMERATED
Messaging-Status ::= ENUMERATED Messaging-Status ::= ENUMERATED
{ {
status-unknown(1), unknown(0),
not-applicable(1),
operation-failed(2), operation-failed(2),
operation-succeeded(3), operation-succeeded(3),
operation-cancelled(4), operation-cancelled(4),
operation-started(5),
... ...
} }
Messaging-Party-Information ::= SEQUENCE Messaging-Party-Information ::= SEQUENCE
{ {
party-qualifier [0] Messaging-Party-Qualifier, party-qualifier [0] Messaging-Party-Qualifier,
party-identity [1] Messaging-Party-Identity, party-identity [1] Messaging-Party-Identity,
... ...
} }
...@@ -327,10 +334,10 @@ Messaging-Party-Identity ::= CHOICE ...@@ -327,10 +334,10 @@ Messaging-Party-Identity ::= CHOICE
{ {
msisdn [0] OCTET STRING (SIZE (1..9)), msisdn [0] OCTET STRING (SIZE (1..9)),
-- MSISDN of the target, encoded in the same format as the AddressString -- 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)), 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 [5]) -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23])
email-address [2] E-mail-Address-List, email-address [2] E-mail-Address-List,
... ...
} }
...@@ -338,11 +345,10 @@ Messaging-Party-Identity ::= CHOICE ...@@ -338,11 +345,10 @@ Messaging-Party-Identity ::= CHOICE
Messaging-Trigger ::= ENUMERATED Messaging-Trigger ::= ENUMERATED
{ {
unknown(0), unknown(0),
fixed-device(1), user(1),
mobile-device(2), user-agent(2),
mobile-application(3), system(3),
web-application(4), system-operator(4),
network-operator(5),
... ...
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment