Commit 5095e95a authored by canterburym's avatar canterburym
Browse files

TS 33108 v13.0.0 (2015-12-21) agreed at SA#70

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

DEFINITIONS IMPLICIT TAGS ::=

@@ -29,7 +29,7 @@ IMPORTS

			FROM UmtsHI2Operations
    		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
   				lawfulintercept(2) threeGPP(4) hi2(1) r12(12) version-8 (8)};
   				lawfulintercept(2) threeGPP(4) hi2(1)  r13 (13) version-0 (0)};
    			-- Imported from 3GPP TS 33.108, UMTS PS HI2
	

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

eps-sending-of-IRI  OPERATION ::= 
{
@@ -203,6 +203,19 @@ IRI-Parameters ::= SEQUENCE
																									-- service setting management or manipulation XCAP messages occuring through the Ut interface
																								    -- defined in the 3GPP TS 24 623 [77]. 
																									logicalFunctionInformation	[59] DataNodeIdentifier OPTIONAL,
																									ccUnavailableReason		[60] PrintableString	OPTIONAL,
																									carrierSpecificData					[61] OCTET STRING OPTIONAL,
	-- Copy of raw data specified by the CSP or his vendor related to HSS.
	current-previous-systems			[62] Current-Previous-Systems OPTIONAL,
			change-Of-Target-Identity				[63] Change-Of-Target-Identity OPTIONAL,
		requesting-Network-Identifier		[64] OCTET STRING OPTIONAL,
		-- the requesting network identifier PLMN id (Mobile Country Code and Mobile Network Country, 
		-- defined in E212 [87]).
																									requesting-Node-Type					[65] Requesting-Node-Type OPTIONAL,
																									serving-System-Identifier				[66] OCTET STRING OPTIONAL,
																									-- the serving network identifier PLMN id (MNC, Mobile Country Code and MNC,Mobile Network	
																									-- Country, defined in E212 [87]) and 3GPP TR 21.905 [38], that may be included in the Diameter 
																									-- AVP to and from the HSS.
																								


@@ -216,7 +229,7 @@ DataNodeIdentifier ::= SEQUENCE
{
	dataNodeAddress		[1] DataNodeAddress OPTIONAL,
	logicalFunctionType	[2] LogicalFunctionType OPTIONAL,
	dataNodeName		[3] PrintableString(SIZE(7..25)) OPTIONAL,
	dataNodeName		[3] PrintableString(SIZE(7..25)) ) OPTIONAL,
	--Unique identifier of a Data Node within the CSP domain. Could be a name/number combination.
...
}
@@ -516,7 +529,15 @@ EPSEvent ::= ENUMERATED
	pMIPsessionModification                 (40),
	startOfInterceptWithEUTRANAttachedUE    (41),
	dSMIPSessionModification                (42),
	packetDataHeaderInformation				(43)
	packetDataHeaderInformation				(43),
	hSS-Subscriber-Record-Change			(44),
	registration-Termination				(45),
	-- FFS
	location-Up-Date						(46),
	-- FFS
	cancel-Location							(47),
	register-Location						(48),
	location-Information-Request			(49)

}
-- see [19]
@@ -541,9 +562,11 @@ IMSevent ::= ENUMERATED
        -- interception started on an already established IMS session. 
	xCAPRequest (5),
		-- This value indicates to LEMF that the XCAP request is sent.
	xCAPResponse (6)
	xCAPResponse (6) ,
		-- 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.  
}

Services-Data-Information ::= SEQUENCE
@@ -651,7 +674,9 @@ EPS-GTPV2-SpecificParameters ::= SEQUENCE
	-- The use of extendedHandoverIndication and handoverIndication parameters is 
	-- mutually exclusive and depends on the actual ASN.1 encoding method. 

    uLITimestamp                         [28]  OCTET STRING (SIZE (8))            OPTIONAL
    uLITimestamp                         [28]  OCTET STRING (SIZE (8))            OPTIONAL,
    uELocalIPAddress                     [29]  OCTET STRING                       OPTIONAL,
    uEUdpPort                            [30]  OCTET STRING (SIZE (2))            OPTIONAL

    }  

