From 5487bc67531703ba965f4bdbc6e2c41a51456251 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:34:26 +0100 Subject: [PATCH] TS 102 232-1 v3.17.1 (2018-09-11) agreed at LI#48 (Bergen, 2018-06-26) --- 102232-1/LI-PS-PDU.asn | 28 +++++++++++++------ ...I-PS-PDU,ver27.txt => LI-PS-PDU,ver28.txt} | 28 +++++++++++++------ 2 files changed, 40 insertions(+), 16 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver27.txt => LI-PS-PDU,ver28.txt} (96%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 5b0e18a..891cfce 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version27(27)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version28(28)} DEFINITIONS IMPLICIT TAGS ::= @@ -16,6 +16,7 @@ IMPORTS -- from TS 101 671 [4] IRI-Parameters, IRIsContent, + Location, Network-Element-Identifier FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} @@ -188,7 +189,14 @@ IMPORTS {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} CCIPPacketHeader FROM CDMA2000CCModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)}; + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} + + -- from ETSI TS 103 462 [X] + ILHIPayload + FROM ILHIPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}; + -- This import is only used for the handover between LEMFs. + -- end of IMPORTS @@ -198,7 +206,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version26(26)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version28(28)} -- ==================== -- Top-level definition @@ -237,8 +245,10 @@ Payload ::= CHOICE ..., hI1-Operation [3] HI1-Operation, encryptionContainer [4] EncryptionContainer, - threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation + threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, -- This structure may be functionally redundant with hI1-Operation from TS 101 671 + iLHIPayload [6] SEQUENCE OF ILHIPayload + -- For typical use cases see ETSI TS 103 462 [45] } TimeStampQualifier ::= ENUMERATED @@ -507,7 +517,8 @@ DataType ::= ENUMERATED { iRI(1), cC(2), - ... + ..., + iLHI(3) } @@ -644,7 +655,8 @@ Location ::= SEQUENCE umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, ..., - wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, + eTSI671HI2Location [3] HI2Operations.Location OPTIONAL } WlanLocationAttributes ::= SEQUENCE @@ -657,8 +669,8 @@ WlanLocationAttributes ::= SEQUENCE IPAddress ::= SEQUENCE -- This parameter was previously imported from TS 101 671 [4] but has been copied - -- to TS 102 232-1. It is not recommended to use this parameter in future - -- change requests. Suggested approach is to use a parameter from TS 103 280 [42] + -- to TS 102 232-1. It is not recommended to use this parameter in + -- future change requests. Suggested approach is to use a parameter from TS 103 280 [42] -- instead. { iP-type [1] ENUMERATED diff --git a/102232-1/portal/LI-PS-PDU,ver27.txt b/102232-1/portal/LI-PS-PDU,ver28.txt similarity index 96% rename from 102232-1/portal/LI-PS-PDU,ver27.txt rename to 102232-1/portal/LI-PS-PDU,ver28.txt index 5b0e18a..891cfce 100644 --- a/102232-1/portal/LI-PS-PDU,ver27.txt +++ b/102232-1/portal/LI-PS-PDU,ver28.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version27(27)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version28(28)} DEFINITIONS IMPLICIT TAGS ::= @@ -16,6 +16,7 @@ IMPORTS -- from TS 101 671 [4] IRI-Parameters, IRIsContent, + Location, Network-Element-Identifier FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} @@ -188,7 +189,14 @@ IMPORTS {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} CCIPPacketHeader FROM CDMA2000CCModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)}; + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} + + -- from ETSI TS 103 462 [X] + ILHIPayload + FROM ILHIPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}; + -- This import is only used for the handover between LEMFs. + -- end of IMPORTS @@ -198,7 +206,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version26(26)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version28(28)} -- ==================== -- Top-level definition @@ -237,8 +245,10 @@ Payload ::= CHOICE ..., hI1-Operation [3] HI1-Operation, encryptionContainer [4] EncryptionContainer, - threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation + threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, -- This structure may be functionally redundant with hI1-Operation from TS 101 671 + iLHIPayload [6] SEQUENCE OF ILHIPayload + -- For typical use cases see ETSI TS 103 462 [45] } TimeStampQualifier ::= ENUMERATED @@ -507,7 +517,8 @@ DataType ::= ENUMERATED { iRI(1), cC(2), - ... + ..., + iLHI(3) } @@ -644,7 +655,8 @@ Location ::= SEQUENCE umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, ..., - wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, + eTSI671HI2Location [3] HI2Operations.Location OPTIONAL } WlanLocationAttributes ::= SEQUENCE @@ -657,8 +669,8 @@ WlanLocationAttributes ::= SEQUENCE IPAddress ::= SEQUENCE -- This parameter was previously imported from TS 101 671 [4] but has been copied - -- to TS 102 232-1. It is not recommended to use this parameter in future - -- change requests. Suggested approach is to use a parameter from TS 103 280 [42] + -- to TS 102 232-1. It is not recommended to use this parameter in + -- future change requests. Suggested approach is to use a parameter from TS 103 280 [42] -- instead. { iP-type [1] ENUMERATED -- GitLab