Loading 102232-1/LI-PS-PDU.asn +6 −53 Changes for 102232-1/LI-PS-PDU.asn: 6 added lines, 53 removed lines. Original line number Diff line number Diff line Loading @@ -13,14 +13,16 @@ IMPORTS LIID, LongString, ShortString, TS671IPAddress, TS671IPValue, WGS84CoordinateDecimal FROM Common-Parameters {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version281(281)} -- from ETSI TS 103 280 [44] Common-Locations CPEProvidedLocation, CommonLocation, WlanLocation, CPEProvidedLocation WlanLocation FROM Common-Locations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) commonLocations(39) genHeader(1) version1(1)} Loading Loading @@ -741,58 +743,9 @@ WlanLocationAttributes ::= Common-Locations.WlanLocation CPEProvidedLocationAttributes ::= Common-Locations.CPEProvidedLocation IPAddress ::= Common-Parameters.TS671IPAddress IPAddress ::= SEQUENCE -- This parameter was previously imported from ETSI TS 101 671 [4] but has been copied -- to ETSI TS 102 232-1 (the present document). It is not recommended to use this parameter in -- future change requests. Suggested approach is to use a parameter from ETSI TS 103 280 [44] -- 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 than 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-NAT-translated [6] BOOLEAN OPTIONAL -- If TRUE then NAT translated, if FALSE then not NAT translated. -- If absent, IPAddress may or may not be NAT translated. } 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" ... } IP-value ::= Common-Parameters.TS671IPValue LawfulInterceptionIdentifier ::= Common-Parameters.LIID -- LIID is a common parameter imported from ETSI TS 103 280 [44]. Loading 103280/TS_103_280.asn1 +52 −0 Changes for 103280/TS_103_280.asn1: 52 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -171,4 +171,56 @@ FixMode ::= ENUMERATED fix3D(3) } TS671IPAddress ::= SEQUENCE -- This parameter was previously imported from ETSI TS 101 671 but has been copied -- to the present document. It is not recommended to use this parameter in -- future change requests. Suggested approach is to use a new parameter from -- the present document instead. { iP-type [1] ENUMERATED { iPV4(0), iPV6(1), ... }, iP-value [2] TS671IPValue, 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 than 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-NAT-translated [6] BOOLEAN OPTIONAL -- If TRUE then NAT translated, if FALSE then not NAT translated. -- If absent, IPAddress may or may not be NAT translated. } TS671IPValue ::= 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" ... } END Loading
102232-1/LI-PS-PDU.asn +6 −53 Changes for 102232-1/LI-PS-PDU.asn: 6 added lines, 53 removed lines. Original line number Diff line number Diff line Loading @@ -13,14 +13,16 @@ IMPORTS LIID, LongString, ShortString, TS671IPAddress, TS671IPValue, WGS84CoordinateDecimal FROM Common-Parameters {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version281(281)} -- from ETSI TS 103 280 [44] Common-Locations CPEProvidedLocation, CommonLocation, WlanLocation, CPEProvidedLocation WlanLocation FROM Common-Locations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) commonLocations(39) genHeader(1) version1(1)} Loading Loading @@ -741,58 +743,9 @@ WlanLocationAttributes ::= Common-Locations.WlanLocation CPEProvidedLocationAttributes ::= Common-Locations.CPEProvidedLocation IPAddress ::= Common-Parameters.TS671IPAddress IPAddress ::= SEQUENCE -- This parameter was previously imported from ETSI TS 101 671 [4] but has been copied -- to ETSI TS 102 232-1 (the present document). It is not recommended to use this parameter in -- future change requests. Suggested approach is to use a parameter from ETSI TS 103 280 [44] -- 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 than 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-NAT-translated [6] BOOLEAN OPTIONAL -- If TRUE then NAT translated, if FALSE then not NAT translated. -- If absent, IPAddress may or may not be NAT translated. } 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" ... } IP-value ::= Common-Parameters.TS671IPValue LawfulInterceptionIdentifier ::= Common-Parameters.LIID -- LIID is a common parameter imported from ETSI TS 103 280 [44]. Loading
103280/TS_103_280.asn1 +52 −0 Changes for 103280/TS_103_280.asn1: 52 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -171,4 +171,56 @@ FixMode ::= ENUMERATED fix3D(3) } TS671IPAddress ::= SEQUENCE -- This parameter was previously imported from ETSI TS 101 671 but has been copied -- to the present document. It is not recommended to use this parameter in -- future change requests. Suggested approach is to use a new parameter from -- the present document instead. { iP-type [1] ENUMERATED { iPV4(0), iPV6(1), ... }, iP-value [2] TS671IPValue, 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 than 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-NAT-translated [6] BOOLEAN OPTIONAL -- If TRUE then NAT translated, if FALSE then not NAT translated. -- If absent, IPAddress may or may not be NAT translated. } TS671IPValue ::= 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" ... } END