@@ -707,7 +732,6 @@ ProtConfigOptions ::= SEQUENCE
}



EPS-PMIP-SpecificParameters ::= SEQUENCE
{
    lifetime                              [1]  INTEGER (0..65535)                 OPTIONAL,
@@ -788,12 +812,12 @@ MediaSecFailureIndication ::= ENUMERATED
PacketDataHeaderInformation ::= CHOICE
{

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

PacketDataHeader ::= CHOICE
PacketDataHeaderReport ::= CHOICE
{

	packetDataHeaderMapped	[1]	PacketDataHeaderMapped,
@@ -836,7 +860,7 @@ PacketDataHeaderCopy ::= SEQUENCE
} 


PacketDataHeaderSummary ::= SEQUENCE OF PacketFlowSummary
PacketDataHeaderSummaryReport ::= SEQUENCE OF PacketFlowSummary

PacketFlowSummary ::= SEQUENCE
{
@@ -890,4 +914,60 @@ TunnelProtocol ::= CHOICE
HeNBLocation ::= EPSLocation


Requesting-Node-Type ::= ENUMERATED
{
	mSC				(1),
	sMS-Centre		(2),
	gMLC			(3),
	mME				(4),
	sGSN			(5),
	...
}

Change-Of-Target-Identity ::= SEQUENCE 
{
			new-MSISDN								[1] PartyInformation OPTIONAL,
			-- new MSISDN of the target, encoded in the same format as the AddressString
																										-- parameters defined in MAP format document TS 29.002 [4]
																										new-AMSISDN				[2] PartyInformation OPTIONAL,
			-- new A MSISDN of the target, encoded in the same format as the AddressString
																										-- parameters defined in MAP format document TS 29.002 [4]
																										old-MSISDN				[3] PartyInformation OPTIONAL,
			-- new MSISDN of the target, encoded in the same format as the AddressString
																										-- parameters defined in MAP format document TS 29.002 [4]
																										old-AMSISDN				[4] PartyInformation OPTIONAL,
			-- new A MSISDN of the target, encoded in the same format as the AddressString
																										-- parameters defined in MAP format document TS 29.002 [4]
			new-IMSI 								[5] PartyInformation OPTIONAL,
					-- See MAP format [4] International Mobile 
																											-- Station Identity E.212 number beginning with Mobile Country Code
			old-IMSI 								[6] PartyInformation OPTIONAL,
					-- See MAP format [4] International Mobile 
																											-- Station Identity E.212 number beginning with Mobile Country Code
			new-IMEI 								[7] PartyInformation OPTIONAL,
					-- See MAP format [4] International Mobile 
																											-- Equipement Identity defined in MAP format document TS 29.002 [4]
			old-IMEI 								[8] PartyInformation OPTIONAL,
					-- See MAP format [4] International Mobile 
																											-- Equipement Identity defined in MAP format document TS 29.002 [4]
																									
...
} 
																									

Current-Previous-Systems ::= SEQUENCE 
{
	serving-System-Identifier			[1] OCTET STRING OPTIONAL,
	-- VPLMN id (Mobile Country Code and Mobile Network Country, E. 212 number [87]).
	current-Serving-MME-Address			[2] DataNodeIdentifier OPTIONAL,
																									-- The IP address of the serving SGSN or the Diameter Origin-Host and Origin-Realm of the 
																										-- serving node.
																									previous-Serving-System-Identifier		[3] OCTET STRING OPTIONAL,
																									-- VPLMN id (Mobile Country Code and Mobile Network Country, defined in E212 [87]).
																									previous-Serving-MME-Address			[4] DataNodeIdentifier OPTIONAL,
																									-- The IP address of the previous serving node or its Diameter Origin-Host and Origin-Realm.
...
} 


END
 No newline at end of file
+7 −7
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-3 (3)} 
IWLANUmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2wlan(6)  r13 (13) version-0 (0)} 

DEFINITIONS IMPLICIT TAGS ::=

@@ -28,7 +28,7 @@ IMPORTS

			FROM UmtsHI2Operations
    		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
   				lawfulintercept(2) threeGPP(4) hi2(1) r12(12) version-4 (4)};
   				lawfulintercept(2) threeGPP(4) hi2(1)  r13(13) version-0 (0)};
    			-- Imported from 3GPP TS 33.108, UMTS PS HI2
	

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

