diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 240f20668047e45bca5ac951682ace0b9b1050a5..e102b025a46c99ee51c949e1d771c1e5b374d9bd 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) version25(25)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)} DEFINITIONS IMPLICIT TAGS ::= @@ -8,8 +8,12 @@ BEGIN IMPORTS -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) + -- from TS 103 280 [44] + LIID + FROM Common-Parameters + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} + -- from TS 101 671 [4] - LawfulInterceptionIdentifier, IRI-Parameters, IRIsContent, Network-Element-Identifier @@ -28,14 +32,14 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version16(16)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} -- from TS 102 232-03 [6] IPCC, IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version11(11)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} -- from TS 102 232-04 [32] L2CC, @@ -48,7 +52,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} -- from TS 102 232-06 [36] PstnIsdnCC, @@ -185,7 +189,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) version25(25)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version26(26)} -- ==================== -- Top-level definition @@ -201,6 +205,7 @@ PSHeader ::= SEQUENCE { li-psDomainId [0] OBJECT IDENTIFIER, lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- As of ASN.1 version 26 this parameter is included from TS 103 280 [44] authorizationCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.3 communicationIdentifier [3] CommunicationIdentifier, @@ -640,5 +645,61 @@ 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] + -- instead. +{ + iP-type [1] ENUMERATED + { + iPV4(0), + iPV6(1), + ... + }, + iP-value [2] IP-value, + iP-assignment [3] ENUMERATED + { + static(1), + -- The static coding shall be used to report a static address. + dynamic(2), + -- The dynamic coding shall be used to report a dynamically allocated address. + notKnown(3), + -- The notKnown coding shall be used to report other then static or dynamically + -- allocated IP addresses. + ... + } OPTIONAL, + ..., + iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, + -- Indicates the length of the prefix delegated by the CSP to the subscriber + -- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60" + -- Mandatory in case where the iP-value contains an IPv6 binary value + iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL + -- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field. + -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to + -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to + -- a /29 CIDR-format subnet mask +} + +IP-value ::= CHOICE +{ + iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), + -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" + -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" + iPTextAddress [2] IA5String (SIZE(7..45)), + -- In case of IPv6, the delivered iPTextAddress field could include a complete + -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. + -- In case of IPv4, the delivered iPTextAddress field could include a single + -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" + ... +} + +LawfulInterceptionIdentifier ::= LIID + -- LIID is a common parameter imported from TS 103 280 [44]. + -- It is redefined as LawfulInterceptionIdentifier in this + -- module to preserve the original type name during the + -- removal of imports from TS 101 671 [4]. + + END --end of LI-PS-PDU diff --git a/102232-1/portal/LI-PS-PDU,ver25.txt b/102232-1/portal/LI-PS-PDU,ver26.txt similarity index 87% rename from 102232-1/portal/LI-PS-PDU,ver25.txt rename to 102232-1/portal/LI-PS-PDU,ver26.txt index 240f20668047e45bca5ac951682ace0b9b1050a5..e102b025a46c99ee51c949e1d771c1e5b374d9bd 100644 --- a/102232-1/portal/LI-PS-PDU,ver25.txt +++ b/102232-1/portal/LI-PS-PDU,ver26.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) version25(25)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)} DEFINITIONS IMPLICIT TAGS ::= @@ -8,8 +8,12 @@ BEGIN IMPORTS -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) + -- from TS 103 280 [44] + LIID + FROM Common-Parameters + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} + -- from TS 101 671 [4] - LawfulInterceptionIdentifier, IRI-Parameters, IRIsContent, Network-Element-Identifier @@ -28,14 +32,14 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version16(16)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} -- from TS 102 232-03 [6] IPCC, IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version11(11)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} -- from TS 102 232-04 [32] L2CC, @@ -48,7 +52,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} -- from TS 102 232-06 [36] PstnIsdnCC, @@ -185,7 +189,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) version25(25)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version26(26)} -- ==================== -- Top-level definition @@ -201,6 +205,7 @@ PSHeader ::= SEQUENCE { li-psDomainId [0] OBJECT IDENTIFIER, lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- As of ASN.1 version 26 this parameter is included from TS 103 280 [44] authorizationCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.3 communicationIdentifier [3] CommunicationIdentifier, @@ -640,5 +645,61 @@ 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] + -- instead. +{ + iP-type [1] ENUMERATED + { + iPV4(0), + iPV6(1), + ... + }, + iP-value [2] IP-value, + iP-assignment [3] ENUMERATED + { + static(1), + -- The static coding shall be used to report a static address. + dynamic(2), + -- The dynamic coding shall be used to report a dynamically allocated address. + notKnown(3), + -- The notKnown coding shall be used to report other then static or dynamically + -- allocated IP addresses. + ... + } OPTIONAL, + ..., + iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, + -- Indicates the length of the prefix delegated by the CSP to the subscriber + -- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60" + -- Mandatory in case where the iP-value contains an IPv6 binary value + iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL + -- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field. + -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to + -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to + -- a /29 CIDR-format subnet mask +} + +IP-value ::= CHOICE +{ + iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), + -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" + -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" + iPTextAddress [2] IA5String (SIZE(7..45)), + -- In case of IPv6, the delivered iPTextAddress field could include a complete + -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. + -- In case of IPv4, the delivered iPTextAddress field could include a single + -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" + ... +} + +LawfulInterceptionIdentifier ::= LIID + -- LIID is a common parameter imported from TS 103 280 [44]. + -- It is redefined as LawfulInterceptionIdentifier in this + -- module to preserve the original type name during the + -- removal of imports from TS 101 671 [4]. + + END --end of LI-PS-PDU