From 79cd4a058b718b768eccbe78831339f7df58aa28 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:27 +0100 Subject: [PATCH] TS 102 232-3 v3.2.1 (2012-06-28) agreed at LI#30 (Amsterdam, 2012-05-14) --- 102232-3/IPAccessPDU.asn | 47 +++++++++++++------ ...ccessPDU,ver8.txt => IPAccessPDU,ver9.txt} | 47 +++++++++++++------ 2 files changed, 66 insertions(+), 28 deletions(-) rename 102232-3/portal/{IPAccessPDU,ver8.txt => IPAccessPDU,ver9.txt} (83%) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index adc177e..49fb540 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -1,5 +1,5 @@ IPAccessPDU -{itu-t(0) dentified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version8(8)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version9(9)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,15 +8,15 @@ IMPORTS -- from ETSI TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; -- ============================ -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -26,13 +26,13 @@ iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRIOnly(3)} IPCC ::= SEQUENCE { - iPCCObjId [0] RELATIVE-OID, + iPCCObjId [0] RELATIVE-OID, iPCCContents [1] IPCCContents } IPCCContents ::= CHOICE { - iPPackets [0] OCTET STRING, + iPPackets [0] OCTET STRING, ... } @@ -42,7 +42,7 @@ IPCCContents ::= CHOICE IPIRI ::= SEQUENCE { - iPIRIObjId [0] RELATIVE-OID, + iPIRIObjId [0] RELATIVE-OID, iPIRIContents [1] IPIRIContents, ... } @@ -57,9 +57,8 @@ IPIRIContents ::= SEQUENCE targetIPAddress [4] IPAddress OPTIONAL, -- IP address may not be available in case of failed logon attempts. -- If it is available, it must be sent. - -- When iPVersion is iPV4 or iPV6, the IP address is carried by this parameter - -- when iPVersion is iPV4andV6 (Example: in case of Dual Stack IPv4-IPv6 architecture), - -- the additional IP address is carried by parameter additionalIPaddress. + -- 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, -- Target network ID (e.g. MAC address, PSTN number) targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, @@ -81,7 +80,7 @@ IPIRIContents ::= SEQUENCE -- The number of octets the target received octetsTransmitted [14] INTEGER (0..18446744073709551615) OPTIONAL, -- The number of octets the target transmitted - rawAAAData [15] OCTET STRING OPTIONAL, + rawAAAData [15] OCTET STRING OPTIONAL, -- Content of the raw AAA record ..., expectedEndTime [16] GeneralizedTime OPTIONAL, @@ -95,8 +94,15 @@ IPIRIContents ::= SEQUENCE nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL, -- National IP IRI Parameters additionalIPAddress [21] IPAddress OPTIONAL, - authenticationType [22] AuthenticationType 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 + authenticationType [22] AuthenticationType OPTIONAL, -- Field used to identify the authentication type to assist with LEMF data validation + otherTargetIdentifiers [23] SEQUENCE OF OtherTargetIdentifiers OPTIONAL + -- 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 } AccessEventType ::= ENUMERATED @@ -186,7 +192,7 @@ IPIRIIDType ::= CHOICE NationalIPIRIParameters ::= SEQUENCE { - countryCode [1] PrintableString (SIZE (2)), + countryCode [1] PrintableString (SIZE (2)), -- Country Code according to ISO 3166-1 [16], -- the country to which the parameters inserted after the extension marker apply. ... @@ -214,6 +220,18 @@ AuthenticationType ::= ENUMERATED ... } +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 imported from TS 101 671 [1]. + -- This can be an IPv4 address (with or without a subnet range defined) or + -- an IPv6 address (with or without a prefix range defined). + ... +} + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== @@ -294,3 +312,4 @@ UDPInformation ::= SEQUENCE } END -- end of IPAccessPDU + diff --git a/102232-3/portal/IPAccessPDU,ver8.txt b/102232-3/portal/IPAccessPDU,ver9.txt similarity index 83% rename from 102232-3/portal/IPAccessPDU,ver8.txt rename to 102232-3/portal/IPAccessPDU,ver9.txt index adc177e..49fb540 100644 --- a/102232-3/portal/IPAccessPDU,ver8.txt +++ b/102232-3/portal/IPAccessPDU,ver9.txt @@ -1,5 +1,5 @@ IPAccessPDU -{itu-t(0) dentified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version8(8)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version9(9)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,15 +8,15 @@ IMPORTS -- from ETSI TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; -- ============================ -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -26,13 +26,13 @@ iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRIOnly(3)} IPCC ::= SEQUENCE { - iPCCObjId [0] RELATIVE-OID, + iPCCObjId [0] RELATIVE-OID, iPCCContents [1] IPCCContents } IPCCContents ::= CHOICE { - iPPackets [0] OCTET STRING, + iPPackets [0] OCTET STRING, ... } @@ -42,7 +42,7 @@ IPCCContents ::= CHOICE IPIRI ::= SEQUENCE { - iPIRIObjId [0] RELATIVE-OID, + iPIRIObjId [0] RELATIVE-OID, iPIRIContents [1] IPIRIContents, ... } @@ -57,9 +57,8 @@ IPIRIContents ::= SEQUENCE targetIPAddress [4] IPAddress OPTIONAL, -- IP address may not be available in case of failed logon attempts. -- If it is available, it must be sent. - -- When iPVersion is iPV4 or iPV6, the IP address is carried by this parameter - -- when iPVersion is iPV4andV6 (Example: in case of Dual Stack IPv4-IPv6 architecture), - -- the additional IP address is carried by parameter additionalIPaddress. + -- 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, -- Target network ID (e.g. MAC address, PSTN number) targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, @@ -81,7 +80,7 @@ IPIRIContents ::= SEQUENCE -- The number of octets the target received octetsTransmitted [14] INTEGER (0..18446744073709551615) OPTIONAL, -- The number of octets the target transmitted - rawAAAData [15] OCTET STRING OPTIONAL, + rawAAAData [15] OCTET STRING OPTIONAL, -- Content of the raw AAA record ..., expectedEndTime [16] GeneralizedTime OPTIONAL, @@ -95,8 +94,15 @@ IPIRIContents ::= SEQUENCE nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL, -- National IP IRI Parameters additionalIPAddress [21] IPAddress OPTIONAL, - authenticationType [22] AuthenticationType 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 + authenticationType [22] AuthenticationType OPTIONAL, -- Field used to identify the authentication type to assist with LEMF data validation + otherTargetIdentifiers [23] SEQUENCE OF OtherTargetIdentifiers OPTIONAL + -- 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 } AccessEventType ::= ENUMERATED @@ -186,7 +192,7 @@ IPIRIIDType ::= CHOICE NationalIPIRIParameters ::= SEQUENCE { - countryCode [1] PrintableString (SIZE (2)), + countryCode [1] PrintableString (SIZE (2)), -- Country Code according to ISO 3166-1 [16], -- the country to which the parameters inserted after the extension marker apply. ... @@ -214,6 +220,18 @@ AuthenticationType ::= ENUMERATED ... } +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 imported from TS 101 671 [1]. + -- This can be an IPv4 address (with or without a subnet range defined) or + -- an IPv6 address (with or without a prefix range defined). + ... +} + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== @@ -294,3 +312,4 @@ UDPInformation ::= SEQUENCE } END -- end of IPAccessPDU + -- GitLab