Commit 48715d05 authored by canterburym's avatar canterburym
Browse files

Merge branch 'meeting/SA107' into 'main' 

Output from SA#107

See merge request !300
parents a3890aa1 8620e29d

33128/r17/TS33128Payloads.asn

+22 −15
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) version12(12)}

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



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

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



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

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



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

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -1187,7 +1187,8 @@ AMFRegistration ::= SEQUENCE 
    nonIMEISVPEI                [15] NonIMEISVPEI OPTIONAL,

    mACRestIndicator            [16] MACRestrictionIndicator OPTIONAL,

    pagingRestrictionIndicator  [17] PagingRestrictionIndicator OPTIONAL,

    rATType                     [18] RATType OPTIONAL

    rATType                     [18] RATType OPTIONAL,

    additionalUserIdentifiers   [19] UserIdentifiers OPTIONAL

}



-- See clause 6.2.2.2.3 for details of this structure
@@ -1203,7 +1204,8 @@ AMFDeregistration ::= SEQUENCE 
    cause                       [8] FiveGMMCause OPTIONAL,

    location                    [9] Location OPTIONAL,

    switchOffIndicator          [10] SwitchOffIndicator OPTIONAL,

    reRegRequiredIndicator      [11] ReRegRequiredIndicator OPTIONAL

    reRegRequiredIndicator      [11] ReRegRequiredIndicator OPTIONAL,

    additionalUserIdentifiers   [12] UserIdentifiers OPTIONAL

}



-- See clause 6.2.2.2.4 for details of this structure
@@ -1216,7 +1218,8 @@ AMFLocationUpdate ::= SEQUENCE 
    gUTI                        [5] FiveGGUTI OPTIONAL,

    location                    [6] Location,

    sMSOverNASIndicator         [7] SMSOverNASIndicator OPTIONAL,

    oldGUTI                     [8] EPS5GGUTI OPTIONAL

    oldGUTI                     [8] EPS5GGUTI OPTIONAL,

    additionalUserIdentifiers   [9] UserIdentifiers OPTIONAL

}



-- See clause 6.2.2.2.5 for details of this structure
@@ -1236,7 +1239,8 @@ AMFStartOfInterceptionWithRegisteredUE ::= SEQUENCE 
    fiveGSTAIList               [12] TAIList OPTIONAL,

    sMSOverNASIndicator         [13] SMSOverNASIndicator OPTIONAL,

    oldGUTI                     [14] EPS5GGUTI OPTIONAL,

    eMM5GRegStatus              [15] EMM5GMMStatus OPTIONAL

    eMM5GRegStatus              [15] EMM5GMMStatus OPTIONAL,

    additionalUserIdentifiers   [16] UserIdentifiers OPTIONAL

}



-- See clause 6.2.2.2.6 for details of this structure
@@ -1250,7 +1254,8 @@ AMFUnsuccessfulProcedure ::= SEQUENCE 
    pEI                         [6] PEI OPTIONAL,

    gPSI                        [7] GPSI OPTIONAL,

    gUTI                        [8] FiveGGUTI OPTIONAL,

    location                    [9] Location OPTIONAL

    location                    [9] Location OPTIONAL,

    additionalUserIdentifiers   [10] UserIdentifiers OPTIONAL

}



-- See clause 6.2.2.2.8 on for details of this structure
@@ -1263,7 +1268,8 @@ AMFPositioningInfoTransfer ::= SEQUENCE 
    gUTI                        [5] FiveGGUTI OPTIONAL,

    nRPPaMessage                [6] OCTET STRING OPTIONAL,

    lPPMessage                  [7] OCTET STRING OPTIONAL,

    lcsCorrelationId            [8] UTF8String (SIZE(1..255))

    lcsCorrelationId            [8] UTF8String (SIZE(1..255)),

    additionalUserIdentifiers   [9] UserIdentifiers OPTIONAL

}



--See clause 6.2.2.2.9 on for details of this structure
@@ -3867,7 +3873,8 @@ AMFIdentifierAssociation ::= SEQUENCE 
    gPSI                       [4] GPSI OPTIONAL,

    gUTI                       [5] FiveGGUTI,

    location                   [6] Location,

    fiveGSTAIList    [7] TAIList OPTIONAL

    fiveGSTAIList              [7] TAIList OPTIONAL,

    additionalUserIdentifiers  [8] UserIdentifiers OPTIONAL

}



MMEIdentifierAssociation ::= SEQUENCE

33128/r18/TS33128Payloads.asn

+76 −18
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) r18(18) version10(10)}

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



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
@@ -18,7 +18,7 @@ IMPORTS 
-- Relative OIDs

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



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

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



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

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -287,7 +287,19 @@ XIRIEvent ::= CHOICE 


    -- MMS-related events continued from choice 35

    mMSConvertedFromEmail                               [165] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [166] MMSConvertedToEmail

    mMSConvertedToEmail                                 [166] MMSConvertedToEmail,



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



    -- SGW events, see clause 6.3.3.2

    ePSPDNConnectionEstablishment                       [176] EPSPDNConnectionEstablishment,

    ePSPDNConnectionModification                        [177] EPSPDNConnectionModification,

    ePSPDNConnectionRelease                             [178] EPSPDNConnectionRelease,

    ePSStartOfInterceptionWithEstablishedPDNConnection  [179] EPSStartOfInterceptionWithEstablishedPDNConnection,

    ePSPDNUnsuccessfulProcedure                         [180] EPSPDNUnsuccessfulProcedure,



    -- IMS events, see clause 7.12.4.2, continued from tag 164

    startOfInterceptionWithEstablishedIMSDataChannel    [181] StartOfInterceptionWithEstablishedIMSDataChannel

}



