Commit 2daf2c99 authored by canterburym's avatar canterburym
Browse files

TS 33108 v13.2.0 (2016-06-23) agreed at SA#72

parent d8e12a91
Loading
Loading
Loading
Loading
+4 −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) r13(13) version-1 (1)} 
EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r13(13) version-2 (2)} 

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) r13(13) version-1 (1)}
hi2epsDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2eps(8) r13(13) version-2 (2)}

eps-sending-of-IRI  OPERATION ::= 
{
@@ -296,8 +296,8 @@ PartyInformation ::= SEQUENCE
			-- See [67]
        nai                    [10] OCTET STRING    OPTIONAL,
            -- NAI of the target, encoded in the same format as defined by [EPS stage 3 specs] 
		x3GPPAssertedIdentity [11] OCTET STRING 	OPTIONAL,	
		-- X3GPPAssertedIdentity header (3GPP TS 24 109 [79]) of the target, used in 
		x-3GPP-Asserted-Identity [11] OCTET STRING 	OPTIONAL,	
		-- X-3GPP-Asserted-Identity header (3GPP TS 24 109 [79]) of the target, used in 
		-- some XCAP transactions as a complement information to SIP URI or Tel URI.
		xUI						[12] OCTET STRING 	OPTIONAL
		-- XCAP User Identifier (XUI)is a string, valid as a path element in an XCAP URI, that is 
+11 −6
Original line number Diff line number Diff line
GCSE-HI3 {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3gcse(14) r12(12) version-0(0)}
GCSE-HI3 {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3gcse(14) r13(13) version-0(0)}
 
DEFINITIONS IMPLICIT TAGS ::=

@@ -15,13 +15,18 @@ TimeStamp
	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1)  version18(18)}-- from ETSI HI2Operations TS 101 671, version 3.12.1

GcseCorrelation,
GcsePartyInformation
GcsePartyIdentity
	
	FROM CONFHI2Operations
	FROM GCSEHI2Operations
	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)
    threeGPP(4) hi2gcse(13)  r12(12) version-1 (1)};
    threeGPP(4) hi2gcse(13)  r13(13) version-0 (0)}
    -- Imported from Gcse HI2 Operations part of this standard

National-HI3-ASN1parameters

	FROM Eps-HI3-PS 
	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) 	threeGPP(4) hi3eps(9) r12 (12) version-0(0)};

-- Object Identifier Definitions

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

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi3gcseDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3gcse(14) r12(12) version-0(0)}
hi3gcseDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3gcse(14) r13(13) version-0(0)}

Gcse-CC-PDU	::= SEQUENCE 
{
@@ -57,7 +62,7 @@ GcseLIC-header ::= SEQUENCE

MediaID ::= SEQUENCE 
{
		sourceUserID	[1] GcsePartyInformation	OPTIONAL,  -- include SDP information 
		sourceUserID	[1] GcsePartyIdentity	OPTIONAL,  -- include SDP information 
			-- describing GCSE Server Side characteristics.

		streamID		[2] OCTET STRING 	OPTIONAL,  -- include streamID from SDP information. 
+15 −14
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-2 (2)} 
GCSEHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2gcse(13)  r13 (13) version-0 (0)} 

DEFINITIONS IMPLICIT TAGS ::=

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

			

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

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

gcse-sending-of-IRI  OPERATION ::= 
{
@@ -53,13 +54,13 @@ gcse-sending-of-IRI OPERATION ::=
-- The timer.default value is 60s.
-- NOTE:	The same note as for HI management operation applies.

GCSEIRIsContent		::= CHOICE
GcseIRIsContent		::= CHOICE
{
	gcseiRIContent			GcseIRIContent,
	gcseIRISequence			GcseIRISequence
}

GCSEIRISequence		::= SEQUENCE OF GCSEIRIContent
GcseIRISequence		::= SEQUENCE OF GcseIRIContent

-- Aggregation of GCSEIRIContent is an optional feature.
-- It may be applied in cases when at a given point in time
@@ -69,7 +70,7 @@ GCSEIRISequence ::= SEQUENCE OF GCSEIRIContent
-- apply aggragation.
-- When aggregation is not to be applied,  
-- GCSEIRIContent needs to be chosen.
GCSEIRIContent		::= CHOICE 
GcseIRIContent		::= CHOICE 
{
	iRI-Begin-record		[1] IRI-Parameters,	-- include at least one optional parameter 
	iRI-End-record			[2] IRI-Parameters,
@@ -159,9 +160,9 @@ GcsePartyIdentity ::= SEQUENCE

		iMPI			[4]	SET OF IMSIdentity  OPTIONAL,

		proseUEID		[6] SET OF ProseUEID OPTIONAL,
		proseUEID		[6] SET OF ProSeUEID OPTIONAL,

		otherID			[7] OtherID OPTIONAL,
		otherID			[7] OtherIdentity OPTIONAL,
		
	...
}
@@ -196,7 +197,7 @@ ProSeUEID ::= OCTET STRING --coded with the 3 octets corresponding to the Source
                           --PDU in TS 25.321[85]. 


GcseGroupCharacteristics ::= SEQUENCE OF
GcseGroupCharacteristics ::= SEQUENCE
{
		characteristicsEncoding	[1] UTF8String 	OPTIONAL, -- Specifies the encoding format of 
            -- the contents included within the parameter characteristics.
@@ -225,7 +226,7 @@ Upstream ::= SEQUENCE
}


Downstream ::= SEQUENCE OF
Downstream ::= SEQUENCE
{
		accessType [1] AccessType,
		accessId   [2] AccessID, 	 
@@ -233,10 +234,10 @@ Downstream ::= SEQUENCE OF
} -- it may be possible for the UE to receive in multiple ways (e.g., via normal EPS as well 
  -- as mulitcast.

AccessType ::= Enumerated
AccessType ::= ENUMERATED
{
		EPS_Unicast   (1),
		EPS_Multicast (2), 	 
		ePS-Unicast   (1),
		ePS-Multicast (2), 	 
	...
} 

+5 −5
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)  r13 (13) version-0 (0)} 
IWLANUmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2wlan(6)  r13 (13) version-1 (1)} 

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)  r13 (13) version-0 (0)}
hi2wlanDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2wlan(6)  r13 (13) version-1 (1)}

