Commit 6b65f0db authored by canterburym's avatar canterburym
Browse files

Resolving merge conflicts

parents f7b79469 33c5188b

33128/r17/TS33128IdentityAssociation.asn

+11 −3
Original line number Diff line number Diff line 
TS33128IdentityAssociation

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) tS33128IdentityAssociation(20) r16(16) version2(2)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) tS33128IdentityAssociation(20) r17(17) version0(0)}





DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=



BEGIN



tS33128IdentityAssociationOID RELATIVE-OID ::= {threeGPP(4) tS33128IdentityAssociation(20) r16(16) version2(2)}

tS33128IdentityAssociationOID RELATIVE-OID ::= {threeGPP(4) tS33128IdentityAssociation(20) r17(17) version0(0)}



iEFRecordOID RELATIVE-OID ::= {tS33128IdentityAssociationOID iEF(1)}
@@ -34,7 +34,8 @@ IEFAssociationRecord ::= SEQUENCE 
    nCGITime        [6] GeneralizedTime,

    sUCI            [7] SUCI OPTIONAL,

    pEI             [8] PEI OPTIONAL,

    fiveGSTAIList   [9] FiveGSTAIList OPTIONAL

    fiveGSTAIList   [9] FiveGSTAIList OPTIONAL,

    gPSI            [10] GPSI OPTIONAL

}



IEFDeassociationRecord ::= SEQUENCE
@@ -95,5 +96,12 @@ EUI64 ::= OCTET STRING (SIZE(8)) 


SUCI ::= OCTET STRING (SIZE(8..3008))



GPSI ::= CHOICE

{

    gPSIMSISDN  [1] MSISDN,

    gPSINAI     [2] NAI

}



MSISDN ::= NumericString (SIZE(1..15))



END
 
 No newline at end of file

33128/r17/TS33128Payloads.asn

+149 −10
Original line number Diff line number Diff line
@@ -171,7 +171,13 @@ XIRIEvent ::= CHOICE 


    -- STIR SHAKEN and RCD/eCNAM Events, see clause 7.X.2

    sTIRSHAKENSignatureGeneration                       [2581] STIRSHAKENSignatureGeneration,

    sTIRSHAKENSignatureValidation                       [2582] STIRSHAKENSignatureValidation

    sTIRSHAKENSignatureValidation                       [2582] STIRSHAKENSignatureValidation,

    -- IMS events, see clause 7.X.4.2

    iMSMessage                                          [2721] IMSMessage,

    startOfInterceptionForActiveIMSSession              [2722] StartOfInterceptionForActiveIMSSession,



    -- Separated Location Reporting, see clause 7.3.X

    separatedLocationReporting                          [2731] SeparatedLocationReporting

}



-- ==============
@@ -335,7 +341,14 @@ IRIEvent ::= CHOICE 
    

    -- STIR SHAKEN and RCD/eCNAM Events, see clause 7.X.3

    sTIRSHAKENSignatureGeneration                       [2581] STIRSHAKENSignatureGeneration,

    sTIRSHAKENSignatureValidation                       [2582] STIRSHAKENSignatureValidation

    sTIRSHAKENSignatureValidation                       [2582] STIRSHAKENSignatureValidation,



    -- IMS events, see clause 7.X.4.2

    iMSMessage                                          [2721] IMSMessage,

    startOfInterceptionForActiveIMSSession              [2722] StartOfInterceptionForActiveIMSSession,



    -- Separated Location Reporting, see clause 7.3.X

    separatedLocationReporting                          [2731] SeparatedLocationReporting

}



IRITargetIdentifier ::= SEQUENCE
@@ -416,7 +429,8 @@ N9HRMessageCause ::= ENUMERATED 
    pDUSessionReleased(3),

    updatedLocationAvailable(4),

    sMFChanged(5),

    other(6)

    other(6),

    hRLIEnabled(7)

}



S8HRMessageCause ::= ENUMERATED
@@ -427,7 +441,8 @@ S8HRMessageCause ::= ENUMERATED 
    pDNDisconnected(4),

    updatedLocationAvailable(5),

    sGWChanged(6),

    other(7)

    other(7),

    hRLIEnabled(8)

}



-- ==================
@@ -1253,7 +1268,8 @@ SMFPDUSessionEstablishment ::= SEQUENCE 
    accessType                  [16] AccessType OPTIONAL,

    rATType                     [17] RATType OPTIONAL,

    sMPDUDNRequest              [18] SMPDUDNRequest OPTIONAL,

    uEEPSPDNConnection          [19] UEEPSPDNConnection OPTIONAL

    uEEPSPDNConnection          [19] UEEPSPDNConnection OPTIONAL,

    ePS5GSComboInfo             [20] EPS5GSComboInfo OPTIONAL

}



