Commit 49c9b339 authored by canterburym's avatar canterburym
Browse files

Merge branch 'cr/33138/0685' into 'meeting/SA106'

TS 33.128 CR0685 - Solution for email target identifier in MMS

See merge request !288
parents 9220aead b66061ee
Loading
Loading
Loading
Loading
Loading
+51 −4
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ XIRIEvent ::= CHOICE

    -- tag 16 is reserved because there is no equivalent mDFCellSiteReport in XIRIEvent

    -- MMS-related events, see clause 7.4.2
    -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([133-134] below)
    mMSSend                                             [17] MMSSend,
    mMSSendByNonLocalTarget                             [18] MMSSendByNonLocalTarget,
    mMSNotification                                     [19] MMSNotification,
@@ -195,7 +195,11 @@ XIRIEvent ::= CHOICE
    -- Tags 113 to 131 are not used in this version of the specification

    -- AMF events, see 6.2.2.2.9, continued from tag 111
    aMFUEConfigurationUpdate                            [132] AMFUEConfigurationUpdate
    aMFUEConfigurationUpdate                            [132] AMFUEConfigurationUpdate,

    -- MMS-related events continued from choice 35
    mMSConvertedFromEmail                               [133] MMSConvertedFromEmail,
    mMSConvertedToEmail                                 [134] MMSConvertedToEmail
}

-- ==============
@@ -248,7 +252,7 @@ IRIEvent ::= CHOICE
    -- MDF-related events, see clause 7.3.2
    mDFCellSiteReport                                   [16] MDFCellSiteReport,

    -- MMS-related events, see clause 7.4.2
    -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([133-134] below)
    mMSSend                                             [17] MMSSend,
    mMSSendByNonLocalTarget                             [18] MMSSendByNonLocalTarget,
    mMSNotification                                     [19] MMSNotification,
@@ -384,7 +388,11 @@ IRIEvent ::= CHOICE
    -- Tags 113 to 131 are not used in this version of the specification

    -- AMF events, see 6.2.2.3, continued from tag 111
    aMFUEConfigurationUpdate                            [132] AMFUEConfigurationUpdate
    aMFUEConfigurationUpdate                            [132] AMFUEConfigurationUpdate,

    -- MMS-related events continued from choice 35
    mMSConvertedFromEmail                               [133] MMSConvertedFromEmail,
    mMSConvertedToEmail                                 [134] MMSConvertedToEmail
}

IRITargetIdentifier ::= SEQUENCE
@@ -2905,6 +2913,45 @@ MMBoxDescription ::= SEQUENCE
    contentType              [19] UTF8String OPTIONAL
}

MMSConvertedFromEmail ::= SEQUENCE
{
    version             [1]  MMSVersion,
    transactionID       [2]  UTF8String,
    terminatingMMSParty [3]  SEQUENCE OF MMSParty,
    contentType         [4]  MMSContentType,
    originatingMMSParty [5]  MMSParty,
    messageClass        [6]  MMSMessageClass OPTIONAL,
    dateTime            [7]  Timestamp,
    expiry              [8]  MMSExpiry OPTIONAL,
    deliveryReport      [9]  BOOLEAN OPTIONAL,
    priority            [10] MMSPriority OPTIONAL,
    readReport          [11] BOOLEAN OPTIONAL,
    subject             [12] MMSSubject OPTIONAL,
    messageID           [13] UTF8String OPTIONAL
}

MMSConvertedToEmail ::= SEQUENCE
{
    version             [1]  MMSVersion,
    transactionID       [2]  UTF8String,
    terminatingMMSParty [3]  SEQUENCE OF MMSParty,
    contentType         [4]  MMSContentType,
    originatingMMSParty [5]  MMSParty,
    messageClass        [6]  MMSMessageClass OPTIONAL,
    dateTime            [7]  Timestamp,
    expiry              [8]  MMSExpiry OPTIONAL,
    desiredDeliveryTime [9]  Timestamp OPTIONAL,
    deliveryReport      [10] BOOLEAN OPTIONAL,
    priority            [11] MMSPriority OPTIONAL,
    senderVisibility    [12] BOOLEAN OPTIONAL,
    store               [13] BOOLEAN OPTIONAL,
    state               [14] MMState OPTIONAL,
    flags               [15] MMFlags OPTIONAL,
    readReport          [16] BOOLEAN OPTIONAL,
    subject             [17] MMSSubject OPTIONAL,
    messageID           [18] UTF8String OPTIONAL
}

-- =========
-- MMS CCPDU
-- =========