Commit a3890aa1 authored by canterburym's avatar canterburym
Browse files

Merge branch 'meeting/SA106' into 'main' 

Output from SA#106

See merge request !272
parents bc095e55 519d74c8

33128/r16/TS33128Payloads.asn

+53 −6
Original line number Diff line number Diff line 
TS33128Payloads

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version15(15)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version16(16)}



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
@@ -9,7 +9,7 @@ BEGIN 
-- Relative OIDs

-- =============



tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version15(15)}

tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version16(16)}



xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -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 ([65-66] below)

    mMSSend                                             [17] MMSSend,

    mMSSendByNonLocalTarget                             [18] MMSSendByNonLocalTarget,

    mMSNotification                                     [19] MMSNotification,
@@ -118,7 +118,11 @@ XIRIEvent ::= CHOICE 
    mMEIdentifierAssocation                             [63] MMEIdentifierAssocation,



 -- PDU to MA PDU session-related events, see clause 6.2.3.2.8

    sMFPDUtoMAPDUSessionModification                    [64] SMFPDUtoMAPDUSessionModification

    sMFPDUtoMAPDUSessionModification                    [64] SMFPDUtoMAPDUSessionModification,

    

    -- MMS-related events continued from choice 35

    mMSConvertedFromEmail                               [65] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [66] MMSConvertedToEmail

}



-- ==============
@@ -171,7 +175,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 ([65-66] below)

    mMSSend                                             [17] MMSSend,

    mMSSendByNonLocalTarget                             [18] MMSSendByNonLocalTarget,

    mMSNotification                                     [19] MMSNotification,
@@ -231,7 +235,11 @@ IRIEvent ::= CHOICE 
     mMEIdentifierAssocation                            [63] MMEIdentifierAssocation,



    -- PDU to MA PDU session-related events, see clause 6.2.3.2.8

    sMFPDUtoMAPDUSessionModification                    [64] SMFPDUtoMAPDUSessionModification

    sMFPDUtoMAPDUSessionModification                    [64] SMFPDUtoMAPDUSessionModification,



    -- MMS-related events continued from choice 35

    mMSConvertedFromEmail                               [65] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [66] MMSConvertedToEmail 

}



IRITargetIdentifier ::= SEQUENCE
@@ -1258,6 +1266,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

-- =========

33128/r17/TS33128Payloads.asn

+53 −6
Original line number Diff line number Diff line 
TS33128Payloads

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version11(11)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version12(12)}



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
@@ -9,7 +9,7 @@ BEGIN 
-- Relative OIDs

-- =============



tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version11(11)}

tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version12(12)}



xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -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

-- =========

33128/r18/TS33128Payloads.asn

+353 −8

File changed.

Preview size limit exceeded, changes collapsed.

33128/r19/TS33128Payloads.asn

+582 −23

File changed.

Preview size limit exceeded, changes collapsed.

testing/asn_compile_targets.json

+7 −1
Original line number Diff line number Diff line
@@ -9,5 +9,11 @@ 
        "./testing/dependencies/asn/IPAccessPDU.asn",

        "./testing/dependencies/asn/stubs/LI-PS-PDU.asn"

    ],

    ["./33128/r18/TS33128IdentityAssociation.asn"]

    ["./33128/r18/TS33128IdentityAssociation.asn"],

    [

        "./33128/r19/TS33128Payloads.asn",

        "./testing/dependencies/asn/IPAccessPDU.asn",

        "./testing/dependencies/asn/stubs/LI-PS-PDU.asn"

    ],

    ["./33128/r19/TS33128IdentityAssociation.asn"]

]