Commit f456e4be authored by canterburym's avatar canterburym
Browse files

TS 33108 v13.1.0 (2016-03-17) agreed at SA#71

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

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

eps-sending-of-IRI  OPERATION ::= 
{
@@ -127,8 +127,7 @@ IRI-Parameters ::= SEQUENCE

	serviceCenterAddress	[13] PartyInformation OPTIONAL,
		-- e.g. in case of SMS message this parameter provides the address of  the relevant 
		-- server within the calling (if server is originating) or called (if server is
		-- terminating) party address parameters
		-- server 
	sMS						[14] SMS-report OPTIONAL,
		-- this parameter provides the SMS content and associated information

@@ -229,7 +228,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.
...
}
@@ -637,7 +636,7 @@ EPS-GTPV2-SpecificParameters ::= SEQUENCE
    ePSBearerQoS                         [9]   OCTET STRING                       OPTIONAL,
    bearerActivationType                 [10]  TypeOfBearer                       OPTIONAL,
    aPN-AMBR                             [11]  OCTET STRING                       OPTIONAL,
    -- Only octets 5 onwards of AMBR IE from 3GPP TS 29.274 [46] shall be included.
    -- see 3GPP TS 29.274 [46] parameters coding rules defined for EPS-GTPV2-SpecificParameters.
    procedureTransactionId               [12]  OCTET STRING                       OPTIONAL,
    linkedEPSBearerId                    [13]  OCTET STRING                       OPTIONAL,
    --The Linked EPS Bearer Identity shall be included and coded according to 3GPP TS 29.274 [46].
@@ -676,7 +675,9 @@ EPS-GTPV2-SpecificParameters ::= SEQUENCE

    uLITimestamp                         [28]  OCTET STRING (SIZE (8))            OPTIONAL,
    uELocalIPAddress                     [29]  OCTET STRING                       OPTIONAL,
    uEUdpPort                            [30]  OCTET STRING (SIZE (2))            OPTIONAL
    uEUdpPort                            [30]  OCTET STRING (SIZE (2))            OPTIONAL,
    tWANIdentifier                       [31]  OCTET STRING                       OPTIONAL,
    tWANIdentifierTimestamp              [32]  OCTET STRING (SIZE (4))            OPTIONAL

    }  

@@ -701,7 +702,7 @@ EPSLocation ::= SEQUENCE
{
   
	userLocationInfo    [1] OCTET STRING (SIZE (1..39)) OPTIONAL,
        -- coded according to 3GPP TS 29.274 [46]; the type IE is not included 
        -- see 3GPP TS 29.274 [46] parameters coding rules defined for EPS-GTPV2-SpecificParameters. 
	gsmLocation			[2] GSMLocation OPTIONAL,
 	umtsLocation		[3] UMTSLocation OPTIONAL,
	olduserLocationInfo	[4] OCTET STRING (SIZE (1..39))	OPTIONAL,
@@ -860,7 +861,7 @@ PacketDataHeaderCopy ::= SEQUENCE
} 


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

PacketFlowSummary ::= SEQUENCE
{
+3 −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)  r13 (0) version-0 (0)} 
{itu-t (0) identified-organization (4) etsi (0) securityDomain (2) lawfulIntercept (2) threeGPP(4) hi2CS (3)  r13 (13) version-1 (1)} 

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


umtsCS-sending-of-IRI  OPERATION ::= 
@@ -245,6 +245,7 @@ Change-Of-Target-Identity ::= SEQUENCE
					-- 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]
+2 −3
Original line number Diff line number Diff line
@@ -131,8 +131,7 @@ IRI-Parameters ::= SEQUENCE

	serviceCenterAddress	[13] PartyInformation OPTIONAL,
		-- e.g. in case of SMS message this parameter provides the address of  the relevant 
		-- server within the calling (if server is originating) or called (if server is
		-- terminating) party address parameters
		-- server 
	sMS						[14] SMS-report OPTIONAL,
		-- this parameter provides the SMS content and associated information

@@ -405,7 +404,7 @@ CivicAddress ::= CHOICE {

XmlCivicAddress ::= UTF8String 
     -- Must conform to the February 2008 version of the XML format on the representation of 
     -- civic location described in IETF RFC 5139[yy].
     -- civic location described in IETF RFC 5139[72].


DetailedCivicAddress ::= SEQUENCE {
+8 −6
Original line number Diff line number Diff line
VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r12(12) version-3 (3)}
VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12)  r13 (13) version-0 (0)}
 
DEFINITIONS IMPLICIT TAGS ::=

@@ -8,7 +8,6 @@ BEGIN
IMPORTS

LawfulInterceptionIdentifier, 
	
TimeStamp
	FROM HI2Operations 
	{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
@@ -16,7 +15,7 @@ TimeStamp

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)};
FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r13 (13) version-1 (1)};


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

-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi3voipDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3voip(12) r12(12) version-3 (3)}
hi3voipDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3voip(12) r12(13) version-0 (0)}

Voip-CC-PDU	::= SEQUENCE 
{
@@ -39,7 +38,10 @@ VoipLIC-header ::= SEQUENCE
{
	hi3voipDomainId			[0]	OBJECT IDENTIFIER,  -- 3GPP VoIP HI3 Domain
	lIID					[2] LawfulInterceptionIdentifier OPTIONAL,
	voipCorrelationNumber	[3]	VoipCorrelationNumber, -- Contained in CorrelationValues [HI2]
	voipCorrelationNumber	[3]	VoipCorrelationNumber, -- Contain s the same contents as the 
                              -- cc parameter contained within an IRI-to-CC-Correlation parameter 
                              -- which is contained in the IMS-VoIP-Correlation parameter in the 
                              -- IRI [HI2]
	timeStamp				[4]	TimeStamp OPTIONAL,
	sequence-number			[5]	INTEGER (0..65535),
	t-PDU-direction			[6] TPDU-direction,