Commit 0ed58b04 authored by canterburym's avatar canterburym
Browse files

TS 33108 v12.8.0 (2015-03-20) agreed at SA#67

parent 33f76b93
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ TPDU-direction ::= ENUMERATED
	to-target 		(2),
	unknown 		(3),
	conftarget      (4),
      -- When the conference is the target of interception (4) is used to denote there is no
      -- When the conference is the target (4) is used to denote there is no
      -- directionality.
	from-mixer		(5),
	  -- Indicates the stream sent from the conference server towards the conference party.
+47 −26
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) r12(12) version-57 (57)} 
EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r12(12) version-58 (58)} 

DEFINITIONS IMPLICIT TAGS ::=

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

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2epsDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2eps(8) r12(12) version-57 (57)}
hi2epsDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2eps(8) r12(12) version-58 (58)}

eps-sending-of-IRI  OPERATION ::= 
{
@@ -201,6 +201,8 @@ IRI-Parameters ::= SEQUENCE
																								    -- The HTTP message (HTPP header and any XCAP body) of any of the target's IMS supplementary 
																									-- service setting management or manipulation XCAP messages occuring through the Ut interface
																								    -- defined in the 3GPP TS 24 623 [77]. 
																									logicalFunctionInformation	[59] DataNodeIdentifier OPTIONAL,
																								


	national-HI2-ASN1parameters	[256]	National-HI2-ASN1parameters	OPTIONAL
@@ -209,6 +211,25 @@ IRI-Parameters ::= SEQUENCE

																								-- PARAMETERS FORMATS
																								
DataNodeIdentifier ::= SEQUENCE
{
	dataNodeAddress		[1] DataNodeAddress OPTIONAL,
	logicalFunctionType	[2] LogicalFunctionType OPTIONAL,
	dataNodeName		[3] PrintableString((SIZE(7..25)) OPTIONAL,
	--Unique identifier of a Data Node within the CSP domain. Could be a name/number combination.
...
}

LogicalFunctionType ::= ENUMERATED
{
	pDNGW		(0),
	mME			(1),
	sGW			(2),
	ePDG		(3),
	hSS			(4),
...
}

PANI-Header-Info::= SEQUENCE
{
    access-Type 		[1] OCTET STRING 		OPTIONAL,
+4 −4
Original line number Diff line number Diff line
GCSEHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2gcse(13)  r12 (12) version-1 (1)} 
GCSEHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2gcse(13)  r12 (12) version-2 (2)} 

DEFINITIONS IMPLICIT TAGS ::=

@@ -26,9 +26,9 @@ IMPORTS
				
		EPSLocation
	
			FROM UmtsHI2Operations
			FROM EpsHI2Operations
			{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
 				  lawfulIntercept(2) threeGPP(4) hi2eps(8) r12(12) version-56(56)}; -- Imported
 				  lawfulIntercept(2) threeGPP(4) hi2eps(8) r12(12) version-57(57)}; -- Imported
				-- from EPS ASN.1 Portion of this standard

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

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2gcseDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2gcse(13) r12 (12) version-1(1)}
hi2gcseDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2gcse(13) r12 (12) version-2(2)}

gcse-sending-of-IRI  OPERATION ::= 
{
+3 −3
Original line number Diff line number Diff line
IWLANUmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2wlan(6)  r12 (12) version-2 (2)} 
IWLANUmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2wlan(6)  r12 (12) version-3 (3)} 

DEFINITIONS IMPLICIT TAGS ::=

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

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2wlanDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2wlan(6)  r12 (12) version-2(2)}
hi2wlanDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2wlan(6)  r12 (12) version-3 (3)}

iwlan-umts-sending-of-IRI  OPERATION ::= 
{
@@ -290,7 +290,7 @@ PacketDataHeaderCopy ::= SEQUENCE



PacketDataSummary ::= SEQUENCE OF PacketFlowSummary
PacketDataHeaderSummary ::= SEQUENCE OF PacketFlowSummary

PacketFlowSummary ::= SEQUENCE
{
+33 −46
Original line number Diff line number Diff line
ThreeGPP-HI1NotificationOperations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) r12(12)version-0(0)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1) r12(12)version-1 (1)}

DEFINITIONS IMPLICIT TAGS ::=

