Commit c986c007 authored by canterburym's avatar canterburym
Browse files

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

Meeting/li#56e

See merge request !24
parents a76d7465 09560aaf
Pipeline #8419 failed with stage
...@@ -41,7 +41,7 @@ IMPORTS ...@@ -41,7 +41,7 @@ IMPORTS
IPIRI, IPIRI,
IPIRIOnly IPIRIOnly
FROM IPAccessPDU FROM 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)}
-- from ETSI TS 102 232-4 [32] -- from ETSI TS 102 232-4 [32]
L2CC, L2CC,
...@@ -54,7 +54,7 @@ IMPORTS ...@@ -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) version12(12)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)}
-- from ETSI TS 102 232-6 [36] -- from ETSI TS 102 232-6 [36]
PstnIsdnCC, PstnIsdnCC,
...@@ -62,7 +62,7 @@ IMPORTS ...@@ -62,7 +62,7 @@ IMPORTS
FROM PstnIsdnPDU FROM PstnIsdnPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)}
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
IRI-Parameters, IRI-Parameters,
UmtsIRIsContent, UmtsIRIsContent,
CorrelationValues, CorrelationValues,
...@@ -72,7 +72,7 @@ IMPORTS ...@@ -72,7 +72,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs -- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application. -- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
IRI-Parameters, IRI-Parameters,
UmtsCS-IRIsContent UmtsCS-IRIsContent
FROM UmtsCS-HI2Operations FROM UmtsCS-HI2Operations
...@@ -80,7 +80,7 @@ IMPORTS ...@@ -80,7 +80,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs -- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application. -- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
IRI-Parameters, IRI-Parameters,
EpsIRIsContent, EpsIRIsContent,
EPSLocation EPSLocation
...@@ -89,7 +89,7 @@ IMPORTS ...@@ -89,7 +89,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs -- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application. -- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
IRI-Parameters, IRI-Parameters,
ConfIRIsContent ConfIRIsContent
FROM CONFHI2Operations FROM CONFHI2Operations
...@@ -97,7 +97,7 @@ IMPORTS ...@@ -97,7 +97,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs -- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application. -- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
IRI-Parameters, IRI-Parameters,
ProSeIRIsContent ProSeIRIsContent
FROM ProSeHI2Operations FROM ProSeHI2Operations
...@@ -105,7 +105,7 @@ IMPORTS ...@@ -105,7 +105,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs -- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application. -- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
IRI-Parameters, IRI-Parameters,
GcseIRIsContent GcseIRIsContent
FROM GCSEHI2Operations FROM GCSEHI2Operations
...@@ -113,42 +113,42 @@ IMPORTS ...@@ -113,42 +113,42 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs -- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application. -- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
CC-PDU CC-PDU
FROM Umts-HI3-PS FROM Umts-HI3-PS
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3(2)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3(2)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
CC-PDU CC-PDU
FROM Eps-HI3-PS FROM Eps-HI3-PS
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
Conf-CC-PDU Conf-CC-PDU
FROM CONF-HI3-IMS FROM CONF-HI3-IMS
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3conf(11)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3conf(11)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
Voip-CC-PDU Voip-CC-PDU
FROM VoIP-HI3-IMS FROM VoIP-HI3-IMS
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3voip(12)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3voip(12)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
Gcse-CC-PDU Gcse-CC-PDU
FROM GCSE-HI3 FROM GCSE-HI3
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3gcse(14)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3gcse(14)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
ThreeGPP-HI1-Operation ThreeGPP-HI1-Operation
FROM ThreeGPP-HI1NotificationOperations FROM ThreeGPP-HI1NotificationOperations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)}
...@@ -159,13 +159,13 @@ IMPORTS ...@@ -159,13 +159,13 @@ IMPORTS
-- The implementation depends of national regulations or LEA/CSP negotiations. -- The implementation depends of national regulations or LEA/CSP negotiations.
-- 3GPP HI1 may be used with other services/networks than 3GPP's one. -- 3GPP HI1 may be used with other services/networks than 3GPP's one.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
CSvoice-CC-PDU CSvoice-CC-PDU
FROM CSvoice-HI3-IP FROM CSvoice-HI3-IP
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- The implementation of the CS domain delivery in IP have to be based on ETSI TS 133 108 [9]. -- The implementation of the CS domain delivery in IP have to be based on 3GPP TS 33.108 [9].
-- from ETSI TS 101 909-20-1 [33] -- from ETSI TS 101 909-20-1 [33]
TARGETACTIVITYMONITOR-1, TARGETACTIVITYMONITOR-1,
...@@ -205,7 +205,7 @@ IMPORTS ...@@ -205,7 +205,7 @@ IMPORTS
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)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- end of IMPORTS -- end of IMPORTS
...@@ -239,7 +239,7 @@ PSHeader ::= SEQUENCE ...@@ -239,7 +239,7 @@ PSHeader ::= SEQUENCE
timeStamp [5] GeneralizedTime OPTIONAL, timeStamp [5] GeneralizedTime OPTIONAL,
-- see clause 5.2.6 -- see clause 5.2.6
..., ...,
interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL,
-- see clause 5.2.11 -- see clause 5.2.11
microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL,
timeStampQualifier [8] TimeStampQualifier OPTIONAL timeStampQualifier [8] TimeStampQualifier OPTIONAL
...@@ -253,12 +253,12 @@ Payload ::= CHOICE ...@@ -253,12 +253,12 @@ Payload ::= CHOICE
tRIPayload [2] TRIPayload, tRIPayload [2] TRIPayload,
..., ...,
hI1-Operation [3] HI1-Operation, hI1-Operation [3] HI1-Operation,
encryptionContainer [4] EncryptionContainer, encryptionContainer [4] EncryptionContainer,
threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation,
-- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4]
iLHIPayload [6] SEQUENCE OF ILHIPayload, iLHIPayload [6] SEQUENCE OF ILHIPayload,
-- For typical use cases see ETSI TS 103 462 [45] -- For typical use cases see ETSI TS 103 462 [45]
hI4Payload [7] SEQUENCE OF HI4Payload hI4Payload [7] SEQUENCE OF HI4Payload
} }
TimeStampQualifier ::= ENUMERATED TimeStampQualifier ::= ENUMERATED
...@@ -336,28 +336,28 @@ PayloadDirection ::= ENUMERATED ...@@ -336,28 +336,28 @@ PayloadDirection ::= ENUMERATED
CCContents ::= CHOICE CCContents ::= CHOICE
-- Any of these choices may be commented out if they are not being used, see clause A.3 -- Any of these choices may be commented out if they are not being used, see clause A.3
{ {
emailCC [1] EmailCC, emailCC [1] EmailCC,
iPCC [2] IPCC, iPCC [2] IPCC,
uMTSCC [4] OCTET STRING, uMTSCC [4] OCTET STRING,
..., ...,
l2CC [6] L2CC, l2CC [6] L2CC,
tTRAFFIC-1 [7] TS101909201.TTRAFFIC, tTRAFFIC-1 [7] TS101909201.TTRAFFIC,
cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC, cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC,
tTRAFFIC-2 [9] TS101909202.TTRAFFIC, tTRAFFIC-2 [9] TS101909202.TTRAFFIC,
cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC, cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC,
pstnIsdnCC [11] PstnIsdnCC, pstnIsdnCC [11] PstnIsdnCC,
iPMMCC [12] IPMMCC, iPMMCC [12] IPMMCC,
cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader,
messagingCC [14] MessagingCC, messagingCC [14] MessagingCC,
ePSCC [15] OCTET STRING, ePSCC [15] OCTET STRING,
uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU,
ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU,
messagingMMCC [18] MessagingMMCC, messagingMMCC [18] MessagingMMCC,
confCC-CC-PDU [19] CONF-HI3-IMS.Conf-CC-PDU, confCC-CC-PDU [19] CONF-HI3-IMS.Conf-CC-PDU,
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 (CONTAINING TS33128Payloads.CCPayload) threeGPP33128DefinedCC [23] OCTET STRING (CONTAINING TS33128Payloads.CCPayload)
} }
MicroSecondTimeStamp ::= SEQUENCE MicroSecondTimeStamp ::= SEQUENCE
...@@ -423,7 +423,7 @@ IRIContents ::= CHOICE ...@@ -423,7 +423,7 @@ IRIContents ::= CHOICE
confIRI [16] ConfIRI, confIRI [16] ConfIRI,
proseIRI [17] ProSeIRI, proseIRI [17] ProSeIRI,
gcseIRI [18] GcseIRI, gcseIRI [18] GcseIRI,
threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload) threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload)
} }
UMTSIRI ::= CHOICE UMTSIRI ::= CHOICE
...@@ -515,7 +515,7 @@ IntegrityCheck ::= SEQUENCE ...@@ -515,7 +515,7 @@ IntegrityCheck ::= SEQUENCE
-- Network byte order -- Network byte order
-- If checkValue contains a signature, the octet string field space may be -- If checkValue contains a signature, the octet string field space may be
-- used to insert the appropriate ASN.1 DER or BER encoded structure for the -- used to insert the appropriate ASN.1 DER or BER encoded structure for the
-- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. -- DSS/DSA signature as described in IETF RFC 3279 [43], clause 2.2.2.
..., ...,
hashAlgorithm [4] HashAlgorithm OPTIONAL hashAlgorithm [4] HashAlgorithm OPTIONAL
-- Clarifies the hash function if checkType is hash(1). -- Clarifies the hash function if checkType is hash(1).
......
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 ::=
...@@ -41,7 +41,7 @@ IMPORTS ...@@ -41,7 +41,7 @@ IMPORTS
IPIRI, IPIRI,
IPIRIOnly IPIRIOnly
FROM IPAccessPDU FROM 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)}
-- from ETSI TS 102 232-4 [32] -- from ETSI TS 102 232-4 [32]
L2CC, L2CC,
...@@ -54,7 +54,7 @@ IMPORTS ...@@ -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) version13(13)}
-- from ETSI TS 102 232-6 [36] -- from ETSI TS 102 232-6 [36]
PstnIsdnCC, PstnIsdnCC,
...@@ -62,7 +62,7 @@ IMPORTS ...@@ -62,7 +62,7 @@ IMPORTS
FROM PstnIsdnPDU FROM PstnIsdnPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)}
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
IRI-Parameters, IRI-Parameters,
UmtsIRIsContent, UmtsIRIsContent,
CorrelationValues, CorrelationValues,
...@@ -72,7 +72,7 @@ IMPORTS ...@@ -72,7 +72,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs -- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application. -- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
IRI-Parameters, IRI-Parameters,
UmtsCS-IRIsContent UmtsCS-IRIsContent
FROM UmtsCS-HI2Operations FROM UmtsCS-HI2Operations
...@@ -80,7 +80,7 @@ IMPORTS ...@@ -80,7 +80,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs -- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application. -- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
IRI-Parameters, IRI-Parameters,
EpsIRIsContent, EpsIRIsContent,
EPSLocation EPSLocation
...@@ -89,7 +89,7 @@ IMPORTS ...@@ -89,7 +89,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs -- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application. -- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
IRI-Parameters, IRI-Parameters,
ConfIRIsContent ConfIRIsContent
FROM CONFHI2Operations FROM CONFHI2Operations
...@@ -97,7 +97,7 @@ IMPORTS ...@@ -97,7 +97,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs -- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application. -- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
IRI-Parameters, IRI-Parameters,
ProSeIRIsContent ProSeIRIsContent
FROM ProSeHI2Operations FROM ProSeHI2Operations
...@@ -105,7 +105,7 @@ IMPORTS ...@@ -105,7 +105,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs -- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application. -- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
IRI-Parameters, IRI-Parameters,
GcseIRIsContent GcseIRIsContent
FROM GCSEHI2Operations FROM GCSEHI2Operations
...@@ -113,42 +113,42 @@ IMPORTS ...@@ -113,42 +113,42 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs -- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application. -- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
CC-PDU CC-PDU
FROM Umts-HI3-PS FROM Umts-HI3-PS
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3(2)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3(2)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
CC-PDU CC-PDU
FROM Eps-HI3-PS FROM Eps-HI3-PS
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
Conf-CC-PDU Conf-CC-PDU
FROM CONF-HI3-IMS FROM CONF-HI3-IMS
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3conf(11)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3conf(11)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
Voip-CC-PDU Voip-CC-PDU
FROM VoIP-HI3-IMS FROM VoIP-HI3-IMS
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3voip(12)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3voip(12)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
Gcse-CC-PDU Gcse-CC-PDU
FROM GCSE-HI3 FROM GCSE-HI3
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3gcse(14)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3gcse(14)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
ThreeGPP-HI1-Operation ThreeGPP-HI1-Operation
FROM ThreeGPP-HI1NotificationOperations FROM ThreeGPP-HI1NotificationOperations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)}
...@@ -159,13 +159,13 @@ IMPORTS ...@@ -159,13 +159,13 @@ IMPORTS
-- The implementation depends of national regulations or LEA/CSP negotiations. -- The implementation depends of national regulations or LEA/CSP negotiations.
-- 3GPP HI1 may be used with other services/networks than 3GPP's one. -- 3GPP HI1 may be used with other services/networks than 3GPP's one.
-- from ETSI TS 133 108 [9] -- from 3GPP TS 33.108 [9]
CSvoice-CC-PDU CSvoice-CC-PDU
FROM CSvoice-HI3-IP FROM CSvoice-HI3-IP
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- The implementation of the CS domain delivery in IP have to be based on ETSI TS 133 108 [9]. -- The implementation of the CS domain delivery in IP have to be based on 3GPP TS 33.108 [9].
-- from ETSI TS 101 909-20-1 [33] -- from ETSI TS 101 909-20-1 [33]
TARGETACTIVITYMONITOR-1, TARGETACTIVITYMONITOR-1,
...@@ -199,11 +199,13 @@ IMPORTS ...@@ -199,11 +199,13 @@ 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)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- end of IMPORTS -- end of IMPORTS
...@@ -213,7 +215,7 @@ IMPORTS ...@@ -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
...@@ -237,7 +239,7 @@ PSHeader ::= SEQUENCE ...@@ -237,7 +239,7 @@ PSHeader ::= SEQUENCE
timeStamp [5] GeneralizedTime OPTIONAL, timeStamp [5] GeneralizedTime OPTIONAL,
-- see clause 5.2.6 -- see clause 5.2.6
..., ...,
interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL,
-- see clause 5.2.11 -- see clause 5.2.11
microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL,
timeStampQualifier [8] TimeStampQualifier OPTIONAL timeStampQualifier [8] TimeStampQualifier OPTIONAL
...@@ -251,12 +253,12 @@ Payload ::= CHOICE ...@@ -251,12 +253,12 @@ Payload ::= CHOICE
tRIPayload [2] TRIPayload, tRIPayload [2] TRIPayload,
..., ...,
hI1-Operation [3] HI1-Operation, hI1-Operation [3] HI1-Operation,
encryptionContainer [4] EncryptionContainer, encryptionContainer [4] EncryptionContainer,
threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation,
-- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4]
iLHIPayload [6] SEQUENCE OF ILHIPayload, iLHIPayload [6] SEQUENCE OF ILHIPayload,
-- For typical use cases see ETSI TS 103 462 [45] -- For typical use cases see ETSI TS 103 462 [45]
hI4Payload [7] SEQUENCE OF HI4Payload hI4Payload [7] SEQUENCE OF HI4Payload
} }
TimeStampQualifier ::= ENUMERATED TimeStampQualifier ::= ENUMERATED
...@@ -270,7 +272,7 @@ TimeStampQualifier ::= ENUMERATED ...@@ -270,7 +272,7 @@ TimeStampQualifier ::= ENUMERATED
HI4Payload ::= CHOICE HI4Payload ::= CHOICE
{ {
threeGPP-LI-Notification [1] TS33128Payloads.LiNotificationPayload, threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload,
... ...
} }
...@@ -334,28 +336,29 @@ PayloadDirection ::= ENUMERATED ...@@ -334,28 +336,29 @@ PayloadDirection ::= ENUMERATED
CCContents ::= CHOICE CCContents ::= CHOICE
-- Any of these choices may be commented out if they are not being used, see clause A.3 -- Any of these choices may be commented out if they are not being used, see clause A.3
{ {
emailCC [1] EmailCC, emailCC [1] EmailCC,
iPCC [2] IPCC, iPCC [2] IPCC,
uMTSCC [4] OCTET STRING, uMTSCC [4] OCTET STRING,
...,