-- See clause 6.2.3.2.3 for details of this structure
@@ -1269,7 +1285,8 @@ SMFPDUSessionModification ::= SEQUENCE 
    requestType                 [8] FiveGSMRequestType,

    accessType                  [9] AccessType OPTIONAL,

    rATType                     [10] RATType OPTIONAL,

    pDUSessionID                [11] PDUSessionID OPTIONAL

    pDUSessionID                [11] PDUSessionID OPTIONAL,

    ePS5GSComboInfo             [12] EPS5GSComboInfo OPTIONAL

}



-- See clause 6.2.3.2.4 for details of this structure
@@ -1284,7 +1301,8 @@ SMFPDUSessionRelease ::= SEQUENCE 
    uplinkVolume                [7] INTEGER OPTIONAL,

    downlinkVolume              [8] INTEGER OPTIONAL,

    location                    [9] Location OPTIONAL,

    cause                       [10] SMFErrorCodes OPTIONAL

    cause                       [10] SMFErrorCodes OPTIONAL,

    ePS5GSComboInfo             [11] EPS5GSComboInfo OPTIONAL

}



-- See clause 6.2.3.2.5 for details of this structure
@@ -1308,7 +1326,8 @@ SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE 
    accessType                  [16] AccessType OPTIONAL,

    rATType                     [17] RATType OPTIONAL,

    sMPDUDNRequest              [18] SMPDUDNRequest OPTIONAL,

    timeOfSessionEstablishment  [19] Timestamp OPTIONAL

    timeOfSessionEstablishment  [19] Timestamp OPTIONAL,

    ePS5GSComboInfo             [20] EPS5GSComboInfo OPTIONAL

}



-- See clause 6.2.3.2.6 for details of this structure
@@ -1528,6 +1547,49 @@ RequestIndication ::= ENUMERATED 
    rELDUETO5GANREQUEST(7)

}



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

-- PGW-C + SMF Parameters

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



EPS5GSComboInfo ::= SEQUENCE

{

    ePSInterworkingIndication [1] EPSInterworkingIndication,

    ePSSubscriberIDs          [2] EPSSubscriberIDs,

    ePSPDNCnxInfo             [3] EPSPDNCnxInfo OPTIONAL,

    ePSBearerInfo             [4] EPSBearerInfo OPTIONAL

}



EPSInterworkingIndication ::= ENUMERATED

{

    none(1),

    withN26(2),

    withoutN26(3),

    iwkNon3GPP(4)

}



EPSSubscriberIDs ::= SEQUENCE

{

    iMSI   [1] IMSI OPTIONAL,

    mSISDN [2] MSISDN OPTIONAL,

    iMEI   [3] IMEI OPTIONAL

}



EPSPDNCnxInfo ::= SEQUENCE

{

    pGWS8ControlPlaneFTEID [1] FTEID,

    linkedBearerID         [2] EPSBearerID OPTIONAL

}



EPSBearerInfo ::= SEQUENCE OF EPSBearers



EPSBearers ::= SEQUENCE

{

    ePSBearerID         [1] EPSBearerID,

    pGWS8UserPlaneFTEID [2] FTEID,

    qCI                 [3] QCI

}



QCI ::= INTEGER (0..255)

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

-- 5G UPF definitions

-- ==================
@@ -2735,6 +2797,61 @@ PTCAccessPolicyFailure ::= ENUMERATED 
    requestUnsuccessful(1),

    requestUnknown(2)

}

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

-- IMS definitions

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



-- See clause 7.X.4.2.1 for details of this structure

IMSMessage ::= SEQUENCE

{

    payload               [1] IMSPayload,

    sessionDirection      [2] SessionDirection,

    voIPRoamingIndication [3] VoIPRoamingIndication OPTIONAL,

    location              [6] Location OPTIONAL

}

-- See clause 7.X.4.2.3 for details of this structure

StartOfInterceptionForActiveIMSSession ::= SEQUENCE

{

    originatingId         [1] SEQUENCE OF IMPU,

    terminatingId         [2] IMPU,

    sDPState              [3] SEQUENCE OF OCTET STRING OPTIONAL,

    diversionIdentity     [4] IMPU OPTIONAL,

    voIPRoamingIndication [5] VoIPRoamingIndication OPTIONAL,

    location              [7] Location OPTIONAL

}



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

