Commit d345910c authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'cr/102232-1/0100' into 'meeting/LI60' 

TS 102232-1 CR0100 - Extending options for location information

See merge request !13
parents ebf3d4ff 2fd61316

102232-1/LI-PS-PDU.asn

+6 −4
Original line number Original line Diff line number Diff line 
LI-PS-PDU

LI-PS-PDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version33(33)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version34(34)}





DEFINITIONS IMPLICIT TAGS ::=

DEFINITIONS IMPLICIT TAGS ::=
@@ -190,7 +190,8 @@ IMPORTS 
	-- from 3GPP TS 33.128 [46]

	-- from 3GPP TS 33.128 [46]

	LINotificationPayload,

	LINotificationPayload,

	IRIPayload,

	IRIPayload,

	CCPayload

	CCPayload,

	UserLocation

		FROM TS33128Payloads

		FROM TS33128Payloads

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)};

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)};

		-- The relevant module (including the 3GPP release and version number)

		-- The relevant module (including the 3GPP release and version number)
@@ -204,7 +205,7 @@ IMPORTS 




lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}

lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}





li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version33(33)}

li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version34(34)}





-- ====================

-- ====================

-- Top-level definition

-- Top-level definition
@@ -667,7 +668,8 @@ Location ::= SEQUENCE 
	epsLocation				[1] EpsHI2Operations.EPSLocation OPTIONAL,

	epsLocation				[1] EpsHI2Operations.EPSLocation OPTIONAL,

	...,

	...,

	wlanLocationAttributes	[2] WlanLocationAttributes OPTIONAL,

	wlanLocationAttributes	[2] WlanLocationAttributes OPTIONAL,

	eTSI671HI2Location		[3] HI2Operations.Location OPTIONAL

	eTSI671HI2Location		[3] HI2Operations.Location OPTIONAL,

	threeGPP33128UserLocation       [4] TS33128Payloads.UserLocation OPTIONAL

}

}





WlanLocationAttributes ::= SEQUENCE

WlanLocationAttributes ::= SEQUENCE