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
IPIRI,
IPIRIOnly
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]
L2CC,
......@@ -54,7 +54,7 @@ IMPORTS
IPMMCC,
IPMMIRI
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]
PstnIsdnCC,
......@@ -62,7 +62,7 @@ IMPORTS
FROM PstnIsdnPDU
{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,
UmtsIRIsContent,
CorrelationValues,
......@@ -72,7 +72,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
IRI-Parameters,
UmtsCS-IRIsContent
FROM UmtsCS-HI2Operations
......@@ -80,7 +80,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
IRI-Parameters,
EpsIRIsContent,
EPSLocation
......@@ -89,7 +89,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
IRI-Parameters,
ConfIRIsContent
FROM CONFHI2Operations
......@@ -97,7 +97,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
IRI-Parameters,
ProSeIRIsContent
FROM ProSeHI2Operations
......@@ -105,7 +105,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
IRI-Parameters,
GcseIRIsContent
FROM GCSEHI2Operations
......@@ -113,42 +113,42 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
CC-PDU
FROM Umts-HI3-PS
{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)
-- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
CC-PDU
FROM Eps-HI3-PS
{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)
-- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
Conf-CC-PDU
FROM CONF-HI3-IMS
{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)
-- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
Voip-CC-PDU
FROM VoIP-HI3-IMS
{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)
-- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
Gcse-CC-PDU
FROM GCSE-HI3
{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)
-- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
ThreeGPP-HI1-Operation
FROM ThreeGPP-HI1NotificationOperations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)}
......@@ -159,13 +159,13 @@ IMPORTS
-- The implementation depends of national regulations or LEA/CSP negotiations.
-- 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
FROM CSvoice-HI3-IP
{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)
-- 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]
TARGETACTIVITYMONITOR-1,
......@@ -515,7 +515,7 @@ IntegrityCheck ::= SEQUENCE
-- Network byte order
-- 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
-- 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
-- Clarifies the hash function if checkType is hash(1).
......
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 ::=
......@@ -41,7 +41,7 @@ IMPORTS
IPIRI,
IPIRIOnly
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]
L2CC,
......@@ -54,7 +54,7 @@ IMPORTS
IPMMCC,
IPMMIRI
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]
PstnIsdnCC,
......@@ -62,7 +62,7 @@ IMPORTS
FROM PstnIsdnPDU
{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,
UmtsIRIsContent,
CorrelationValues,
......@@ -72,7 +72,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
IRI-Parameters,
UmtsCS-IRIsContent
FROM UmtsCS-HI2Operations
......@@ -80,7 +80,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
IRI-Parameters,
EpsIRIsContent,
EPSLocation
......@@ -89,7 +89,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
IRI-Parameters,
ConfIRIsContent
FROM CONFHI2Operations
......@@ -97,7 +97,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
IRI-Parameters,
ProSeIRIsContent
FROM ProSeHI2Operations
......@@ -105,7 +105,7 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
IRI-Parameters,
GcseIRIsContent
FROM GCSEHI2Operations
......@@ -113,42 +113,42 @@ IMPORTS
-- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
CC-PDU
FROM Umts-HI3-PS
{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)
-- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
CC-PDU
FROM Eps-HI3-PS
{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)
-- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
Conf-CC-PDU
FROM CONF-HI3-IMS
{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)
-- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
Voip-CC-PDU
FROM VoIP-HI3-IMS
{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)
-- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
Gcse-CC-PDU
FROM GCSE-HI3
{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)
-- needs to be chosen when compiling the application.
-- from ETSI TS 133 108 [9]
-- from 3GPP TS 33.108 [9]
ThreeGPP-HI1-Operation
FROM ThreeGPP-HI1NotificationOperations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)}
......@@ -159,13 +159,13 @@ IMPORTS
-- The implementation depends of national regulations or LEA/CSP negotiations.
-- 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
FROM CSvoice-HI3-IP
{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)
-- 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]
TARGETACTIVITYMONITOR-1,
......@@ -199,7 +199,9 @@ IMPORTS
-- This import is only used for the handover between LEMFs.
-- from 3GPP TS 33.128 [46]
LINotificationPayload
LINotificationPayload,
IRIPayload,
CCPayload
FROM TS33128Payloads
{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)
......@@ -213,7 +215,7 @@ IMPORTS
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
......@@ -270,7 +272,7 @@ TimeStampQualifier ::= ENUMERATED
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,
gcseCC-CC-PDU [21] GCSE-HI3.Gcse-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
{
......@@ -420,7 +423,8 @@ IRIContents ::= CHOICE
confIRI [16] ConfIRI,
proseIRI [17] ProSeIRI,
gcseIRI [18] GcseIRI,
threeGPP33128DefinedIRI [19] OCTET STRING}
threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload)
}
UMTSIRI ::= CHOICE
-- This structure may be commented out if not used
......@@ -511,7 +515,7 @@ IntegrityCheck ::= SEQUENCE
-- Network byte order
-- 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
-- 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
-- Clarifies the hash function if checkType is hash(1).
......
......@@ -5,7 +5,6 @@ DEFINITIONS IMPLICIT TAGS ::=
BEGIN
IMPORTS
-- from ETSI TS 102 232-1 [2]
IPAddress,
Location
......@@ -24,6 +23,7 @@ iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)
-- all four definitions relative to {itu-t(0) identified-organization(4)
-- etsi(0) securityDomain(2) lawfulintercept(2)}
-- ==========================
-- IP Communications Contents
-- ==========================
......@@ -55,12 +55,12 @@ IPIRIContents ::= SEQUENCE
{
accessEventType [0] AccessEventType,
targetUsername [1] OCTET STRING,
-- in ASCII characters
-- in ASCII-characters
internetAccessType [2] InternetAccessType,
iPVersion [3] IPVersion,
targetIPAddress [4] IPAddress OPTIONAL,
-- IP address may not be available in case of failed logon attempts.
-- If it is available, it shall be sent.
-- If it is available, it must be sent.
-- 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.
targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL,
......@@ -114,7 +114,9 @@ IPIRIContents ::= SEQUENCE
-- This field will carry the NAS-Port-ID as defined in RFC 2869 [17]:
-- This parameter shall be populated with the RADIUS value.
framedRoutes [26] SEQUENCE OF FramedRoute OPTIONAL
-- It is used to list all the available Framed Route and Framed IPv6 Route informationX
-- It is used to list all the available Framed Route and Framed IPv6 Route information
}
AccessEventType ::= ENUMERATED
......@@ -141,7 +143,6 @@ AccessEventType ::= ENUMERATED
endOfInterceptionWithSessionActive(9),
-- LI is ended on a target who still has an active session
unknown(10)
}
InternetAccessType ::= ENUMERATED
......@@ -200,7 +201,7 @@ IPIRIIDType ::= CHOICE
printableIDType [0] UTF8String (SIZE (1..128)),
-- For printable userIDs, such as the Radius username, phonenumbers
macAddressType [1] OCTET STRING (SIZE (6)),
-- For MAC address types, raw binary format as in IETF RFC 2132 [15]
-- For MAC address types, raw binary format as in RFC 2132 [15]
ipAddressType [2] IPAddress,
-- For IP address types
...
......@@ -242,13 +243,12 @@ OtherTargetIdentifiers ::= CHOICE
-- This list is extensible to accommodate other target identifiers which
-- may be required in future.
iPAddress [0] IPAddress,
-- IPAddress imported from ETSI TS 102 232 [2].
-- IPAddress imported from TS 102 232 [2].
-- This can be an IPv4 address (with or without a subnet range defined) or
-- an IPv6 address (with or without a prefix range defined).
...
}
FramedRoute ::= CHOICE
{
-- Additional Framed Route prefix information associated with the target service
......@@ -273,8 +273,8 @@ IPIRIOnly ::= SEQUENCE
protocolInformation [2] ProtocolInformation,
iPAggregatedNbrOfPackets [3] INTEGER OPTIONAL,
iPAggregatedNbrOfBytes [4] INTEGER OPTIONAL,
pDSRInformation [5] PDSRInformation OPTIONAL,
...
...,
pDSRInformation [5] PDSRInformation OPTIONAL
}
IPInformation ::= CHOICE
......@@ -363,5 +363,5 @@ PDSRSummaryTrigger ::= ENUMERATED
}
END -- end of 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 ::=
BEGIN
IMPORTS
-- from ETSI TS 102 232-1 [2]
IPAddress
IPAddress,
Location
FROM LI-PS-PDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)};
......@@ -16,12 +16,14 @@ IMPORTS
-- Object Identifier Definition
-- ============================
iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) iRI(1)}
iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) cC(2)}
iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) iRIOnly(3)}
-- all three definitions relative to {itu-t(0) identified-organization(4)
iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version14(14)}
iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)}
iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)}
iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)}
-- all four definitions relative to {itu-t(0) identified-organization(4)
-- etsi(0) securityDomain(2) lawfulintercept(2)}
-- ==========================
-- IP Communications Contents
-- ==========================
......@@ -53,7 +55,7 @@ IPIRIContents ::= SEQUENCE
{
accessEventType [0] AccessEventType,
targetUsername [1] OCTET STRING,
-- in ASCIIcharacters
-- in ASCII-characters
internetAccessType [2] InternetAccessType,
iPVersion [3] IPVersion,
targetIPAddress [4] IPAddress OPTIONAL,
......@@ -126,7 +128,7 @@ AccessEventType ::= ENUMERATED
accessReject(2),
-- IAS access is refused to the target
accessFailed(3),
-- The Access_attempt timed-out or failed otherwise
-- The accessAttempt timed-out or failed otherwise
sessionStart(4),
-- A target starts using the IAS; not in use anymore from version 4(4)
sessionEnd(5),
......@@ -241,7 +243,7 @@ OtherTargetIdentifiers ::= CHOICE
-- This list is extensible to accommodate other target identifiers which
-- may be required in future.
iPAddress [0] IPAddress,
-- IPAddress imported from TS 101 671 [1].
-- IPAddress imported from TS 102 232 [2].
-- This can be an IPv4 address (with or without a subnet range defined) or
-- an IPv6 address (with or without a prefix range defined).
...
......@@ -271,7 +273,8 @@ IPIRIOnly ::= SEQUENCE
protocolInformation [2] ProtocolInformation,
iPAggregatedNbrOfPackets [3] INTEGER OPTIONAL,
iPAggregatedNbrOfBytes [4] INTEGER OPTIONAL,
...
...,
pDSRInformation [5] PDSRInformation OPTIONAL
}
IPInformation ::= CHOICE
......@@ -339,5 +342,26 @@ UDPInformation ::= SEQUENCE
checkSum [3] OCTET STRING (SIZE (2))OPTIONAL
}
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
......@@ -4,7 +4,7 @@
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)}
DEFINITIONS IMPLICIT TAGS ::=
BEGIN
......@@ -22,8 +22,8 @@ IMPORTS
-- Object Identifier Definition
-- ============================
iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) iRI(1)}
iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) cC(2)}
iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) iRI(1)}
iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) cC(2)}
-- both definitions relative to:
-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
......@@ -107,9 +107,11 @@ IPIRIContents ::= CHOICE
originalIPMMMessage [0] OCTET STRING,
-- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers
sIPMessage [1] SIPMessage,
-- Copy of the SIP content and the source and destination IP address
-- Copy of the SIP content and the source and destination IP address of the intercepted
-- SIP message as transmitted on the network layer (see clause 5.2.7).
h323Message [2] H323Message,
-- Copy of the H.323 content and the source and destination IP address
-- Copy of the H.323 content and the source and destination IP address of the intercepted
-- H.323 message as transmitted on the network layer (see clause 5.2.7).
...,
nationalIPMMIRIParameters [3] NationalIPMMIRIParameters,
-- This parameter is used according to national regulations
......@@ -120,8 +122,9 @@ IPIRIContents ::= CHOICE
-- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers
-- see clause 5.2.6.
iRIOnlySIPMessage [6] SIPMessage
-- Copy of the SIP content and the source and destination IP address
-- see clause 5.2.6.
-- Copy of the SIP content and the source and destination IP address of the intercepted
-- SIP message as transmitted on the network layer.
-- (see clause 5.2.6 and 5.2.7).
}
SIPMessage ::= SEQUENCE
......
......@@ -4,7 +4,7 @@
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)}
DEFINITIONS IMPLICIT TAGS ::=
BEGIN
......@@ -22,8 +22,8 @@ IMPORTS
-- Object Identifier Definition
-- ============================
iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) iRI(1)}
iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) cC(2)}
iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) iRI(1)}
iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) cC(2)}
-- both definitions relative to:
-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
......@@ -107,9 +107,11 @@ IPIRIContents ::= CHOICE
originalIPMMMessage [0] OCTET STRING,
-- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers
sIPMessage [1] SIPMessage,
-- Copy of the SIP content and the source and destination IP address
-- Copy of the SIP content and the source and destination IP address of the intercepted
-- SIP message as transmitted on the network layer (see clause 5.2.7).
h323Message [2] H323Message,
-- Copy of the H.323 content and the source and destination IP address
-- Copy of the H.323 content and the source and destination IP address of the intercepted
-- H.323 message as transmitted on the network layer (see clause 5.2.7).
...,
nationalIPMMIRIParameters [3] NationalIPMMIRIParameters,
-- This parameter is used according to national regulations
......@@ -120,8 +122,9 @@ IPIRIContents ::= CHOICE
-- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers
-- see clause 5.2.6.
iRIOnlySIPMessage [6] SIPMessage
-- Copy of the SIP content and the source and destination IP address
-- see clause 5.2.6.
-- Copy of the SIP content and the source and destination IP address of the intercepted
-- SIP message as transmitted on the network layer.
-- (see clause 5.2.6 and 5.2.7).
}
SIPMessage ::= SEQUENCE
......
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version24(24)}
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version25(25)}
DEFINITIONS IMPLICIT TAGS ::=
......@@ -12,7 +12,7 @@ BEGIN
retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)}
-- rdHeader
rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version24(24)}
rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version25(25)}
-- ======================================
-- Top level definitions for RDHI wrapper
......@@ -457,7 +457,8 @@ IndividualInfo ::= SEQUENCE
{
male(0),
female(1),
...
...,
other(2)
} OPTIONAL,
identificationNumber [5] UTF8String OPTIONAL,
authenticationInfo [6] AuthenticationInfo OPTIONAL,
......
<?xml version="1.0"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.26.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.26.1#/RetainedData" elementFormDefault="qualified">
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.27.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.27.1#/RetainedData" elementFormDefault="qualified">
<xsd:annotation>
<xsd:documentation xml:lang="en">
XSD translated from ASN.1 derived from outcome of TS 102 657 v1.26.1
XSD translated from ASN.1 derived from outcome of TS 102 657 v1.27.1
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType name="GeneralizedTime">
......@@ -603,6 +603,7 @@
<xsd:choice>
<xsd:element name="male" type="NULL"/>
<xsd:element name="female" type="NULL"/>
<xsd:element name="other" type="NULL"/>
</xsd:choice>
</xsd:complexType>