diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index b57655781de7ed4a5cb09b84cd4b7ead37931d5e..1c7b64eae67fa1d6efa81568498cfa9340e593ce 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -6,7 +6,7 @@ BEGIN IMPORTS -- from ETSI TS 102 232-1 [2] - IPAddress, + IPAddress, Location FROM LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; @@ -20,8 +20,9 @@ iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version14(14)} iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)} iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)} iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)} - -- all four definitions relative to {itu-t(0) identified-organization(4) - -- etsi(0) securityDomain(2) lawfulintercept(2)} + + -- definitions are relative to + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} -- ========================== @@ -58,10 +59,10 @@ IPIRIContents ::= SEQUENCE -- in ASCII-characters internetAccessType [2] InternetAccessType, iPVersion [3] IPVersion, - targetIPAddress [4] IPAddress OPTIONAL, + targetIPAddress [4] LI-PS-PDU.IPAddress OPTIONAL, -- IP address may not be available in case of failed logon attempts. -- If it is available, it must be sent. - -- This field will carry the first IPv4 or IPv6 target IP address with or without + -- This field will carry the first IPv4 or IPv6 target IP address with or without -- subnet. Use of this field is fully described in section 6.2.1. targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, -- Target network ID (e.g. MAC address, PSTN number) @@ -85,7 +86,7 @@ IPIRIContents ::= 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 ..., expectedEndTime [16] GeneralizedTime OPTIONAL, @@ -94,12 +95,12 @@ IPIRIContents ::= SEQUENCE -- The phone number dialed by the target for dial-up pOPIdentifier [18] IPIRIIDType OPTIONAL, -- The identifier or name of the POP - pOPIPAddress [19] IPAddress OPTIONAL, + pOPIPAddress [19] LI-PS-PDU.IPAddress OPTIONAL, -- The IP address of the POP nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL, -- National IP IRI Parameters - additionalIPAddress [21] IPAddress OPTIONAL, - -- This field will carry the first IPv6 target IP address with or without prefix when the + additionalIPAddress [21] LI-PS-PDU.IPAddress OPTIONAL, + -- This field will carry the first IPv6 target IP address with or without prefix when the -- iPVersion parameter is set to iPV4andV6. -- Use of this field is fully described in section 6.2.1 authenticationType [22] AuthenticationType OPTIONAL, @@ -108,7 +109,7 @@ 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] LI-PS-PDU.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]: @@ -141,7 +142,7 @@ AccessEventType ::= ENUMERATED accessEnd(8), -- A target stops using the IAS, the session ends endOfInterceptionWithSessionActive(9), - -- LI is ended on a target who still has an active session + -- LI is ended on a target who still has an active session unknown(10) } @@ -202,7 +203,7 @@ IPIRIIDType ::= CHOICE -- For printable userIDs, such as the Radius username, phonenumbers macAddressType [1] OCTET STRING (SIZE (6)), -- For MAC address types, raw binary format as in RFC 2132 [15] - ipAddressType [2] IPAddress, + ipAddressType [2] LI-PS-PDU.IPAddress, -- For IP address types ... } @@ -218,7 +219,7 @@ NationalIPIRIParameters ::= SEQUENCE -- extension marker (...). -- It is recommended that "version parameter" and "vendor identification parameter" are -- included in the national parameters definition. Vendor identifications can be - -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended + -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended -- to avoid using tags from 240 to 255 in a formal type definition. } @@ -240,11 +241,11 @@ AuthenticationType ::= ENUMERATED OtherTargetIdentifiers ::= CHOICE { -- Additional target identifiers associated with the target service - -- This list is extensible to accommodate other target identifiers which + -- This list is extensible to accommodate other target identifiers which -- may be required in future. - iPAddress [0] IPAddress, + iPAddress [0] LI-PS-PDU.IPAddress, -- IPAddress imported from TS 102 232 [2]. - -- This can be an IPv4 address (with or without a subnet range defined) or + -- This can be an IPv4 address (with or without a subnet range defined) or -- an IPv6 address (with or without a prefix range defined). ... } @@ -254,8 +255,8 @@ 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 + -- 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. ... @@ -347,7 +348,7 @@ PDSRInformation::= SEQUENCE summaryTrigger [0] PDSRSummaryTrigger, firstPacketTimestamp [1] GeneralizedTime, lastPacketTimestamp [2] GeneralizedTime, - packetCount [3] INTEGER, + packetCount [3] INTEGER, byteCount [4] INTEGER, ... } @@ -364,4 +365,3 @@ PDSRSummaryTrigger ::= ENUMERATED END -- end of IPAccessPDU -