From 8965152a9f5308361dd661ef189f25aba22d046b Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 6 May 2022 08:48:34 +0100 Subject: [PATCH] Moving R17 changes across to R18 --- 33128/r17/TS33128Payloads.asn | 2 +- 33128/r18/TS33128Payloads.asn | 319 ++++++++++++++++++++++++++++++++-- 2 files changed, 301 insertions(+), 20 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index ff2e7b0d..871a97e6 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -3928,7 +3928,7 @@ PEI ::= CHOICE eUI64 [4] EUI64 } -PortNumber ::= INTEGER(0..65535) +PortNumber ::= INTEGER (0..65535) PrimaryAuthenticationType ::= ENUMERATED { diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 2c82e89f..fe6bbf18 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -49,7 +49,7 @@ XIRIEvent ::= CHOICE -- SMS-related events, see clause 6.2.5, see also sMSReport ([56] below) sMSMessage [12] SMSMessage, - -- LALS-related events, see clause 7.3.3 + -- LALS-related events, see clause 7.3.1 lALSReport [13] LALSReport, -- PDHR/PDSR-related events, see clause 6.2.3.4.1 @@ -176,7 +176,7 @@ XIRIEvent ::= CHOICE sTIRSHAKENSignatureGeneration [103] STIRSHAKENSignatureGeneration, sTIRSHAKENSignatureValidation [104] STIRSHAKENSignatureValidation, - -- IMS events, see clause 7.11.4.2 + -- IMS events, see clause 7.12.4.2 iMSMessage [105] IMSMessage, startOfInterceptionForActiveIMSSession [106] StartOfInterceptionForActiveIMSSession, iMSCCUnavailable [107] IMSCCUnavailable, @@ -236,7 +236,7 @@ IRIEvent ::= CHOICE -- SMS-related events, see clause 6.2.5, see also sMSReport ([56] below) sMSMessage [12] SMSMessage, - -- LALS-related events, see clause 7.3.3 + -- LALS-related events, see clause 7.3.1 lALSReport [13] LALSReport, -- PDHR/PDSR-related events, see clause 6.2.3.4.1 @@ -404,7 +404,8 @@ CCPDU ::= CHOICE extendedUPFCCPDU [2] ExtendedUPFCCPDU, mMSCCPDU [3] MMSCCPDU, nIDDCCPDU [4] NIDDCCPDU, - pTCCCPDU [5] PTCCCPDU + pTCCCPDU [5] PTCCCPDU, + iMSCCPDU [6] IMSCCPDU } -- =========================== @@ -1341,7 +1342,13 @@ SMFPDUSessionEstablishment ::= SEQUENCE rATType [17] RATType OPTIONAL, sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL, uEEPSPDNConnection [19] UEEPSPDNConnection OPTIONAL, - ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL + ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL, + selectedDNN [21] DNN OPTIONAL, + servingNetwork [22] SMFServingNetwork OPTIONAL, + oldPDUSessionID [23] PDUSessionID OPTIONAL, + handoverState [24] HandoverState OPTIONAL, + gTPTunnelInfo [25] GTPTunnelInfo OPTIONAL, + pCCRules [26] PCCRuleSet OPTIONAL } -- See clause 6.2.3.2.3 for details of this structure @@ -1358,7 +1365,12 @@ SMFPDUSessionModification ::= SEQUENCE accessType [9] AccessType OPTIONAL, rATType [10] RATType OPTIONAL, pDUSessionID [11] PDUSessionID OPTIONAL, - ePS5GSComboInfo [12] EPS5GSComboInfo OPTIONAL + ePS5GSComboInfo [12] EPS5GSComboInfo OPTIONAL, + uEEndpoint [13] UEEndpointAddress OPTIONAL, + servingNetwork [14] SMFServingNetwork OPTIONAL, + handoverState [15] HandoverState OPTIONAL, + gTPTunnelInfo [16] GTPTunnelInfo OPTIONAL, + pCCRules [17] PCCRuleSet OPTIONAL } -- See clause 6.2.3.2.4 for details of this structure @@ -1374,7 +1386,10 @@ SMFPDUSessionRelease ::= SEQUENCE downlinkVolume [8] INTEGER OPTIONAL, location [9] Location OPTIONAL, cause [10] SMFErrorCodes OPTIONAL, - ePS5GSComboInfo [11] EPS5GSComboInfo OPTIONAL + ePS5GSComboInfo [11] EPS5GSComboInfo OPTIONAL, + nGAPCause [12] NGAPCauseInt OPTIONAL, + fiveGMMCause [13] FiveGMMCause OPTIONAL, + pCCRuleIDs [14] PCCRuleIDSet OPTIONAL } -- See clause 6.2.3.2.5 for details of this structure @@ -1399,7 +1414,11 @@ SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE rATType [17] RATType OPTIONAL, sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL, timeOfSessionEstablishment [19] Timestamp OPTIONAL, - ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL + ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL, + uEEPSPDNConnection [21] UEEPSPDNConnection OPTIONAL, + servingNetwork [22] SMFServingNetwork OPTIONAL, + gTPTunnelInfo [23] GTPTunnelInfo OPTIONAL, + pCCRules [24] PCCRuleSet OPTIONAL } -- See clause 6.2.3.2.6 for details of this structure @@ -1441,7 +1460,11 @@ SMFPDUtoMAPDUSessionModification ::= SEQUENCE rATType [10] RATType OPTIONAL, pDUSessionID [11] PDUSessionID, requestIndication [12] RequestIndication, - aTSSSContainer [13] ATSSSContainer + aTSSSContainer [13] ATSSSContainer, + uEEndpoint [14] UEEndpointAddress OPTIONAL, + servingNetwork [15] SMFServingNetwork OPTIONAL, + handoverState [16] HandoverState OPTIONAL, + gTPTunnelInfo [17] GTPTunnelInfo OPTIONAL } -- See clause 6.2.3.2.7.1 for details of this structure @@ -1467,7 +1490,12 @@ SMFMAPDUSessionEstablishment ::= SEQUENCE mAUpgradeIndication [18] SMFMAUpgradeIndication OPTIONAL, ePSPDNCnxInfo [19] SMFEPSPDNCnxInfo OPTIONAL, mAAcceptedIndication [20] SMFMAAcceptedIndication, - aTSSSContainer [21] ATSSSContainer OPTIONAL + aTSSSContainer [21] ATSSSContainer OPTIONAL, + uEEPSPDNConnection [22] UEEPSPDNConnection OPTIONAL, + ePS5GSComboInfo [23] EPS5GSComboInfo OPTIONAL, + selectedDNN [24] DNN OPTIONAL, + handoverState [25] HandoverState OPTIONAL, + pCCRules [26] PCCRuleSet OPTIONAL } -- See clause 6.2.3.2.7.2 for details of this structure @@ -1487,8 +1515,11 @@ SMFMAPDUSessionModification ::= SEQUENCE mAUpgradeIndication [12] SMFMAUpgradeIndication OPTIONAL, ePSPDNCnxInfo [13] SMFEPSPDNCnxInfo OPTIONAL, mAAcceptedIndication [14] SMFMAAcceptedIndication, - aTSSSContainer [15] ATSSSContainer OPTIONAL - + aTSSSContainer [15] ATSSSContainer OPTIONAL, + uEEPSPDNConnection [16] UEEPSPDNConnection OPTIONAL, + ePS5GSComboInfo [17] EPS5GSComboInfo OPTIONAL, + handoverState [18] HandoverState OPTIONAL, + pCCRules [19] PCCRuleSet OPTIONAL } -- See clause 6.2.3.2.7.3 for details of this structure @@ -1503,7 +1534,10 @@ SMFMAPDUSessionRelease ::= SEQUENCE uplinkVolume [7] INTEGER OPTIONAL, downlinkVolume [8] INTEGER OPTIONAL, location [9] Location OPTIONAL, - cause [10] SMFErrorCodes OPTIONAL + cause [10] SMFErrorCodes OPTIONAL, + nGAPCause [11] NGAPCauseInt OPTIONAL, + fiveGMMCause [12] FiveGMMCause OPTIONAL, + pCCRuleIDs [13] PCCRuleIDSet OPTIONAL } -- See clause 6.2.3.2.7.4 for details of this structure @@ -1529,7 +1563,10 @@ SMFStartOfInterceptionWithEstablishedMAPDUSession ::= SEQUENCE mAUpgradeIndication [18] SMFMAUpgradeIndication OPTIONAL, ePSPDNCnxInfo [19] SMFEPSPDNCnxInfo OPTIONAL, mAAcceptedIndication [20] SMFMAAcceptedIndication, - aTSSSContainer [21] ATSSSContainer OPTIONAL + aTSSSContainer [21] ATSSSContainer OPTIONAL, + ePS5GSComboInfo [22] EPS5GSComboInfo OPTIONAL, + uEEPSPDNConnection [23] UEEPSPDNConnection OPTIONAL, + pCCRules [24] PCCRuleSet OPTIONAL } -- See clause 6.2.3.2.7.5 for details of this structure @@ -1581,18 +1618,56 @@ AccessInfo ::= SEQUENCE gTPTunnelID [3] FTEID, non3GPPAccessEndpoint [4] UEEndpointAddress OPTIONAL, establishmentStatus [5] EstablishmentStatus, - aNTypeToReactivate [6] AccessType OPTIONAL + aNTypeToReactivate [6] AccessType OPTIONAL, + gTPTunnelInfo [7] GTPTunnelInfo OPTIONAL } -- see Clause 6.1.2 of TS 24.193[44] for the details of the ATSSS container contents. ATSSSContainer ::= OCTET STRING +DLRANTunnelInformation ::= SEQUENCE +{ + dLQOSFlowTunnelInformation [1] QOSFlowTunnelInformation OPTIONAL, + additionalDLQOSFlowTunnelInformation [2] QOSFlowTunnelInformationList OPTIONAL, + redundantDLQOSFlowTunnelInformation [3] QOSFlowTunnelInformationList OPTIONAL, + additionalredundantDLQOSFlowTunnelInformation [4] QOSFlowTunnelInformationList OPTIONAL +} + EstablishmentStatus ::= ENUMERATED { established(0), released(1) } +FiveGSGTPTunnels ::= SEQUENCE +{ + uLNGUUPTunnelInformation [1] FTEID OPTIONAL, + additionalULNGUUPTunnelInformation [2] FTEIDList OPTIONAL, + dLRANTunnelInformation [3] DLRANTunnelInformation OPTIONAL +} + +FiveQI ::= INTEGER (0..255) + +HandoverState ::= ENUMERATED +{ + none(1), + preparing(2), + prepared(3), + completed(4), + cancelled(5) +} + +NGAPCauseInt ::= SEQUENCE +{ + group [1] NGAPCauseGroupInt, + value [2] NGAPCauseValueInt +} + +-- Derived as described in TS 29.571 [17] clause 5.4.4.12 +NGAPCauseGroupInt ::= INTEGER + +NGAPCauseValueInt ::= INTEGER + SMFMAUpgradeIndication ::= BOOLEAN -- Given in YAML encoding as defined in clause 6.1.6.2.31 of TS 29.502[16] @@ -1619,6 +1694,194 @@ RequestIndication ::= ENUMERATED rELDUETO5GANREQUEST(7) } +QOSFlowTunnelInformation ::= SEQUENCE +{ + uPTunnelInformation [1] FTEID, + associatedQOSFlowList [2] QOSFlowLists +} + +QOSFlowTunnelInformationList ::= SEQUENCE OF QOSFlowTunnelInformation + +QOSFlowDescription ::= OCTET STRING + +QOSFlowLists ::= SEQUENCE OF QOSFlowList + +QOSFlowList ::= SEQUENCE +{ + qFI [1] QFI, + qOSRules [2] QOSRules OPTIONAL, + eBI [3] EPSBearerID OPTIONAL, + qOSFlowDescription [4] QOSFlowDescription OPTIONAL, + qOSFlowProfile [5] QOSFlowProfile OPTIONAL, + associatedANType [6] AccessType OPTIONAL, + defaultQOSRuleIndication [7] BOOLEAN OPTIONAL +} + +QOSFlowProfile ::= SEQUENCE +{ + fiveQI [1] FiveQI +} + +QOSRules ::= OCTET STRING + +-- See clauses 5.6.2.6-1 and 5.6.2.9-1 of TS 29.512 [Re3], clause table 5.6.2.5-1 of TS 29.508 [Re4] for the details of this structure +PCCRule ::= SEQUENCE +{ + pCCRuleID [1] PCCRuleID OPTIONAL, + appId [2] UTF8String OPTIONAL, + flowInfos [3] FlowInformationSet OPTIONAL, + appReloc [4] BOOLEAN OPTIONAL, + simConnInd [5] BOOLEAN OPTIONAL, + simConnTerm [6] INTEGER OPTIONAL, + maxAllowedUpLat [7] INTEGER OPTIONAL, + trafficRoutes [8] RouteToLocationSet, + trafficSteeringPolIdDl [9] UTF8String OPTIONAL, + trafficSteeringPolIdUl [10] UTF8String OPTIONAL, + sourceDNAI [11] DNAI OPTIONAL, + targetDNAI [12] DNAI OPTIONAL, + dNAIChangeType [13] DNAIChangeType OPTIONAL, + sourceUEIPAddr [14] IPAddress OPTIONAL, + targetUEIPAddr [15] IPAddress OPTIONAL, + sourceTrafficRouting [16] RouteToLocation OPTIONAL, + targetTrafficRouting [17] RouteToLocation OPTIONAL, + eASIPReplaceInfos [18] EASIPReplaceInfos OPTIONAL +} + +-- See table 5.6.2.14-1 of TS 29.512 [Re3] +PCCRuleID ::= UTF8String + +PCCRuleSet ::= SET OF PCCRule + +PCCRuleIDSet ::= SET OF PCCRuleID + +FlowInformationSet ::= SET OF FlowInformation + +RouteToLocationSet ::= SET OF RouteToLocation + +-- See table 5.6.2.14 of TS 29.512 [Re3] +FlowInformation ::= SEQUENCE +{ + flowDescription [1] FlowDescription OPTIONAL, + ethFlowDescription [2] EthFlowDescription OPTIONAL, + tosTrafficClass [3] OCTET STRING (SIZE(2)) OPTIONAL, + spi [4] OCTET STRING (SIZE(4)) OPTIONAL, + flowLabel [5] OCTET STRING (SIZE(3)) OPTIONAL, + flowDirection [6] FlowDirection OPTIONAL +} + +-- See table 5.6.2.14 of TS 29.512 [Re3] +FlowDescription ::= SEQUENCE +{ + sourceIPAddress [1] IPAddressOrRangeOrAny, + destinationIPAddress [2] IPAddressOrRangeOrAny, + sourcePortNumber [3] PortNumber OPTIONAL, + destinationPortNumber [4] PortNumber OPTIONAL, + protocol [5] NextLayerProtocolOrAny +} + +IPAddressOrRangeOrAny ::= CHOICE +{ + iPAddress [1] IPAddress, + ipAddressRange [2] IPMask, + anyIPAddress [3] AnyIPAddress +} + +IPMask ::= SEQUENCE +{ + fromIPAddress [1] IPAddress, + toIPAddress [2] IPAddress +} + +AnyIPAddress ::= ENUMERATED +{ + any(1) +} + +NextLayerProtocolOrAny ::= CHOICE +{ + nextLayerProtocol [1] NextLayerProtocol, + anyNextLayerProtocol [2] AnyNextLayerProtocol +} + +AnyNextLayerProtocol ::= ENUMERATED +{ + ip(1) +} + +-- See table 5.6.2.17-1 of TS 29.514 [Re5] +EthFlowDescription ::= SEQUENCE +{ + destMacAddress [1] MACAddress OPTIONAL, + ethType [2] OCTET STRING (SIZE(2)), + fDesc [3] FlowDescription OPTIONAL, + fDir [4] FDir OPTIONAL, + sourceMacAddress [5] MACAddress OPTIONAL, + vlanTags [6] SET OF VLANTag, + srcMacAddrEnd [7] MACAddress OPTIONAL, + destMacAddrEnd [8] MACAddress OPTIONAL +} + +-- See table 5.6.2.17-1 of TS 29.514 [Re5] +FDir ::= ENUMERATED +{ + downlink(1) +} + +-- See table 5.6.2.17-1 of TS 29.514 [Re5] +VLANTag ::= SEQUENCE +{ + priority [1] BIT STRING (SIZE(3)), + cFI [2] BIT STRING (SIZE(1)), + vLANID [3] BIT STRING (SIZE(12)) +} + +-- See table 5.6.2.14 of TS 29.512 [Re3] +FlowDirection ::= ENUMERATED +{ + downlinkOnly(1), + uplinkOnly(2), + dowlinkAndUplink(3) +} + +-- See table 5.4.2.1 of TS 29.571 [17] +DNAIChangeType ::= ENUMERATED +{ + early(1), + earlyAndLate(2), + late(3) +} + +-- See table 5.6.2.15 of TS 29.571 [17] +RouteToLocation ::= SEQUENCE +{ + dNAI [1] DNAI, + routeInfo [2] RouteInfo +} + +-- See table 5.4.2.1 of TS 29.571 [17] +DNAI ::= UTF8String + +-- See table 5.4.4.16 of TS 29.571 [17] +RouteInfo ::= SEQUENCE +{ + iPAddressTunnelEndpoint [1] IPAddress, + uDPPortNumberTunnelEndpoint [2] PortNumber +} + +-- See clause 4.1.4.2 of TS 29.512 [Re3] +EASIPReplaceInfos ::= SEQUENCE +{ + sourceEASAddress [1] EASServerAddress, + targetEASAddress [2] EASServerAddress +} + +-- See clause 4.1.4.2 of TS 29.512 [Re3] +EASServerAddress ::= SEQUENCE +{ + iPAddress [1] IPAddress, + port [2] PortNumber +} + -- ====================== -- PGW-C + SMF Parameters -- ====================== @@ -1662,6 +1925,12 @@ EPSBearers ::= SEQUENCE } QCI ::= INTEGER (0..255) + +GTPTunnelInfo ::= SEQUENCE +{ + fiveGSGTPTunnels [1] FiveGSGTPTunnels OPTIONAL +} + -- ================== -- 5G UPF definitions -- ================== @@ -2995,6 +3264,18 @@ IMSCCUnavailable ::= SEQUENCE sDPState [2] OCTET STRING OPTIONAL } +-- ========= +-- IMS CCPDU +-- ========= + +IMSCCPDU ::= SEQUENCE +{ + payload [1] IMSCCPDUPayload, + sDPInfo [2] OCTET STRING OPTIONAL +} + +IMSCCPDUPayload ::= OCTET STRING + -- ============== -- IMS parameters -- ============== @@ -3669,8 +3950,6 @@ FiveGSUserState ::= ENUMERATED notProvidedFromAMF(6) } -FiveQI ::= INTEGER (0..255) - ForbiddenAreaInformation ::= SEQUENCE { pLMNIdentity [1] PLMNID, @@ -3686,6 +3965,8 @@ FTEID ::= SEQUENCE iPv6Address [3] IPv6Address OPTIONAL } +FTEIDList ::= SEQUENCE OF FTEID + GPSI ::= CHOICE { mSISDN [1] MSISDN, @@ -4675,12 +4956,12 @@ Angle ::= INTEGER (0..360) Uncertainty ::= INTEGER (0..127) Orientation ::= INTEGER (0..180) Confidence ::= INTEGER (0..100) -InnerRadius ::= INTEGER (0..65535) +InnerRadius ::= INTEGER (0..327675) AgeOfLocationEstimate ::= INTEGER (0..32767) HorizontalSpeed ::= UTF8String VerticalSpeed ::= UTF8String SpeedUncertainty ::= UTF8String -BarometricPressure ::= INTEGER (30000..155000) +BarometricPressure ::= INTEGER (30000..115000) -- TS 29.572 [24], clause 6.1.6.3.13 VerticalDirection ::= ENUMERATED -- GitLab