-- ==============
@@ -558,7 +570,19 @@ IRIEvent ::= CHOICE 


    -- MMS-related events continued from choice 35

    mMSConvertedFromEmail                               [165] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [166] MMSConvertedToEmail

    mMSConvertedToEmail                                 [166] MMSConvertedToEmail,



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



    -- SGW events, see clause 6.3.3.2

    ePSPDNConnectionEstablishment                       [176] EPSPDNConnectionEstablishment,

    ePSPDNConnectionModification                        [177] EPSPDNConnectionModification,

    ePSPDNConnectionRelease                             [178] EPSPDNConnectionRelease,

    ePSStartOfInterceptionWithEstablishedPDNConnection  [179] EPSStartOfInterceptionWithEstablishedPDNConnection,

    ePSPDNUnsuccessfulProcedure                         [180] EPSPDNUnsuccessfulProcedure,



    -- IMS events, see clause 7.12.4.2, continued from tag 164

    startOfInterceptionWithEstablishedIMSDataChannel    [181] StartOfInterceptionWithEstablishedIMSDataChannel

}



IRITargetIdentifier ::= SEQUENCE
@@ -1694,7 +1718,8 @@ AMFRegistration ::= SEQUENCE 
    unavailabilityPeriodDuration    [27] UnavailabilityPeriodDuration OPTIONAL,

    fiveGSUpdateType                [28] FiveGSUpdateType OPTIONAL,

    uEAreaIndication                [29] UEAreaIndication OPTIONAL,

    establishmentCauseNon3GPPAccess [30] EstablishmentCauseNon3GPPAccess OPTIONAL

    establishmentCauseNon3GPPAccess [30] EstablishmentCauseNon3GPPAccess OPTIONAL,

    additionalUserIdentifiers       [31] UserIdentifiers OPTIONAL

}



-- See clause 6.2.2.2.3 for details of this structure
@@ -1711,7 +1736,8 @@ AMFDeregistration ::= SEQUENCE 
    location                      [9] Location OPTIONAL,

    switchOffIndicator            [10] SwitchOffIndicator OPTIONAL,

    reRegRequiredIndicator        [11] ReRegRequiredIndicator OPTIONAL,

    unavailabilityPeriodDuration  [12] UnavailabilityPeriodDuration OPTIONAL

    unavailabilityPeriodDuration  [12] UnavailabilityPeriodDuration OPTIONAL,

    additionalUserIdentifiers     [13] UserIdentifiers OPTIONAL

}



-- See clause 6.2.2.2.4 for details of this structure
@@ -1725,7 +1751,8 @@ AMFLocationUpdate ::= SEQUENCE 
    location                        [6] Location,

    deprecatedSMSOverNASIndicator   [7] SMSOverNASIndicator OPTIONAL,

    deprecatedOldGUTI               [8] EPS5GGUTI OPTIONAL,

    uEAreaIndication                [9] UEAreaIndication OPTIONAL

    uEAreaIndication                [9] UEAreaIndication OPTIONAL,

    additionalUserIdentifiers       [10] UserIdentifiers OPTIONAL

}



-- See clause 6.2.2.2.5 for details of this structure
@@ -1750,7 +1777,8 @@ AMFStartOfInterceptionWithRegisteredUE ::= SEQUENCE 
    uEPolicy                      [17] UEPolicy OPTIONAL,

    unavailabilityPeriodDuration  [18] UnavailabilityPeriodDuration OPTIONAL,

    fiveGSUpdateType              [19] FiveGSUpdateType OPTIONAL,

    uEAreaIndication              [20] UEAreaIndication OPTIONAL

    uEAreaIndication              [20] UEAreaIndication OPTIONAL,

    additionalUserIdentifiers     [21] UserIdentifiers OPTIONAL

}



-- See clause 6.2.2.2.6 for details of this structure
@@ -1764,7 +1792,8 @@ AMFUnsuccessfulProcedure ::= SEQUENCE 
    pEI                         [6] PEI OPTIONAL,

    gPSI                        [7] GPSI OPTIONAL,

    gUTI                        [8] FiveGGUTI OPTIONAL,

    location                    [9] Location OPTIONAL

    location                    [9] Location OPTIONAL,

    additionalUserIdentifiers   [10] UserIdentifiers OPTIONAL

}



