Commit a7f1d716 authored by canterburym's avatar canterburym
Browse files

Merge branch 'meeting/SA94e' into 'main'

Meeting/SA94e

See merge request !120
parents 74f0f51f 007b2581
Pipeline #5734 passed with stages
in 2 minutes and 3 seconds
TS33128Payloads
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version7(7)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version8(8)}
DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
......@@ -9,7 +9,7 @@ BEGIN
-- Relative OIDs
-- =============
tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version7(7)}
tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version8(8)}
xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
......@@ -167,7 +167,7 @@ IRIEvent ::= CHOICE
pDHeaderReport [14] PDHeaderReport,
pDSummaryReport [15] PDSummaryReport,
-- MDF-related events, see clause 7.3.4
-- MDF-related events, see clause 7.3.2
mDFCellSiteReport [16] MDFCellSiteReport,
-- MMS-related events, see clause 7.4.2
......@@ -2072,6 +2072,8 @@ E164Number ::= NumericString (SIZE(1..15))
EmailAddress ::= UTF8String
EUI64 ::= OCTET STRING (SIZE(8))
FiveGGUTI ::= SEQUENCE
{
mCC [1] MCC,
......@@ -2212,7 +2214,9 @@ PDUSessionType ::= ENUMERATED
PEI ::= CHOICE
{
iMEI [1] IMEI,
iMEISV [2] IMEISV
iMEISV [2] IMEISV,
mACAddress [3] MACAddress,
eUI64 [4] EUI64
}
PortNumber ::= INTEGER(0..65535)
......
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
TS33128Payloads
{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) version2(2)}
DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
......@@ -9,7 +9,7 @@ BEGIN
-- Relative OIDs
-- =============
tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version1(1)}
tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version2(2)}
xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
......@@ -167,7 +167,17 @@ XIRIEvent ::= CHOICE
-- HR LI Events, see clause 7.10.3.3
n9HRPDUSessionInfo [100] N9HRPDUSessionInfo,
s8HRBearerInfo [101] S8HRBearerInfo
s8HRBearerInfo [101] S8HRBearerInfo,
-- Separated Location Reporting, see clause 7.3.4
separatedLocationReporting [102] SeparatedLocationReporting,
-- STIR SHAKEN and RCD/eCNAM Events, see clause 7.11.2
sTIRSHAKENSignatureGeneration [103] STIRSHAKENSignatureGeneration,
sTIRSHAKENSignatureValidation [104] STIRSHAKENSignatureValidation,
-- IMS events, see clause 7.11.4.2
iMSMessage [105] IMSMessage,
startOfInterceptionForActiveIMSSession [106] StartOfInterceptionForActiveIMSSession
}
-- ==============
......@@ -216,7 +226,7 @@ IRIEvent ::= CHOICE
pDHeaderReport [14] PDHeaderReport,
pDSummaryReport [15] PDSummaryReport,
-- MDF-related events, see clause 7.3.4
-- MDF-related events, see clause 7.3.2
mDFCellSiteReport [16] MDFCellSiteReport,
-- MMS-related events, see clause 7.4.2
......@@ -324,10 +334,22 @@ IRIEvent ::= CHOICE
aFAKMAApplicationKeyRefresh [96] AFAKMAApplicationKeyRefresh,
aFStartOfInterceptWithEstablishedAKMAApplicationKey [97] AFStartOfInterceptWithEstablishedAKMAApplicationKey,
aFAuxiliarySecurityParameterEstablishment [98] AFAuxiliarySecurityParameterEstablishment,
aFApplicationKeyRemoval [99] AFApplicationKeyRemoval
aFApplicationKeyRemoval [99] AFApplicationKeyRemoval,
-- tag 100 is reserved because there is no equivalent n9HRPDUSessionInfo in IRIEvent.
-- tag 101 is reserved because there is no equivalent S8HRBearerInfo in IRIEvent.
-- Separated Location Reporting, see clause 7.3.4
separatedLocationReporting [102] SeparatedLocationReporting,
-- STIR SHAKEN and RCD/eCNAM Events, see clause 7.11.3
sTIRSHAKENSignatureGeneration [103] STIRSHAKENSignatureGeneration,
sTIRSHAKENSignatureValidation [104] STIRSHAKENSignatureValidation,
-- IMS events, see clause 7.11.4.2
iMSMessage [105] IMSMessage,
startOfInterceptionForActiveIMSSession [106] StartOfInterceptionForActiveIMSSession
}
IRITargetIdentifier ::= SEQUENCE
......@@ -408,7 +430,8 @@ N9HRMessageCause ::= ENUMERATED
pDUSessionReleased(3),
updatedLocationAvailable(4),
sMFChanged(5),
other(6)
other(6),
hRLIEnabled(7)
}
S8HRMessageCause ::= ENUMERATED
......@@ -419,7 +442,8 @@ S8HRMessageCause ::= ENUMERATED
pDNDisconnected(4),
updatedLocationAvailable(5),
sGWChanged(6),
other(7)
other(7),
hRLIEnabled(8)
}
-- ==================
......@@ -1245,7 +1269,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
......@@ -1261,7 +1286,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
......@@ -1276,7 +1302,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
......@@ -1300,7 +1327,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
......@@ -1520,6 +1548,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
-- ==================
......@@ -2727,6 +2798,164 @@ PTCAccessPolicyFailure ::= ENUMERATED
requestUnsuccessful(1),
requestUnknown(2)
}
-- ===============
-- IMS definitions
-- ===============
-- See clause 7.12.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.12.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
-- =================================
-- See clause 7.11.2.1.2 for details of this structure
STIRSHAKENSignatureGeneration ::= SEQUENCE
{
pASSporTs [1] SEQUENCE OF PASSporT
}
-- See clause 7.11.2.1.3 for details of this structure
STIRSHAKENSignatureValidation ::= SEQUENCE
{
pASSporTs [1] SEQUENCE OF PASSporT OPTIONAL,
rCDTerminalDisplayInfo [2] RCDDisplayInfo OPTIONAL,
eCNAMTerminalDisplayInfo [3] ECNAMDisplayInfo OPTIONAL,
sHAKENValidationResult [4] SHAKENValidationResult,
sHAKENFailureStatusCode [5] SHAKENFailureStatusCode OPTIONAL
}
-- ================================
-- STIR/SHAKEN/RCD/eCNAM parameters
-- ================================
PASSporT ::= SEQUENCE
{
pASSporTHeader [1] PASSporTHeader,
pASSporTPayload [2] PASSporTPayload,
pASSporTSignature [3] OCTET STRING
}
PASSporTHeader ::= SEQUENCE
{
type [1] JWSTokenType,
algorithm [2] UTF8String,
ppt [3] UTF8String OPTIONAL,
x5u [4] UTF8String
}
JWSTokenType ::= ENUMERATED
{
passport(1)
}
PASSporTPayload ::= SEQUENCE
{
issuedAtTime [1] GeneralizedTime,
originator [2] STIRSHAKENOriginator,
destination [3] STIRSHAKENDestinations,
attestation [4] Attestation,
origId [5] UTF8String,
diversion [6] STIRSHAKENDestination
}
STIRSHAKENOriginator ::= CHOICE
{
telephoneNumber [1] STIRSHAKENTN,
sTIRSHAKENURI [2] UTF8String
}
STIRSHAKENDestinations ::= SEQUENCE OF STIRSHAKENDestination
STIRSHAKENDestination ::= CHOICE
{
telephoneNumber [1] STIRSHAKENTN,
sTIRSHAKENURI [2] UTF8String
}
STIRSHAKENTN ::= CHOICE
{
mSISDN [1] MSISDN
}
Attestation ::= ENUMERATED
{
attestationA(1),
attestationB(2),
attestationC(3)
}
SHAKENValidationResult ::= ENUMERATED
{
tNValidationPassed(1),
tNValidationFailed(2),
noTNValidation(3)
}
SHAKENFailureStatusCode ::= INTEGER
ECNAMDisplayInfo ::= SEQUENCE
{
name [1] UTF8String,
additionalInfo [2] OCTET STRING OPTIONAL
}
RCDDisplayInfo ::= SEQUENCE
{
name [1] UTF8String,
jcd [2] OCTET STRING OPTIONAL,
jcl [3] OCTET STRING OPTIONAL
}
-- ===================
-- 5G LALS definitions
......@@ -3032,6 +3261,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
-- =================
......@@ -3055,6 +3300,8 @@ E164Number ::= NumericString (SIZE(1..15))
EmailAddress ::= UTF8String
EUI64 ::= OCTET STRING (SIZE(8))
FiveGGUTI ::= SEQUENCE
{
mCC [1] MCC,
......@@ -3216,7 +3463,9 @@ PDUSessionType ::= ENUMERATED
PEI ::= CHOICE
{
iMEI [1] IMEI,
iMEISV [2] IMEISV
iMEISV [2] IMEISV,
mACAddress [3] MACAddress,
eUI64 [4] EUI64
}
PortNumber ::= INTEGER(0..65535)
......@@ -3420,7 +3669,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
......
<?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>
......@@ -128,6 +129,13 @@
<xs:element name="NID" type="NID" minOccurs="0"/>
</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">
......
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1"
xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r17:v2"
xmlns:common="http://uri.etsi.org/03280/common/2017/07"
targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1"
targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v2"
elementFormDefault="qualified">
<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
......@@ -276,5 +276,23 @@
<xs:maxInclusive value="255"/>
</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>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment