From b0f22c5ddce041d83030a28ce9a149706be63b46 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:04 +0100 Subject: [PATCH] TS 102 232-4 v3.1.1 (2012-02-28) agreed at LI#29 (Dun Laoghaire, 2012-01-24) --- 102232-4/L2AccessPDU.asn | 38 +++++++++++++++---- ...ccessPDU,ver5.txt => L2AccessPDU,ver6.txt} | 38 +++++++++++++++---- 2 files changed, 60 insertions(+), 16 deletions(-) rename 102232-4/portal/{L2AccessPDU,ver5.txt => L2AccessPDU,ver6.txt} (80%) diff --git a/102232-4/L2AccessPDU.asn b/102232-4/L2AccessPDU.asn index 0920565..89375ee 100644 --- a/102232-4/L2AccessPDU.asn +++ b/102232-4/L2AccessPDU.asn @@ -1,6 +1,6 @@ L2AccessPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) -li-ps(5) l2Access(4) version5(5)} +li-ps(5) l2Access(4) version6(6)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,9 +9,9 @@ BEGIN -- Object Identifier Definition -- ============================ -l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) iRI(1)} -l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) cC(2)} -l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) iRIOnly(3)} +l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) iRI(1)} +l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) cC(2)} +l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -35,8 +35,10 @@ L2CC ::= SEQUENCE ethernet [5] OCTET STRING, -- The ethernet protocol is used ..., - l2ATM2684 [6] OCTET STRING + l2ATM2684 [6] OCTET STRING, -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols` [16] is used + l2FR2427 [7] OCTET STRING + -- The protocol RFC 2427 “Multiprotocol Interconnect over Frame Relay” [18] is used } } @@ -55,8 +57,9 @@ L2IRIContents ::= SEQUENCE { accessEventType [0] AccessEventType, internetAccessType [2] InternetAccessType OPTIONAL, - targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, - -- Target network ID (e.g. MAC address, PSTN number) + targetNetworkID [5] UTF8String (SIZE (1..128)) OPTIONAL, + -- Target network ID (e.g. MAC address, PSTN number, additional information from + -- network elements) targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, -- CPEID (e.g. Relay Agent info, computer name) targetLocation [7] UTF8String (SIZE (1..64))OPTIONAL, @@ -75,8 +78,11 @@ L2IRIContents ::= 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 + ..., + authenticationType [16] AuthenticationType OPTIONAL + -- Field used to identify the authentication type to assist with LEMF data validation } AccessEventType ::= ENUMERATED @@ -140,6 +146,22 @@ EndReason ::= ENUMERATED ... } +AuthenticationType ::= ENUMERATED +{ + unknown(0), + -- AAA function for the target service is unknown + static(1), + -- The target service is assigned a static IP address & no AAA expected + radiusAAA(2), + -- AAA function for the target service is provided by RADIUS + dhcpAAA(3), + -- AAA function for the target service is provided by DHCP + diameterAAA(4), + -- AAA function for the target service is provided by DIAMETER + ... +} + + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== diff --git a/102232-4/portal/L2AccessPDU,ver5.txt b/102232-4/portal/L2AccessPDU,ver6.txt similarity index 80% rename from 102232-4/portal/L2AccessPDU,ver5.txt rename to 102232-4/portal/L2AccessPDU,ver6.txt index 0920565..89375ee 100644 --- a/102232-4/portal/L2AccessPDU,ver5.txt +++ b/102232-4/portal/L2AccessPDU,ver6.txt @@ -1,6 +1,6 @@ L2AccessPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) -li-ps(5) l2Access(4) version5(5)} +li-ps(5) l2Access(4) version6(6)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,9 +9,9 @@ BEGIN -- Object Identifier Definition -- ============================ -l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) iRI(1)} -l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) cC(2)} -l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) iRIOnly(3)} +l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) iRI(1)} +l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) cC(2)} +l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -35,8 +35,10 @@ L2CC ::= SEQUENCE ethernet [5] OCTET STRING, -- The ethernet protocol is used ..., - l2ATM2684 [6] OCTET STRING + l2ATM2684 [6] OCTET STRING, -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols` [16] is used + l2FR2427 [7] OCTET STRING + -- The protocol RFC 2427 “Multiprotocol Interconnect over Frame Relay” [18] is used } } @@ -55,8 +57,9 @@ L2IRIContents ::= SEQUENCE { accessEventType [0] AccessEventType, internetAccessType [2] InternetAccessType OPTIONAL, - targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, - -- Target network ID (e.g. MAC address, PSTN number) + targetNetworkID [5] UTF8String (SIZE (1..128)) OPTIONAL, + -- Target network ID (e.g. MAC address, PSTN number, additional information from + -- network elements) targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, -- CPEID (e.g. Relay Agent info, computer name) targetLocation [7] UTF8String (SIZE (1..64))OPTIONAL, @@ -75,8 +78,11 @@ L2IRIContents ::= 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 + ..., + authenticationType [16] AuthenticationType OPTIONAL + -- Field used to identify the authentication type to assist with LEMF data validation } AccessEventType ::= ENUMERATED @@ -140,6 +146,22 @@ EndReason ::= ENUMERATED ... } +AuthenticationType ::= ENUMERATED +{ + unknown(0), + -- AAA function for the target service is unknown + static(1), + -- The target service is assigned a static IP address & no AAA expected + radiusAAA(2), + -- AAA function for the target service is provided by RADIUS + dhcpAAA(3), + -- AAA function for the target service is provided by DHCP + diameterAAA(4), + -- AAA function for the target service is provided by DIAMETER + ... +} + + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== -- GitLab