iwlan-umts-sending-of-IRI  OPERATION ::= 
{
@@ -236,7 +236,7 @@ PacketDataHeaderInformation ::= CHOICE
{

	packetDataHeader		[1]	PacketDataHeaderReport,
	packetDataHeaderSummary	[2]	PacketDataHeaderSummaryReport,
	packetDataSummary	[2]	PacketDataSummaryReport,
...
}

@@ -290,7 +290,7 @@ PacketDataHeaderCopy ::= SEQUENCE



PacketDataHeaderSummaryReport ::= SEQUENCE OF PacketFlowSummary
PacketDataSummaryReport ::= SEQUENCE OF PacketFlowSummary

PacketFlowSummary ::= SEQUENCE
{
@@ -304,7 +304,7 @@ PacketFlowSummary ::= SEQUENCE
	-- Assigned Internet Protocol Numbers can be found at 
	-- http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml
	flowLabel				[6] INTEGER OPTIONAL,
	summaryPeriod			[7] ReportInteval,
	summaryPeriod			[7] ReportInterval,
	packetCount				[8] INTEGER,
	sumOfPacketSizes		[9] INTEGER,
	packetDataSummaryReason	[10] ReportReason,
+12 −12
Original line number Diff line number Diff line
ProSeHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2prose(15) r12(12) version1(1)} 
ProSeHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2prose(15) r13(13) version0(0)} 

DEFINITIONS IMPLICIT TAGS ::=

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

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2ProSeDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2prose(15) r12(12) version1(1)}
hi2ProSeDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2prose(15) r13(13) version0(0)}

prose-sending-of-IRI  OPERATION ::= 
{
@@ -89,7 +89,7 @@ IRI-Parameters ::= SEQUENCE
		-- date and time of the event triggering the report. 
	networkIdentifier				[3] Network-Identifier,
	proseEventData					[4] ProSeEventData,
	national-Parameters				[5] National-Parameters Optional,
	national-Parameters				[5] National-Parameters OPTIONAL,
	national-HI2-ASN1parameters		[6]	National-HI2-ASN1parameters	OPTIONAL,
...
}
@@ -108,13 +108,13 @@ ProSeEventData ::= CHOICE

ProSeDirectDiscovery ::= SEQUENCE
{
	proseDirectDiscoveryEvent	[0] ProSeDirectDiscoveryEvent
	proseDirectDiscoveryEvent	[0] ProSeDirectDiscoveryEvent,
	targetImsi					[1] OCTET STRING (SIZE (3..8)),
			-- See MAP format [4] International Mobile 
			-- Station Identity E.212 number beginning with Mobile Country Code
	targetRole					[2] TargetRole, 
	directDiscoveryData			[3] DirectDiscoveryData,
	metadata					[4] UTF8STRING OPTIONAL,
	metadata					[4] UTF8String OPTIONAL,
	otherUeImsi					[5] OCTET STRING (SIZE (3..8)) OPTIONAL,
			-- See MAP format [4] International Mobile 
			-- Station Identity E.212 number beginning with Mobile Country Code
@@ -140,27 +140,27 @@ TargetRole ::= ENUMERATED
}


DirectDiscoveryData::= SEQUENCE OF 
DirectDiscoveryData::= SEQUENCE 
{
	discoveryPLMNID 			[1] UTF8STRING,
	proseAppIdName				[2] UTF8STRING,
	proseAppCode				[3] OCTET STRING (SIZE 23),
	discoveryPLMNID 			[1] UTF8String,
	proseAppIdName				[2] UTF8String,
	proseAppCode				[3] OCTET STRING (SIZE (23)),
            -- See format in TS 23.003 [25]
	proseAppMask				[4] ProSeAppMask OPTIONAL,
	timer						[5] INTEGER (SIZE 3),
	timer						[5] INTEGER,
	
	...
}

ProSeAppMask		::= CHOICE
{
	proseMask				[1] OCTET STRING (SIZE 23),
	proseMask				[1] OCTET STRING (SIZE (23)),
	-- formatted like the proseappcode; used in conjuction with the corresponding 
	-- proseappcode bitstring to form a filter.
	proseMaskSequence		[2] ProSeMaskSequence
}

ProSeMaskSequence		::= SEQUENCE OF OCTET STRING (SIZE 23)
ProSeMaskSequence		::= SEQUENCE OF OCTET STRING (SIZE (23))
-- There can be multiple masks for a ProSe App code at the monitoring UE

END
 No newline at end of file
Loading