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

Merge branch 'meeting/LI62' into 'main' 

Output of LI62

See merge request li/schemas-definitions!56
parents 01d89e19 33eb9211

.editorconfig

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# top-most EditorConfig file

root = true



# Unix-style newlines with a newline ending every file

[**]

end_of_line = lf

insert_final_newline = true



# ASN.1, XML: 4 space indents

[**.{asn,asn1,xml,xsd}]

indent_style = space

indent_size = 4

trim_trailing_whitespace = true

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ generate_artefacts: 
    - echo $CI_MERGE_REQUEST_IID

    - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME

    - echo $ARTEFACT_NAME

    - forgelib-changedocs -v https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID

    - forgelib-changedocs -v -d -c -l --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID

  artifacts:

    untracked: true

    paths:

102232-1/LI-PS-PDU.asn

+488 −488
Original line number Diff line number Diff line 
LI-PS-PDU

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

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



DEFINITIONS IMPLICIT TAGS ::=
@@ -11,7 +11,7 @@ IMPORTS 
    -- from ETSI TS 103 280 [44]

    LIID

        FROM Common-Parameters

		{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)}

        {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version241(241)}





    -- from ETSI TS 101 671 [4]
@@ -34,33 +34,33 @@ IMPORTS 
    MessagingMMCC,

    MessagingIRI

        FROM EmailPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version19(19)}

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version20(20)}



    -- from ETSI TS 102 232-3 [6]

    IPCC,

    IPIRI,

    IPIRIOnly

        FROM IPAccessPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)}

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version15(15)}



    -- from ETSI TS 102 232-4 [32]

    L2CC,

    L2IRI,

    L2IRIOnly

        FROM L2AccessPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)}

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version8(8)}



    -- from ETSI TS 102 232-5 [37]

    IPMMCC,

    IPMMIRI

        FROM IPMultimediaPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version14(14)}

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version16(16)}



    -- from ETSI TS 102 232-6 [36]

    PstnIsdnCC,

    PstnIsdnIRI

        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) version6(6)}



    -- from 3GPP TS 33.108 [9]

    IRI-Parameters,
@@ -205,7 +205,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) version34(34)}

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



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

-- Top-level definition
@@ -246,11 +246,11 @@ Payload ::= CHOICE 
        -- Clause 6.2.3 explains how to include more than one payload in the same PDU

    tRIPayload              [2] TRIPayload,

    ...,

	hI1-Operation			[3] HI1-Operation,

    hI1-Operation           [3] HI1NotificationOperations.HI1-Operation,

    encryptionContainer     [4] EncryptionContainer,

	threeGPP-HI1-Operation	[5] ThreeGPP-HI1-Operation,

    threeGPP-HI1-Operation  [5] ThreeGPP-HI1NotificationOperations.ThreeGPP-HI1-Operation,

        -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4]

	iLHIPayload				[6] SEQUENCE OF ILHIPayload,

    iLHIPayload             [6] SEQUENCE OF ILHIPDU.ILHIPayload,

        -- For typical use cases see ETSI TS 103 462 [45]

    hI4Payload              [7] SEQUENCE OF HI4Payload

}
@@ -283,7 +283,7 @@ CommunicationIdentifier ::= SEQUENCE 
    deliveryCountryCode             [2] PrintableString (SIZE (2)) OPTIONAL,

        -- see clause 5.2.4

    ...,

	cINExtension					[3] CorrelationValues OPTIONAL

    cINExtension                    [3] UmtsHI2Operations.CorrelationValues OPTIONAL

        -- To be used when a single INTEGER is not sufficient to identify

        -- a particular session (see clause 5.2.4)

}
@@ -293,7 +293,7 @@ NetworkIdentifier ::= SEQUENCE 
    operatorIdentifier          [0] OCTET STRING (SIZE(1..16)),

    networkElementIdentifier    [1] OCTET STRING (SIZE(1..16)) OPTIONAL,

    ...,

	eTSI671NEID					[2] Network-Element-Identifier OPTIONAL

    eTSI671NEID                 [2] HI2Operations.Network-Element-Identifier OPTIONAL

        -- For network element identifier, use either networkElementIdentifier or eTSI671NEID

}
@@ -331,25 +331,25 @@ CCContents ::= CHOICE 
    -- Any of these choices may be commented out if they are not being used, see clause A.3

