diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 357171a38e52da6368d32bbf005a9de93937cf7e..39fb907c29a7c010ada9caf29b60dea66fd5e7e6 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) version16(16)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version17(17)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version16(16)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version17(17)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -58,7 +58,7 @@ XIRIEvent ::= CHOICE -- tag 16 is reserved because there is no equivalent mDFCellSiteReport in XIRIEvent - -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([65-66] below) + -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([165-166] below) mMSSend [17] MMSSend, mMSSendByNonLocalTarget [18] MMSSendByNonLocalTarget, mMSNotification [19] MMSNotification, @@ -117,12 +117,18 @@ XIRIEvent ::= CHOICE aMFIdentifierAssocation [62] AMFIdentifierAssocation, mMEIdentifierAssocation [63] MMEIdentifierAssocation, - -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 + -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, - -- MMS-related events continued from choice 35 - mMSConvertedFromEmail [65] MMSConvertedFromEmail, - mMSConvertedToEmail [66] MMSConvertedToEmail + -- Tags 65 to 164 are not used in this version of the specification + + -- In V16.18.0 (threeGPP(4) ts33128(19) r16(16) version16(16)), + -- tag 65 was mMSConvertedFromEmail (now tag 165) and + -- tag 66 was mMSConvertedToEmail (now tag 166). + -- These fields were renumbered in V16.19.0 (threeGPP(4) ts33128(19) r16(16) version17(17)) + -- to avoid conflict and permit interoperability with newer releases. + mMSConvertedFromEmail [165] MMSConvertedFromEmail, + mMSConvertedToEmail [166] MMSConvertedToEmail } -- ============== @@ -175,7 +181,7 @@ IRIEvent ::= CHOICE -- MDF-related events, see clause 7.3.2 mDFCellSiteReport [16] MDFCellSiteReport, - -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([65-66] below) + -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([165-166] below) mMSSend [17] MMSSend, mMSSendByNonLocalTarget [18] MMSSendByNonLocalTarget, mMSNotification [19] MMSNotification, @@ -237,9 +243,15 @@ IRIEvent ::= CHOICE -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, - -- MMS-related events continued from choice 35 - mMSConvertedFromEmail [65] MMSConvertedFromEmail, - mMSConvertedToEmail [66] MMSConvertedToEmail + -- Tags 65-164 are not used in this version of the specification + + -- In V16.18.0 (threeGPP(4) ts33128(19) r16(16) version16(16)), + -- tag 65 was mMSConvertedFromEmail (now tag 165) and + -- tag 66 was mMSConvertedToEmail (now tag 166). + -- These fields were renumbered in V16.19.0 (threeGPP(4) ts33128(19) r16(16) version17(17)) + -- to avoid conflict and permit interoperability with newer releases. + mMSConvertedFromEmail [165] MMSConvertedFromEmail, + mMSConvertedToEmail [166] MMSConvertedToEmail } IRITargetIdentifier ::= SEQUENCE diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 80b1ffa96b9a727ec56e02592b260da8bc74784e..d26a00e80144270853814aa747c964abbd6def69 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) version13(13)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version14(14)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version13(13)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version14(14)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -58,7 +58,7 @@ XIRIEvent ::= CHOICE -- tag 16 is reserved because there is no equivalent mDFCellSiteReport in XIRIEvent - -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([133-134] below) + -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([165-166] below) mMSSend [17] MMSSend, mMSSendByNonLocalTarget [18] MMSSendByNonLocalTarget, mMSNotification [19] MMSNotification, @@ -197,9 +197,22 @@ XIRIEvent ::= CHOICE -- AMF events, see 6.2.2.2.9, continued from tag 111 aMFUEConfigurationUpdate [132] AMFUEConfigurationUpdate, - -- MMS-related events continued from choice 35 - mMSConvertedFromEmail [133] MMSConvertedFromEmail, - mMSConvertedToEmail [134] MMSConvertedToEmail + -- Tags 133 to 164 are not used in this version of the specification + + -- In V17.15.0 (threeGPP(4) ts33128(19) r17(17) version12(12)) and + -- in V17.16.0 (threeGPP(4) ts33128(19) r17(17) version13(13)), + -- tag 134 was mMSConvertedFromEmail (now tag 165) and + -- tag 135 was mMSConvertedToEmail (now tag 166). + -- These fields were renumbered in V17.17.0 (threeGPP(4) ts33128(19) r17(17) version14(14)) + -- to avoid conflict and permit interoperability with newer releases. + mMSConvertedFromEmail [165] MMSConvertedFromEmail, + mMSConvertedToEmail [166] MMSConvertedToEmail, + + -- Tags 167 to 185 are not used in this version of the specification + + -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 + aMFIdentifierDeassociation [186] AMFIdentifierDeassociation, + mMEIdentifierDeassociation [187] MMEIdentifierDeassociation } -- ============== @@ -252,7 +265,7 @@ IRIEvent ::= CHOICE -- MDF-related events, see clause 7.3.2 mDFCellSiteReport [16] MDFCellSiteReport, - -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([133-134] below) + -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([165-166] below) mMSSend [17] MMSSend, mMSSendByNonLocalTarget [18] MMSSendByNonLocalTarget, mMSNotification [19] MMSNotification, @@ -390,9 +403,23 @@ IRIEvent ::= CHOICE -- AMF events, see 6.2.2.3, continued from tag 111 aMFUEConfigurationUpdate [132] AMFUEConfigurationUpdate, - -- MMS-related events continued from choice 35 - mMSConvertedFromEmail [133] MMSConvertedFromEmail, - mMSConvertedToEmail [134] MMSConvertedToEmail + -- Tags 133 to 164 are not used in this version of the specification + + -- In V17.15.0 (threeGPP(4) ts33128(19) r17(17) version12(12)) and + -- in V17.16.0 (threeGPP(4) ts33128(19) r17(17) version13(13)), + -- tag 134 was mMSConvertedFromEmail (now tag 165) and + -- tag 135 was mMSConvertedToEmail (now tag 166). + -- These fields were renumbered in V17.17.0 (threeGPP(4) ts33128(19) r17(17) version14(14)) + -- to avoid conflict and permit interoperability with newer releases. + mMSConvertedFromEmail [165] MMSConvertedFromEmail, + mMSConvertedToEmail [166] MMSConvertedToEmail, + + -- Tags 167 to 185 are not used in this version of the specification + + -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 + aMFIdentifierDeassociation [186] AMFIdentifierDeassociation, + mMEIdentifierDeassociation [187] MMEIdentifierDeassociation + } IRITargetIdentifier ::= SEQUENCE @@ -3877,6 +3904,17 @@ AMFIdentifierAssociation ::= SEQUENCE additionalUserIdentifiers [8] UserIdentifiers OPTIONAL } +AMFIdentifierDeassociation ::= SEQUENCE +{ + sUPI [1] SUPI, + sUCI [2] SUCI OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + gUTI [5] FiveGGUTI, + location [6] Location OPTIONAL, + additionalUserIdentifiers [7] UserIdentifiers OPTIONAL +} + MMEIdentifierAssociation ::= SEQUENCE { iMSI [1] IMSI, @@ -3887,6 +3925,15 @@ MMEIdentifierAssociation ::= SEQUENCE tAIList [6] TAIList OPTIONAL } +MMEIdentifierDeassociation ::= SEQUENCE +{ + iMSI [1] IMSI, + iMEI [2] IMEI OPTIONAL, + mSISDN [3] MSISDN OPTIONAL, + gUTI [4] GUTI, + location [5] Location OPTIONAL +} + -- ================================= -- Identifier Association parameters -- ================================= @@ -4416,7 +4463,19 @@ RATType ::= ENUMERATED nRMEO(17), nRGEO(18), nROTHERSAT(19), - nRREDCAP(20) + nRREDCAP(20), + wBEUTRANLEO(21), + wBEUTRANMEO(22), + wBEUTRANGEO(23), + wBEUTRANOTHERSAT(24), + nBIOTLEO(25), + nBIOTMEO(26), + nBIOTGEO(27), + nBIOTOTHERSAT(28), + lTEMLEO(29), + lTEMMEO(30), + lTEMGEO(31), + lTEMOTHERSAT(32) } RejectedNSSAI ::= SEQUENCE OF RejectedSNSSAI diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 60f6ecaccad4b7bf179bf54ba423b6f4a7fa84ca..9f4f08fa99ea138ab1b3928ed7aea35d8a15eef3 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1,5 +1,5 @@ TS33128Payloads -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version11(11)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version12(12)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -18,7 +18,7 @@ IMPORTS -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version11(11)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version12(12)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -299,7 +299,13 @@ XIRIEvent ::= CHOICE ePSPDNUnsuccessfulProcedure [180] EPSPDNUnsuccessfulProcedure, -- IMS events, see clause 7.12.4.2, continued from tag 164 - startOfInterceptionWithEstablishedIMSDataChannel [181] StartOfInterceptionWithEstablishedIMSDataChannel + startOfInterceptionWithEstablishedIMSDataChannel [181] StartOfInterceptionWithEstablishedIMSDataChannel, + + -- Tags 182 to 185 are not used in this version of the specification + + -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 + aMFIdentifierDeassociation [186] AMFIdentifierDeassociation, + mMEIdentifierDeassociation [187] MMEIdentifierDeassociation } -- ============== @@ -582,7 +588,13 @@ IRIEvent ::= CHOICE ePSPDNUnsuccessfulProcedure [180] EPSPDNUnsuccessfulProcedure, -- IMS events, see clause 7.12.4.2, continued from tag 164 - startOfInterceptionWithEstablishedIMSDataChannel [181] StartOfInterceptionWithEstablishedIMSDataChannel + startOfInterceptionWithEstablishedIMSDataChannel [181] StartOfInterceptionWithEstablishedIMSDataChannel, + + -- Tags 182 to 185 are not used in this version of the specification + + -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 + aMFIdentifierDeassociation [186] AMFIdentifierDeassociation, + mMEIdentifierDeassociation [187] MMEIdentifierDeassociation } IRITargetIdentifier ::= SEQUENCE @@ -1288,7 +1300,9 @@ UAStarParams ::= CHOICE { tls12 [1] TLS12UAStarParams, generic [2] GenericUAStarParams, - tls13 [3] TLS13UAStarParams + tls13 [3] TLS13UAStarParams, + dtls12 [4] DTLS12UAStarParams, + dtls13 [5] DTLS13UAStarParams } GenericUAStarParams ::= SEQUENCE @@ -1344,6 +1358,22 @@ TLS12UAStarParams ::= SEQUENCE tLSClientExtensions [19] OCTET STRING (SIZE(0..65535)) OPTIONAL } +-- ================================================== +-- Specific UaStarParams for DTLS 1.2 (RFC6347) +-- Inline references below are to clauses of RFC6347. +-- ================================================== + +DTLS12UAStarParams ::= SEQUENCE +{ + tLS12CommonParams [1] TLS12UAStarParams, + -- RFC 6347 [142] clause 4.1 + clientEpoch [2] INTEGER, + -- RFC 6347 [142] clause 4.1 + serverEpoch [3] INTEGER, + -- RFC 9146 [143] + connectionID [4] OCTET STRING (SIZE(0..255)) OPTIONAL +} + -- ================================================== -- Specific UaStarParams for TLS 1.3 (RFC8446) -- Inline references below are to clauses of RFC8446. @@ -1600,6 +1630,27 @@ TLS13UAStarParams ::= SEQUENCE tLSResumptionTickets [31] SEQUENCE OF TLS13NewSessionTicket OPTIONAL } +-- ===================================================== +-- Specific UaStarParams for DTLS 1.3 (RFC9147) +-- Inline references below are to clauses of RFC9147. +-- The client/server SnKey can alternatively be +-- derived from information carried in tLS13CommonParams +-- ===================================================== + +DTLS13UAStarParams ::= SEQUENCE +{ + tLS13CommonParams [1] TLS13UAStarParams, + -- RFC9147 [144] clause 4.2 + clientEpoch [2] INTEGER, + -- RFC9147 [144] clause 4.2 + serverEpoch [3] INTEGER, + -- RFC9147 [144] clause 4.2.3 + clientSnKey [4] OCTET STRING (SIZE(1..65535)) OPTIONAL, + -- RFC9147 [144] clause 4.2.3 + serverSnKey [5] OCTET STRING (SIZE(1..65535)) OPTIONAL, + -- RFC9146 [143] + connectionID [6] OCTET STRING (SIZE(0..255)) OPTIONAL +} KAF ::= OCTET STRING @@ -5740,6 +5791,17 @@ AMFIdentifierAssociation ::= SEQUENCE additionalUserIdentifiers [8] UserIdentifiers OPTIONAL } +AMFIdentifierDeassociation ::= SEQUENCE +{ + sUPI [1] SUPI, + sUCI [2] SUCI OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + gUTI [5] FiveGGUTI, + location [6] Location OPTIONAL, + additionalUserIdentifiers [7] UserIdentifiers OPTIONAL +} + MMEIdentifierAssociation ::= SEQUENCE { iMSI [1] IMSI, @@ -5749,6 +5811,14 @@ MMEIdentifierAssociation ::= SEQUENCE location [5] Location, tAIList [6] TAIList OPTIONAL } +MMEIdentifierDeassociation ::= SEQUENCE +{ + iMSI [1] IMSI, + iMEI [2] IMEI OPTIONAL, + mSISDN [3] MSISDN OPTIONAL, + gUTI [4] GUTI, + location [5] Location OPTIONAL +} -- ================================= -- Identifier Association parameters @@ -6741,7 +6811,20 @@ RATType ::= ENUMERATED nRMEO(17), nRGEO(18), nROTHERSAT(19), - nRREDCAP(20) + nRREDCAP(20), + wBEUTRANLEO(21), + wBEUTRANMEO(22), + wBEUTRANGEO(23), + wBEUTRANOTHERSAT(24), + nBIOTLEO(25), + nBIOTMEO(26), + nBIOTGEO(27), + nBIOTOTHERSAT(28), + lTEMLEO(29), + lTEMMEO(30), + lTEMGEO(31), + lTEMOTHERSAT(32), + nREREDCAP(33) } RejectedNSSAI ::= SEQUENCE OF RejectedSNSSAI diff --git a/33128/r19/TS33128Payloads.asn b/33128/r19/TS33128Payloads.asn index 4db26cbae84caa6df802734699116d08e8316464..c3b96c04eba5c3c080f1f40bf6144ec1706343ec 100644 --- a/33128/r19/TS33128Payloads.asn +++ b/33128/r19/TS33128Payloads.asn @@ -1,5 +1,5 @@ TS33128Payloads -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r19(19) version2(2)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r19(19) version3(3)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -18,7 +18,7 @@ IMPORTS -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r19(19) version2(2)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r19(19) version3(3)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -322,8 +322,18 @@ XIRIEvent ::= CHOICE -- 5G ProSe Direct Communication events, see clause 7.17.2 fiveGDDNMFProSeUNIDirectDiscovery [184] FiveGDDNMFProSeUNIDirectDiscovery, - fiveGDDNMFProSeNNIDirectDiscovery [185] FiveGDDNMFProSeNNIDirectDiscovery + fiveGDDNMFProSeNNIDirectDiscovery [185] FiveGDDNMFProSeNNIDirectDiscovery, + -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 + aMFIdentifierDeassociation [186] AMFIdentifierDeassociation, + mMEIdentifierDeassociation [187] MMEIdentifierDeassociation, + + -- 5G Personal IoT events, see clause 7.18.2 + fiveGPINAPPMessage [188] FiveGPINAPPMessage, + fiveGStartOfInterceptionWithPINClientInPIN [189] FiveGStartOfInterceptionWithPINClientInPIN, + + -- Charging data event records, see clause 7.19 + chargingDataEvent [190] ChargingDataEvent } -- ============== @@ -629,7 +639,18 @@ IRIEvent ::= CHOICE -- 5G ProSe Direct Communication events, see clause 7.17.3 fiveGDDNMFProSeUNIDirectDiscovery [184] FiveGDDNMFProSeUNIDirectDiscovery, - fiveGDDNMFProSeNNIDirectDiscovery [185] FiveGDDNMFProSeNNIDirectDiscovery + fiveGDDNMFProSeNNIDirectDiscovery [185] FiveGDDNMFProSeNNIDirectDiscovery, + + -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 + aMFIdentifierDeassociation [186] AMFIdentifierDeassociation, + mMEIdentifierDeassociation [187] MMEIdentifierDeassociation, + + -- 5G Personal IoT events, see clause 7.18.3 + fiveGPINAPPMessage [188] FiveGPINAPPMessage, + fiveGStartOfInterceptionWithPINClientInPIN [189] FiveGStartOfInterceptionWithPINClientInPIN, + + -- Charging data event records, see clause 7.19 + chargingDataEvent [190] ChargingDataEvent } IRITargetIdentifier ::= SEQUENCE @@ -1362,7 +1383,9 @@ UAStarParams ::= CHOICE { tls12 [1] TLS12UAStarParams, generic [2] GenericUAStarParams, - tls13 [3] TLS13UAStarParams + tls13 [3] TLS13UAStarParams, + dtls12 [4] DTLS12UAStarParams, + dtls13 [5] DTLS13UAStarParams } GenericUAStarParams ::= SEQUENCE @@ -1418,6 +1441,22 @@ TLS12UAStarParams ::= SEQUENCE tLSClientExtensions [19] OCTET STRING (SIZE(0..65535)) OPTIONAL } +-- ================================================== +-- Specific UaStarParams for DTLS 1.2 (RFC6347) +-- Inline references below are to clauses of RFC6347. +-- ================================================== + +DTLS12UAStarParams ::= SEQUENCE +{ + tLS12CommonParams [1] TLS12UAStarParams, + -- RFC 6347 [144] clause 4.1 + clientEpoch [2] INTEGER, + -- RFC 6347 [144] clause 4.1 + serverEpoch [3] INTEGER, + -- RFC 9146 [145] + connectionID [4] OCTET STRING (SIZE(0..255)) OPTIONAL +} + -- ================================================== -- Specific UaStarParams for TLS 1.3 (RFC8446) -- Inline references below are to clauses of RFC8446. @@ -1674,7 +1713,27 @@ TLS13UAStarParams ::= SEQUENCE tLSResumptionTickets [31] SEQUENCE OF TLS13NewSessionTicket OPTIONAL } +-- ===================================================== +-- Specific UaStarParams for DTLS 1.3 (RFC9147) +-- Inline references below are to clauses of RFC9147. +-- The client/server SnKey can alternatively be +-- derived from information carried in tLS13CommonParams +-- ===================================================== +DTLS13UAStarParams ::= SEQUENCE +{ + tLS13CommonParams [1] TLS13UAStarParams, + -- RFC9147 [146] clause 4.2 + clientEpoch [2] INTEGER, + -- RFC9147 [146] clause 4.2 + serverEpoch [3] INTEGER, + -- RFC9147 [146] clause 4.2.3 + clientSnKey [4] OCTET STRING (SIZE(1..65535)) OPTIONAL, + -- RFC9147 [146] clause 4.2.3 + serverSnKey [5] OCTET STRING (SIZE(1..65535)) OPTIONAL, + -- RFC9146 [145] + connectionID [6] OCTET STRING (SIZE(0..255)) OPTIONAL +} KAF ::= OCTET STRING @@ -5956,6 +6015,64 @@ FiveGProSeMessage ::= CHOICE fiveGProSeUsageInformationReportMessage [2] XMLType } +-- ========================= +-- 5G PIN Server definitions +-- ========================= + +-- See clause 7.18.2.2 for details of this structure +FiveGPINAPPMessage ::= SEQUENCE +{ + pINEIdentities [1] PINEIdentities, + mACAddress [2] MACAddress OPTIONAL, + pINID [3] PINID OPTIONAL, + pINServerID [4] PINServerID, + pINAPPMessage [5] XMLType +} + +-- See clause 7.18.2.3 for details of this structure +FiveGStartOfInterceptionWithPINClientInPIN ::= CHOICE +{ + pINClientInPINS [1] PINClientInPINS, + pINClientsInPIN [2] PINClientsInPIN +} + +PINClientInPINS ::= SEQUENCE +{ + pINEIdentities [1] PINEIdentities, + mACAddress [2] MACAddress OPTIONAL, + pINServerID [3] PINServerID, + pINClientProfile [4] XMLType, + pINProfiles [5] SEQUENCE OF PINProfile +} + +PINClientsInPIN ::= SEQUENCE +{ + pINID [1] PINID, + pINServerID [2] PINServerID, + pINClientProfiles [3] SEQUENCE OF PINClientProfile, + pINProfile [4] XMLType +} + +-- ======================== +-- 5G PIN Server parameters +-- ======================== + +PINEIdentities ::= SEQUENCE (SIZE(1..MAX)) OF PINEIdentity + +PINEIdentity ::= CHOICE +{ + pINClientID [1] PINClientID, + gPSI [2] GPSI, + identityToken [3] IdentityToken +} + +PINClientID ::= UTF8String +IdentityToken ::= UTF8String +PINID ::= UTF8String +PINServerID ::= UTF8String +PINClientProfile ::=XMLType +PINProfile ::= XMLType + -- =================== -- 5G LALS definitions -- =================== @@ -6036,6 +6153,17 @@ AMFIdentifierAssociation ::= SEQUENCE additionalUserIdentifiers [8] UserIdentifiers OPTIONAL } +AMFIdentifierDeassociation ::= SEQUENCE +{ + sUPI [1] SUPI, + sUCI [2] SUCI OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + gUTI [5] FiveGGUTI, + location [6] Location OPTIONAL, + additionalUserIdentifiers [7] UserIdentifiers OPTIONAL +} + MMEIdentifierAssociation ::= SEQUENCE { iMSI [1] IMSI, @@ -6046,6 +6174,15 @@ MMEIdentifierAssociation ::= SEQUENCE tAIList [6] TAIList OPTIONAL } +MMEIdentifierDeassociation ::= SEQUENCE +{ + iMSI [1] IMSI, + iMEI [2] IMEI OPTIONAL, + mSISDN [3] MSISDN OPTIONAL, + gUTI [4] GUTI, + location [5] Location OPTIONAL +} + -- ================================= -- Identifier Association parameters -- ================================= @@ -6604,6 +6741,127 @@ RoamingStatusUpdateInfo ::= SEQUENCE iMSI [1] IMSI OPTIONAL, pLMNID [2] PLMNID OPTIONAL } + +-- ========================= +-- Charging Data Definitions +-- ========================= + +ChargingDataEvent ::= SEQUENCE +{ + location [1] Location OPTIONAL, + chargingDataInformation [2] ChargingDataInformation +} + +-- ======================== +-- Charging Data Parameters +-- ======================== + +ChargingDataInformation ::= CHOICE +{ + nchfChargingDataRequest [1] NchfChargingDataRequest, + rfChargingDataRequest [2] RfChargingDataRequest, + translatedChargingDataInfo [3] TranslatedChargingDataInfo +} + +NchfChargingDataRequest ::= SEQUENCE +{ + sBIchargingData [1] SBIChargingData, + nchfChargingEvent [2] NchfChargingEvent OPTIONAL, + roamerInOut [3] RoamerInOut +} + +SBIChargingData ::= CHOICE +{ + fullSBIChargingData [1] EncapsulatedSBIChargingData +} + +EncapsulatedSBIChargingData ::= CHOICE +{ + encapsulatedSBIConvergedChargingData [1] SBIType, + encapsulatedSBIOfflineChargingData [2] SBIType +} + +NchfChargingEvent ::= ENUMERATED +{ + pDUSessionChargingInformation(1), + sMSChargingInformation(2), + nEFChargingInformation(3), + registrationChargingInformation(4), + n2ConnectionChargingInformation(5), + locationReportingChargingInformation(6), + nSPAChargingInformation(7), + nSMChargingInformation(8), + mMTelChargingInformation(9), + iMSChargingInformation(10), + edgeInfrastructureUsageChargingInformation(11), + eASDeploymentChargingInformation(12), + directEdgeEnablingServiceChargingInformation(13), + exposedEdgeEnablingServiceChargingInformation(14), + proSeChargingInformation(15), + mMSChargingInformation(16), + mBSSessionChargingInformation(17), + tSNChargingInformation(18), + nSACFChargingInformation(19), + nSSAAChargingInformation(20), + rangingSLChargingInformation(21) +} + +RoamerInOut ::= ENUMERATED +{ + in-bound(1), + out-bound(2) +} + +RfChargingDataRequest ::= SEQUENCE +{ + rfChargingData [1] DiameterChargingData, + rfChargingEvent [2] RfChargingEvent OPTIONAL +} + +DiameterChargingData ::= CHOICE +{ + fullDiameterChargingData [1] EncapsulatedRfChargingData +} + +EncapsulatedRfChargingData ::= OCTET STRING + +RfChargingEvent ::= ENUMERATED +{ + aoC-Information(1), + pS-Information(2), + iMS-Information(3), + mMS-Information(4), + lCS-Information(5), + poC-Information(6), + mBMS-Inform(7), + sMS-Information(8), + vCS-Information(9), + mMTel-Information(10), + proSe-Information(11), + service-Generic-Information(12), + iM-Information(13), + dCD-Information(14), + m2M-Information(15), + cPDT-Information(16) +} + +TranslatedChargingDataInfo ::= SEQUENCE + +{ + translatedChargingData [1] TranslatedChargingData +} + +TranslatedChargingData ::= SEQUENCE +{ + releaseID [1] INTEGER (0..7), + versonID [2] INTEGER (0..31), + specificationNumber [3] INTEGER (0..31), + releaseIDExtension [4] INTEGER (0..255) OPTIONAL, + recordData [5] ExternalChargingASN +} + +ExternalChargingASN ::= ExternalASNType + -- ================= -- Common Parameters -- ================= @@ -7128,7 +7386,20 @@ RATType ::= ENUMERATED nRMEO(17), nRGEO(18), nROTHERSAT(19), - nRREDCAP(20) + nRREDCAP(20), + wBEUTRANLEO(21), + wBEUTRANMEO(22), + wBEUTRANGEO(23), + wBEUTRANOTHERSAT(24), + nBIOTLEO(25), + nBIOTMEO(26), + nBIOTGEO(27), + nBIOTOTHERSAT(28), + lTEMLEO(29), + lTEMMEO(30), + lTEMGEO(31), + lTEMOTHERSAT(32), + nREREDCAP(33) } RejectedNSSAI ::= SEQUENCE OF RejectedSNSSAI @@ -7302,7 +7573,8 @@ Location ::= SEQUENCE locationPresenceReport [3] LocationPresenceReport OPTIONAL, fourGPositioningInfo [4] FourGPositioningInfo OPTIONAL, fourGLocationInfo [5] FourGLocationInfo OPTIONAL, - iMSLocation [6] IMSLocation OPTIONAL + iMSLocation [6] IMSLocation OPTIONAL, + coarseLocation [7] CoarseLocation OPTIONAL } CellSiteInformation ::= SEQUENCE @@ -8231,6 +8503,14 @@ IABMTUserLocation ::= SEQUENCE tAI [2] TAI OPTIONAL } +CoarseLocation ::= CHOICE +{ + tS36413CoarseUELocation [1] TS36413CoarseUELocation +} + +-- TS 36.413 [38], clause 9.2.1.167 +TS36413CoarseUELocation ::= OCTET STRING + -- ================================================== -- Structures to allow reuse of encapsulated payloads -- ================================================== diff --git a/33128/r19/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r19/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 0e6d8b8af9fd092c6d25bba02d00e90aa27af7bb..c87422949f6196df3e900a76aee8b7921360e990 100644 --- a/33128/r19/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r19/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,5 +1,5 @@ - + @@ -85,6 +85,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -97,6 +118,7 @@ + @@ -402,4 +424,17 @@ + + + + + + + + + + + + + diff --git a/testing/asn_lint_exceptions.json b/testing/asn_lint_exceptions.json index eb6d7919d1d4071c9fa516767bf8afc243abdd19..1ca9aeffc6c427ad8a4a896e7d3769ac698d02f7 100644 --- a/testing/asn_lint_exceptions.json +++ b/testing/asn_lint_exceptions.json @@ -18,7 +18,9 @@ "Enumerations for MMSReplyCharging start at 0, not 1", "Enumerations for MMStatusExtension start at 0, not 1", "Tag 2 missing in LALSReport", - "Tag 6 missing in LALSReport" + "Tag 6 missing in LALSReport", + "Tags 65-164 missing in XIRIEvent", + "Tags 65-164 missing in IRIEvent" ], "33128/r17/TS33128Payloads.asn" : [ "Tag 100 XIRIEvent field 'n9HRPDUSessionInfo' is not present in IRIEvent", @@ -43,7 +45,11 @@ "Tag 2 missing in LALSReport", "Tag 6 missing in LALSReport", "Tag 8 missing in MMEStartOfInterceptionWithEPSAttachedUE", - "Tag 11 missing in MMEStartOfInterceptionWithEPSAttachedUE" + "Tag 11 missing in MMEStartOfInterceptionWithEPSAttachedUE", + "Tags 133-164 missing in XIRIEvent", + "Tags 167-185 missing in XIRIEvent", + "Tags 133-164 missing in IRIEvent", + "Tags 167-185 missing in IRIEvent" ], "33128/r18/TS33128Payloads.asn" : [ "Tag 100 XIRIEvent field 'n9HRPDUSessionInfo' is not present in IRIEvent", @@ -67,7 +73,9 @@ "Tag 161 XIRIEvent field 'iPIRIPacketReport' is not present in IRIEvent", "Tag 161 missing in IRIEvent", "Tags 167-175 missing in XIRIEvent", - "Tags 167-175 missing in IRIEvent" + "Tags 167-175 missing in IRIEvent", + "Tags 182-185 missing in XIRIEvent", + "Tags 182-185 missing in IRIEvent" ], "33128/r19/TS33128Payloads.asn" : [ "Tag 100 XIRIEvent field 'n9HRPDUSessionInfo' is not present in IRIEvent",