diff --git a/102232-6/PstnIsdnPDU.asn b/102232-6/PstnIsdnPDU.asn index 212755aeddc73234a9dc03603650669beb845d7b..c9f363d168aa5a1a6c3ce5de10bc99ee70177a64 100644 --- a/102232-6/PstnIsdnPDU.asn +++ b/102232-6/PstnIsdnPDU.asn @@ -1,5 +1,5 @@ PstnIsdnPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version3(3)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version4(4)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,12 +9,12 @@ IMPORTS -- from TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)} -- from TS 102 232-01 [2] PayloadDirection FROM LI-PS-PDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version8(8)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version13(13)}; -- ============================ @@ -23,29 +23,29 @@ IMPORTS -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} -pstnIsdnIRIObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version3(3) iRI(1)} -pstnIsdnCCObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version3(3) cC(2)} +pstnIsdnIRIObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version4(4) iRI(1)} +pstnIsdnCCObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version4(4) cC(2)} -- =============================== -- Description of the PstnIsdn IRI -- =============================== -PstnIsdnIRI ::= SEQUENCE +PstnIsdnIRI ::= SEQUENCE { - pstnIsdnIRIObjId [0] RELATIVE-OID, - pstnIsdnIRIContents [1] PstnIsdnIRIContents + pstnIsdnIRIObjId [0] RELATIVE-OID, + pstnIsdnIRIContents [1] PstnIsdnIRIContents } -PstnIsdnIRIContents ::= CHOICE +PstnIsdnIRIContents ::= CHOICE { - supplementaryInfo [0] SupplementaryInfo, + supplementaryInfo [0] SupplementaryInfo, ... } -SupplementaryInfo ::= SEQUENCE +SupplementaryInfo ::= SEQUENCE { - informationAppliesTo [0] InformationAppliesTo, + informationAppliesTo [0] InformationAppliesTo, -- Identifies the PDUs to which this info applies mediaFormat [1] INTEGER (0..127), -- As defined in RFC 3551 [10] @@ -66,10 +66,10 @@ SupplementaryInfo ::= SEQUENCE -- May be omitted if all headers are present. } -InformationAppliesTo ::= SEQUENCE +InformationAppliesTo ::= SEQUENCE -- Identifies the PDUs to which a piece of supplementary information applies { - payloadDirection [0] PayloadDirection, + payloadDirection [0] PayloadDirection, -- The direction of the traffic to which this info applies cCLinkID [1] INTEGER (0..65535) OPTIONAL, -- If there are multiple CCLinks, this field states CCLink to which this info applies @@ -78,7 +78,7 @@ InformationAppliesTo ::= SEQUENCE ... } -FrameType ::= ENUMERATED +FrameType ::= ENUMERATED { ipFrame(0), -- All headers are present @@ -88,16 +88,18 @@ FrameType ::= ENUMERATED -- UDP and IP headers are missing audioFrame(3), -- All headers are missing - ... + ..., + artificialRtpFrame(4) + -- UDP and IP headers are missing, artificial RTP frame has been added } -- ============================== -- Description of the PstnIsdn CC -- ============================== -PstnIsdnCC ::= SEQUENCE +PstnIsdnCC ::= SEQUENCE { - pstnIsdnCCObjId [0] RELATIVE-OID, + pstnIsdnCCObjId [0] RELATIVE-OID, pstnIsdnCCContents [1] OCTET STRING, -- See clause 6.2 for definition of format of PstnIsdn CC cCLinkID [2] INTEGER (0..65535) OPTIONAL, diff --git a/102232-6/portal/PstnIsdnPDU, ver3.txt b/102232-6/portal/PstnIsdnPDU,ver4.txt similarity index 75% rename from 102232-6/portal/PstnIsdnPDU, ver3.txt rename to 102232-6/portal/PstnIsdnPDU,ver4.txt index 212755aeddc73234a9dc03603650669beb845d7b..c9f363d168aa5a1a6c3ce5de10bc99ee70177a64 100644 --- a/102232-6/portal/PstnIsdnPDU, ver3.txt +++ b/102232-6/portal/PstnIsdnPDU,ver4.txt @@ -1,5 +1,5 @@ PstnIsdnPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version3(3)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version4(4)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,12 +9,12 @@ IMPORTS -- from TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)} -- from TS 102 232-01 [2] PayloadDirection FROM LI-PS-PDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version8(8)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version13(13)}; -- ============================ @@ -23,29 +23,29 @@ IMPORTS -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} -pstnIsdnIRIObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version3(3) iRI(1)} -pstnIsdnCCObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version3(3) cC(2)} +pstnIsdnIRIObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version4(4) iRI(1)} +pstnIsdnCCObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version4(4) cC(2)} -- =============================== -- Description of the PstnIsdn IRI -- =============================== -PstnIsdnIRI ::= SEQUENCE +PstnIsdnIRI ::= SEQUENCE { - pstnIsdnIRIObjId [0] RELATIVE-OID, - pstnIsdnIRIContents [1] PstnIsdnIRIContents + pstnIsdnIRIObjId [0] RELATIVE-OID, + pstnIsdnIRIContents [1] PstnIsdnIRIContents } -PstnIsdnIRIContents ::= CHOICE +PstnIsdnIRIContents ::= CHOICE { - supplementaryInfo [0] SupplementaryInfo, + supplementaryInfo [0] SupplementaryInfo, ... } -SupplementaryInfo ::= SEQUENCE +SupplementaryInfo ::= SEQUENCE { - informationAppliesTo [0] InformationAppliesTo, + informationAppliesTo [0] InformationAppliesTo, -- Identifies the PDUs to which this info applies mediaFormat [1] INTEGER (0..127), -- As defined in RFC 3551 [10] @@ -66,10 +66,10 @@ SupplementaryInfo ::= SEQUENCE -- May be omitted if all headers are present. } -InformationAppliesTo ::= SEQUENCE +InformationAppliesTo ::= SEQUENCE -- Identifies the PDUs to which a piece of supplementary information applies { - payloadDirection [0] PayloadDirection, + payloadDirection [0] PayloadDirection, -- The direction of the traffic to which this info applies cCLinkID [1] INTEGER (0..65535) OPTIONAL, -- If there are multiple CCLinks, this field states CCLink to which this info applies @@ -78,7 +78,7 @@ InformationAppliesTo ::= SEQUENCE ... } -FrameType ::= ENUMERATED +FrameType ::= ENUMERATED { ipFrame(0), -- All headers are present @@ -88,16 +88,18 @@ FrameType ::= ENUMERATED -- UDP and IP headers are missing audioFrame(3), -- All headers are missing - ... + ..., + artificialRtpFrame(4) + -- UDP and IP headers are missing, artificial RTP frame has been added } -- ============================== -- Description of the PstnIsdn CC -- ============================== -PstnIsdnCC ::= SEQUENCE +PstnIsdnCC ::= SEQUENCE { - pstnIsdnCCObjId [0] RELATIVE-OID, + pstnIsdnCCObjId [0] RELATIVE-OID, pstnIsdnCCContents [1] OCTET STRING, -- See clause 6.2 for definition of format of PstnIsdn CC cCLinkID [2] INTEGER (0..65535) OPTIONAL,