Manual merge to resolve conflicts in cr/33128/0388 (b039ae49) · Commits · SA3 / SA3 LI

33128/r17/TS33128Payloads.asn

+65 −4

Original line number	Diff line number	Diff line
		@@ -1342,7 +1342,9 @@ SMFPDUSessionModification ::= SEQUENCE
		handoverState [15] HandoverState OPTIONAL,
		gTPTunnelInfo [16] GTPTunnelInfo OPTIONAL,
		pCCRules [17] PCCRuleSet OPTIONAL,
		ePSPDNConnectionModification[18] EPSPDNConnectionModification OPTIONAL
		ePSPDNConnectionModification[18] EPSPDNConnectionModification OPTIONAL,
		uPPathChange [19] UPPathChange OPTIONAL,
		pFDDataForApp [20] PFDDataForApp OPTIONAL
		}

		-- See clause 6.2.3.2.4 for details of this structure
		@@ -1392,7 +1394,8 @@ SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE
		servingNetwork [22] SMFServingNetwork OPTIONAL,
		gTPTunnelInfo [23] GTPTunnelInfo OPTIONAL,
		pCCRules [24] PCCRuleSet OPTIONAL,
		ePSStartOfInterceptionWithEstablishedPDNConnection [25] EPSStartOfInterceptionWithEstablishedPDNConnection OPTIONAL
		ePSStartOfInterceptionWithEstablishedPDNConnection [25] EPSStartOfInterceptionWithEstablishedPDNConnection OPTIONAL,
		pFDDataForApps [26] PFDDataForApps OPTIONAL
		}

		-- See clause 6.2.3.2.6 for details of this structure
		@@ -1493,7 +1496,9 @@ SMFMAPDUSessionModification ::= SEQUENCE
		uEEPSPDNConnection [16] UEEPSPDNConnection OPTIONAL,
		ePS5GSComboInfo [17] EPS5GSComboInfo OPTIONAL,
		handoverState [18] HandoverState OPTIONAL,
		pCCRules [19] PCCRuleSet OPTIONAL
		pCCRules [19] PCCRuleSet OPTIONAL,
		uPPathChange [20] UPPathChange OPTIONAL,
		pFDDataForApp [21] PFDDataForApp OPTIONAL
		}

		-- See clause 6.2.3.2.7.3 for details of this structure
		@@ -1540,7 +1545,8 @@ SMFStartOfInterceptionWithEstablishedMAPDUSession ::= SEQUENCE
		aTSSSContainer [21] ATSSSContainer OPTIONAL,
		ePS5GSComboInfo [22] EPS5GSComboInfo OPTIONAL,
		uEEPSPDNConnection [23] UEEPSPDNConnection OPTIONAL,
		pCCRules [24] PCCRuleSet OPTIONAL
		pCCRules [24] PCCRuleSet OPTIONAL,
		pFDDataForApps [25] PFDDataForApps OPTIONAL
		}

		-- See clause 6.2.3.2.7.5 for details of this structure
		@@ -1721,6 +1727,19 @@ PCCRule ::= SEQUENCE
		eASIPReplaceInfos [18] EASIPReplaceInfos OPTIONAL
		}

		--See clause table 5.6.2.5-1 of TS 29.508 [90] for the details of this structure.
		UPPathChange ::= SEQUENCE
		{
		sourceDNAI [1] DNAI OPTIONAL,
		targetDNAI [2] DNAI OPTIONAL,
		dNAIChangeType [3] DNAIChangeType OPTIONAL,
		sourceUEIPAddr [4] IPAddress OPTIONAL,
		targetUEIPAddr [5] IPAddress OPTIONAL,
		sourceTrafficRouting [6] RouteToLocation OPTIONAL,
		targetTrafficRouting [7] RouteToLocation OPTIONAL,
		mACAddress [8] MACAddress OPTIONAL
		}

		-- See table 5.6.2.14-1 of TS 29.512 [89]
		PCCRuleID ::= UTF8String

		@@ -1957,6 +1976,48 @@ EPSStartOfInterceptionWithEstablishedPDNConnection ::= SEQUENCE
		bearerContexts [17] SEQUENCE OF EPSBearerContext
		}

		PFDDataForApps ::= SET OF PFDDataForApp

		PFDDataForApp ::= SEQUENCE
		{
		aPPId [1] UTF8String,
		pFDs [2] PFDs
		}

		PFDs ::= SET OF PFD

		-- See table 5.6.2.5-1 of TS 29.551 [AA]
		PFD ::= SEQUENCE
		{
		pFDId [1] UTF8String,
		pFDFlowDescriptions [2] PFDFlowDescriptions,
		urls [3] PFDURLs,
		domainNames [4] DomainNames,
		dnProtocol [5] DnProtocol
		}

		PFDURLs ::= SET OF UTF8String

		PFDFlowDescriptions ::= SET OF PFDFlowDescription

		DomainNames ::= SET OF UTF8String

		PFDFlowDescription ::= SEQUENCE
		{
		nextLayerProtocol [1] NextLayerProtocol,
		serverIPAddress [2] IPAddress,
		serverPortNumber [3] PortNumber
		}

		-- See table 5.14.2.2.4-1 of TS 29.122 [63]
		DnProtocol ::= ENUMERATED
		{
		dnsQname(1),
		tlsSni(2),
		tlsSan(3),
		tlsScn(4)
		}

		-- ======================
		-- PGW-C + SMF Parameters
		-- ======================