iwlan-umts-sending-of-IRI  OPERATION ::= 
{
@@ -235,13 +235,13 @@ SessionAliveTime ::= OCTET STRING
PacketDataHeaderInformation ::= CHOICE
{

	packetDataHeader		[1]	PacketDataHeader,
	packetDataHeaderSummary	[2]	PacketDataHeaderSummary,
	packetDataHeader		[1]	PacketDataHeaderReport,
	packetDataHeaderSummary	[2]	PacketDataHeaderSummaryReport,
...
}


PacketDataHeader ::= CHOICE
PacketDataHeaderReport ::= CHOICE
{

	packetDataHeaderMapped	[1]	PacketDataHeaderMapped,
@@ -290,7 +290,7 @@ PacketDataHeaderCopy ::= SEQUENCE



PacketDataHeaderSummary ::= SEQUENCE OF PacketFlowSummary
PacketDataHeaderSummaryReport ::= SEQUENCE OF PacketFlowSummary

PacketFlowSummary ::= SEQUENCE
{
+70 −2
Original line number Diff line number Diff line
UmtsCS-HI2Operations 
{itu-t (0) identified-organization (4) etsi (0) securityDomain (2) lawfulIntercept (2) threeGPP(4) hi2CS (3) r11(11) version-1 (1)} 
{itu-t (0) identified-organization (4) etsi (0) securityDomain (2) lawfulIntercept (2) threeGPP(4) hi2CS (3)  r13 (0) version-0 (0)} 

DEFINITIONS IMPLICIT TAGS ::=

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

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2CSDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2CS(3) r11(11) version-1(1)}
hi2CSDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2CS(3)  r13 (13) version-0 (0)}


umtsCS-sending-of-IRI  OPERATION ::= 
@@ -186,6 +186,18 @@ IRI-Parameters ::= SEQUENCE
	umts-Cs-Event						[33] Umts-Cs-Event OPTIONAL,
	-- Care should be taken to ensure additional parameter numbering does not conflict with
	-- ETSI TS 101 671 or Annex B.3 of this document (PS HI2).
	serving-System-Identifier			[34] OCTET STRING OPTIONAL,
		-- the serving network identifier PLMN id (MNC, Mobile Country Code and MNC, Mobile Network
		
	 		-- Country, defined in E212 [87]) and 3GPP TR 21.905 [38].
	carrierSpecificData					[35] OCTET STRING OPTIONAL,
	-- Copy of raw data specified by the CSP or his vendor related to HLR.
	current-Previous-Systems			[36] Current-Previous-Systems OPTIONAL,
	change-Of-Target-Identity			[37] Change-Of-Target-Identity OPTIONAL,
																									requesting-Network-Identifier		[38] OCTET STRING OPTIONAL,
		-- the requesting network identifier PLMN id (Mobile Country Code and Mobile Network Country,
		-- defined in E212 [87]).
																									requesting-Node-Type					[39] Requesting-Node-Type OPTIONAL,
	national-HI2-ASN1parameters			[255]	National-HI2-ASN1parameters	OPTIONAL

}
@@ -200,7 +212,63 @@ Umts-Cs-Event ::= ENUMERATED
	sMS								(6),
	location-update					(7),
	subscriber-Controlled-Input 	(8),
	...,
	hLR-Subscriber-Record-Change	(9),
	serving-System					(10),
	cancel-Location					(11),
	register-Location				(12),
	location-Information-Request	(13)
}

Requesting-Node-Type ::= ENUMERATED
{
	mSC				(1),
	sMS-Centre		(2),
	gMLC			(3),
	mME				(4),
	sGSN			(5),
	...
}

