Commit 0602a415 authored by canterburym's avatar canterburym
Browse files

TS 33108 v16.0.0 (2019-12-19) agreed at SA#86

parent 7e8572e7

33108/r16/CONFHI2Operations.asn

+3 −31
Original line number Diff line number Diff line 
CONFHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2conf(10)  r13 (13) version-0 (0)}

CONFHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2conf(10)  r16 (16) version-0 (0)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -6,10 +6,6 @@ BEGIN 


IMPORTS



		OPERATION,

		ERROR

			FROM Remote-Operations-Information-Objects

			{joint-iso-itu-t(2) remote-operations(4) informationObjects(5) version1(0)}



		LawfulInterceptionIdentifier,

		TimeStamp,
@@ -27,7 +23,7 @@ IMPORTS 
	

			FROM UmtsHI2Operations

			{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)

 				  lawfulIntercept(2) threeGPP(4) hi2(1)  r13 (13) version-1(1)}; -- Imported from PS

 				  lawfulIntercept(2) threeGPP(4) hi2(1)  r16 (16) version-1(1)}; -- Imported from PS

				-- ASN.1 Portion of this standard
@@ -40,17 +36,7 @@ securityDomain(2) lawfulIntercept(2)} 


-- Security Subdomains

threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}

hi2confDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2conf(10) r13 (13) version-0 (0)}



conf-sending-of-IRI  OPERATION ::=

{

	ARGUMENT	ConfIRIsContent

	ERRORS		{ OperationErrors }

	CODE		global:{threeGPPSUBDomainId hi2conf(10) opcode(1)}

}

-- Class 2 operation . The timer shall be set to a value between 3 s and 240 s.

-- The timer.default value is 60s.

-- NOTE:	The same note as for HI management operation applies.

hi2confDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2conf(10) r16 (16) version-0 (0)}



ConfIRIsContent		::= CHOICE

{
@@ -77,20 +63,6 @@ ConfIRIContent ::= CHOICE 
   ...

}



unknown-version 		ERROR ::= { CODE local:0}

missing-parameter		ERROR ::= { CODE local:1}

unknown-parameter-value	ERROR ::= { CODE local:2}

unknown-parameter		ERROR ::= { CODE local:3}



OperationErrors ERROR ::=

{

	unknown-version |

	missing-parameter |

	unknown-parameter-value |

	unknown-parameter

}

-- These values may be sent by the LEMF, when an operation or a parameter is misunderstood.



IRI-Parameters		::= SEQUENCE

{

	hi2confDomainId				[0]	OBJECT IDENTIFIER,  -- 3GPP HI2 Conf domain

33108/r16/EpsHI2Operations.asn

+13 −36
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) r15(15) version-5 (5)}

EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r16 (16) version-0 (0)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -6,10 +6,6 @@ BEGIN 


IMPORTS



		OPERATION,

		ERROR

			FROM Remote-Operations-Information-Objects

			{joint-iso-itu-t(2) remote-operations(4) informationObjects(5) version1(0)}



		LawfulInterceptionIdentifier,

		TimeStamp,
@@ -31,7 +27,7 @@ IMPORTS 


			FROM UmtsHI2Operations

    		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)

   				lawfulintercept(2) threeGPP(4) hi2(1)  r15 (15) version-1 (1)};

   				lawfulintercept(2) threeGPP(4) hi2(1)  r16 (16) version-0 (0)};

    			-- Imported from 3GPP TS 33.108, UMTS PS HI2
@@ -43,17 +39,7 @@ securityDomain(2) lawfulIntercept(2)} 


-- Security Subdomains

threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}

hi2epsDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2eps(8) r15(15) version-5 (5)}



eps-sending-of-IRI  OPERATION ::=

{

	ARGUMENT	EpsIRIsContent

	ERRORS		{ OperationErrors }

	CODE		global:{threeGPPSUBDomainId hi2eps(8) opcode(1)}

}

-- Class 2 operation . The timer shall be set to a value between 3 s and 240 s.

-- The timer.default value is 60s.

-- NOTE:	The same note as for HI management operation applies.

hi2epsDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2eps(8) r16(16) version-0 (0)}



EpsIRIsContent		::= CHOICE

{
@@ -83,20 +69,6 @@ EpsIRIContent ::= CHOICE 
}

-- the EpsIRIContent may provide events that correspond to UMTS/GPRS as well.



unknown-version 		ERROR ::= { CODE local:0}

missing-parameter		ERROR ::= { CODE local:1}

unknown-parameter-value	ERROR ::= { CODE local:2}

unknown-parameter		ERROR ::= { CODE local:3}



OperationErrors ERROR ::=

{

	unknown-version |

	missing-parameter |

	unknown-parameter-value |

	unknown-parameter

}

