Commit 38cebd87 authored by canterburym's avatar canterburym
Browse files

Merge branch 'cr/TS33128/0221' of forge.3gpp.org:sa3/li-trial into trialmerge/sa93e/1

parents 120c1b03 cda907c0

33128/r17/TS33128Payloads.asn

+24 −2
Original line number Diff line number Diff line 
TS33128Payloads

<<<<<<< HEAD

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

=======

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

>>>>>>> cda907c0247cbcd3cbc0734c28beddb1d1497c94



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

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



<<<<<<< HEAD

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

=======

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

>>>>>>> cda907c0247cbcd3cbc0734c28beddb1d1497c94



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

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -835,7 +843,9 @@ AMFRegistration ::= SEQUENCE 
    fiveGSTAIList               [11] TAIList OPTIONAL,

    sMSOverNasIndicator         [12] SMSOverNASIndicator OPTIONAL,

    oldGUTI                     [13] EPS5GGUTI OPTIONAL,

    eMM5GRegStatus              [14] EMM5GMMStatus OPTIONAL

    eMM5GRegStatus              [14] EMM5GMMStatus OPTIONAL,

    nonIMEISVPEI                [15] NonIMEISVPEI OPTIONAL,

    mACRestIndicator            [16] MACRestrictionIndicator OPTIONAL

}



-- See clause 6.2.2.2.3 for details of this structure
@@ -2883,6 +2893,13 @@ IPv6FlowLabel ::= INTEGER(0..1048575) 


MACAddress ::= OCTET STRING (SIZE(6))



MACRestrictionIndicator ::= ENUMERATED

{

    noResrictions(1),

    mACAddressNotUseableAsEquipmentIdentifier(2),

    unknown(3)

}



MCC ::= NumericString (SIZE(3))



MNC ::= NumericString (SIZE(2..3))
@@ -2909,6 +2926,11 @@ NonLocalID ::= ENUMERATED 
    nonLocal(2)

}



NonIMEISVPEI ::= CHOICE

{

    mACAddress [1] MACAddress

}



NSSAI ::= SEQUENCE OF SNSSAI



PLMNID ::= SEQUENCE