Commit da1dd5eb authored by canterburym's avatar canterburym
Browse files

Merge branch 'maintenance/SA104' into 'main' 

Output of SA#104

See merge request !270
parents 631eddd4 ca609927

33128/r15/TS33128Payloads.asn

+15 −9
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) r15(15) version6(6)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r15(15) version7(7)}



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

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



xIRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) xIRI(1)}

xCCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) xCC(2)}

xIRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version7(7) xIRI(1)}

xCCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version7(7) xCC(2)}



iRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) iRI(3)}

cCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) cC(4)}

iRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version7(7) iRI(3)}

cCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version7(7) cC(4)}



lINotificationPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) lINotification(5)}

lINotificationPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version7(7) lINotification(5)}



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

-- X2 xIRI payload
@@ -71,7 +71,8 @@ IRIPayload ::= SEQUENCE 
{

    relativeOID              [1] RELATIVE-OID,

    event                    [2] IRIEvent,

    targetIdentifiers   [3] SEQUENCE OF IRITargetIdentifier OPTIONAL

    targetIdentifiers        [3] SEQUENCE OF IRITargetIdentifier OPTIONAL,

    mediatedFromIndicator    [4] MediatedFromIndicator OPTIONAL

}



IRIEvent ::= CHOICE
@@ -113,6 +114,11 @@ IRITargetIdentifier ::= SEQUENCE 
    provenance                                          [2] TargetIdentifierProvenance OPTIONAL

}



MediatedFromIndicator ::= CHOICE

{

    xIRIRelativeOID   [1] RELATIVE-OID

}



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

-- HI3 CC payload

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

33128/r16/TS33128Payloads.asn

+11 −5
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) version14(14)}

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



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

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



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

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



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

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -135,7 +135,8 @@ IRIPayload ::= SEQUENCE 
{

    iRIPayloadOID          [1] RELATIVE-OID,

    event                  [2] IRIEvent,

    targetIdentifiers   [3] SEQUENCE OF IRITargetIdentifier OPTIONAL

    targetIdentifiers      [3] SEQUENCE OF IRITargetIdentifier OPTIONAL,

    mediatedFromIndicator  [4] MediatedFromIndicator OPTIONAL

}



IRIEvent ::= CHOICE
@@ -239,6 +240,11 @@ IRITargetIdentifier ::= SEQUENCE 
    provenance                                          [2] TargetIdentifierProvenance OPTIONAL

}



MediatedFromIndicator ::= CHOICE

{

    xIRIRelativeOID   [1] RELATIVE-OID

}



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

-- HI3 CC payload

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

33128/r17/TS33128Payloads.asn

+11 −5
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) version10(10)}

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



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

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



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

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



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

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -212,7 +212,8 @@ IRIPayload ::= SEQUENCE 
{

    iRIPayloadOID         [1] RELATIVE-OID,

    event                 [2] IRIEvent,

    targetIdentifiers   [3] SEQUENCE OF IRITargetIdentifier OPTIONAL

    targetIdentifiers     [3] SEQUENCE OF IRITargetIdentifier OPTIONAL,

    mediatedFromIndicator [4] MediatedFromIndicator OPTIONAL

}



IRIEvent ::= CHOICE
@@ -392,6 +393,11 @@ IRITargetIdentifier ::= SEQUENCE 
    provenance                                          [2] TargetIdentifierProvenance OPTIONAL

}



MediatedFromIndicator ::= CHOICE

{

    xIRIRelativeOID   [1] RELATIVE-OID

}



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

-- HI3 CC payload

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

33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd

+4 −2
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:r17:v4"

           xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r17:v5"

           xmlns:common="http://uri.etsi.org/03280/common/2017/07"

           targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v4"

           targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v5"

           elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
@@ -244,6 +244,8 @@ 


  <xs:element name="HR" type="EmptyElement"></xs:element>

  <xs:element name="IMSSignaling" type="EmptyElement"></xs:element>

  <xs:element name="APN" type="common:ShortString"></xs:element>

  <xs:element name="DNN" type="common:ShortString"></xs:element>



  <xs:element name="HRLIT1TargetIdentifierExtensions" type="HRLIT1TargetIdentifierExtensions"></xs:element>

33128/r18/TS33128Dictionaries.xml

+3 −3
Original line number Diff line number Diff line
@@ -54,11 +54,11 @@ 
            </DictionaryEntry>

            <DictionaryEntry>

                <Value>OngoingIdentityAssociation</Value>

                <Meaning>A request for location information of the target, consisting at least of the TAI and the NCGI.</Meaning>

                <Meaning>A request for an ongoing series of IdentityResponseDetails responses matching the query provided.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>LocationAcquisition</Value>

                <Meaning>A request for an ongoing series of IdentityResponseDetails responses matching the query provided.</Meaning>

                <Meaning>A request for location information of the target, consisting at least of the TAI and the NCGI.</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>
@@ -68,7 +68,7 @@ 
        <DictionaryEntries>

            <DictionaryEntry>

                <Value>IncludeNCGIInResponse</Value>

                <Meaning>A request for returning the NCGI in the response.</Meaning>

                <Meaning>A request for returning the NCGI and additional CGIs in the response.</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>