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

Merge branch 'meeting/LI#55e' into 'master'

Meeting/li#55e

See merge request trial!18
parents e59e10af 762d8239
Loading
Loading
Loading
Loading
Loading
+11 −7
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) version30(30)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version31(31)}


DEFINITIONS IMPLICIT TAGS ::=
DEFINITIONS IMPLICIT TAGS ::=


@@ -54,7 +54,7 @@ IMPORTS
	IPMMCC,
	IPMMCC,
	IPMMIRI
	IPMMIRI
		FROM IPMultimediaPDU
		FROM IPMultimediaPDU
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version12(12)}


	-- from ETSI TS 102 232-6 [36]
	-- from ETSI TS 102 232-6 [36]
	PstnIsdnCC,
	PstnIsdnCC,
@@ -199,7 +199,9 @@ IMPORTS
		-- This import is only used for the handover between LEMFs.
		-- This import is only used for the handover between LEMFs.


	-- from 3GPP TS 33.128 [46]
	-- from 3GPP TS 33.128 [46]
	LINotificationPayload
	LINotificationPayload,
	IRIPayload,
	CCPayload
		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)
@@ -213,7 +215,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) version30(30)}
li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version31(31)}


-- ====================
-- ====================
-- Top-level definition
-- Top-level definition
@@ -270,7 +272,7 @@ TimeStampQualifier ::= ENUMERATED


HI4Payload ::= CHOICE
HI4Payload ::= CHOICE
{
{
	threeGPP-LI-Notification [1] TS33128Payloads.LiNotificationPayload,
	threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload,
	... 
	... 
}
}


@@ -355,7 +357,8 @@ CCContents ::= CHOICE
	voipCC-CC-PDU		[20] VoIP-HI3-IMS.Voip-CC-PDU,
	voipCC-CC-PDU		[20] VoIP-HI3-IMS.Voip-CC-PDU,
	gcseCC-CC-PDU		[21] GCSE-HI3.Gcse-CC-PDU,
	gcseCC-CC-PDU		[21] GCSE-HI3.Gcse-CC-PDU,
	cSvoice-CC-PDU		[22] CSvoice-HI3-IP.CSvoice-CC-PDU,
	cSvoice-CC-PDU		[22] CSvoice-HI3-IP.CSvoice-CC-PDU,
	threeGPP33128DefinedCC		[23] OCTET STRING }
	threeGPP33128DefinedCC		[23] OCTET STRING  (CONTAINING TS33128Payloads.CCPayload)
}


MicroSecondTimeStamp ::= SEQUENCE
MicroSecondTimeStamp ::= SEQUENCE
{
{
@@ -420,7 +423,8 @@ IRIContents ::= CHOICE
	confIRI						[16] ConfIRI,
	confIRI						[16] ConfIRI,
	proseIRI					[17] ProSeIRI,
	proseIRI					[17] ProSeIRI,
	gcseIRI						[18] GcseIRI,
	gcseIRI						[18] GcseIRI,
	threeGPP33128DefinedIRI	[19] OCTET STRING}
	threeGPP33128DefinedIRI		[19] OCTET STRING  (CONTAINING TS33128Payloads.IRIPayload)
}


UMTSIRI ::= CHOICE
UMTSIRI ::= CHOICE
	-- This structure may be commented out if not used
	-- This structure may be commented out if not used
+40 −16
Original line number Original line Diff line number Diff line
IPAccessPDU
IPAccessPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)}


DEFINITIONS IMPLICIT TAGS ::=
DEFINITIONS IMPLICIT TAGS ::=
BEGIN
BEGIN


IMPORTS
IMPORTS

	-- from ETSI TS 102 232-1 [2]
	-- from ETSI TS 102 232-1 [2]
	IPAddress,
	IPAddress,
	Location
	Location
@@ -16,10 +17,11 @@ IMPORTS
-- Object Identifier Definition
-- Object Identifier Definition
-- ============================
-- ============================


iPIRIObjId RELATIVE-OID				::= {li-ps(5) iPAccess(3) version13(13) iRI(1)}
iPAccessPDUObjId RELATIVE-OID                   ::= {li-ps(5) iPAccess(3) version14(14)}
iPCCObjId RELATIVE-OID				::= {li-ps(5) iPAccess(3) version13(13) cC(2)}
iPIRIObjId RELATIVE-OID                         ::= {iPAccessPDUObjId iRI(1)}
iPIRIOnlyObjId RELATIVE-OID			::= {li-ps(5) iPAccess(3) version13(13) iRIOnly(3)}
iPCCObjId RELATIVE-OID                          ::= {iPAccessPDUObjId cC(2)}
	-- all three definitions relative to {itu-t(0) identified-organization(4)
iPIRIOnlyObjId RELATIVE-OID                     ::= {iPAccessPDUObjId iRIOnly(3)}
        -- all four definitions relative to {itu-t(0) identified-organization(4)
        -- etsi(0) securityDomain(2) lawfulintercept(2)}
        -- etsi(0) securityDomain(2) lawfulintercept(2)}


