Commit 66e0a236 authored by canterburym's avatar canterburym
Browse files

TS 33108 v9.6.0 (2011-04-01) agreed at SA#51

parent 5cc95cb4
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
CONF-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3conf(11) r8(8) version-2(2)}
CONF-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3conf(11) r8(8) version-3(3)}
 
DEFINITIONS IMPLICIT TAGS ::=

@@ -18,7 +18,7 @@ ConfCorrelation
	
	FROM CONFHI2Operations
	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)
    threeGPP(4) hi2conf(10) r8(8) version-0 (0)};
    threeGPP(4) hi2conf(10) r8(8) version-1 (1)};
    -- Imported from Conf HI2 Operations part of this standard

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

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi3confDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3conf(11) r8(8) version-1(1)}
hi3confDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3conf(11) r8(8) version-3(3)}

Conf-CC-PDU	::= SEQUENCE 
{
+18 −3
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) r8(8) version-5(5)} 
EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r8(8) version-6(6)} 

DEFINITIONS IMPLICIT TAGS ::=

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

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2DomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2eps(8) r8(8) version-4(4)}
hi2epsDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2eps(8) r8(8) version-6(6)}

eps-sending-of-IRI  OPERATION ::= 
{
@@ -158,6 +158,11 @@ IRI-Parameters ::= SEQUENCE
    visitedNetworkId               [41] UTF8String                 OPTIONAL,
         -- contains the visited network identifier inside the EPS Serving System Update for
         -- non 3GPP access, coded according to [53]
	-- Tag							[42] was taken into use by the Rel-10 module
	servingS4-SGSN-address			[43] OCTET STRING OPTIONAL,
	-- Diameter Origin-Host and Origin-Realm of the S4-SGSN based on the TS 29.272 [55]. 
	-- Only the data fields from the Diameter AVPs are provided concatenated 
	-- with a semicolon to populate this field.

	national-HI2-ASN1parameters	[255]	National-HI2-ASN1parameters	OPTIONAL
}
@@ -434,8 +439,14 @@ GPRS-parameters ::= SEQUENCE
	pDP-address-allocated-to-the-target 	[1] DataNodeAddress OPTIONAL,
	aPN 					[2] OCTET STRING (SIZE(1..100)) OPTIONAL,
	pDP-type 				[3] OCTET STRING (SIZE(2)) OPTIONAL,
	-- when PDP-type is IPv4 or IPv6, the IP address is carried by parameter
	-- pDP-address-allocated-to-the-target
	-- when PDP-type is IPv4v6, the additional IP address is carried by parameter
	-- additionalIPaddress
	...,
	nSAPI					[4] OCTET STRING (SIZE (1)) OPTIONAL
	nSAPI					[4] OCTET STRING (SIZE (1)) OPTIONAL,
	additionalIPaddress		[5]	DataNodeAddress OPTIONAL

}

GPRSOperationErrorCode ::= OCTET STRING
@@ -489,6 +500,10 @@ EPS-GTPV2-SpecificParameters ::= SEQUENCE
    failedEUTRANAttachReason             [19]  OCTET STRING (SIZE (1))            OPTIONAL,
    -- coded according to TS 24.301 [47]      
    servingMMEaddress                    [20]  OCTET STRING                       OPTIONAL,
	-- Contains the data fields from the Diameter Origin-Host and Origin-Realm AVPs
	-- as received in the HSS from the MME according to the TS 29.272 [55].
	-- Only the data fields from the Diameter AVPs are provided concatenated 
	-- with a semicolon to populate this field.
    bearerDeactivationType               [21]  TypeOfBearer                       OPTIONAL,
    bearerDeactivationCause              [22]  OCTET STRING (SIZE (1))            OPTIONAL,
    ePSlocationOfTheTarget               [23]  EPSLocation                        OPTIONAL,
+13 −3
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) r8(8) version-1(1)} 
UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r8(8) version-2(2)} 

DEFINITIONS IMPLICIT TAGS ::=

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

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2DomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2(1) r8(8) version-1(1)}
hi2DomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2(1) r8(8) version-2(2)}

umts-sending-of-IRI  OPERATION ::= 
{
@@ -157,6 +157,11 @@ IRI-Parameters ::= SEQUENCE
 			-- Tag			[33] was taken into use by ETSI module in TS 101 671v2.13.1
	ldiEvent	 			[34] LDIevent OPTIONAL,
	correlation 			[35] CorrelationValues OPTIONAL,
	-- Tag					[36] was taken into use by the Rel-10 module
	servingS4-SGSN-address	[37] OCTET STRING OPTIONAL,
	-- Diameter Origin-Host and Origin-Realm of the S4-SGSN based on the TS 29.272 [55]. 
	-- Only the data fields from the Diameter AVPs are provided concatenated 
	-- with a semicolon to populate this field.

	national-HI2-ASN1parameters	[255]	National-HI2-ASN1parameters	OPTIONAL
}
@@ -408,8 +413,13 @@ GPRS-parameters ::= SEQUENCE
		-- 3GPP TS 24.008 [9] without the APN IEI (only the last 100 octets are used).
		-- Octets are coded according to 3GPP TS 23.003 [25].
	pDP-type 				[3] OCTET STRING (SIZE(2)) OPTIONAL,
	-- when PDP-type is IPv4 or IPv6, the IP address is carried by parameter
	-- pDP-address-allocated-to-the-target
	-- when PDP-type is IPv4v6, the additional IP address is carried by parameter
	-- additionalIPaddress
	...,
	nSAPI					[4] OCTET STRING (SIZE (1)) OPTIONAL
	nSAPI					[4] OCTET STRING (SIZE (1)) OPTIONAL,
	additionalIPaddress		[5]	DataNodeAddress OPTIONAL
}

GPRSOperationErrorCode ::= OCTET STRING