Merge branch 'meeting/SA101' into 'main' (228843ce) · Commits · SA3 / SA3 LI

33108/r17/EpsHI2Operations.asn

+59 −58

Original line number	Diff line number	Diff line
		EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r16 (16) version-1 (1)}
		EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r17 (17) version-0 (0)}

		DEFINITIONS IMPLICIT TAGS ::=

		@@ -39,7 +39,7 @@ securityDomain(2) lawfulIntercept(2)}

		-- Security Subdomains
		threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
		hi2epsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2eps(8) r16(16) version-1 (1)}
		hi2epsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2eps(8) r17(17) version-0 (0)}

		EpsIRIsContent ::= CHOICE
		{
		@@ -499,7 +499,8 @@ SMS-report ::= SEQUENCE
		} OPTIONAL,
		content [4] OCTET STRING (SIZE (1 .. 270)) OPTIONAL,
		-- Encoded in the format defined for the SMS mobile
		...
		...,
		sMSContentRemovedIndicator [5] BOOLEAN OPTIONAL
		}
		}

33108/r17/UmtsCS-HI2Operations.asn

+6 −6

Original line number	Diff line number	Diff line
		UmtsCS-HI2Operations
		{itu-t (0) identified-organization (4) etsi (0) securityDomain (2) lawfulIntercept (2) threeGPP(4) hi2CS (3) r16 (16) version-0 (0)}
		{itu-t (0) identified-organization (4) etsi (0) securityDomain (2) lawfulIntercept (2) threeGPP(4) hi2CS (3) r17 (17) version-0 (0)}

		DEFINITIONS IMPLICIT TAGS ::=

		@@ -29,7 +29,7 @@ IMPORTS

		FROM UmtsHI2Operations
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
		lawfulintercept(2) threeGPP(4) hi2(1) r16 (16) version-0(0)};
		lawfulintercept(2) threeGPP(4) hi2(1) r17 (17) version-0(0)};


		-- Object Identifier Definitions
		@@ -40,7 +40,7 @@ securityDomain(2) lawfulIntercept(2)}

		-- Security Subdomains
		threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
		hi2CSDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2CS(3) r16 (16) version-0 (0)}
		hi2CSDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2CS(3) r17 (17) version-0 (0)}


		UmtsCS-IRIsContent ::= CHOICE

33108/r17/UmtsHI2Operations.asn

+61 −60

Original line number	Diff line number	Diff line
		UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r16 (16) version-1 (1)}
		UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r17 (17) version-0 (0)}

		DEFINITIONS IMPLICIT TAGS ::=

		@@ -30,7 +30,7 @@ securityDomain(2) lawfulIntercept(2)}

		-- Security Subdomains
		threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
		hi2DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2(1) r16 (16) version-1 (1)}
		hi2DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2(1) r17 (17) version-0 (0)}

		UmtsIRIsContent ::= CHOICE
		{
		@@ -490,7 +490,8 @@ SMS-report ::= SEQUENCE
		} OPTIONAL,
		content [4] OCTET STRING (SIZE (1 .. 270)) OPTIONAL,
		-- Encoded in the format defined for the SMS mobile
		...
		...,
		sMSContentRemovedIndicator [5] BOOLEAN OPTIONAL
		}
		}

33128/r17/TS33128Payloads.asn

+5 −4

Original line number	Diff line number	Diff line
		TS33128Payloads
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version8(8)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version9(9)}

		DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=

		@@ -9,7 +9,7 @@ BEGIN
		-- Relative OIDs
		-- =============

		tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version8(8)}
		tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version9(9)}

		xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
		xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
		@@ -1967,7 +1967,7 @@ EPSPDNConnectionModification ::= SEQUENCE
		servingNetwork [15] SMFServingNetwork OPTIONAL,
		sMPDUDNRequest [16] SMPDUDNRequest OPTIONAL,
		bearerContextsCreated [17] SEQUENCE OF EPSBearerContextCreated OPTIONAL,
		bearerConcextsModified [18] SEQUENCE OF EPSBearerContextModified,
		bearerContextsModified [18] SEQUENCE OF EPSBearerContextModified,
		bearerContextsMarkedForRemoval [19] SEQUENCE OF EPSBearerContextForRemoval OPTIONAL,
		bearersDeleted [20] SEQUENCE OF EPSBearersDeleted OPTIONAL,
		indicationFlags [21] PDNConnectionIndicationFlags OPTIONAL,
		@@ -2123,7 +2123,8 @@ EPSBearerContextModified ::= SEQUENCE
		cause [2] EPSBearerModificationCauseValue,
		gTPTunnelInfo [3] GTPTunnelInfo OPTIONAL,
		bearerQOS [4] EPSBearerQOS OPTIONAL,
		protocolConfigurationOptions [5] PDNProtocolConfigurationOptions OPTIONAL
		protocolConfigurationOptions [5] PDNProtocolConfigurationOptions OPTIONAL,
		linkedEPSBearerIDs [6] SEQUENCE OF EPSBearerID OPTIONAL
		}

		EPSBearersDeleted ::= SEQUENCE

33128/r18/TS33128Dictionaries.xml

+11 −1

Original line number	Diff line number	Diff line
		@@ -72,6 +72,16 @@
		</DictionaryEntry>
		</DictionaryEntries>
		</Dictionary>
		<Dictionary> <!--LIHILAFlags: see Clause 5.11.2.2 Table 5.11.2.2-1 -->
		<Owner>3GPP</Owner>
		<Name>LIHILAFlags</Name>
		<DictionaryEntries>
		<DictionaryEntry>
		<Value>ReqCurrentLoc</Value>
		<Meaning>Indicates whether the current location of the UE is requested.</Meaning>
		</DictionaryEntry>
		</DictionaryEntries>
		</Dictionary>
		<Dictionary> <!--ManifestSpecification: see Clause 5.7.2 Table 5.7.2-6 -->
		<Owner>3GPP</Owner>
		<Name>ManifestSpecification</Name>