-- ==========================
-- ==========================
@@ -53,12 +55,12 @@ IPIRIContents ::= SEQUENCE
{
{
	accessEventType			[0] AccessEventType,
	accessEventType			[0] AccessEventType,
	targetUsername			[1] OCTET STRING,
	targetUsername			[1] OCTET STRING,
		-- in ASCII-characters
		-- in ASCII characters
	internetAccessType		[2] InternetAccessType,
	internetAccessType		[2] InternetAccessType,
	iPVersion				[3] IPVersion,
	iPVersion				[3] IPVersion,
	targetIPAddress			[4] IPAddress OPTIONAL,
	targetIPAddress			[4] IPAddress OPTIONAL,
		-- IP address may not be available in case of failed logon attempts.
		-- IP address may not be available in case of failed logon attempts.
		-- If it is available, it must be sent.
		-- If it is available, it shall be sent.
		-- This field will carry the first IPv4 or IPv6 target IP address with or without 
		-- This field will carry the first IPv4 or IPv6 target IP address with or without 
		-- subnet. Use of this field is fully described in section 6.2.1.
		-- subnet. Use of this field is fully described in section 6.2.1.
	targetNetworkID			[5] UTF8String (SIZE (1..20)) OPTIONAL,
	targetNetworkID			[5] UTF8String (SIZE (1..20)) OPTIONAL,
@@ -112,9 +114,7 @@ IPIRIContents ::= SEQUENCE
		-- This field will carry the NAS-Port-ID as defined in RFC 2869 [17]:
		-- This field will carry the NAS-Port-ID as defined in RFC 2869 [17]:
		-- This parameter shall be populated with the RADIUS value.
		-- This parameter shall be populated with the RADIUS value.
	framedRoutes			[26] SEQUENCE OF FramedRoute OPTIONAL
	framedRoutes			[26] SEQUENCE OF FramedRoute OPTIONAL
		-- It is used to list all the available Framed Route and Framed IPv6 Route information
		-- It is used to list all the available Framed Route and Framed IPv6 Route informationX


}
}


AccessEventType ::= ENUMERATED
AccessEventType ::= ENUMERATED
@@ -141,6 +141,7 @@ AccessEventType ::= ENUMERATED
	endOfInterceptionWithSessionActive(9),
	endOfInterceptionWithSessionActive(9),
	 	-- LI is ended on a target who still has an active session
	 	-- LI is ended on a target who still has an active session
	unknown(10)
	unknown(10)

}
}


InternetAccessType ::= ENUMERATED
InternetAccessType ::= ENUMERATED
@@ -199,7 +200,7 @@ IPIRIIDType ::= CHOICE
	printableIDType			[0] UTF8String (SIZE (1..128)),
	printableIDType			[0] UTF8String (SIZE (1..128)),
		-- For printable userIDs, such as the Radius username, phonenumbers
		-- For printable userIDs, such as the Radius username, phonenumbers
	macAddressType			[1] OCTET STRING (SIZE (6)),
	macAddressType			[1] OCTET STRING (SIZE (6)),
		-- For MAC address types, raw binary format as in RFC 2132 [15]
		-- For MAC address types, raw binary format as in IETF RFC 2132 [15]
	ipAddressType			[2] IPAddress,
	ipAddressType			[2] IPAddress,
		-- For IP address types
		-- For IP address types
	...
	...
@@ -241,12 +242,13 @@ OtherTargetIdentifiers ::= CHOICE
		-- This list is extensible to accommodate other target identifiers which 
		-- This list is extensible to accommodate other target identifiers which 
		-- may be required in future.
		-- may be required in future.
	iPAddress		[0] IPAddress,
	iPAddress		[0] IPAddress,
		-- IPAddress imported from TS 102 232 [2].
		-- IPAddress imported from ETSI TS 102 232 [2].
		-- This can be an IPv4 address (with or without a subnet range defined) or 
		-- This can be an IPv4 address (with or without a subnet range defined) or 
		-- an IPv6 address (with or without a prefix range defined).
		-- an IPv6 address (with or without a prefix range defined).
	...
	...
}
}



FramedRoute ::= CHOICE
FramedRoute ::= CHOICE
{
{
		-- Additional Framed Route prefix information associated with the target service
		-- Additional Framed Route prefix information associated with the target service
@@ -271,6 +273,7 @@ IPIRIOnly ::= SEQUENCE
	protocolInformation         [2] ProtocolInformation,
	protocolInformation         [2] ProtocolInformation,
	iPAggregatedNbrOfPackets	[3] INTEGER OPTIONAL,
	iPAggregatedNbrOfPackets	[3] INTEGER OPTIONAL,
	iPAggregatedNbrOfBytes		[4] INTEGER OPTIONAL,
	iPAggregatedNbrOfBytes		[4] INTEGER OPTIONAL,
    pDSRInformation             [5] PDSRInformation OPTIONAL,
	...
	...
}
}


