Commit 62288c56 authored by canterburym's avatar canterburym
Browse files

TS 33108 v13.4.0 (2016-12-16) agreed at SA#74

parent 99aa7039
Loading
Loading
Loading
Loading
+13 −13
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) r12(12) version-1 (1)}
CONF-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3conf(11)  r13 (13) version-0 (0)}

DEFINITIONS IMPLICIT TAGS ::=

@@ -20,12 +20,12 @@ ConfPartyInformation
	
	FROM CONFHI2Operations
	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)
    threeGPP(4) hi2conf(10)  r12(12) version-1 (1)}
    threeGPP(4) hi2conf(10)   r13 (13) version-0 (0)}
    -- Imported from Conf 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)};
    {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)  r12(12) version-55 (55)};
-- Imported form EPS HI3 part of this standard

-- Object Identifier Definitions
@@ -36,7 +36,7 @@ securityDomain(2) lawfulIntercept(2)}

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi3confDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3conf(11) r12(12) version-1 (1)}
hi3confDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3conf(11)  r13 (13) version-0 (0)}

Conf-CC-PDU	::= SEQUENCE
{
+43 −40
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)  r12 (12) version-1 (1)} 
CONFHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2conf(10)  r13 (13) version-0 (0)}

DEFINITIONS IMPLICIT TAGS ::=

@@ -19,14 +19,15 @@ IMPORTS

			FROM HI2Operations
			{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
 				  lawfulIntercept(2) hi2(1) version12 (12)} -- Imported from TS 101 671
 				  lawfulIntercept(2) hi2(1) version18 (18)} -- Imported from TS 101 671, version 3.12.1


		CorrelationValues
		CorrelationValues,
		IMS-VoIP-Correlation
	
			FROM UmtsHI2Operations
			{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
 				  lawfulIntercept(2) threeGPP(4) hi2(1) r8(8) version-1(1)}; -- Imported from PS 
 				  lawfulIntercept(2) threeGPP(4) hi2(1)  r13 (13) version-1(1)}; -- Imported from PS
				-- ASN.1 Portion of this standard

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

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2confDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2conf(10) r12 (12) version-1(1)}
hi2confDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2conf(10) r13 (13) version-0 (0)}

conf-sending-of-IRI  OPERATION ::=
{
@@ -166,7 +167,9 @@ ConfCorrelation ::= CHOICE

{
	correlationValues [1] CorrelationValues,
	correlationNumber [2] OCTET STRING
	correlationNumber [2] OCTET STRING,
	imsVoIP			  [3] IMS-VoIP-Correlation,
	...
}


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

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

eps-sending-of-IRI  OPERATION ::=
{
@@ -216,9 +216,16 @@ IRI-Parameters ::= SEQUENCE
	-- Country, defined in E212 [87]) and 3GPP TR 21.905 [38], that may be included in the Diameter
	-- AVP to and from the HSS.

    proSeTargetType                    [67] ProSeTargetType OPTIONAL,
    proSeRelayMSISDN                   [68] OCTET STRING (SIZE (1..9)) OPTIONAL,
    -- coded according to 3GPP TS 29.274 [46]

    proSeRelayIMSI                     [69] OCTET STRING (SIZE (3..8)) OPTIONAL,
    -- coded according to 3GPP TS 29.274 [46]

	national-HI2-ASN1parameters	[256]	National-HI2-ASN1parameters	OPTIONAL
    proSeRelayIMEI                     [70] OCTET STRING (SIZE (8)) OPTIONAL,
    -- coded according to 3GPP TS 29.274 [46]
	national-HI2-ASN1parameters	[255]	National-HI2-ASN1parameters	OPTIONAL
}
-- Parameters having the same tag numbers must be identical in Rel-5 and onwards modules

@@ -297,7 +304,7 @@ PartyInformation ::= SEQUENCE
        nai                    [10] OCTET STRING    OPTIONAL,
            -- NAI of the target, encoded in the same format as defined by [EPS stage 3 specs]
		x-3GPP-Asserted-Identity [11] OCTET STRING 	OPTIONAL,	
		-- X-3GPP-Asserted-Identity header (3GPP TS 24 109 [79]) of the target, used in 
		-- 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
@@ -536,8 +543,12 @@ EPSEvent ::= ENUMERATED
	-- FFS
	cancel-Location							(47),
	register-Location						(48),
	location-Information-Request			(49)

	location-Information-Request			(49),
    proSeRemoteUEReport                     (50),
    proSeRemoteUEStartOfCommunication       (51),
    proSeRemoteUEEndOfCommunication         (52),
    startOfLIwithProSeRemoteUEOngoingComm   (53),
    startOfLIforProSeUEtoNWRelay            (54)
}
-- see [19]

@@ -566,6 +577,9 @@ IMSevent ::= ENUMERATED
	ccUnavailable	(7)
	-- This value indicates to LEMF that the media is not available for interception for intercept
	-- orders that requires media interception.
	sMSOverIMS	(8)
	-- This value indicates to LEMF that the SMS utilized by SMS over IP (using IMS) is
	-- being reported.
}