@@ -15,19 +15,13 @@ IMPORTS
		TimeStamp,
		CommunicationIdentifier,
		Network-Identifier,
		National-Parameters,
				CalledPartyNumber,
		IPAddress,
		IP-value,
		IPAddress
		
		FROM HI2Operations
			{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
 				  lawfulIntercept(2) hi2(1) version18(18)}; -- Imported from TS 101 671v3.12.1

		ICE-type
			FROM 
			Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) 
			lawfulintercept(2) threeGPP(4) hi3eps(9) r8(8) version-0(0)}



@@ -41,7 +35,7 @@ lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
-- hi1 Domain
threeGPP-hi1NotificationOperationsId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi1(0) notificationOperations(1)}
threeGPP-hi1OperationId OBJECT IDENTIFIER ::= {threeGPP-hi1NotificationOperationsId version0(0)}
threeGPP-hi1OperationId OBJECT IDENTIFIER ::= {threeGPP-hi1NotificationOperationsId r12(12) version1(1)}

ThreeGPP-sending-of-HI1-Notification OPERATION ::=
{
@@ -49,10 +43,10 @@ ThreeGPP-sending-of-HI1-Notification OPERATION ::=
	ERRORS		{Error-ThreeGPP-HI1Notifications}
	CODE		global:{threeGPP-hi1NotificationOperationsId version0(0)}
}
-- Class 2 operation. The timer shall be set to a value between 3s and 240s.
-- Class 2 operation. The timer should be set to a value between 3s and 240s.
-- The timer default value is 60s.
-- NOTE: The value for this timer is to be set on the equipment waiting for the returned message;
-- its value shall be agreed between the NWO/AP/SvP and the LEA, depending on their equipment
-- its value should be agreed between the NWO/AP/SvP and the LEA, depending on their equipment
-- properties.

other-failure-causes	ERROR ::= {CODE local:0}
@@ -66,8 +60,7 @@ Error-ThreeGPP-HI1Notifications ERROR ::=
	missing-parameter |
	unknown-parameter |
	erroneous-parameter
...
}
...}


ThreeGPP-HI1-Operation ::= CHOICE
@@ -77,8 +70,7 @@ ThreeGPP-HI1-Operation ::= CHOICE
	liModified					[3] Notification,
	alarms-indicator			[4] Alarm-Indicator,
	threeGPP-National-HI1-ASN1parameters	[5] ThreeGPP-National-HI1-ASN1parameters,
...
}
...}

-- ==================
-- PARAMETERS FORMATS
@@ -86,7 +78,7 @@ ThreeGPP-HI1-Operation ::= CHOICE

Notification ::= SEQUENCE
{
	domainID						[0] OBJECT IDENTIFIER (hi1OperationId) OPTIONAL,
	domainID						[0] OBJECT IDENTIFIER (threeGPP-hi1OperationId) OPTIONAL,
		-- Once using FTP delivery mechanism
	lawfulInterceptionIdentifier	[1] LawfulInterceptionIdentifier,
	-- This identifier is the LIID identity provided with the lawful authorization for each
@@ -96,20 +88,19 @@ Notification ::= SEQUENCE
		-- authorization) in CS domain.		
	timeStamp						[3] TimeStamp,
	-- date and time of the report.
	threeGPP-National-HI1-ASN1parameters		[5] National-HI1-ASN1parameters OPTIONAL,
	threeGPP-National-HI1-ASN1parameters		[5] ThreeGPP-National-HI1-ASN1parameters OPTIONAL,
	target-Information				[6] Target-Information OPTIONAL,
	network-Identifier				[7] Network-Identifier OPTIONAL,
		-- Same definition of annexes B3, B8, B9, B.11.1. It is recommended to use the same value 
		-- than those decided by the CSP and the LEA as the NWO/PA/SvPIdentifier of 
		-- communicationIdentifier used in CS domain.   
	broadcastStatus					[8] BroadcastStatus OPTIONAL,
...
}
...}


