From 4719d8113d015789ed7f822b56bdff57b3e6c96a Mon Sep 17 00:00:00 2001 From: raonan Date: Thu, 30 Sep 2021 15:07:03 +0200 Subject: [PATCH 01/13] Update TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index dc00dcb..30891ca 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -408,7 +408,8 @@ N9HRMessageCause ::= ENUMERATED pDUSessionReleased(3), updatedLocationAvailable(4), sMFChanged(5), - other(6) + other(6), + hRLIEnabled(7) } S8HRMessageCause ::= ENUMERATED @@ -419,7 +420,8 @@ S8HRMessageCause ::= ENUMERATED pDNDisconnected(4), updatedLocationAvailable(5), sGWChanged(6), - other(7) + other(7), + hRLIEnabled(8) } -- ================== -- GitLab From 6a1065e2d616ec03ff7e08f781d47a2f3752a877 Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 8 Nov 2021 14:22:29 +0100 Subject: [PATCH 02/13] TS 33.128 CR0261 - Addition of PDN Info to SMF Tables --- 33128/r17/TS33128Payloads.asn | 57 ++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 30891ca..76fa560 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1247,7 +1247,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 @@ -1263,7 +1264,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 @@ -1278,7 +1280,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 @@ -1302,7 +1305,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 @@ -1522,6 +1526,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 -- ================== @@ -4013,4 +4060,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -END \ No newline at end of file +END -- GitLab From cd1add5d37cfc90152811d8b86fbc53a5773ff63 Mon Sep 17 00:00:00 2001 From: Alexander Markman Date: Mon, 8 Nov 2021 14:34:50 +0100 Subject: [PATCH 03/13] TS 33128 CR0288 - GPSI for IAC --- 33128/r17/TS33128IdentityAssociation.asn | 14 +++++++++++--- .../r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 12 ++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/33128/r17/TS33128IdentityAssociation.asn b/33128/r17/TS33128IdentityAssociation.asn index 82aca7c..707aaa2 100644 --- a/33128/r17/TS33128IdentityAssociation.asn +++ b/33128/r17/TS33128IdentityAssociation.asn @@ -1,12 +1,12 @@ 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 diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index d824321..501e60a 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,9 +1,9 @@ @@ -88,6 +88,7 @@ + @@ -128,6 +129,13 @@ + + + + + + + -- GitLab From 40cf9e8bf9f74a585d43d36f443dffd8b8bced3d Mon Sep 17 00:00:00 2001 From: hawbaker Date: Fri, 15 Oct 2021 14:57:56 +0200 Subject: [PATCH 04/13] This is the Release 17 mirror of CR 0264 which adds EUI 64 to common parameters and expands PEI to include MACAddress and EUI64 as PEI types. --- 33128/r17/TS33128Payloads.asn | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 76fa560..4a6caed 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -3104,6 +3104,8 @@ E164Number ::= NumericString (SIZE(1..15)) EmailAddress ::= UTF8String +EUI64 ::= OCTET STRING (SIZE(8)) + FiveGGUTI ::= SEQUENCE { mCC [1] MCC, @@ -3265,7 +3267,9 @@ PDUSessionType ::= ENUMERATED PEI ::= CHOICE { iMEI [1] IMEI, - iMEISV [2] IMEISV + iMEISV [2] IMEISV, + mACAddress [3] MACAddress, + eUI64 [4] EUI64 } PortNumber ::= INTEGER(0..65535) -- GitLab From 73c83618ccdcb7927857972909e0fb1a3205d67f Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 8 Nov 2021 14:41:48 +0100 Subject: [PATCH 05/13] TS 33.128 CR0275 - RCS Stage 3 Triggering --- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 2a89264..771cb04 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -276,5 +276,23 @@ + + + + + + + + + + + + + + + + + + - \ No newline at end of file + -- GitLab From d282fcecf38919bb7ad195909b5e5d18971969b9 Mon Sep 17 00:00:00 2001 From: hawbaker Date: Mon, 8 Nov 2021 14:52:25 +0100 Subject: [PATCH 06/13] TS 33.128 CR0273 - Separated Location Reporting --- 33128/r17/TS33128Payloads.asn | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 4a6caed..ed06ced 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -167,7 +167,10 @@ 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.X + separatedLocationReporting [2731] SeparatedLocationReporting } -- ============== @@ -324,10 +327,13 @@ 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.X + separatedLocationReporting [2731] SeparatedLocationReporting } IRITargetIdentifier ::= SEQUENCE @@ -3081,6 +3087,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 -- ================= @@ -3473,7 +3495,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 -- GitLab From 3536de436d6f942f0458cbff4da458464d19a533 Mon Sep 17 00:00:00 2001 From: courbon Date: Mon, 8 Nov 2021 15:06:50 +0100 Subject: [PATCH 07/13] Update TS33128Payloads.asn Only the comment on "SIPMessage" is changed into EncapsulatedSIPMessage. --- 33128/r17/TS33128Payloads.asn | 67 +++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index ed06ced..a0ec4d8 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1,5 +1,5 @@ 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)} @@ -169,6 +169,10 @@ XIRIEvent ::= CHOICE n9HRPDUSessionInfo [100] N9HRPDUSessionInfo, s8HRBearerInfo [101] S8HRBearerInfo, + -- 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 } @@ -332,6 +336,10 @@ IRIEvent ::= CHOICE -- tag 100 is reserved because there is no equivalent n9HRPDUSessionInfo in IRIEvent. -- tag 101 is reserved because there is no equivalent S8HRBearerInfo in IRIEvent. + -- 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 } @@ -2782,6 +2790,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 -- =================== -- 5G LALS definitions -- GitLab From 495734fa632bb5b45f2a6e064cae44155dca02a8 Mon Sep 17 00:00:00 2001 From: courbon Date: Mon, 8 Nov 2021 15:11:28 +0100 Subject: [PATCH 08/13] TS 33.128 CR0258 - STIR SHAKEN Stage 3 --- 33128/r17/TS33128Payloads.asn | 110 ++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index a0ec4d8..1b5552b 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -169,6 +169,9 @@ XIRIEvent ::= CHOICE n9HRPDUSessionInfo [100] N9HRPDUSessionInfo, s8HRBearerInfo [101] S8HRBearerInfo, + -- STIR SHAKEN and RCD/eCNAM Events, see clause 7.X.2 + sTIRSHAKENSignatureGeneration [2581] STIRSHAKENSignatureGeneration, + sTIRSHAKENSignatureValidation [2582] STIRSHAKENSignatureValidation, -- IMS events, see clause 7.X.4.2 iMSMessage [2721] IMSMessage, startOfInterceptionForActiveIMSSession [2722] StartOfInterceptionForActiveIMSSession, @@ -335,6 +338,10 @@ IRIEvent ::= CHOICE -- tag 100 is reserved because there is no equivalent n9HRPDUSessionInfo in IRIEvent. -- tag 101 is reserved because there is no equivalent S8HRBearerInfo in IRIEvent. + + -- STIR SHAKEN and RCD/eCNAM Events, see clause 7.X.3 + sTIRSHAKENSignatureGeneration [2581] STIRSHAKENSignatureGeneration, + sTIRSHAKENSignatureValidation [2582] STIRSHAKENSignatureValidation, -- IMS events, see clause 7.X.4.2 iMSMessage [2721] IMSMessage, @@ -2846,6 +2853,109 @@ SessionDirection ::= ENUMERATED HeaderOnlyIndication ::= BOOLEAN +-- ================================= +-- STIR/SHAKEN/RCD/eCNAM definitions +-- ================================= + +-- See clause 7.X.2.1.2 for details of this structure +STIRSHAKENSignatureGeneration ::= SEQUENCE +{ + pASSporTs [1] SEQUENCE OF PASSporT +} + +-- See clause 7.X.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 -- =================== -- GitLab From 8018b08fe629e31b93e9ac7f4397067f9ec226df Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 8 Nov 2021 14:22:49 +0000 Subject: [PATCH 09/13] Rationalising ASN.1 tag numbers --- 33128/r17/TS33128Payloads.asn | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 1b5552b..5efdfd6 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -169,15 +169,15 @@ XIRIEvent ::= CHOICE n9HRPDUSessionInfo [100] N9HRPDUSessionInfo, s8HRBearerInfo [101] S8HRBearerInfo, + -- Separated Location Reporting, see clause 7.3.X + separatedLocationReporting [102] SeparatedLocationReporting, + -- STIR SHAKEN and RCD/eCNAM Events, see clause 7.X.2 - sTIRSHAKENSignatureGeneration [2581] STIRSHAKENSignatureGeneration, - sTIRSHAKENSignatureValidation [2582] STIRSHAKENSignatureValidation, + sTIRSHAKENSignatureGeneration [103] STIRSHAKENSignatureGeneration, + sTIRSHAKENSignatureValidation [104] 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 + iMSMessage [105] IMSMessage, + startOfInterceptionForActiveIMSSession [106] StartOfInterceptionForActiveIMSSession } -- ============== @@ -339,16 +339,17 @@ IRIEvent ::= CHOICE -- 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.X + separatedLocationReporting [102] SeparatedLocationReporting, + -- STIR SHAKEN and RCD/eCNAM Events, see clause 7.X.3 - sTIRSHAKENSignatureGeneration [2581] STIRSHAKENSignatureGeneration, - sTIRSHAKENSignatureValidation [2582] STIRSHAKENSignatureValidation, + sTIRSHAKENSignatureGeneration [103] STIRSHAKENSignatureGeneration, + sTIRSHAKENSignatureValidation [104] STIRSHAKENSignatureValidation, -- IMS events, see clause 7.X.4.2 - iMSMessage [2721] IMSMessage, - startOfInterceptionForActiveIMSSession [2722] StartOfInterceptionForActiveIMSSession, + iMSMessage [105] IMSMessage, + startOfInterceptionForActiveIMSSession [106] StartOfInterceptionForActiveIMSSession - -- Separated Location Reporting, see clause 7.3.X - separatedLocationReporting [2731] SeparatedLocationReporting } IRITargetIdentifier ::= SEQUENCE -- GitLab From f07ed9f5f110297e1b289fa44c9e9fdbaa4ca2f0 Mon Sep 17 00:00:00 2001 From: hawbaker Date: Fri, 15 Oct 2021 14:54:44 +0200 Subject: [PATCH 10/13] This change adds EUI64 to common parameters and expands PEI to allow MACAddress and EUI64 as PEI types. --- 33128/r16/TS33128Payloads.asn | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 5c54007..e907797 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -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) @@ -2943,4 +2947,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -END \ No newline at end of file +END -- GitLab From da00621f6ccedf63668ecc8fa6485bb25bab367c Mon Sep 17 00:00:00 2001 From: canterburym Date: Tue, 9 Nov 2021 08:31:02 +0100 Subject: [PATCH 11/13] Bumping version number in OID for r16 --- 33128/r16/TS33128Payloads.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index e907797..101498c 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -1,5 +1,5 @@ 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)} -- GitLab From db1e1568db751e10835fd84384e5fd7fb0666d2b Mon Sep 17 00:00:00 2001 From: canterburym Date: Tue, 9 Nov 2021 08:56:57 +0100 Subject: [PATCH 12/13] Bumping XSD version number --- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 771cb04..dabc2ac 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,8 +1,8 @@ -- GitLab From 45eed95cedff6b2dd18ea0649bf569a7a9352921 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 14 Dec 2021 10:55:15 +0000 Subject: [PATCH 13/13] Updating references --- 33128/r16/TS33128Payloads.asn | 4 ++-- 33128/r17/TS33128Payloads.asn | 24 +++++++++---------- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 101498c..269b5f4 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -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 @@ -2947,4 +2947,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -END +END \ No newline at end of file diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 5efdfd6..952d651 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -169,13 +169,13 @@ XIRIEvent ::= CHOICE n9HRPDUSessionInfo [100] N9HRPDUSessionInfo, s8HRBearerInfo [101] S8HRBearerInfo, - -- Separated Location Reporting, see clause 7.3.X + -- Separated Location Reporting, see clause 7.3.4 separatedLocationReporting [102] SeparatedLocationReporting, - -- STIR SHAKEN and RCD/eCNAM Events, see clause 7.X.2 + -- STIR SHAKEN and RCD/eCNAM Events, see clause 7.11.2 sTIRSHAKENSignatureGeneration [103] STIRSHAKENSignatureGeneration, sTIRSHAKENSignatureValidation [104] STIRSHAKENSignatureValidation, - -- IMS events, see clause 7.X.4.2 + -- IMS events, see clause 7.11.4.2 iMSMessage [105] IMSMessage, startOfInterceptionForActiveIMSSession [106] StartOfInterceptionForActiveIMSSession } @@ -226,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 @@ -339,14 +339,14 @@ IRIEvent ::= CHOICE -- 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.X + -- Separated Location Reporting, see clause 7.3.4 separatedLocationReporting [102] SeparatedLocationReporting, - -- STIR SHAKEN and RCD/eCNAM Events, see clause 7.X.3 + -- STIR SHAKEN and RCD/eCNAM Events, see clause 7.11.3 sTIRSHAKENSignatureGeneration [103] STIRSHAKENSignatureGeneration, sTIRSHAKENSignatureValidation [104] STIRSHAKENSignatureValidation, - -- IMS events, see clause 7.X.4.2 + -- IMS events, see clause 7.11.4.2 iMSMessage [105] IMSMessage, startOfInterceptionForActiveIMSSession [106] StartOfInterceptionForActiveIMSSession @@ -2802,7 +2802,7 @@ PTCAccessPolicyFailure ::= ENUMERATED -- IMS definitions -- =============== --- See clause 7.X.4.2.1 for details of this structure +-- See clause 7.12.4.2.1 for details of this structure IMSMessage ::= SEQUENCE { payload [1] IMSPayload, @@ -2810,7 +2810,7 @@ IMSMessage ::= SEQUENCE voIPRoamingIndication [3] VoIPRoamingIndication OPTIONAL, location [6] Location OPTIONAL } --- See clause 7.X.4.2.3 for details of this structure +-- See clause 7.12.4.2.3 for details of this structure StartOfInterceptionForActiveIMSSession ::= SEQUENCE { originatingId [1] SEQUENCE OF IMPU, @@ -2858,13 +2858,13 @@ HeaderOnlyIndication ::= BOOLEAN -- STIR/SHAKEN/RCD/eCNAM definitions -- ================================= --- See clause 7.X.2.1.2 for details of this structure +-- See clause 7.11.2.1.2 for details of this structure STIRSHAKENSignatureGeneration ::= SEQUENCE { pASSporTs [1] SEQUENCE OF PASSporT } --- See clause 7.X.2.1.3 for details of this structure +-- See clause 7.11.2.1.3 for details of this structure STIRSHAKENSignatureValidation ::= SEQUENCE { pASSporTs [1] SEQUENCE OF PASSporT OPTIONAL, @@ -4262,4 +4262,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -END +END \ No newline at end of file diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index dabc2ac..f3e6b85 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -295,4 +295,4 @@ - + \ No newline at end of file -- GitLab