Commit 5cc95cb4 authored by canterburym's avatar canterburym
Browse files

TS 33108 v10.3.0 (2011-04-01) agreed at SA#51

parent a15aa56b
Loading
Loading
Loading
Loading
+6 −6
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) r10(10) version-1(1)}
 
DEFINITIONS IMPLICIT TAGS ::=

@@ -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) r10(10) version-1(1)}

Conf-CC-PDU	::= SEQUENCE 
{
@@ -70,15 +70,15 @@ TPDU-direction ::= ENUMERATED
	from-target 	(1),
	to-target 		(2),
	unknown 		(3),
	-- Set for direction value when the combined delivery is used.

    conftarget      (4)
	conftarget      (4),
      -- When the conference is the target of interception (4) is used to denote there is no
      -- directionality.
	from-mixer		(5),
	  -- Indicates the stream sent from the conference server towards the conference party.
	to-mixer		(6)
	to-mixer		(6),
	  -- Indicates the stream sent from the conference party towards the conference party server.
	combined		(7)
	  -- Indicates that combined CC delivery is used.

}

+16 −4
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) r10(10) version-2(2)} 
EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r10(10) version-3(3)} 

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) r10(10) version-2(2)}
hi2epsDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2eps(8) r10(10) version-3(3)}

eps-sending-of-IRI  OPERATION ::= 
{
@@ -160,6 +160,11 @@ IRI-Parameters ::= SEQUENCE
         -- non 3GPP access, coded according to [53]

	mediaDecryption-info	       [42] MediaDecryption-info OPTIONAL, 
	servingS4-SGSN-address	       [43] OCTET STRING OPTIONAL,
	-- Diameter Origin-Host and Origin-Realm of the S4-SGSN based on the TS 29.272 [59]. 
	-- 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
}
@@ -503,6 +508,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 [59].
	-- 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,
@@ -548,7 +557,10 @@ EPSLocation ::= SEQUENCE
        -- [46].
	tAIlist			    [6] OCTET STRING (SIZE (7..97))	OPTIONAL,
       -- the TAI List is coded acording to 3GPP TS 24.301 [47], without the TAI list IEI
    ...
    ...,
	3gpp2Bsid			[7] OCTET STRING (SIZE (1..12)) OPTIONAL
		-- contains only the payload from the 3GPP2-BSID AVP described in the 3GPP TS 29.212 [56].

}

ProtConfigOptions ::= SEQUENCE
+7 −4
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) r10(10) version-2(2)} 
UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r10(10) version-3(3)} 

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) r10(10) version-2(2)}
hi2DomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2(1) r10(10) version-3(3)}

umts-sending-of-IRI  OPERATION ::= 
{
@@ -158,7 +158,10 @@ IRI-Parameters ::= SEQUENCE
	ldiEvent	 			[34] LDIevent OPTIONAL,
	correlation 			[35] CorrelationValues OPTIONAL,
	mediaDecryption-info	[36] MediaDecryption-info OPTIONAL, 

	servingS4-SGSN-address	[37] OCTET STRING OPTIONAL,
	-- Diameter Origin-Host and Origin-Realm of the S4-SGSN based on the TS 29.272 [59]. 
	-- 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
}