@@ -339,5 +342,26 @@ UDPInformation ::= SEQUENCE
	checkSum			[3] OCTET STRING (SIZE (2))OPTIONAL
	checkSum			[3] OCTET STRING (SIZE (2))OPTIONAL
}
}


END -- end of IPAccessPDU
PDSRInformation::= SEQUENCE
{
    summaryTrigger              [0] PDSRSummaryTrigger,
    firstPacketTimestamp        [1] GeneralizedTime,
    lastPacketTimestamp         [2] GeneralizedTime,
    packetCount                 [3] INTEGER,
    byteCount                   [4] INTEGER,
    ...
}

PDSRSummaryTrigger ::= ENUMERATED
{
    startOfFlow(0),
    timerExpiry(1),
    packetCount(2),
    byteCount(3),
    endOfFlow(4),
    ...
}




END -- end of IPAccessPDU
+51 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" ?>
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <Header>
    <SenderIdentifier>
      <CountryCode>XX</CountryCode>
      <UniqueIdentifier>Sender</UniqueIdentifier>
    </SenderIdentifier>
    <ReceiverIdentifier>
      <CountryCode>XX</CountryCode>
      <UniqueIdentifier>Receiver</UniqueIdentifier>
    </ReceiverIdentifier>
    <TransactionIdentifier>d442c58c-d5e1-4fd9-90ec-9c228ad947f1</TransactionIdentifier>
    <Timestamp>2020-09-22T08:06:17.025833Z</Timestamp>
    <Version>
      <ETSIVersion>V1.7.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.1.1</NationalProfileVersion>
    </Version>
  </Header>
  <Payload>
    <RequestPayload>
      <ActionRequests>
        <ActionRequest>
          <ActionIdentifier>1</ActionIdentifier>
          <CREATE>
            <HI1Object xsi:type="task:LITaskObject">
              <ObjectIdentifier>cd3994b1-e5f3-4b59-a852-5fecd02bd247</ObjectIdentifier>
              <task:ApprovalDetails>
                <common:ApprovalDescription>Single Approval</common:ApprovalDescription>
              </task:ApprovalDetails>
            </HI1Object>
          </CREATE>
        </ActionRequest>
        <ActionRequest>
          <ActionIdentifier>2</ActionIdentifier>
          <CREATE>
            <HI1Object xsi:type="task:LITaskObject">
              <ObjectIdentifier>64e8681a-a4de-4dea-9686-4a2a15e54786</ObjectIdentifier>
              <task:ApprovalDetails>
                <common:ApprovalDescription>First of two approvals</common:ApprovalDescription>
              </task:ApprovalDetails>
              <task:ApprovalDetails>
                <common:ApprovalDescription>Second of two approvals</common:ApprovalDescription>
              </task:ApprovalDetails>
            </HI1Object>
          </CREATE>
        </ActionRequest>
      </ActionRequests>
    </RequestPayload>
  </Payload>
</HI1Message>
 No newline at end of file
+2 −2
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2019/10/Task" xmlns:auth="http://uri.etsi.org/03120/common/2016/02/Authorisation">
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation">
  <Header>
  <Header>
    <SenderIdentifier>
    <SenderIdentifier>
      <CountryCode>XX</CountryCode>
      <CountryCode>XX</CountryCode>
@@ -12,7 +12,7 @@
    <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
    <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
    <Timestamp>2015-09-01T12:00:00.000000Z</Timestamp>
    <Timestamp>2015-09-01T12:00:00.000000Z</Timestamp>
    <Version>
    <Version>
      <ETSIVersion>V1.5.1</ETSIVersion>
      <ETSIVersion>V1.7.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
    </Version>
    </Version>
+2 −2
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2019/10/Task" xmlns:auth="http://uri.etsi.org/03120/common/2016/02/Authorisation">
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation">
  <Header>
  <Header>
    <SenderIdentifier>
    <SenderIdentifier>
      <CountryCode>XX</CountryCode>
      <CountryCode>XX</CountryCode>
@@ -12,7 +12,7 @@
    <TransactionIdentifier>45002c1e-dc4a-470a-9152-8e752638c86c</TransactionIdentifier>
    <TransactionIdentifier>45002c1e-dc4a-470a-9152-8e752638c86c</TransactionIdentifier>
    <Timestamp>2015-09-01T12:01:00.000000Z</Timestamp>
    <Timestamp>2015-09-01T12:01:00.000000Z</Timestamp>
    <Version>
    <Version>
      <ETSIVersion>V1.5.1</ETSIVersion>
      <ETSIVersion>V1.7.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
    </Version>
    </Version>
Loading