From 7530185d9c8a0739a2dc3f422e08022d9ee9340b Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 18 Sep 2020 14:43:18 +0200 Subject: [PATCH 1/3] Update IPAccessPDU.asn as per LI(20)P55006r1 --- 102232-3/IPAccessPDU.asn | 52 ++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index 5c84c65..db9a088 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -1,12 +1,17 @@ +-- ================================ +-- Description of the IP Access PDU +-- ================================ + 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)}; @@ -17,8 +22,8 @@ IMPORTS -- ============================ 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)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version14(14) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -53,12 +58,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 must be sent. + -- If it is available, it shall 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, @@ -112,9 +117,7 @@ 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 information - - + -- It is used to list all the available Framed Route and Framed IPv6 Route informationX } AccessEventType ::= ENUMERATED @@ -141,6 +144,7 @@ AccessEventType ::= ENUMERATED endOfInterceptionWithSessionActive(9), -- LI is ended on a target who still has an active session unknown(10) + } InternetAccessType ::= ENUMERATED @@ -199,7 +203,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 RFC 2132 [15] + -- For MAC address types, raw binary format as in IETF RFC 2132 [15] ipAddressType [2] IPAddress, -- For IP address types ... @@ -241,12 +245,13 @@ OtherTargetIdentifiers ::= CHOICE -- This list is extensible to accommodate other target identifiers which -- may be required in future. iPAddress [0] IPAddress, - -- IPAddress imported from TS 102 232 [2]. + -- IPAddress imported from ETSI 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 @@ -268,9 +273,10 @@ IPIRIOnly ::= SEQUENCE { iPIRIOnlyObjId [0] RELATIVE-OID, iPInformation [1] IPInformation, - protocolInformation [2] ProtocolInformation, + protocolInformation [2] ProtocolInformation, iPAggregatedNbrOfPackets [3] INTEGER OPTIONAL, iPAggregatedNbrOfBytes [4] INTEGER OPTIONAL, + pdsrInformation [5] PDSRInformation OPTIONAL, ... } @@ -339,5 +345,25 @@ UDPInformation ::= SEQUENCE checkSum [3] OCTET STRING (SIZE (2))OPTIONAL } -END -- end of IPAccessPDU +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 -- GitLab From 5a346a9853e8d0e9ecce5f80e856684539931d61 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 18 Sep 2020 14:46:42 +0200 Subject: [PATCH 2/3] Update IPAccessPDU.asn as per LI(20)P55006r1 - removing comments at start --- 102232-3/IPAccessPDU.asn | 4 ---- 1 file changed, 4 deletions(-) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index db9a088..95df7c7 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -1,7 +1,3 @@ --- ================================ --- Description of the IP Access PDU --- ================================ - IPAccessPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)} -- GitLab From 87138e173e0a9313400e4344594197d5dafcd3e2 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 21 Sep 2020 16:22:01 +0100 Subject: [PATCH 3/3] Adding Luke's proposed changes --- 102232-3/IPAccessPDU.asn | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index 95df7c7..2461f42 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -17,11 +17,12 @@ 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) version14(14) iRIOnly(3)} - -- all three definitions relative to {itu-t(0) identified-organization(4) - -- etsi(0) securityDomain(2) lawfulintercept(2)} +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 @@ -269,10 +270,10 @@ IPIRIOnly ::= SEQUENCE { iPIRIOnlyObjId [0] RELATIVE-OID, iPInformation [1] IPInformation, - protocolInformation [2] ProtocolInformation, + protocolInformation [2] ProtocolInformation, iPAggregatedNbrOfPackets [3] INTEGER OPTIONAL, iPAggregatedNbrOfBytes [4] INTEGER OPTIONAL, - pdsrInformation [5] PDSRInformation OPTIONAL, + pDSRInformation [5] PDSRInformation OPTIONAL, ... } @@ -357,7 +358,8 @@ PDSRSummaryTrigger ::= ENUMERATED timerExpiry(1), packetCount(2), byteCount(3), - endOfFlow(4) + endOfFlow(4), + ... } -- GitLab