Commit 02203967 authored by canterburym's avatar canterburym
Browse files

TS 33108 v14.1.0 (2017-06-16) agreed at SA#76

parent 518c5814
...@@ -1014,5 +1014,4 @@ ProSeTargetType ::= ENUMERATED ...@@ -1014,5 +1014,4 @@ ProSeTargetType ::= ENUMERATED
... ...
} }
END END
\ No newline at end of file
MmsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2mms(16) r14(14) version-0 (0)} MmsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2mms(16) r14(14) version-1 (1)}
DEFINITIONS IMPLICIT TAGS ::= DEFINITIONS IMPLICIT TAGS ::=
...@@ -18,12 +18,11 @@ IMPORTS ...@@ -18,12 +18,11 @@ IMPORTS
National-HI2-ASN1parameters, National-HI2-ASN1parameters,
DataNodeAddress, DataNodeAddress,
IPAddress, IPAddress,
IP-value, IP-value
X25Address
FROM HI2Operations FROM HI2Operations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) {itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
lawfulIntercept(2) hi2(1) version18(18)} -- Imported from TS 101 671v3.12.1 lawfulIntercept(2) hi2(1) version18(18)} -- Imported from TS 101 671v3.14.1
Location Location
...@@ -41,7 +40,7 @@ securityDomain(2) lawfulIntercept(2)} ...@@ -41,7 +40,7 @@ securityDomain(2) lawfulIntercept(2)}
-- Security Subdomains -- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2mmsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2mms(16) r14(14) version-0 (0)} hi2mmsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2mms(16) r14(14) version-1 (1)}
mms-sending-of-IRI OPERATION ::= mms-sending-of-IRI OPERATION ::=
{ {
...@@ -118,11 +117,11 @@ IRI-Parameters ::= SEQUENCE ...@@ -118,11 +117,11 @@ IRI-Parameters ::= SEQUENCE
transactionID [11] UTF8String OPTIONAL, transactionID [11] UTF8String OPTIONAL,
messageID [12] UTF8String OPTIONAL, messageID [12] UTF8String OPTIONAL,
-- In accordance with [90] it is encoded as in email address as per [RFC2822]. The characters - In accordance with [90] it is encoded as in email address as per RFC2822 [92].
-- "<" and ">" are not included. -- The characters "<" and ">" are not included.
mMSDateTime [13] DateTime OPTIONAL, mMSDateTime [13] GeneralizedTime OPTIONAL,
messageClass [14] MessageClass OPTIONAL, messageClass [14] MessageClass OPTIONAL,
expiry [15] DateTime OPTIONAL, expiry [15] GeneralizedTime OPTIONAL,
distributionIndicator [16] YesNo OPTIONAL, distributionIndicator [16] YesNo OPTIONAL,
elementDescriptor [17] ElementDescriptor OPTIONAL, elementDescriptor [17] ElementDescriptor OPTIONAL,
retrievalMode [18] YesNo OPTIONAL, retrievalMode [18] YesNo OPTIONAL,
...@@ -145,7 +144,7 @@ IRI-Parameters ::= SEQUENCE ...@@ -145,7 +144,7 @@ IRI-Parameters ::= SEQUENCE
previouslySentBy [32] PreviouslySentBy OPTIONAL, previouslySentBy [32] PreviouslySentBy OPTIONAL,
previouslySentByDateTime [33] PreviouslySentByDateTime OPTIONAL, previouslySentByDateTime [33] PreviouslySentByDateTime OPTIONAL,
mMState [34] MMSState OPTIONAL, mMState [34] MMSState OPTIONAL,
desiredDeliveryTime [35] DateTime OPTIONAL, desiredDeliveryTime [35] GeneralizedTime OPTIONAL,
deliveryReportAllowed [36] YesNo OPTIONAL, deliveryReportAllowed [36] YesNo OPTIONAL,
store [37] YesNo OPTIONAL, store [37] YesNo OPTIONAL,
responseStatus [38] ResponseStatus OPTIONAL, responseStatus [38] ResponseStatus OPTIONAL,
...@@ -166,7 +165,7 @@ IRI-Parameters ::= SEQUENCE ...@@ -166,7 +165,7 @@ IRI-Parameters ::= SEQUENCE
mMSQuotas [51] YesNo OPTIONAL, mMSQuotas [51] YesNo OPTIONAL,
mMSMessageCount [52] INTEGER OPTIONAL, mMSMessageCount [52] INTEGER OPTIONAL,
messageSize [53] INTEGER OPTIONAL, messageSize [53] INTEGER OPTIONAL,
mMSForwardReqDateTime [54] DateTime OPTIONAL, mMSForwardReqDateTime [54] GeneralizedTime OPTIONAL,
adaptationAllowed [55] YesNo OPTIONAL, adaptationAllowed [55] YesNo OPTIONAL,
priority [56] Priority OPTIONAL, priority [56] Priority OPTIONAL,
mMSCorrelationNumber [57] MMSCorrelationNumber OPTIONAL, mMSCorrelationNumber [57] MMSCorrelationNumber OPTIONAL,
...@@ -177,6 +176,42 @@ IRI-Parameters ::= SEQUENCE ...@@ -177,6 +176,42 @@ IRI-Parameters ::= SEQUENCE
-- Parameters having the same tag numbers must be identical in Rel-14 and onwards modules -- Parameters having the same tag numbers must be identical in Rel-14 and onwards modules
-- PARAMETERS FORMATS -- PARAMETERS FORMATS
PartyInformation ::= SEQUENCE
{
party-Qualifier [0] ENUMERATED
{
mMS-Target(1),
...
},
partyIdentity [1] SEQUENCE
{
mSISDN [1] OCTET STRING OPTIONAL,
-- MSISDN, based on the value of
-- global-phone-number found in the MMS (see OMA Multimedia Messaging
-- Service Encapsulation Protocol [90]).
mMSAddress [2] OCTET STRING OPTIONAL,
-- See clause 8 of OMA Multimedia Messaging Service Encapsulation Protocol [90]. It
-- may be each value of a user defined identifier, that will be an external
-- representation of an address processed by the MMS Proxy Relay.
mMSAddressNonLocalID [3] OCTET STRING OPTIONAL,
-- see table 15.3.6.1.2: Mapping between Events information and IRI information
e-Mail [4] OCTET STRING OPTIONAL,
-- it is described in section 3.4 of IETF RFC 2822 [92], but excluding the obsolete
-- definitions as indicated by the "obs-"prefix.(see clause 8 of Multimedia Messaging
-- Service Encapsulation Protocol OMA-TS-MMS_ENC-V1_3-20110913-A [90].)
e164-Format [5] OCTET STRING (SIZE (1 .. 25)) OPTIONAL,
-- E164 address but based on value of global-phone-number the found in the MMS.
iPAddress [6] IPAddress OPTIONAL,
-- IP Address may be an IPv4 or IPv6.
alphanum-Shortcode [8] OCTET STRING OPTIONAL,
-- see clause 8 of OMA Multimedia Messaging Service Encapsulation Protocol [90].
num-Shortcode [9] OCTET STRING OPTIONAL,
-- see clause 8 of OMA Multimedia Messaging Service Encapsulation Protocol [90].
iMSI [10] OCTET STRING OPTIONAL,
...
},
...
}
Address::= EncodedString Address::= EncodedString
...@@ -256,21 +291,21 @@ MessageClass ::= CHOICE ...@@ -256,21 +291,21 @@ MessageClass ::= CHOICE
MMBoxDescriptionPdus ::= SEQUENCE MMBoxDescriptionPdus ::= SEQUENCE
{ {
mMSCorrelation [1] MMSCorrelation OPTIONAL, mMSCorrelation [1] MMSCorrelationNumber OPTIONAL,
toAddresses [2] Addresses, toAddresses [2] Addresses,
cCAddresses [3] Addresses OPTIONAL, cCAddresses [3] Addresses OPTIONAL,
bCCAddresses [4] Addresses OPTIONAL, bCCAddresses [4] Addresses OPTIONAL,
fromAddress [5] From, fromAddress [5] From,
messageID [6] UTF8String, messageID [6] UTF8String,
mMSDateTime [7] DateTime OPTIONAL, mMSDateTime [7] GeneralizedTime OPTIONAL,
previouslySentBy [8] PreviouslySentBy OPTIONAL, previouslySentBy [8] PreviouslySentBy OPTIONAL,
previouslySentByDateTime [9] PreviouslySentByDateTime OPTIONAL, previouslySentByDateTime [9] PreviouslySentByDateTime OPTIONAL,
mMState [10] MMState OPTIONAL, mMState [10] MMSState OPTIONAL,
mMFlags [11] MMFlags OPTIONAL, mMFlags [11] MMFlags OPTIONAL,
messageClass [12] MessageClass OPTIONAL, messageClass [12] MessageClass OPTIONAL,
priority [13] Priority OPTIONAL, priority [13] Priority OPTIONAL,
deliveryTime [14] DateTime OPTIONAL, deliveryTime [14] GeneralizedTime OPTIONAL,
expiry [15] DateTime OPTIONAL, expiry [15] GeneralizedTime OPTIONAL,
deliveryReport [16] YesNo OPTIONAL, deliveryReport [16] YesNo OPTIONAL,
readReport [17] YesNo OPTIONAL, readReport [17] YesNo OPTIONAL,
messageSize [18] INTEGER OPTIONAL, messageSize [18] INTEGER OPTIONAL,
...@@ -281,15 +316,12 @@ MMBoxDescriptionPdus ::= SEQUENCE ...@@ -281,15 +316,12 @@ MMBoxDescriptionPdus ::= SEQUENCE
} }
MMFlags ::= SEQUENCE MMFlags ::= SEQUENCE
{ {
tokenAction [1] TokenAction, tokenAction [1] TokenAction,
mmFlagkeywords [2] EncodedString mmFlagkeywords [2] EncodedString
} }
MMSAttributes ::= CHOICE MMSAttributes ::= CHOICE
{ {
attributeApplicID [1] UTF8String, attributeApplicID [1] UTF8String,
...@@ -298,10 +330,10 @@ MMSAttributes ::= CHOICE ...@@ -298,10 +330,10 @@ MMSAttributes ::= CHOICE
attributeCC [4] Address, attributeCC [4] Address,
attributeContent [5] OCTET STRING, attributeContent [5] OCTET STRING,
attributeContentType [6] OCTET STRING, attributeContentType [6] OCTET STRING,
attributeDate [7] DateTime, attributeDate [7] GeneralizedTime,
attributeDeliveryReport [8] YesNo, attributeDeliveryReport [8] YesNo,
attributeDeliveryTime [9] DateTime, attributeDeliveryTime [9] GeneralizedTime,
attributeExpiry [10] DateTime, attributeExpiry [10] GeneralizedTime,
attributeFrom [11] From, attributeFrom [11] From,
attributeMessageClass [12] MessageClass, attributeMessageClass [12] MessageClass,
attributeMessageID [13] UTF8String, attributeMessageID [13] UTF8String,
...@@ -319,7 +351,6 @@ MMSAttributes ::= CHOICE ...@@ -319,7 +351,6 @@ MMSAttributes ::= CHOICE
MMSCorrelationNumber ::= OCTET STRING MMSCorrelationNumber ::= OCTET STRING
MMSEvent ::= ENUMERATED MMSEvent ::= ENUMERATED
{ {
send (0), send (0),
...@@ -360,7 +391,6 @@ MMSState::= ENUMERATED ...@@ -360,7 +391,6 @@ MMSState::= ENUMERATED
... ...
} }
MMSStatus::= ENUMERATED MMSStatus::= ENUMERATED
{ {
expired (0), expired (0),
...@@ -388,7 +418,7 @@ ParameterValue::= CHOICE ...@@ -388,7 +418,7 @@ ParameterValue::= CHOICE
... ...
} }
PreviouslySentby::= SEQUENCE PreviouslySentBy::= SEQUENCE
{ {
forwardedCount [1] INTEGER, forwardedCount [1] INTEGER,
forwardedPartyID [2] EncodedString, forwardedPartyID [2] EncodedString,
...@@ -396,10 +426,10 @@ PreviouslySentby::= SEQUENCE ...@@ -396,10 +426,10 @@ PreviouslySentby::= SEQUENCE
} }
PreviouslySentbyDateTime::= SEQUENCE PreviouslySentByDateTime::= SEQUENCE
{ {
forwardedCount [1] INTEGER, forwardedCount [1] INTEGER,
forwardedDateTime [2] DateTime, forwardedDateTime [2] GeneralizedTime,
... ...
} }
...@@ -424,7 +454,7 @@ ResponseStatusText::= SEQUENCE ...@@ -424,7 +454,7 @@ ResponseStatusText::= SEQUENCE
{ {
statusCount [1] EncodedString OPTIONAL, statusCount [1] EncodedString OPTIONAL,
-- the statusCount shall only be included for the Delete event. -- the statusCount shall only be included for the Delete event.
actualResponseStatusText [2] EncodedStringValue, actualResponseStatusText [2] EncodedString,
... ...
} }
......
UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r14 (14) version-0 (0)} UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r14 (14) version-1 (1)}
DEFINITIONS IMPLICIT TAGS ::= DEFINITIONS IMPLICIT TAGS ::=
...@@ -23,7 +23,7 @@ IMPORTS ...@@ -23,7 +23,7 @@ IMPORTS
FROM HI2Operations FROM HI2Operations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) {itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
lawfulIntercept(2) hi2(1) version18(18)}; -- Imported from TS 101 671v3.12.1 lawfulIntercept(2) hi2(1) version18(18)}; -- Imported from TS 101 671v3.14.1
-- Object Identifier Definitions -- Object Identifier Definitions
...@@ -34,7 +34,7 @@ securityDomain(2) lawfulIntercept(2)} ...@@ -34,7 +34,7 @@ securityDomain(2) lawfulIntercept(2)}
-- Security Subdomains -- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2(1) r14 (14) version-0 (0)} hi2DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2(1) r14 (14) version-1 (1)}
umts-sending-of-IRI OPERATION ::= umts-sending-of-IRI OPERATION ::=
{ {
...@@ -828,11 +828,14 @@ ExtendedLocParameters ::= SEQUENCE ...@@ -828,11 +828,14 @@ ExtendedLocParameters ::= SEQUENCE
} OPTIONAL, } OPTIONAL,
additional-info [9] PrintableString OPTIONAL, -- clause 5.3.1 additional-info [9] PrintableString OPTIONAL, -- clause 5.3.1
-- the following parameter contains a copy of the unparsed XML code of MLP 'pd' element. -- The following parameter contains a copy of the unparsed XML code of
-- This parameter is present when the LI-LCS client cannot map the MLP 'pd' element into -- MLP response message, i.e. the entire XML document containing
-- an ASN.1 Location object. -- a <slia> (described in [88], clause 5.2.3.2.2) or
-- It may also be present based on national regulations. -- a <slirep> (described in [88], clause 5.2.3.2.3) MLP message.
lALS-rawMLPPosData [10] PrintableString OPTIONAL, -- This parameter is present when the LI-LCS client cannot fully map
-- the MLP response message into an ASN.1 Location object.
lALS-rawMLPPosData [10] UTF8String OPTIONAL,
... ...
} }
......
...@@ -79,7 +79,6 @@ ICE-type ::= ENUMERATED { ...@@ -79,7 +79,6 @@ ICE-type ::= ENUMERATED {
mRF (8) mRF (8)
} }
Payload-description ::= SEQUENCE Payload-description ::= SEQUENCE
{ {
copyOfSDPdescription [1] OCTET STRING OPTIONAL, copyOfSDPdescription [1] OCTET STRING OPTIONAL,
......
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