-- These values may be sent by the LEMF, when an operation or a parameter is misunderstood.



-- Parameters having the same tag numbers have to be identical in Rel-5 and onwards modules.

IRI-Parameters		::= SEQUENCE

{
@@ -242,6 +214,8 @@ IRI-Parameters ::= SEQUENCE 
	ptcEncryption					[79]	PTCEncryptionInfo OPTIONAL,

	-- PTC Encryption Information

	additionalCellIDs				[80] SEQUENCE OF AdditionalCellID OPTIONAL,

    scefID							[81] UTF8String OPTIONAL, 

    -- SCEF-ID FQDN as defined by TS 29.336 [101], clause 8.4.5 and RFC 3588 [102] section 4.3

	national-HI2-ASN1parameters	[255]	National-HI2-ASN1parameters	OPTIONAL

}

    -- Parameters having the same tag numbers have to be identical in Rel-5 and onwards modules
@@ -326,9 +300,11 @@ PartyInformation ::= SEQUENCE 
		xUI						[12] OCTET STRING 	OPTIONAL,

		-- XCAP User Identifier (XUI)is a string, valid as a path element in an XCAP URI, that is

		-- may be associated with each user served by a XCAP resource server. Defined in IETF RFC

		-- 4825[80] as a complement information to SIP URI or Tel URI. 

        iMPI                    [13] OCTET STRING   OPTIONAL

		-- 4825[80] as a complement information to SIP URI or Tel URI

        iMPI                    [13] OCTET STRING   OPTIONAL,

        	-- Private User Identity as defined in 3GPP TS 23.003 [25]

        extID                   [14] UTF8String OPTIONAL

         -- RFC 4282 [102] compliant string as per TS 23.003 [25], clause 19.7.2



	},
@@ -603,7 +579,8 @@ EPSEvent ::= ENUMERATED 
    proSeRemoteUEStartOfCommunication			(51),

    proSeRemoteUEEndOfCommunication			(52),

    startOfLIwithProSeRemoteUEOngoingComm		(53),

    startOfLIforProSeUEtoNWRelay				(54)

    startOfLIforProSeUEtoNWRelay				(54),

	scefRequestednonIPPDNDisconnection			(55)

}

-- see [19]
@@ -637,7 +614,7 @@ IMSevent ::= ENUMERATED 
		-- This value indicates to LEMF that the XCAP response is sent.

	ccUnavailable	(7),

	-- This value indicates to LEMF that the media is not available for interception for intercept

	-- orders that requires media interception.

	-- orders that require media interception.

	sMSOverIMS	(8),

	-- This value indicates to LEMF that the SMS utilized by SMS over IP (using IMS) is

	-- being reported.

33108/r16/GCSEHI2Operations.asn

+3 −31
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)  r15 (15) version-0 (0)}

GCSEHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2gcse(13)  r16 (16) version-0 (0)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -6,10 +6,6 @@ BEGIN 


IMPORTS



		OPERATION,

		ERROR

			FROM Remote-Operations-Information-Objects

			{joint-iso-itu-t(2) remote-operations(4) informationObjects(5) version1(0)}



		LawfulInterceptionIdentifier,

		TimeStamp,
@@ -28,7 +24,7 @@ IMPORTS 
	

			FROM EpsHI2Operations

			{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)

 				  lawfulIntercept(2) threeGPP(4) hi2eps(8) r15(15) version-2(2)};

 				  lawfulIntercept(2) threeGPP(4) hi2eps(8) r16 (16) version-0(0)};

				-- Imported from EPS ASN.1 Portion of this standard
@@ -42,17 +38,7 @@ securityDomain(2) lawfulIntercept(2)} 


-- Security Subdomains

threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}

hi2gcseDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2gcse(13) r15 (15) version-0(0)}



gcse-sending-of-IRI  OPERATION ::=

{

	ARGUMENT	GcseIRIsContent

	ERRORS		{ OperationErrors }

	CODE		global:{threeGPPSUBDomainId hi2gcse(10) opcode(1)}

}

-- Class 2 operation . The timer shall be set to a value between 3 s and 240 s.

-- The timer.default value is 60s.

-- NOTE:	The same note as for HI management operation applies.

hi2gcseDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2gcse(13) r16 (16) version-0(0)}



GcseIRIsContent		::= CHOICE

{
@@ -79,20 +65,6 @@ GcseIRIContent ::= CHOICE 
   ...

}



unknown-version 		ERROR ::= { CODE local:0}

missing-parameter		ERROR ::= { CODE local:1}

unknown-parameter-value	ERROR ::= { CODE local:2}

unknown-parameter		ERROR ::= { CODE local:3}



OperationErrors ERROR ::=

{

	unknown-version |

	missing-parameter |

	unknown-parameter-value |

	unknown-parameter

}

