Unexpected commit

1998cf5c · canterburym · 0ce1849c · 1998cf5c · 1998cf5c
Commit 1998cf5c authored Nov 05, 2020 by canterburym
--- a/102232-3/IPAccessPDU.asn
+++ b/102232-3/IPAccessPDU.asn
@@ -5,9 +5,8 @@ DEFINITIONS IMPLICIT TAGS ::=
 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)};
@@ -17,12 +16,13 @@ IMPORTS
 -- Object Identifier Definition
 -- ============================

-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)}
+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)}
+

 -- ==========================
 -- IP Communications Contents
@@ -55,12 +55,12 @@ IPIRIContents ::= SEQUENCE
 {
 	accessEventType			[0] AccessEventType,
 	targetUsername			[1] OCTET STRING,
-		-- in ASCII characters
+		-- in ASCII-characters
 	internetAccessType		[2] InternetAccessType,
 	iPVersion				[3] IPVersion,
 	targetIPAddress			[4] IPAddress OPTIONAL,
 		-- IP address may not be available in case of failed logon attempts.
-		-- If it is available, it shall be sent.
+		-- If it is available, it must be sent.
 		-- 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,
@@ -114,7 +114,9 @@ IPIRIContents ::= SEQUENCE
 		-- 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 informationX
+		-- It is used to list all the available Framed Route and Framed IPv6 Route information
+
+
 }

 AccessEventType ::= ENUMERATED
@@ -141,7 +143,6 @@ AccessEventType ::= ENUMERATED
 	endOfInterceptionWithSessionActive(9),
 	 	-- LI is ended on a target who still has an active session
 	unknown(10)
-
 }

 InternetAccessType ::= ENUMERATED
@@ -200,7 +201,7 @@ IPIRIIDType ::= CHOICE
 	printableIDType			[0] UTF8String (SIZE (1..128)),
 		-- For printable userIDs, such as the Radius username, phonenumbers
 	macAddressType			[1] OCTET STRING (SIZE (6)),
-		-- For MAC address types, raw binary format as in IETF RFC 2132 [15]
+		-- For MAC address types, raw binary format as in RFC 2132 [15]
 	ipAddressType			[2] IPAddress,
 		-- For IP address types
 	...
@@ -242,13 +243,12 @@ OtherTargetIdentifiers ::= CHOICE
 		-- This list is extensible to accommodate other target identifiers which 
 		-- may be required in future.
 	iPAddress		[0] IPAddress,
-		-- IPAddress imported from ETSI TS 102 232 [2].
+		-- IPAddress imported from TS 102 232 [2].
 		-- This can be an IPv4 address (with or without a subnet range defined) or 
 		-- an IPv6 address (with or without a prefix range defined).
 	...
 }

-
 FramedRoute ::= CHOICE
 {
 		-- Additional Framed Route prefix information associated with the target service
@@ -270,11 +270,11 @@ IPIRIOnly ::= SEQUENCE
 {
 	iPIRIOnlyObjId				[0] RELATIVE-OID,
 	iPInformation				[1] IPInformation,
-	protocolInformation         [2] ProtocolInformation,
+	protocolInformation			[2] ProtocolInformation,
 	iPAggregatedNbrOfPackets	[3] INTEGER OPTIONAL,
 	iPAggregatedNbrOfBytes		[4] INTEGER OPTIONAL,
-    pDSRInformation             [5] PDSRInformation OPTIONAL,
-	...
+	...,
+	pDSRInformation				[5] PDSRInformation OPTIONAL
 }

 IPInformation ::= CHOICE
@@ -344,24 +344,24 @@ UDPInformation ::= SEQUENCE

 PDSRInformation::= SEQUENCE
 {
-    summaryTrigger              [0] PDSRSummaryTrigger,
-    firstPacketTimestamp        [1] GeneralizedTime,
-    lastPacketTimestamp         [2] GeneralizedTime,
-    packetCount                 [3] INTEGER,
-    byteCount                   [4] INTEGER,
-    ...
+	summaryTrigger			[0] PDSRSummaryTrigger,
+	firstPacketTimestamp	[1] GeneralizedTime,
+	lastPacketTimestamp		[2] GeneralizedTime,
+	packetCount	 			[3] INTEGER,
+	byteCount				[4] INTEGER,
+	...
 }

 PDSRSummaryTrigger ::= ENUMERATED
 {
-    startOfFlow(0),
-    timerExpiry(1),
-    packetCount(2),
-    byteCount(3),
-    endOfFlow(4),
-    ...
+	startOfFlow(0),
+	timerExpiry(1),
+	packetCount(2),
+	byteCount(3),
+	endOfFlow(4),
+	...
 }


-
 END -- end of IPAccessPDU
+
--- a/102232-3/portal/IPAccessPDU,ver13.txt
+++ b/102232-3/portal/IPAccessPDU,ver13.txt
 IPAccessPDU
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)}

 DEFINITIONS IMPLICIT TAGS ::=
 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)};