{

    -- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)

	emailCC						[1] EmailCC,

	iPCC						[2] IPCC,

    emailCC                     [1] EmailPDU.EmailCC,

    iPCC                        [2] IPAccessPDU.IPCC,

    -- tag [3] not used

    uMTSCC                      [4] OCTET STRING,

    ...,

    -- tag [5] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)

	l2CC						[6] L2CC,

    l2CC                        [6] L2AccessPDU.L2CC,

    tTRAFFIC-1                  [7] TS101909201.TTRAFFIC,

    cTTRAFFIC-1                 [8] TS101909201.CTTRAFFIC,

    tTRAFFIC-2                  [9] TS101909202.TTRAFFIC,

    cTTRAFFIC-2                 [10] TS101909202.CTTRAFFIC,

	pstnIsdnCC					[11] PstnIsdnCC,

	iPMMCC						[12] IPMMCC,

    pstnIsdnCC                  [11] PstnIsdnPDU.PstnIsdnCC,

    iPMMCC                      [12] IPMultimediaPDU.IPMMCC,

    -- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)

	messagingCC					[14] MessagingCC,

    messagingCC                 [14] EmailPDU.MessagingCC,

    ePSCC                       [15] OCTET STRING,

    uMTSCC-CC-PDU               [16] Umts-HI3-PS.CC-PDU,

    ePSCC-CC-PDU                [17] Eps-HI3-PS.CC-PDU,

	messagingMMCC				[18] MessagingMMCC,

    messagingMMCC               [18] EmailPDU.MessagingMMCC,

    confCC-CC-PDU               [19] CONF-HI3-IMS.Conf-CC-PDU,

    voipCC-CC-PDU               [20] VoIP-HI3-IMS.Voip-CC-PDU,

    gcseCC-CC-PDU               [21] GCSE-HI3.Gcse-CC-PDU,
@@ -402,21 +402,21 @@ IRIContents ::= CHOICE 
    -- Any of these choices may be commented out if they are not being used (see clause A.3)

{

    -- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)

	emailIRI					[1] EmailIRI,

	iPIRI						[2] IPIRI,

	iPIRIOnly					[3] IPIRIOnly,

    emailIRI                    [1] EmailPDU.EmailIRI,

    iPIRI                       [2] IPAccessPDU.IPIRI,

    iPIRIOnly                   [3] IPAccessPDU.IPIRIOnly,

    uMTSIRI                     [4] UMTSIRI,

    eTSI671IRI                  [5] ETSI671IRI,

    ...,

	l2IRI						[6] L2IRI,

	l2IRIOnly					[7] L2IRIOnly,

    l2IRI                       [6] L2AccessPDU.L2IRI,

    l2IRIOnly                   [7] L2AccessPDU.L2IRIOnly,

    tARGETACTIVITYMONITOR-1     [8] TS101909201.TARGETACTIVITYMONITOR-1,

    tARGETACTIVITYMONITOR-2     [9] TS101909202.TARGETACTIVITYMONITOR,

	pstnIsdnIRI					[10] PstnIsdnIRI,

	iPMMIRI						[11] IPMMIRI,

    pstnIsdnIRI                 [10] PstnIsdnPDU.PstnIsdnIRI,

    iPMMIRI                     [11] IPMultimediaPDU.IPMMIRI,

    -- tag [12] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)

    -- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)

	messagingIRI				[14] MessagingIRI,

    messagingIRI                [14] EmailPDU.MessagingIRI,

    ePSIRI                      [15] EPSIRI,

    confIRI                     [16] ConfIRI,

    proseIRI                    [17] ProSeIRI,
@@ -428,17 +428,17 @@ UMTSIRI ::= CHOICE 
    -- This structure may be commented out if not used

{

    iRI-Parameters      [0] UmtsHI2Operations.IRI-Parameters,

	umtsIRIsContent		[1] UmtsIRIsContent,

    umtsIRIsContent     [1] UmtsHI2Operations.UmtsIRIsContent,

    ...,

    iRI-CS-Parameters   [2] UmtsCS-HI2Operations.IRI-Parameters,

	umtsCS-IRIsContent	[3] UmtsCS-IRIsContent

    umtsCS-IRIsContent  [3] UmtsCS-HI2Operations.UmtsCS-IRIsContent

}



ETSI671IRI ::= CHOICE

    -- This structure may be commented out if not used

{

    iRI-Parameters  [0] HI2Operations.IRI-Parameters,

	iRIsContent		[1] IRIsContent,

    iRIsContent     [1] HI2Operations.IRIsContent,

    ...

}
@@ -446,7 +446,7 @@ EPSIRI ::= CHOICE 
    -- This structure may be commented out if not used