-- See clause 6.2.2.2.8 on for details of this structure
@@ -1777,7 +1806,8 @@ AMFPositioningInfoTransfer ::= SEQUENCE 
    gUTI                        [5] FiveGGUTI OPTIONAL,

    nRPPaMessage                [6] OCTET STRING OPTIONAL,

    lPPMessage                  [7] OCTET STRING OPTIONAL,

    lcsCorrelationId            [8] UTF8String (SIZE(1..255))

    lcsCorrelationId            [8] UTF8String (SIZE(1..255)),

    additionalUserIdentifiers   [9] UserIdentifiers OPTIONAL

}



-- See clause 6.2.2.2.9.2 for details of this structure
@@ -2332,7 +2362,8 @@ SMFUnsuccessfulProcedure ::= SEQUENCE 
    accessType                  [16] AccessType OPTIONAL,

    rATType                     [17] RATType OPTIONAL,

    sMPDUDNRequest              [18] SMPDUDNRequest OPTIONAL,

    location                    [19] Location OPTIONAL

    location                    [19] Location OPTIONAL,

    ePSPDNUnsuccessfulProcedure [20] EPSPDNUnsuccessfulProcedure OPTIONAL

}



-- See clause 6.2.3.2.8 for details of this structure
@@ -2899,6 +2930,15 @@ EPSStartOfInterceptionWithEstablishedPDNConnection ::= SEQUENCE 
    bearerContexts                     [17] SEQUENCE OF EPSBearerContext

}



EPSPDNUnsuccessfulProcedure ::= SEQUENCE

{

    failureCause        [1] ESMCause,

    initiator           [2] Initiator,

    ePSSubscriberIDs    [3] EPSSubscriberIDs,

    iMSIUnauthenticated [4] IMSIUnauthenticatedIndication OPTIONAL,

    failedProcedure     [5] EPSPDNFailedProcedure

}



PFDDataForApps ::= SET OF PFDDataForApp



PFDDataForApp ::= SEQUENCE
@@ -3089,6 +3129,13 @@ EPSPDNConnectionRequestType ::= ENUMERATED 


EPSPDNConnectionReleaseScopeIndication ::= BOOLEAN



EPSPDNFailedProcedure ::= CHOICE

{

    ePSPDNConnectionEstablishment [1] EPSPDNConnectionEstablishment,

    ePSPDNConnectionModification  [2] EPSPDNConnectionModification,

    ePSPDNConnectionRelease       [3] EPSPDNConnectionRelease

}



FiveGSInterworkingInfo ::= SEQUENCE

{

    fiveGSInterworkingIndicator  [1] FiveGSInterworkingIndicator,
@@ -4617,6 +4664,16 @@ IMSDataChannelTermination ::= SEQUENCE 
    mediaInstructionData      [5] SBIType OPTIONAL

}



-- See Clause 7.12.4.2.7 for details of this structure

StartOfInterceptionWithEstablishedIMSDataChannel ::= SEQUENCE

{

    targetIdentity            [1] IMPU,

    callingIdentity           [2] IMPU OPTIONAL,

    calledIdentities          [3] SEQUENCE OF IMPU OPTIONAL,

    sessionEventNotification  [4] SBIType OPTIONAL,

    mediaInstructionData      [5] SBIType OPTIONAL

}



-- =========

-- IMS CCPDU

-- =========
@@ -5679,7 +5736,8 @@ AMFIdentifierAssociation ::= SEQUENCE 
    gPSI                        [4] GPSI OPTIONAL,

    gUTI                        [5] FiveGGUTI,

    location                    [6] Location,

    fiveGSTAIList    [7] TAIList OPTIONAL

    fiveGSTAIList               [7] TAIList OPTIONAL,

    additionalUserIdentifiers   [8] UserIdentifiers OPTIONAL

}



MMEIdentifierAssociation ::= SEQUENCE

33128/r19/TS33128Payloads.asn

+237 −21

File changed.

Preview size limit exceeded, changes collapsed.

33128/r19/urn_3GPP_ns_li_3GPPX1Extensions.xsd

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r19:v0" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r19:v0" elementFormDefault="qualified">

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r19:v1" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r19:v1" elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
@@ -398,6 +398,7 @@ 
        <xs:element name="TaskDetails" type="x1:TaskDetails"/>

        <xs:element name="TaskStatus" type="x1:TaskStatus" minOccurs="0"/>

        <xs:element name="LastTaskStatusTime" type="common:QualifiedMicrosecondDateTime" minOccurs="0"/>

        <xs:element name="NEIPAddress" type="common:IPAddress" minOccurs="0"/>

    </xs:sequence>

  </xs:complexType>

testing/asn_lint_exceptions.json

+3 −1
Original line number Diff line number Diff line
@@ -65,7 +65,9 @@ 
        "Tag 8 missing in MMEStartOfInterceptionWithEPSAttachedUE",

        "Tag 11 missing in MMEStartOfInterceptionWithEPSAttachedUE",

        "Tag 161 XIRIEvent field 'iPIRIPacketReport' is not present in IRIEvent",

        "Tag 161 missing in IRIEvent"

        "Tag 161 missing in IRIEvent",

        "Tags 167-175 missing in XIRIEvent",

        "Tags 167-175 missing in IRIEvent"

    ],

    "33128/r19/TS33128Payloads.asn" : [

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