Commit d50be9e4 authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parents 1cc78570 0a368d7a

33128/r17/TS33128Payloads.asn

+25 −10
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 see also MMSConverted events ([133-134] below)

    -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([165-166] below)

    mMSSend                                             [17] MMSSend,

    mMSSendByNonLocalTarget                             [18] MMSSendByNonLocalTarget,

    mMSNotification                                     [19] MMSNotification,
@@ -197,11 +197,18 @@ XIRIEvent ::= CHOICE 
    -- AMF events, see 6.2.2.2.9, continued from tag 111

    aMFUEConfigurationUpdate                            [132] AMFUEConfigurationUpdate,



    -- MMS-related events continued from choice 35

    mMSConvertedFromEmail                               [133] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [134] MMSConvertedToEmail,

    -- Tags 133 to 164 are not used in this version of the specification



    -- Tags 135 to 185 are not used in this version of the specification

    -- In V17.15.0 (threeGPP(4) ts33128(19) r17(17) version12(12)) and

    -- in V17.16.0 (threeGPP(4) ts33128(19) r17(17) version13(13)),

    -- tag 134 was mMSConvertedFromEmail (now tag 165) and

    -- tag 135 was mMSConvertedToEmail (now tag 166).

    -- These fields were renumbered in V17.17.0 (threeGPP(4) ts33128(19) r17(17) version14(14))

    -- to avoid conflict and permit interoperability with newer releases.

    mMSConvertedFromEmail                               [165] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [166] MMSConvertedToEmail,



    -- Tags 167 to 185 are not used in this version of the specification



    -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2

    aMFIdentifierDeassociation                          [186] AMFIdentifierDeassociation,
@@ -258,7 +265,7 @@ IRIEvent ::= CHOICE 
    -- MDF-related events, see clause 7.3.2

    mDFCellSiteReport                                   [16] MDFCellSiteReport,



    -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([133-134] below)

    -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([165-166] below)

    mMSSend                                             [17] MMSSend,

    mMSSendByNonLocalTarget                             [18] MMSSendByNonLocalTarget,

    mMSNotification                                     [19] MMSNotification,
@@ -396,15 +403,23 @@ IRIEvent ::= CHOICE 
    -- AMF events, see 6.2.2.3, continued from tag 111

    aMFUEConfigurationUpdate                            [132] AMFUEConfigurationUpdate,



    -- MMS-related events continued from choice 35

    mMSConvertedFromEmail                               [133] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [134] MMSConvertedToEmail,

    -- Tags 133 to 164 are not used in this version of the specification



    -- In V17.15.0 (threeGPP(4) ts33128(19) r17(17) version12(12)) and

    -- in V17.16.0 (threeGPP(4) ts33128(19) r17(17) version13(13)),

    -- tag 134 was mMSConvertedFromEmail (now tag 165) and

    -- tag 135 was mMSConvertedToEmail (now tag 166).

    -- These fields were renumbered in V17.17.0 (threeGPP(4) ts33128(19) r17(17) version14(14))

    -- to avoid conflict and permit interoperability with newer releases.

    mMSConvertedFromEmail                               [165] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [166] MMSConvertedToEmail,



    -- Tags 135 to 185 are not used in this version of the specification

    -- Tags 167 to 185 are not used in this version of the specification



    -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2

    aMFIdentifierDeassociation                          [186] AMFIdentifierDeassociation,

    mMEIdentifierDeassociation                          [187] MMEIdentifierDeassociation



}



IRITargetIdentifier ::= SEQUENCE

testing/asn_lint_exceptions.json

+4 −2
Original line number Diff line number Diff line
@@ -46,8 +46,10 @@ 
        "Tag 6 missing in LALSReport",

        "Tag 8 missing in MMEStartOfInterceptionWithEPSAttachedUE",

        "Tag 11 missing in MMEStartOfInterceptionWithEPSAttachedUE",

        "Tags 135-185 missing in XIRIEvent",

        "Tags 135-185 missing in IRIEvent"

        "Tags 133-164 missing in XIRIEvent",

        "Tags 167-185 missing in XIRIEvent",

        "Tags 133-164 missing in IRIEvent",

        "Tags 167-185 missing in IRIEvent"

    ],

    "33128/r18/TS33128Payloads.asn" : [

        "Tag 100 XIRIEvent field 'n9HRPDUSessionInfo' is not present in IRIEvent",