{

    iRI-EPS-Parameters  [0] EpsHI2Operations.IRI-Parameters,

	epsIRIsContent		[1] EpsIRIsContent,

    epsIRIsContent      [1] EpsHI2Operations.EpsIRIsContent,

    ...

}
@@ -454,7 +454,7 @@ ConfIRI ::= CHOICE 
    -- This structure may be commented out if not used

{

    iRI-Conf-Parameters     [0] CONFHI2Operations.IRI-Parameters,

	confIRIsContent			[1] ConfIRIsContent,

    confIRIsContent         [1] CONFHI2Operations.ConfIRIsContent,

    ...

}
@@ -463,7 +463,7 @@ ProSeIRI ::= CHOICE 
    -- This structure may be commented out if not used

{

    iRI-ProSe-Parameters    [0] ProSeHI2Operations.IRI-Parameters,

	proseIRIsContent		[1] ProSeIRIsContent,

    proseIRIsContent        [1] ProSeHI2Operations.ProSeIRIsContent,

    ...

}
@@ -472,7 +472,7 @@ GcseIRI ::= CHOICE 
    -- This structure may be commented out if not used

{

    iRI-Gcse-Parameters     [0] GCSEHI2Operations.IRI-Parameters,

	gcseIRIsContent			[1] GcseIRIsContent,

    gcseIRIsContent         [1] GCSEHI2Operations.GcseIRIsContent,

    ...

}
@@ -728,7 +728,7 @@ IP-value ::= CHOICE 
    ...

}



LawfulInterceptionIdentifier ::= LIID

LawfulInterceptionIdentifier ::= Common-Parameters.LIID

    -- LIID is a common parameter imported from ETSI TS 103 280 [44].

    -- It is redefined as LawfulInterceptionIdentifier in this

    -- module to preserve the original type name during the

102232-2/EmailPDU.asn

+360 −363
Original line number Diff line number Diff line 
-- ============================

-- Description of the Email PDU

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



EmailPDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version19(19)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version20(20)}



DEFINITIONS IMPLICIT TAGS ::=

BEGIN
@@ -13,19 +9,19 @@ IMPORTS 
    -- from ETSI TS 102 232-1 [3]

    IPAddress

        FROM LI-PS-PDU

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

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



    -- from ETSI TS 102 232-5 [38]

    IPMMCC

        FROM IPMultimediaPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)};

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version16(16)};





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

-- Object Identifier Definition

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



emailPDUObjId RELATIVE-OID			::= {li-ps(5) email(2) version19(19)}

emailPDUObjId RELATIVE-OID          ::= {li-ps(5) email(2) version20(20)}

emailIRIObjId RELATIVE-OID          ::= {emailPDUObjId iRI(1)}

emailCCObjId RELATIVE-OID           ::= {emailPDUObjId cC(2)}

messagingIRIObjId RELATIVE-OID      ::= {emailPDUObjId messagingIRI(3)}
@@ -69,9 +65,9 @@ EmailIRI ::= SEQUENCE 
{

    emailIRIObjId               [0] RELATIVE-OID,

    eventType                   [1] E-mail-Event,

	client-Address				[2] IPAddress OPTIONAL,

    client-Address              [2] LI-PS-PDU.IPAddress OPTIONAL,

        -- Provided if available

	server-Address				[3] IPAddress OPTIONAL,

    server-Address              [3] LI-PS-PDU.IPAddress OPTIONAL,

        -- Provided if available

    client-Port                 [4] INTEGER OPTIONAL,

        -- Provided if available
@@ -234,13 +230,13 @@ MessagingCC ::= SEQUENCE 




MessagingMMCC ::= SEQUENCE

	-- MessagingMMCC is the PDU sent for the captured IPMMCC content

    -- MessagingMMCC is the PDU sent for the captured IPMultimediaPDU.IPMMCC content

{

    messaging-mm-cc-obj-id      [0] RELATIVE-OID,

    event-identifier            [1] INTEGER (0..4294967295),

        -- Used to correlate to MessagingIRI within the same CIN

    content-identifier          [2] INTEGER (0..4294967295) OPTIONAL,

	content						[3] IPMMCC,

    content                     [3] IPMultimediaPDU.IPMMCC,

    ...

}
@@ -264,7 +260,8 @@ MessagingIRI ::= SEQUENCE 
        -- Used to correlate to MessagingCC or MessagingMMCC within the same CIN. Mandatory when CC is also sent

    original-message            [9] OCTET STRING OPTIONAL,

    ...,

	box-identifier				[10] OCTET STRING OPTIONAL

    box-identifier              [10] OCTET STRING OPTIONAL,

    total-recipient-count       [11] INTEGER (0..4294967295) OPTIONAL

}



