From c89ca560b97a185cfdf1b99d7cfa6973dae8bd28 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:33:36 +0100 Subject: [PATCH] TS 102 232-3 v3.7.1 (2017-11-23) agreed at LI#46 (Rotterdam, 2017-10-03) --- 102232-3/IPAccessPDU.asn | 39 +++++++++++++------ ...essPDU,ver12.txt => IPAccessPDU,ver13.txt} | 39 +++++++++++++------ 2 files changed, 54 insertions(+), 24 deletions(-) rename 102232-3/portal/{IPAccessPDU,ver12.txt => IPAccessPDU,ver13.txt} (90%) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index 4b6ce37..e4813de 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -1,28 +1,24 @@ IPAccessPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version12(12)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - -- from ETSI TS 101 671 [1] - IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} - -- from ETSI TS 102 232-1 [2] + IPAddress Location FROM LI-PS-PDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; -- ============================ -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) iRIOnly(3)} +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)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -110,8 +106,14 @@ IPIRIContents ::= SEQUENCE -- 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 - location [24] Location OPTIONAL + location [24] Location OPTIONAL, -- The location associated with the target + pOPPortID [25] OCTET STRING OPTIONAL, + -- 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 + } @@ -124,7 +126,7 @@ AccessEventType ::= ENUMERATED accessReject(2), -- IAS access is refused to the target accessFailed(3), - -- The accessAttempt timed-out or failed otherwise + -- The Access_attempt timed-out or failed otherwise sessionStart(4), -- A target starts using the IAS; not in use anymore from version 4(4) sessionEnd(5), @@ -245,6 +247,19 @@ OtherTargetIdentifiers ::= CHOICE ... } +FramedRoute ::= CHOICE +{ + -- Additional Framed Route prefix information associated with the target service + + framedRoute [0] OCTET STRING, + -- This could contain an IPv4 as well as IPv6 FramedRoute information + -- including additional information such Gateway address and + -- one or more metrics in texual format. + -- This parameter shall be populated with the RADIUS value. + ... +} + + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== diff --git a/102232-3/portal/IPAccessPDU,ver12.txt b/102232-3/portal/IPAccessPDU,ver13.txt similarity index 90% rename from 102232-3/portal/IPAccessPDU,ver12.txt rename to 102232-3/portal/IPAccessPDU,ver13.txt index 4b6ce37..e4813de 100644 --- a/102232-3/portal/IPAccessPDU,ver12.txt +++ b/102232-3/portal/IPAccessPDU,ver13.txt @@ -1,28 +1,24 @@ IPAccessPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version12(12)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - -- from ETSI TS 101 671 [1] - IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} - -- from ETSI TS 102 232-1 [2] + IPAddress Location FROM LI-PS-PDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; -- ============================ -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) iRIOnly(3)} +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)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -110,8 +106,14 @@ IPIRIContents ::= SEQUENCE -- 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 - location [24] Location OPTIONAL + location [24] Location OPTIONAL, -- The location associated with the target + pOPPortID [25] OCTET STRING OPTIONAL, + -- 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 + } @@ -124,7 +126,7 @@ AccessEventType ::= ENUMERATED accessReject(2), -- IAS access is refused to the target accessFailed(3), - -- The accessAttempt timed-out or failed otherwise + -- The Access_attempt timed-out or failed otherwise sessionStart(4), -- A target starts using the IAS; not in use anymore from version 4(4) sessionEnd(5), @@ -245,6 +247,19 @@ OtherTargetIdentifiers ::= CHOICE ... } +FramedRoute ::= CHOICE +{ + -- Additional Framed Route prefix information associated with the target service + + framedRoute [0] OCTET STRING, + -- This could contain an IPv4 as well as IPv6 FramedRoute information + -- including additional information such Gateway address and + -- one or more metrics in texual format. + -- This parameter shall be populated with the RADIUS value. + ... +} + + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== -- GitLab