Alarm-Indicator ::= SEQUENCE
{
	domainID						[0] OBJECT IDENTIFIER (hi1OperationId) OPTIONAL,
	domainID						[0] OBJECT IDENTIFIER (threeGPP-hi1OperationId) OPTIONAL,
		-- Once using FTP delivery mechanism
	communicationIdentifier			[1] CommunicationIdentifier OPTIONAL,
		-- Only the NO/AP/SP Identifier is provided (the one provided with the
@@ -121,7 +112,7 @@ Alarm-Indicator ::= SEQUENCE
	lawfulInterceptionIdentifier	[4] LawfulInterceptionIdentifier OPTIONAL,
		-- This identifier is the LIID identity provided with the lawful authorization
		-- for each target in according to national law
	threeGPP-National-HI1-ASN1parameters		[5] National-HI1-ASN1parameters OPTIONAL,
	threeGPP-National-HI1-ASN1parameters		[5] ThreeGPP-National-HI1-ASN1parameters OPTIONAL,
	target-Information				[6] Target-Information OPTIONAL,
	network-Identifier				[7] Network-Identifier OPTIONAL,
	-- the NO/AP/SP Identifier,
@@ -129,15 +120,11 @@ Alarm-Indicator ::= SEQUENCE
	network-Element-Information		[8] OCTET STRING (SIZE (1..256)) OPTIONAL,
		-- This identifier may be a network element identifier such an IP address with its IP value,
		-- that may not work properly. To be defined between the CSP and the LEA.
	iCE-type						[9] ICE-type OPTIONAL, 
		-- The ICE-type indicates the applicable Intercepting Control Element of PDU 
		-- that may note work properly
...
}
...}

ThreeGPP-National-HI1-ASN1parameters ::= SEQUENCE
{
	domainID		[0] OBJECT IDENTIFIER (hi1OperationId) OPTIONAL,
	domainID		[0] OBJECT IDENTIFIER (threeGPP-hi1OperationId) OPTIONAL,
		-- Once using FTP delivery mechanism.
	countryCode		[1] PrintableString (SIZE (2)),
		-- Country Code according to ISO 3166-1 [39],
@@ -149,8 +136,7 @@ ThreeGPP-National-HI1-ASN1parameters ::= SEQUENCE
		-- included in the national parameters definition. Vendor identifications can be
		-- retrieved from IANA web site. Besides, it is recommended to avoid
		-- using tags from 240 to 255 in a formal type definition.
...
}
...}

Target-Information ::= SEQUENCE
{
@@ -173,7 +159,9 @@ Target-Information ::= SEQUENCE
	liDeactivatedTime	[6] TimeStamp OPTIONAL,
	liModificationTime	[7] TimeStamp OPTIONAL,
	interceptionType	[8] InterceptionType OPTIONAL,
...
...,
	liSetUpTime        [9] TimeStamp OPTIONAL
	-- date and time when the warrant is entered into the ADMF
}


@@ -193,14 +181,15 @@ TargetType ::= ENUMERATED

DeliveryInformation ::= SEQUENCE
{
	deliveryNumber 		[0] CalledPartyNumber OPTIONAL,
	-- Cicuit swutch LEMF voice delivery E164 number 
      hi2DeliveryIpAddress 	[1] IPAddress OPTIONAL,
	hi2DeliveryNumber 		[0] CalledPartyNumber OPTIONAL,
	-- Circuit switch IRI delivery E164 number 
	hi3DeliveryNumber 		[1] CalledPartyNumber OPTIONAL,
	-- Circuit switch voice content delivery E164 number 
	hi2DeliveryIpAddress 	[2] IPAddress OPTIONAL,
	-- HI2 address of the LEMF.
      hi3DeliveryIpAddress	[2] IPAddress OPTIONAL,
	-- HI2 address of the LEMF
....
}
	hi3DeliveryIpAddress	[3] IPAddress OPTIONAL,
	-- HI3 address of the LEMF.
...}

InterceptionType ::= ENUMERATED
{
@@ -208,10 +197,9 @@ InterceptionType ::= ENUMERATED
      voiceIriOnly(1),
      dataIriCc(2),
      dataIriOnly(3),
      voiceAndDataCC(4)
      voiceAndDataOnly(5)
...
}
      voiceAndDataIriCc(4),
      voiceAndDataIriOnly(5),
...}


BroadcastStatus ::= ENUMERATED
@@ -221,8 +209,7 @@ BroadcastStatus ::= ENUMERATED
	-- been modified or confirm to include the target id requested by the LEA.
	unsuccesfull(1),
	-- case of usage: such information could be provided to the LEMF following the impossibility to get a positive confirmation from at least one node with an LI function on the broadcasted command made by the operator's mediation or the management of mediation.
...
}
...}


END
 No newline at end of file
Loading