-- IMS parameters

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



IMSPayload ::= CHOICE

{

    encapsulatedSIPMessage            [1] SIPMessage

}



SIPMessage ::= SEQUENCE

{

    iPSourceAddress       [1] IPAddress,

    iPDestinationAddress  [2] IPAddress,

    sIPContent            [3] OCTET STRING

}



VoIPRoamingIndication ::= ENUMERATED

{

    roamingLBO(1),

    roamingS8HR(2),

    roamingN9HR(3)

}



SessionDirection ::= ENUMERATED

{

    fromTarget(1), 

    toTarget(2),

    combined(3),

    indeterminate(4)

}



HeaderOnlyIndication ::= BOOLEAN



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

-- STIR/SHAKEN/RCD/eCNAM definitions
@@ -3143,6 +3260,22 @@ FiveGMMStatus ::= ENUMERATED 
    uENot5GMMRegistered(2)

}



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

-- Separated Location Reporting definitions

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



SeparatedLocationReporting ::= SEQUENCE

{

    sUPI                        [1] SUPI,

    sUCI                        [2] SUCI OPTIONAL,

    pEI                         [3] PEI OPTIONAL,

    gPSI                        [4] GPSI OPTIONAL,

    gUTI                        [5] FiveGGUTI OPTIONAL,

    location                    [6] Location,

    non3GPPAccessEndpoint       [7] UEEndpointAddress OPTIONAL,

    rATType                     [8] RATType OPTIONAL

}



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

-- Common Parameters

-- =================
@@ -3166,6 +3299,8 @@ E164Number ::= NumericString (SIZE(1..15)) 


EmailAddress ::= UTF8String



EUI64 ::= OCTET STRING (SIZE(8))



FiveGGUTI ::= SEQUENCE

{

    mCC         [1] MCC,
@@ -3327,7 +3462,9 @@ PDUSessionType ::= ENUMERATED 
PEI ::= CHOICE

{

    iMEI        [1] IMEI,

    iMEISV      [2] IMEISV

    iMEISV      [2] IMEISV,

    mACAddress  [3] MACAddress,

    eUI64       [4] EUI64

}



PortNumber ::= INTEGER(0..65535)
@@ -3531,7 +3668,9 @@ N3GALocation ::= SEQUENCE 
    hFCNodeID                   [7] HFCNodeID OPTIONAL,

    gLI                         [8] GLI OPTIONAL,

    w5GBANLineType              [9] W5GBANLineType OPTIONAL,

    gCI                         [10] GCI OPTIONAL

    gCI                         [10] GCI OPTIONAL,

    ageOfLocationInfo           [11] INTEGER OPTIONAL,

    uELocationTimestamp         [12] Timestamp OPTIONAL

}



-- TS 38.413 [23], clause 9.3.2.4

33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

+10 −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:3GPPIdentityExtensions:r17:v2"

           xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v3"

           xmlns:x1="http://uri.etsi.org/03221/X1/2017/10"

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

           targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v2"

           targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v3"

           elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
@@ -88,6 +88,7 @@ 
      <xs:element name="AssociationStartTime" type="common:QualifiedMicrosecondDateTime"/>

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

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

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

    </xs:sequence>

  </xs:complexType>
@@ -129,6 +130,13 @@ 
    </xs:sequence>

  </xs:complexType>

  

  <xs:complexType name="GPSI">

    <xs:choice>

      <xs:element name="GPSIMSISDN" type="common:GPSIMSISDN"/>

      <xs:element name="GPSINAI" type="common:GPSINAI"/>

    </xs:choice>

  </xs:complexType>



  <xs:simpleType name="MCC">

    <xs:restriction base="xs:string">

      <xs:pattern value="[0-9]{3}"></xs:pattern>

33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd

+19 −1
Original line number Diff line number Diff line
@@ -277,4 +277,22 @@ 
    </xs:restriction>

  </xs:simpleType>

  

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



  <xs:complexType name="RCSTargetIdentifierExtensions">

    <xs:sequence>

      <xs:element name="RCSTargetIdentifier" type="RCSTargetIdentifier" minOccurs="1" maxOccurs="unbounded"></xs:element>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="RCSTargetIdentifier">

    <xs:choice>

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

    </xs:choice>

  </xs:complexType>



  <xs:simpleType name="RCSContentURI">

    <xs:restriction base="xs:anyURI"></xs:restriction>

  </xs:simpleType>



</xs:schema>