@@ -16,11 +16,13 @@ IMPORTS
 -- Object Identifier Definition
 -- ============================

-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)}
+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)}
+

 -- ==========================
 -- IP Communications Contents
@@ -53,7 +55,7 @@ IPIRIContents ::= SEQUENCE
 {
 	accessEventType			[0] AccessEventType,
 	targetUsername			[1] OCTET STRING,
-		-- in ASCIIcharacters
+		-- in ASCII-characters
 	internetAccessType		[2] InternetAccessType,
 	iPVersion				[3] IPVersion,
 	targetIPAddress			[4] IPAddress OPTIONAL,
@@ -126,7 +128,7 @@ AccessEventType ::= ENUMERATED
 	accessReject(2),
 		-- IAS access is refused to the target
 	accessFailed(3),
-		-- The Access_attempt timed-out or failed otherwise
+		-- The accessAttempt timed-out or failed otherwise
 	sessionStart(4),
 		-- A target starts using the IAS; not in use anymore from version 4(4)
 	sessionEnd(5),
@@ -241,7 +243,7 @@ OtherTargetIdentifiers ::= CHOICE
 		-- This list is extensible to accommodate other target identifiers which 
 		-- may be required in future.
 	iPAddress		[0] IPAddress,
-		-- IPAddress imported from TS 101 671 [1].
+		-- IPAddress imported from TS 102 232 [2].
 		-- This can be an IPv4 address (with or without a subnet range defined) or 
 		-- an IPv6 address (with or without a prefix range defined).
 	...
@@ -271,7 +273,8 @@ IPIRIOnly ::= SEQUENCE
 	protocolInformation			[2] ProtocolInformation,
 	iPAggregatedNbrOfPackets	[3] INTEGER OPTIONAL,
 	iPAggregatedNbrOfBytes		[4] INTEGER OPTIONAL,
-	...
+	...,
+	pDSRInformation				[5] PDSRInformation OPTIONAL
 }

 IPInformation ::= CHOICE
@@ -339,5 +342,26 @@ UDPInformation ::= SEQUENCE
 	checkSum			[3] OCTET STRING (SIZE (2))OPTIONAL
 }

+PDSRInformation::= SEQUENCE
+{
+	summaryTrigger			[0] PDSRSummaryTrigger,
+	firstPacketTimestamp	[1] GeneralizedTime,
+	lastPacketTimestamp		[2] GeneralizedTime,
+	packetCount	 			[3] INTEGER,
+	byteCount				[4] INTEGER,
+	...
+}
+
+PDSRSummaryTrigger ::= ENUMERATED
+{
+	startOfFlow(0),
+	timerExpiry(1),
+	packetCount(2),
+	byteCount(3),
+	endOfFlow(4),
+	...
+}
+
+
 END -- end of IPAccessPDU