Messaging-System-Type ::= ENUMERATED
@@ -398,7 +395,7 @@ Messaging-Party-Identity ::= CHOICE 
    email-address           [2] E-mail-Address-List,

        -- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses.

    ...,

	ip-address				[3] IPAddress,

    ip-address              [3] LI-PS-PDU.IPAddress,

        -- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34]

    alphanumeric            [4] UTF8String,

    ip-address-and-port [5] IP-Address-And-Port,
@@ -427,7 +424,7 @@ Messaging-Party-Identity ::= CHOICE 


IP-Address-And-Port ::= SEQUENCE

{

	ip-address				[0] IPAddress,

    ip-address              [0] LI-PS-PDU.IPAddress,

        -- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34]

    port-number             [1] INTEGER,

        -- port-number is defined by IETF RFC 6335 [35]

102232-3/IPAccessPDU.asn

+247 −247
Original line number Diff line number Diff line 
IPAccessPDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version15(15)}



DEFINITIONS IMPLICIT TAGS ::=

BEGIN
@@ -9,19 +9,20 @@ IMPORTS 
    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)};

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





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

-- Object Identifier Definition

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



iPAccessPDUObjId RELATIVE-OID				::= {li-ps(5) iPAccess(3) version14(14)}

iPAccessPDUObjId RELATIVE-OID               ::= {li-ps(5) iPAccess(3) version15(15)}

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)}



    -- definitions are relative to

    -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}





-- ==========================
@@ -58,7 +59,7 @@ IPIRIContents ::= SEQUENCE 
        -- in ASCII-characters

    internetAccessType      [2] InternetAccessType,

    iPVersion               [3] IPVersion,

	targetIPAddress			[4] IPAddress OPTIONAL,

    targetIPAddress         [4] LI-PS-PDU.IPAddress OPTIONAL,

        -- IP address may not be available in case of failed logon attempts.

        -- If it is available, it must be sent.

        -- This field will carry the first IPv4 or IPv6 target IP address with or without
@@ -94,11 +95,11 @@ IPIRIContents ::= SEQUENCE 
        -- The phone number dialed by the target for dial-up

    pOPIdentifier           [18] IPIRIIDType OPTIONAL,

        -- The identifier or name of the POP

	pOPIPAddress			[19] IPAddress OPTIONAL,

    pOPIPAddress            [19] LI-PS-PDU.IPAddress OPTIONAL,

        -- The IP address of the POP

    nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL,

        -- National IP IRI Parameters

	additionalIPAddress		[21] IPAddress OPTIONAL,

    additionalIPAddress     [21] LI-PS-PDU.IPAddress OPTIONAL,

        -- This field will carry the first IPv6 target IP address with or without prefix when the

        -- iPVersion parameter is set to iPV4andV6.

        -- Use of this field is fully described in section 6.2.1
@@ -108,7 +109,7 @@ IPIRIContents ::= SEQUENCE 
        -- This parameter will carry the second and subsequent IPv4 or IPv6 target IP addresses

        -- It is used when multiple subnet/prefix ranges are assigned to a target service.

        -- Use of this field is fully described in section 6.2.1

	location				[24] Location OPTIONAL,

    location                [24] LI-PS-PDU.Location OPTIONAL,

        -- The location associated with the target

    pOPPortID               [25] OCTET STRING OPTIONAL,

        -- This field will carry the NAS-Port-ID as defined in RFC 2869 [17]:
@@ -202,7 +203,7 @@ IPIRIIDType ::= CHOICE 
        -- For printable userIDs, such as the Radius username, phonenumbers

    macAddressType          [1] OCTET STRING (SIZE (6)),

        -- For MAC address types, raw binary format as in RFC 2132 [15]

	ipAddressType			[2] IPAddress,

    ipAddressType           [2] LI-PS-PDU.IPAddress,

        -- For IP address types

    ...

}
@@ -242,7 +243,7 @@ OtherTargetIdentifiers ::= CHOICE 
        -- Additional target identifiers associated with the target service

        -- This list is extensible to accommodate other target identifiers which

        -- may be required in future.

	iPAddress		[0] IPAddress,

    iPAddress       [0] LI-PS-PDU.IPAddress,

        -- 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).
@@ -364,4 +365,3 @@ PDSRSummaryTrigger ::= ENUMERATED 




END -- end of IPAccessPDU