From 2ea0bbeb76eae69ffc6277d89625783fdc0b62bf Mon Sep 17 00:00:00 2001 From: vanschelts Date: Mon, 10 Jun 2024 14:11:39 +0200 Subject: [PATCH 1/3] Added IRI packet report sequence --- 102232-3/IPAccessPDU.asn | 57 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index f418ce5..312feef 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -20,6 +20,7 @@ iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version17( iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)} iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)} iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)} +iPIRIPacketReportObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIPacketReport(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -270,11 +271,14 @@ FramedRoute ::= CHOICE ... } - -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== +-- This module is included for legacy/migration purposes +-- only, new implementations are encouraged to implement +-- IRI Packet Reports + IPIRIOnly ::= SEQUENCE { iPIRIOnlyObjId [0] RELATIVE-OID, @@ -371,5 +375,56 @@ PDSRSummaryTrigger ::= ENUMERATED ... } +-- ==================================================== +-- Intercept-related information for IRI Packet Reports +-- ==================================================== + +IPIRIPacketReport ::= SEQUENCE +{ + iPIRIPacketReportObjId [0] RELATIVE-OID, + trigger [1] PacketReportTrigger, + packet [2] OCTET STRING, + indications [3] PacketReportIndications, + bidirectional [4] BOOLEAN OPTIONAL, + packetCount [5] INTEGER OPTIONAL, + packetCountReverse [6] INTEGER OPTIONAL, + byteCount [7] INTEGER OPTIONAL, + byteCountReverse [8] INTEGER OPTIONAL, + firstTimestamp [9] GeneralizedTime OPTIONAL, + lastTimestamp [10] GeneralizedTime OPTIONAL, + ... +} + +PacketReportTrigger ::= ENUMERATED +{ + startOfFlow(0), + endOfFlow(1), + entireFlow(2), + flowTimeout(3), + flowTimerExpiration(4), + flowPacketCount(5), + flowByteCount(6), + headerReport(7), + endOfReport(8), + ... +} + +PacketReportIndications ::= BIT STRING +{ + zeroedIPv4TotalLength(0), + zeroedIPv4Flags(1), + zeroedIPv4TimeToLive(2), + zeroedIPv4HeaderChecksum(3), + zeroedIPv6PayloadLength(4), + removedIPv6ExtensionHeaders(5), + zeroedTCPSequenceNumber(6), + zeroedTCPAcknowledgementNumber(7), + zeroedTCPFlags(8), + zeroedTCPWindowSize(9), + zeroedTCPChecksum(10), + zeroedUDPLength(11), + zeroedUDPChecksum(12), + ... +} END -- end of IPAccessPDU -- GitLab From 1570499651ab381f2aae27ca37444b1dc67390f5 Mon Sep 17 00:00:00 2001 From: vanschelts Date: Mon, 10 Jun 2024 14:49:22 +0200 Subject: [PATCH 2/3] Import IRI Packet Report from 232-3 --- 102232-1/LI-PS-PDU.asn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index f3b2329..e285a0a 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -39,7 +39,8 @@ IMPORTS -- from ETSI TS 102 232-3 [6] IPCC, IPIRI, - IPIRIOnly + IPIRIOnly, + IPIRIPacketReport FROM IPAccessPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version17(17)} @@ -421,7 +422,8 @@ IRIContents ::= CHOICE confIRI [16] ConfIRI, proseIRI [17] ProSeIRI, gcseIRI [18] GcseIRI, - threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload) + threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload), + iPIRIPacketReport [20] IPAccessPDU.IPIRIPacketReport } UMTSIRI ::= CHOICE -- GitLab From ae05480387ad8944ac900882417f0d7bd22b22ac Mon Sep 17 00:00:00 2001 From: vanschelts Date: Tue, 11 Jun 2024 08:35:01 +0200 Subject: [PATCH 3/3] Revert "Added IRI packet report sequence" This reverts commit 2ea0bbeb76eae69ffc6277d89625783fdc0b62bf. --- 102232-3/IPAccessPDU.asn | 57 +--------------------------------------- 1 file changed, 1 insertion(+), 56 deletions(-) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index 312feef..f418ce5 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -20,7 +20,6 @@ iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version17( iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)} iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)} iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)} -iPIRIPacketReportObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIPacketReport(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -271,14 +270,11 @@ FramedRoute ::= CHOICE ... } + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== --- This module is included for legacy/migration purposes --- only, new implementations are encouraged to implement --- IRI Packet Reports - IPIRIOnly ::= SEQUENCE { iPIRIOnlyObjId [0] RELATIVE-OID, @@ -375,56 +371,5 @@ PDSRSummaryTrigger ::= ENUMERATED ... } --- ==================================================== --- Intercept-related information for IRI Packet Reports --- ==================================================== - -IPIRIPacketReport ::= SEQUENCE -{ - iPIRIPacketReportObjId [0] RELATIVE-OID, - trigger [1] PacketReportTrigger, - packet [2] OCTET STRING, - indications [3] PacketReportIndications, - bidirectional [4] BOOLEAN OPTIONAL, - packetCount [5] INTEGER OPTIONAL, - packetCountReverse [6] INTEGER OPTIONAL, - byteCount [7] INTEGER OPTIONAL, - byteCountReverse [8] INTEGER OPTIONAL, - firstTimestamp [9] GeneralizedTime OPTIONAL, - lastTimestamp [10] GeneralizedTime OPTIONAL, - ... -} - -PacketReportTrigger ::= ENUMERATED -{ - startOfFlow(0), - endOfFlow(1), - entireFlow(2), - flowTimeout(3), - flowTimerExpiration(4), - flowPacketCount(5), - flowByteCount(6), - headerReport(7), - endOfReport(8), - ... -} - -PacketReportIndications ::= BIT STRING -{ - zeroedIPv4TotalLength(0), - zeroedIPv4Flags(1), - zeroedIPv4TimeToLive(2), - zeroedIPv4HeaderChecksum(3), - zeroedIPv6PayloadLength(4), - removedIPv6ExtensionHeaders(5), - zeroedTCPSequenceNumber(6), - zeroedTCPAcknowledgementNumber(7), - zeroedTCPFlags(8), - zeroedTCPWindowSize(9), - zeroedTCPChecksum(10), - zeroedUDPLength(11), - zeroedUDPChecksum(12), - ... -} END -- end of IPAccessPDU -- GitLab