Change-Of-Target-Identity ::= SEQUENCE 
{
			new-MSISDN								[1] PartyInformation OPTIONAL,
			-- new MSISDN of the target, encoded in the same format as the AddressString
																										-- parameters defined in MAP format document TS 29.002 [4]
																										old-MSISDN				[2] PartyInformation OPTIONAL,
			-- new MSISDN of the target, encoded in the same format as the AddressString
																										-- parameters defined in MAP format document TS 29.002 [4]
			new-IMSI 								[3] PartyInformation OPTIONAL,
					-- See MAP format [4] International Mobile 
																											-- Station Identity E.212 number beginning with Mobile Country Code
			old-IMSI 								[4] PartyInformation OPTIONAL,
					-- See MAP format [4] International Mobile 
																											-- Station Identity E.212 number beginning with Mobile Country Code
																									
		... 	new-IMEI 								[5] PartyInformation OPTIONAL,
					-- See MAP format [4] International Mobile 
																											-- Equipement Identity defined in MAP format document TS 29.002 [4]
			old-IMEI 								[6] PartyInformation OPTIONAL
					-- See MAP format [4] International Mobile 
																											-- Equipement Identity defined in MAP format document TS 29.002 [4]
} 
																									
Current-Previous-Systems ::= SEQUENCE 
{
	current-Serving-System-Identifier			[1] OCTET STRING OPTIONAL,
	-- VPLMN id (Mobile Country Code and Mobile Network Country, E. 212 number [87]).
	current-Serving-MSC-Number					[2] OCTET STRING OPTIONAL,
	-- E.164 number of the serving MSC.
	current-Serving-MSC-Address					[3] OCTET STRING OPTIONAL,
																									-- The IP address of the serving MSC or its Diameter Origin-Host and Origin-Realm.	previous-
																									previous-Serving-System-Identifier		[4] OCTET STRING OPTIONAL,
																									-- VPLMN id (Mobile Country Code and Mobile Network Country, defined in E212 [87]).
																									previous-Serving-MSC-Number			[5] OCTET STRING OPTIONAL,
																									-- The E.164 number of the previous serving MSC.
																									previous-Serving-MSC-Address			[6] OCTET STRING OPTIONAL,
																									-- The IP address of the previous serving MSC or its Diameter Origin-Host and Origin-Realm.
...
} 


END
 No newline at end of file
+96 −22
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) r12(12) version-9 (9)} 
UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1)  r13 (13) version-0 (0)} 

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) r12(12) version-8 (8)}
hi2DomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2(1)  r13 (13) version-0 (0)}

umts-sending-of-IRI  OPERATION ::= 
{
@@ -179,6 +179,18 @@ IRI-Parameters ::= SEQUENCE
	-- The entire HTTP contents of any of the target's IMS supplementary service setting 
	-- management or manipulation XCAP messages, mainly made through the Ut 
	-- interface defined in the 3GPP TS 24 623 [77].
	ccUnavailableReason		[48] PrintableString	OPTIONAL,
	carrierSpecificData					[49] OCTET STRING OPTIONAL,
	-- Copy of raw data specified by the CSP or his vendor related to HSS.
	current-Previous-Systems			[50] Current-Previous-Systems OPTIONAL,
	change-Of-Target-Identity				[51] Change-Of-Target-Identity OPTIONAL,
	requesting-Network-Identifier		[52] OCTET STRING OPTIONAL,
	-- the requesting network identifier PLMN id (Mobile Country Code and Mobile Network Country, 
	-- defined in E212 [87]).
	requesting-Node-Type					[53] Requesting-Node-Type OPTIONAL,
	serving-System-Identifier				[54] OCTET STRING OPTIONAL,
	-- the requesting network identifier (Mobile Country Code and Mobile Network Country,
	-- defined in E212 [87]).


	national-HI2-ASN1parameters	[255]	National-HI2-ASN1parameters	OPTIONAL
@@ -533,7 +545,14 @@ GPRSEvent ::= ENUMERATED
	servingSystem							(14),
	... ,
	startOfInterceptionWithMSAttached		(15),
	packetDataHeaderInformation				(16)
	packetDataHeaderInformation				(16) ,	hSS-Subscriber-Record-Change			(17),
	registration-Termination				(18),
	-- FFS
	location-Up-Date						(19),
	-- FFS
	cancel-Location							(20),
	register-Location						(21),
	location-Information-Request			(22)

}
-- see [19]
@@ -558,9 +577,66 @@ IMSevent ::= ENUMERATED
																								                -- interception started on an already established IMS session. 
																									xCAPRequest (5),
																										-- This value indicates to LEMF that the XCAP request is sent.
																									xCAPResponse (6)
																									xCAPResponse (6) ,
		-- 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.  
}

