Commit 0aead0b4 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Updating OIDs

parent 88fa5048

102232-1/LI-PS-PDU.asn

+7 −7
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 ::=
@@ -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

102232-2/EmailPDU.asn

+4 −4
Original line number Diff line number Diff line 
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
@@ -9,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)}

102232-3/IPAccessPDU.asn

+3 −3
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,14 +9,14 @@ 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)}

102232-4/L2AccessPDU.asn

+2 −2
Original line number Diff line number Diff line 
L2AccessPDU

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

li-ps(5) l2Access(4) version7(7)}

li-ps(5) l2Access(4) version8(8)}



DEFINITIONS IMPLICIT TAGS ::=

BEGIN
@@ -9,7 +9,7 @@ BEGIN 
-- Object Identifier Definition

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



l2AccessPDUObjId RELATIVE-OID   ::= {li-ps(5) l2Access(4) version7(7)}

l2AccessPDUObjId RELATIVE-OID   ::= {li-ps(5) l2Access(4) version8(8)}

l2IRIObjId RELATIVE-OID         ::= {l2AccessPDUObjId iRI(1)}

l2CCObjId RELATIVE-OID          ::= {l2AccessPDUObjId cC(2)}

l2IRIOnlyObjId RELATIVE-OID     ::= {l2AccessPDUObjId iRIOnly(3)}

102232-5/IPMultimediaPDU.asn

+3 −3
Original line number Diff line number Diff line 
IPMultimediaPDU

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

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



DEFINITIONS IMPLICIT TAGS ::=

BEGIN
@@ -9,7 +9,7 @@ IMPORTS 
    IPAddress,

    Location

        FROM 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)};
@@ -17,7 +17,7 @@ IMPORTS 
-- Object Identifier Definition

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



iPMultimediaPDUObjId RELATIVE-OID   ::= {li-ps(5) iPMultimedia(5) version15(15)}

iPMultimediaPDUObjId RELATIVE-OID   ::= {li-ps(5) iPMultimedia(5) version16(16)}

iPMMIRIObjId RELATIVE-OID           ::= {iPMultimediaPDUObjId iRI(1)}

iPMMCCObjId RELATIVE-OID            ::= {iPMultimediaPDUObjId cC(2)}