Commit 785daa97 authored by grahamj's avatar grahamj
Browse files

Merge branch 'draft/lm-r17-amf-tag-fixes' into 'cr/33128/0832'

Draft/lm r17 amf tag fixes

See merge request !383
parents be3f68ab 4bdfacb3
Loading
Loading
Loading
Loading
Loading
+36 −4
Original line number Diff line number Diff line
@@ -1215,7 +1215,15 @@ AMFRegistration ::= SEQUENCE
    mACRestIndicator            [16] MACRestrictionIndicator OPTIONAL,
    pagingRestrictionIndicator  [17] PagingRestrictionIndicator OPTIONAL,
    rATType                     [18] RATType OPTIONAL,
    additionalUserIdentifiers   [19] UserIdentifiers OPTIONAL

    -- Tags 19 to 30 are not used in this version of the specification

    -- In V17.16.0 (threeGPP(4) ts33128(19) r17(17) version13(13)) through
    -- to V17.21.0 (threeGPP(4) ts33128(19) r17(17) version15(15)),
    -- tag 19 was additionalUserIdentifiers (now tag 31).
    -- These fields were renumbered in V17.22.0 (threeGPP(4) ts33128(19) r17(17) version16(16))
    -- to avoid conflict and permit interoperability with newer releases.
    additionalUserIdentifiers   [31] UserIdentifiers OPTIONAL
}

-- See clause 6.2.2.2.3 for details of this structure
@@ -1232,7 +1240,15 @@ AMFDeregistration ::= SEQUENCE
    location                    [9] Location OPTIONAL,
    switchOffIndicator          [10] SwitchOffIndicator OPTIONAL,
    reRegRequiredIndicator      [11] ReRegRequiredIndicator OPTIONAL,
    additionalUserIdentifiers   [12] UserIdentifiers OPTIONAL

    -- Tag 12 is not used in this version of the specification

    -- In V17.16.0 (threeGPP(4) ts33128(19) r17(17) version13(13)) through
    -- to V17.21.0 (threeGPP(4) ts33128(19) r17(17) version15(15)),
    -- tag 12 was additionalUserIdentifiers (now tag 13).
    -- This field was renumbered in V17.22.0 (threeGPP(4) ts33128(19) r17(17) version16(16))
    -- to avoid conflict and permit interoperability with newer releases.
    additionalUserIdentifiers   [13] UserIdentifiers OPTIONAL
}

-- See clause 6.2.2.2.4 for details of this structure
@@ -1246,7 +1262,15 @@ AMFLocationUpdate ::= SEQUENCE
    location                    [6] Location,
    sMSOverNASIndicator         [7] SMSOverNASIndicator OPTIONAL,
    oldGUTI                     [8] EPS5GGUTI OPTIONAL,
    additionalUserIdentifiers   [9] UserIdentifiers OPTIONAL

    -- Tag 9 is not used in this version of the specification

    -- In V17.16.0 (threeGPP(4) ts33128(19) r17(17) version13(13)) through
    -- to V17.21.0 (threeGPP(4) ts33128(19) r17(17) version15(15)),
    -- tag 9 was additionalUserIdentifiers (now tag 10).
    -- This field was renumbered in V17.22.0 (threeGPP(4) ts33128(19) r17(17) version16(16))
    -- to avoid conflict and permit interoperability with newer releases.
    additionalUserIdentifiers   [10] UserIdentifiers OPTIONAL
}

-- See clause 6.2.2.2.5 for details of this structure
@@ -1267,7 +1291,15 @@ AMFStartOfInterceptionWithRegisteredUE ::= SEQUENCE
    sMSOverNASIndicator         [13] SMSOverNASIndicator OPTIONAL,
    oldGUTI                     [14] EPS5GGUTI OPTIONAL,
    eMM5GRegStatus              [15] EMM5GMMStatus OPTIONAL,
    additionalUserIdentifiers   [16] UserIdentifiers OPTIONAL

    -- Tags 16 to 20 are not used in this version of the specification

    -- In V17.16.0 (threeGPP(4) ts33128(19) r17(17) version13(13)) through
    -- to V17.21.0 (threeGPP(4) ts33128(19) r17(17) version15(15)),
    -- tag 16 was additionalUserIdentifiers (now tag 21).
    -- These fields were renumbered in V17.22.0 (threeGPP(4) ts33128(19) r17(17) version16(16))
    -- to avoid conflict and permit interoperability with newer releases.
    additionalUserIdentifiers   [21] UserIdentifiers OPTIONAL
}

-- See clause 6.2.2.2.6 for details of this structure
+5 −1
Original line number Diff line number Diff line
@@ -49,7 +49,11 @@
        "Tags 133-164 missing in XIRIEvent",
        "Tags 167-185 missing in XIRIEvent",
        "Tags 133-164 missing in IRIEvent",
        "Tags 167-185 missing in IRIEvent"
        "Tags 167-185 missing in IRIEvent",
        "Tags 19-30 missing in AMFRegistration",
        "Tag 12 missing in AMFDeregistration",
        "Tag 9 missing in AMFLocationUpdate",
        "Tags 16-20 missing in AMFStartOfInterceptionWithRegisteredUE"
    ],
    "33128/r18/TS33128Payloads.asn" : [
        "Tag 100 XIRIEvent field 'n9HRPDUSessionInfo' is not present in IRIEvent",