Services-Data-Information ::= SEQUENCE
@@ -677,8 +691,9 @@ EPS-GTPV2-SpecificParameters ::= SEQUENCE
    uELocalIPAddress                     [29]  OCTET STRING                       OPTIONAL,
    uEUdpPort                            [30]  OCTET STRING (SIZE (2))            OPTIONAL,
    tWANIdentifier                       [31]  OCTET STRING                       OPTIONAL,
    tWANIdentifierTimestamp              [32]  OCTET STRING (SIZE (4))            OPTIONAL

    tWANIdentifierTimestamp              [32]  OCTET STRING (SIZE (4))            OPTIONAL,
    proSeRemoteUeContextConnected        [33]  RemoteUeContextConnected           OPTIONAL,
    proSeRemoteUeContextDisconnected     [34]  RemoteUeContextDisconnected        OPTIONAL
    }

   -- All the parameters within EPS-GTPV2-SpecificParameters are coded as the corresponding IEs
@@ -732,6 +747,23 @@ ProtConfigOptions ::= SEQUENCE
...
}

RemoteUeContextConnected ::= SEQUENCE OF RemoteUEContext

RemoteUEContext ::= SEQUENCE

{
    remoteUserID                          [1]    RemoteUserID,
    remoteUEIPInformation                 [2]    RemoteUEIPInformation,
...

}

RemoteUserID ::= OCTET STRING

RemoteUEIPInformation ::= OCTET STRING

RemoteUeContextDisconnected ::= RemoteUserID


EPS-PMIP-SpecificParameters ::= SEQUENCE
{
@@ -970,5 +1002,12 @@ Current-Previous-Systems ::= SEQUENCE
...
}

ProSeTargetType ::= ENUMERATED
{
	pRoSeRemoteUE		(1),
	pRoSeUEtoNwRelay	(2),
	...
}


END
 No newline at end of file
+18 −18
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) notificationOperations(1) r13(13)version-0 (0)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1) r13(13)version-1 (1)}

DEFINITIONS IMPLICIT TAGS ::=

@@ -35,13 +35,13 @@ 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 r13(13)  version 0 (0)}
threeGPP-hi1OperationId OBJECT IDENTIFIER ::= {threeGPP-hi1NotificationOperationsId r13(13)  version 1 (1)}

threeGPP-sending-of-HI1-Notification OPERATION ::=
{
	ARGUMENT	ThreeGPP-HI1-Operation
	ERRORS		{Error-ThreeGPP-HI1Notifications}
	CODE		global:{threeGPP-hi1NotificationOperationsId version0(0)}
	CODE		global:{threeGPP-hi1NotificationOperationsId  version1 (1)}
}
-- Class 2 operation. The timer should be set to a value between 3s and 240s.
-- The timer default value is 60s.
@@ -78,7 +78,7 @@ ThreeGPP-HI1-Operation ::= CHOICE

Notification ::= SEQUENCE
{
	domainID						[0] OBJECT IDENTIFIER (threeGPP-hi1OperationId) OPTIONAL,
	domainID						[0] OBJECT IDENTIFIER OPTIONAL,
		-- Once using FTP delivery mechanism
	lawfulInterceptionIdentifier	[1] LawfulInterceptionIdentifier,
	-- This identifier is the LIID identity provided with the lawful authorization for each
@@ -100,7 +100,7 @@ Notification ::= SEQUENCE

Alarm-Indicator ::= SEQUENCE
{
	domainID						[0] OBJECT IDENTIFIER (threeGPP-hi1OperationId) OPTIONAL,
	domainID						[0] OBJECT IDENTIFIER OPTIONAL,
		-- Once using FTP delivery mechanism
	communicationIdentifier			[1] CommunicationIdentifier OPTIONAL,
		-- Only the NO/AP/SP Identifier is provided (the one provided with the
@@ -124,7 +124,7 @@ Alarm-Indicator ::= SEQUENCE

ThreeGPP-National-HI1-ASN1parameters ::= SEQUENCE
{
	domainID		[0] OBJECT IDENTIFIER (threeGPP-hi1OperationId) OPTIONAL,
	domainID		[0] OBJECT IDENTIFIER OPTIONAL,
		-- Once using FTP delivery mechanism.
	countryCode		[1] PrintableString (SIZE (2)),
		-- Country Code according to ISO 3166-1 [39],
+66 −66
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)  r13 (13) version-1 (1)} 
{itu-t (0) identified-organization (4) etsi (0) securityDomain (2) lawfulIntercept (2) threeGPP(4) hi2CS (3)  r13 (13) version-2 (2)}

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)  r13 (13) version-1 (1)}
hi2CSDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2CS(3)  r13 (13) version-2 (2)}


umtsCS-sending-of-IRI  OPERATION ::=
@@ -246,7 +246,7 @@ Change-Of-Target-Identity ::= SEQUENCE
		-- Station Identity E.212 number beginning with Mobile Country Code

	...,
		... 	new-IMEI 								[5] PartyInformation OPTIONAL,
	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
Loading