-- These values may be sent by the LEMF, when an operation or a parameter is misunderstood.



IRI-Parameters		::= SEQUENCE

{

	hi2gcseDomainId				[0]	OBJECT IDENTIFIER,  -- 3GPP HI2 GCSE domain

33108/r16/IWLANUmtsHI2Operations.asn

+4 −32
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-1 (1)}

IWLANUmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2wlan(6)  r16 (16) version-0 (0)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -6,10 +6,6 @@ BEGIN 


IMPORTS



		OPERATION,

		ERROR

			FROM Remote-Operations-Information-Objects

			{joint-iso-itu-t(2) remote-operations(4) informationObjects(5) version1(0)}



		LawfulInterceptionIdentifier,

		TimeStamp,
@@ -28,7 +24,7 @@ IMPORTS 


			FROM UmtsHI2Operations

    		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)

   				lawfulintercept(2) threeGPP(4) hi2(1)  r13(13) version-0 (0)};

   				lawfulintercept(2) threeGPP(4) hi2(1)  r16 (16) version-0 (0)};

    			-- Imported from 3GPP TS 33.108, UMTS PS HI2
@@ -40,17 +36,7 @@ securityDomain(2) lawfulIntercept(2)} 


-- Security Subdomains

threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}

hi2wlanDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2wlan(6)  r13 (13) version-1 (1)}



iwlan-umts-sending-of-IRI  OPERATION ::=

{

	ARGUMENT	IWLANUmtsIRIsContent

	ERRORS		{ OperationErrors }

	CODE		global:{threeGPPSUBDomainId hi2wlan(6) opcode(1)}

}

-- Class 2 operation . The timer shall be set to a value between 3 s and 240 s.

-- The timer.default value is 60s.

-- NOTE:	The same note as for HI management operation applies.

hi2wlanDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2wlan(6)  r16 (16) version-1 (1)}



IWLANUmtsIRIsContent		::= CHOICE

{
@@ -77,20 +63,6 @@ IWLANUmtsIRIContent ::= CHOICE 
   ...

}



unknown-version 		ERROR ::= { CODE local:0}

missing-parameter		ERROR ::= { CODE local:1}

unknown-parameter-value	ERROR ::= { CODE local:2}

unknown-parameter		ERROR ::= { CODE local:3}



OperationErrors ERROR ::=

{

	unknown-version |

	missing-parameter |

	unknown-parameter-value |

	unknown-parameter

}

-- These values may be sent by the LEMF, when an operation or a parameter is misunderstood.



IRI-Parameters		::= SEQUENCE

{

	hi2iwlanDomainId				[0]	OBJECT IDENTIFIER,  -- 3GPP HI2 WLAN domain

33108/r16/MBMSUmtsHI2Operations.asn

+2 −30
Original line number Diff line number Diff line 
MBMSUmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2mbms(7) r12(12) version1 (0)}

MBMSUmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2mbms(7) r16 (16) version0 (0)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -6,10 +6,6 @@ BEGIN 


IMPORTS



		OPERATION,

		ERROR

			FROM Remote-Operations-Information-Objects

			{joint-iso-itu-t(2) remote-operations(4) informationObjects(5) version1(0)}



		LawfulInterceptionIdentifier,

		TimeStamp,
@@ -31,17 +27,7 @@ securityDomain(2) lawfulIntercept(2)} 


-- Security Subdomains

threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}

hi2mbmsDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2mbms(7)  r12 (12) version1(0)}



mbms-umts-sending-of-IRI  OPERATION ::=

{

	ARGUMENT	MBMSUmtsIRIsContent

	ERRORS		{ OperationErrors }

	CODE		global:{threeGPPSUBDomainId hi2mbms(7) opcode(1)}

}

-- Class 2 operation . The timer shall be set to a value between 3 s and 240 s.

-- The timer.default value is 60s.

-- NOTE:	The same note as for HI management operation applies.

hi2mbmsDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2mbms(7)  r16 (16) version0 (0)}



MBMSUmtsIRIsContent		::= CHOICE

{
@@ -69,20 +55,6 @@ MBMSUmtsIRIContent ::= CHOICE 
   ...

}



unknown-version 		ERROR ::= { CODE local:0}

missing-parameter		ERROR ::= { CODE local:1}

unknown-parameter-value	ERROR ::= { CODE local:2}

unknown-parameter		ERROR ::= { CODE local:3}



OperationErrors ERROR ::=

{

	unknown-version |

	missing-parameter |

	unknown-parameter-value |

	unknown-parameter

}

-- These values may be sent by the LEMF, when an operation or a parameter is misunderstood.



IRI-Parameters		::= SEQUENCE

{

	hi2mbmsDomainId 				[0]	OBJECT IDENTIFIER,  -- 3GPP HI2 MBMS domain