Current-Previous-Systems ::= SEQUENCE 
{
	serving-System-Identifier			[1] OCTET STRING OPTIONAL,
	-- VPLMN id (Mobile Country Code and Mobile Network Country, E. 212 number [87]).
	current-Serving-SGSN-Number			[2] OCTET STRING OPTIONAL,
	-- E.164 number of the serving SGSN.
	current-Serving-SGSN-Address		[3] OCTET STRING OPTIONAL,
																									-- The IP address of the serving SGSN or the Diameter Origin-Host and Origin-Realm of the 
																									-- serving S4 SGSN.
																									current-Serving-S4-SGSN-Address			[4]OCTET STRING OPTIONAL,
																									-- The Diameter Origin-Host and Origin-Realm of the previous serving S4 SGSN.
																									previous-Serving-System-Identifier		[5] OCTET STRING OPTIONAL,
																									-- VPLMN id (Mobile Country Code and Mobile Network Country, defined in E212 [87]).
																									previous-Serving-SGSN-Number				[6] OCTET STRING OPTIONAL,
																									-- The E.164 number of the previous serving MSC.
																									previous-Serving-SGSN-Address			[7] OCTET STRING OPTIONAL,
																									-- The IP address of the previous serving MSC or its Diameter Origin-Host and Origin-Realm.
																									previous-Serving-S4-SGSN-Address			[8]OCTET STRING OPTIONAL,
																									-- The Diameter Origin-Host and Origin-Realm of the previous serving S4 SGSN.
...
} 

Change-Of-Target-Identity ::= SEQUENCE 
{
			new-MSISDN								[1] PartyInformation OPTIONAL,
			-- new MSISDN of the target, encoded in the same format as the AddressString
																										-- parameters defined in MAP format document TS 29.002 [4]
																										old-MSISDN				[2] PartyInformation OPTIONAL,
			-- new MSISDN of the target, encoded in the same format as the AddressString
																										-- parameters defined in MAP format document TS 29.002 [4]
			new-IMSI 								[3] PartyInformation OPTIONAL,
					-- See MAP format [4] International Mobile 
																											-- Station Identity E.212 number beginning with Mobile Country Code
			old-IMSI 								[4] PartyInformation OPTIONAL,
					-- See MAP format [4] International Mobile 
																											-- Station Identity E.212 number beginning with Mobile Country Code
			new-IMEI 								[5] PartyInformation OPTIONAL,
					-- See MAP format [4] International Mobile 
																											-- Equipement Identity defined in MAP format document TS 29.002 [4]
			old-IMEI 								[6] PartyInformation OPTIONAL,
					-- See MAP format [4] International Mobile 
																											-- Equipement Identity defined in MAP format document TS 29.002 [4] 
...
} 
																									
Requesting-Node-Type ::= ENUMERATED
{
	mSC				(1),
	sMS-Centre		(2),
	gMLC			(3),
	mME				(4),
	sGSN			(5),
	...
}

Services-Data-Information ::= SEQUENCE
@@ -640,12 +716,12 @@ MediaSecFailureIndication ::= ENUMERATED
PacketDataHeaderInformation ::= CHOICE
{

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

PacketDataHeader ::= CHOICE
PacketDataHeaderReport ::= CHOICE
{

	packetDataHeaderMapped	[1]	PacketDataHeaderMapped,
@@ -687,7 +763,7 @@ PacketDataHeaderCopy ::= SEQUENCE
} 


PacketDataHeaderSummary ::= SEQUENCE OF PacketFlowSummary
PacketDataSummaryReport ::= SEQUENCE OF PacketFlowSummary

PacketFlowSummary ::= SEQUENCE
{
@@ -708,8 +784,6 @@ PacketFlowSummary ::= SEQUENCE
																								...
}

 

ReportReason ::= ENUMERATED
{
	timerExpired			(0),