TS 33108 v12.5.0 (2014-06-27) agreed at SA#64

035e5eaa · canterburym · 3ea99e1f · 035e5eaa · 035e5eaa · 035e5eaa
Commit 035e5eaa authored Jun 27, 2014 by canterburym
--- a/33108/r12/CONF-HI3-IMS.asn
+++ b/33108/r12/CONF-HI3-IMS.asn
@@ -83,6 +83,81 @@ TPDU-direction ::= ENUMERATED
 	  -- Indicates that combined CC delivery is used.

 }
+B. 12	Contents of Communication (HI3 IMS-based VoIP)
+VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r12(12) version-0(0)}
+ 
+DEFINITIONS IMPLICIT TAGS ::=
+
+BEGIN
+
+
+IMPORTS
+
+LawfulInterceptionIdentifier,
+	
+TimeStamp
+	FROM HI2Operations 
+	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)}-- from ETSI HI2Operations TS 101 671, version 3.12.1
+
+
+National-HI3-ASN1parameters
+
+FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r8(8) version-0(0)}
+
+
+-- Object Identifier Definitions
+
+-- Security DomainId
+lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0)
+securityDomain(2) lawfulIntercept(2)}
+
+-- Security Subdomains
+threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
+hi3voipDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3voip(13) r12(12) version-0(0)}
+
+Voip-CC-PDU	::= SEQUENCE 
+{
+ 	voipLIC-header		[1] VoipLIC-header, 
+	payload				[2] OCTET STRING
+}
+
+VoipLIC-header ::= SEQUENCE 
+{
+	hi3voipDomainId			[0]	OBJECT IDENTIFIER,  -- 3GPP VoIP HI3 Domain
+	lIID					[2] LawfulInterceptionIdentifier OPTIONAL,
+	voipCorrelationNumber	[3]	VoipCorrelationNumber, -- Contained in CorrelationValues [HI2]
+	timeStamp				[4]	TimeStamp OPTIONAL,
+	sequence-number			[5]	INTEGER (0..65535),
+	t-PDU-direction			[6] TPDU-direction,
+	national-HI3-ASN1parameters		[7] National-HI3-ASN1parameters OPTIONAL,
+	--  encoded per national requirements
+	ice-type				[8] ICE-type OPTIONAL,
+		-- The ICE-type indicates the applicable Intercepting Control Element in which
+		-- the VoIP CC is intercepted.
+...
+	
+}
+
+VoipCorrelationNumber ::= OCTET STRING 
+
+TPDU-direction ::= ENUMERATED
+{
+	from-target 	(1),
+	to-target 		(2),
+	combined		(3), -- Indicates that combined CC (i.e., from/to-target)delivery is used.
+	unknown			(4)
+}				
+
+ICE-type ::= ENUMERATED {
+	ggsn			(1),
+	pDN-GW          (2),
+    aGW 			(3),
+	trGW			(4),
+	mGW				(5),
+    other			(6),
+	unknown			(7),			 
+	...
+}				

 National-HI3-ASN1parameters	::= SEQUENCE
 {

--- a/33108/r12/EpsHI2Operations.asn
+++ b/33108/r12/EpsHI2Operations.asn
-EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r12(12) version-4(4)} 
+EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r12(12) version-55(55)} 

 DEFINITIONS IMPLICIT TAGS ::=

@@ -23,8 +23,15 @@ IMPORTS

 			FROM HI2Operations
 			{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
- 				  lawfulIntercept(2) hi2(1) version10(10)}; -- Imported from TS 101 671v3.3.1
-			
+ 				  lawfulIntercept(2) hi2(1) version18(18)} -- Imported from TS 101 671v3.12.1
+		
+  		CivicAddress
+
+			FROM UmtsHI2Operations
+    		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
+   				lawfulintercept(2) threeGPP(4) hi2(1) r12(12) version-4 (4)};
+    			-- Imported from 3GPP TS 33.108, UMTS PS HI2
+	

 -- Object Identifier Definitions

@@ -34,7 +41,7 @@ securityDomain(2) lawfulIntercept(2)}

 -- Security Subdomains
 threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
-hi2epsDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2eps(8) r12(12) version-4(4)}
+hi2epsDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2eps(8) r12(12) version-55(55)}

 eps-sending-of-IRI  OPERATION ::= 
 {
@@ -113,7 +120,7 @@ IRI-Parameters		::= SEQUENCE
 	} OPTIONAL,

 	locationOfTheTarget		[8] Location OPTIONAL,
-		-- location of the target subscriber
+		-- location of the target 
 	partyInformation 		[9] SET SIZE (1..10) OF PartyInformation OPTIONAL, 
 		-- This parameter provides the concerned party, the identiy(ies) of the party
 		--)and all the information provided by the party. 
@@ -175,7 +182,17 @@ IRI-Parameters		::= SEQUENCE
    uLITimestamp            [48] OCTET STRING (SIZE (8)) OPTIONAL,
    -- Coded according to 3GPP TS 29.060 [17]; Only the ULI Timestamp value is reported. 
 	packetDataHeaderInformation		   [49] PacketDataHeaderInformation	OPTIONAL, 
-    mediaSecFailureIndication         [50] MediaSecFailureIndication OPTIONAL,
+																								    mediaSecFailureIndication         [50] MediaSecFailureIndication OPTIONAL,	csgIdentity				[51] OCTET STRING (SIZE (4)) OPTIONAL,  -- Octets are coded according 
+																								      -- to 3GPP TS 23.003 [25].  The 27 bits specified in TS 23.003 shall be encoded as follows. 
+																								      -- The most significant bit of the CSG Identity shall be encoded in the most significant
+																								      -- bit of the first octet of the octet string and the least significant bit coded in bit 6
+																								      -- of octet 4.
+																									heNBIdentity			[52] OCTET STRING OPTIONAL, -- 4 or 6 octets are coded with the 
+																								        -- with the HNB Unqiue Identity as specified in 3GPP TS 23.003 [25], Clause 4.10.
+																									heNBiPAddress			[53] IPAddress,
+																									heNBLocation			[54] HeNBLocation,
+																									tunnelProtocol			[55] TunnelProtocol,
+


 	national-HI2-ASN1parameters	[255]	National-HI2-ASN1parameters	OPTIONAL
@@ -243,10 +260,11 @@ Location	::= SEQUENCE
 		--			SAC		2 octets (no. 6 - 7)
 		--			(according to 3GPP TS 25.413 [62])
 	...,
-	oldRAI				[8] Rai		OPTIONAL
+	oldRAI				[8] Rai		OPTIONAL,
 		-- the Routeing Area Identifier in the old SGSN is coded in accordance with the 
 		--  10.5.5.15 of document [9] without the Routing Area Identification IEI 
 		-- (only the last 6 octets are used).
+  	civicAddress		[9] CivicAddress OPTIONAL
 }
 GlobalCellID	::= OCTET STRING  (SIZE (5..7))
 Rai				::= OCTET STRING (SIZE (6))
@@ -592,8 +610,8 @@ EPSLocation	::= SEQUENCE
 	tAIlist			    [6] OCTET STRING (SIZE (7..97))	OPTIONAL,
       -- the TAI List is coded acording to 3GPP TS 24.301 [47], without the TAI list IEI
    ...,
-	threeGPP2Bsid			[7] OCTET STRING (SIZE (1..12)) OPTIONAL
-		-- contains only the payload from the 3GPP2-BSID AVP described in the 3GPP TS 29.212 [56].
+	threeGPP2Bsid			[7] OCTET STRING (SIZE (1..1,2)) OPTIONAL
+		-- contains only the payload from the 3GPP2-BSID AVP described in the 3GPP TS 2  	civicAddress		[8] CivicAddress OPTIONAL9.212 [56].

 }

@@ -704,7 +722,7 @@ PacketDataHeader ::= CHOICE
 ...
 }

-PacketDataHeaderMapped ::= SEQUENCE OF
+PacketDataHeaderMapped ::= SEQUENCE 
 {
 	sourceIPAddress			[1] IPAddress	OPTIONAL,
 	sourcePortNumber		[2] INTEGER (0..65535) OPTIONAL,	
@@ -730,7 +748,7 @@ TPDU-direction ::= ENUMERATED
 }


-PacketDataHeaderCopy ::= SEQUENCE OF
+PacketDataHeaderCopy ::= SEQUENCE 
 {
 	direction				[1] TPDU-direction,
 	headerCopy				[2] OCTET STRING,	-- includes a copy of the packet header at the IP 
@@ -739,7 +757,7 @@ PacketDataHeaderCopy ::= SEQUENCE OF
 } 


-PacketDataSummary ::= SEQUENCE OF PacketFlowSummary
+PacketDataHeaderSummary ::= SEQUENCE OF PacketFlowSummary

 PacketFlowSummary ::= SEQUENCE
 {
@@ -753,7 +771,7 @@ PacketFlowSummary ::= SEQUENCE
 	-- Assigned Internet Protocol Numbers can be found at 
 	-- http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml
 	flowLabel				[6] INTEGER OPTIONAL,
-	summaryPeriod			[7] ReportInteval,
+	summaryPeriod			[7] ReportInterval,
 	packetCount				[8] INTEGER,
 	sumOfPacketSizes		[9] INTEGER,
 	packetDataSummaryReason	[10] ReportReason,
@@ -763,11 +781,11 @@ PacketFlowSummary ::= SEQUENCE

 ReportReason ::= ENUMERATED
 {
-	timerExpired			[0],	
-	countThresholdHit		[1],
-	pDPComtextDeactivated   [2],
-	pDPContextModification	[3],
-	other or unknown		[4],
+	timerExpired			(0),	
+	countThresholdHit		(1),
+	pDPComtextDeactivated   (2),
+	pDPContextModification	(3),
+	otherOrUnknown		(4),
 	...
 } 


--- a/33108/r12/IWLANUmtsHI2Operations.asn
+++ b/33108/r12/IWLANUmtsHI2Operations.asn
-IWLANUmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2wlan(6)  r12 (12) version-1 (1)} 
+IWLANUmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2wlan(6)  r12 (12) version-2 (2)} 

 DEFINITIONS IMPLICIT TAGS ::=

@@ -21,8 +21,16 @@ IMPORTS

 			FROM HI2Operations
 			{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
- 				  lawfulIntercept(2) hi2(1) version10 (10)}; -- Imported from TS 101 671
-			
+ 				  lawfulIntercept(2) hi2(1) version18 (18)} -- Imported from TS 101 671v3.12.1
+		
+		GeographicalCoordinates,
+		CivicAddress
+
+			FROM UmtsHI2Operations
+    		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
+   				lawfulintercept(2) threeGPP(4) hi2(1) r12(12) version-4 (4)};
+    			-- Imported from 3GPP TS 33.108, UMTS PS HI2
+	

 -- Object Identifier Definitions

@@ -32,7 +40,7 @@ securityDomain(2) lawfulIntercept(2)}

 -- Security Subdomains
 threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
-hi2wlanDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2wlan(6)  r12 (12) version-1(1)}
+hi2wlanDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2wlan(6)  r12 (12) version-2(2)}

 iwlan-umts-sending-of-IRI  OPERATION ::= 
 {
@@ -167,7 +175,7 @@ I-WLANEvent ::= ENUMERATED
 	i-WLANTunnelEstablishment				(3),
 	i-WLANTunnelDisconnect					(4),
 	startOfInterceptionCommunicationActive	(5),
-	... 
+	..., 
 	packetDataHeaderInformation				(6)

 }
@@ -194,7 +202,9 @@ I-WLAN-parameters ::= SEQUENCE
 }

 I-WLANOperationErrorCode ::= OCTET STRING
-- The parameter shall carry the I-WLAN failed tunnel establishment reason, the I-WLAN Failed Access -- Initiation reason or the I-WLAN session termination reason.
+-- The parameter shall carry the I-WLAN failed tunnel establishment reason, the I-WLAN Failed 
+Access
+-- Initiation reason or the I-WLAN session termination reason.


 I-WLANinformation ::= SEQUENCE 
@@ -205,9 +215,10 @@ I-WLANinformation ::= SEQUENCE
 	nASIPIPv6Address					[4]	IPAddress			OPTIONAL,
 	wLANMACAddress						[5]	OCTET STRING		OPTIONAL,
 	sessionAliveTimer					[6]	SessionAliveTime	OPTIONAL,
-	...
+	...,
 --These parameters are defined in 3GPP TS 29.234.
-
+  	geographicalCoordinates 			[7] GeographicalCoordinates OPTIONAL,
+   	civicAddress						[8] CivicAddress OPTIONAL
 }


@@ -239,7 +250,7 @@ PacketDataHeader ::= CHOICE
 }


-PacketDataHeaderMapped ::= SEQUENCE OF
+PacketDataHeaderMapped ::= SEQUENCE 
 {
 	sourceIPAddress			[1] IPAddress	OPTIONAL,
 	sourcePortNumber		[2] INTEGER (0..65535) OPTIONAL,	
@@ -269,7 +280,7 @@ TPDU-direction ::= ENUMERATED



-PacketDataHeaderCopy ::= SEQUENCE OF
+PacketDataHeaderCopy ::= SEQUENCE 
 {
 	direction				[1] TPDU-direction,
 	headerCopy				[2] OCTET STRING,	-- includes a copy of the packet header at the IP 
@@ -303,11 +314,11 @@ PacketFlowSummary ::= SEQUENCE

 ReportReason ::= ENUMERATED
 {
-	timerExpired			[0],	
-	countThresholdHit		[1],
-	pDPComtextDeactivated   [2],
-	pDPContextModification	[3],
-	other or unknown		[4],
+	timerExpired			(0),	
+	countThresholdHit		(1),
+	pDPComtextDeactivated   (2),
+	pDPContextModification	(3),
+	otherOrUnknown		(4),
 	...
 } 


--- a/33108/r12/UmtsCS-HI2Operations.asn
+++ b/33108/r12/UmtsCS-HI2Operations.asn
@@ -133,7 +133,7 @@ IRI-Parameters		::= SEQUENCE
 		-- Duration in seconds. BCD coded : HHMMSS
 		-- Not required for UMTS. May be included for backwards compatibility to GSM
 	locationOfTheTarget					[8] Location OPTIONAL,
-		-- location of the target subscriber
+		-- location of the target 
 	partyInformation 					[9] SET SIZE (1..10) OF PartyInformation OPTIONAL, 
 		-- This parameter provides the concerned party (Originating, Terminating or forwarded
 		-- party), the identity(ies) of the party and all the information provided by the party. 

--- a/33108/r12/UmtsHI2Operations.asn
+++ b/33108/r12/UmtsHI2Operations.asn
-UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r12(12) version-3 (3)} 
+UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r12(12) version-4 (4)} 

 DEFINITIONS IMPLICIT TAGS ::=

@@ -23,7 +23,7 @@ IMPORTS

 			FROM HI2Operations
 			{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
- 				  lawfulIntercept(2) hi2(1) version10(10)}; -- Imported from TS 101 671v2.15.1
+ 				  lawfulIntercept(2) hi2(1) version18(18)}; -- Imported from TS 101 671v3.12.1
 			

 -- Object Identifier Definitions
@@ -34,7 +34,7 @@ securityDomain(2) lawfulIntercept(2)}

 -- Security Subdomains
 threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
-hi2DomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2(1) r12(12) version-3 (3)}
+hi2DomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2(1) r12(12) version-4 (4)}

 umts-sending-of-IRI  OPERATION ::= 
 {
@@ -124,7 +124,7 @@ IRI-Parameters		::= SEQUENCE
 	} OPTIONAL,

 	locationOfTheTarget		[8] Location OPTIONAL,
-		-- location of the target subscriber
+		-- location of the target 
 	partyInformation 		[9] SET SIZE (1..10) OF PartyInformation OPTIONAL, 
 		-- This parameter provides the concerned party, the identiy(ies) of the party
 		--)and all the information provided by the party. 
@@ -244,10 +244,18 @@ Location	::= SEQUENCE
 		-- The TAI is coded according to the TS 29.118 [64] without the TAI IEI.
 		-- The tAI parameter is applicable only to the CS traffic cases where 
 		-- the available location information is the one received from the the MME. 
-	eCGI				[10] OCTET STRING (SIZE (8)) OPTIONAL
+	eCGI				[10] OCTET STRING (SIZE (8)) OPTIONAL,
 		-- the ECGI is coded according to the TS 29.118 [64] without the ECGI IEI.
 		-- The eCGI parameter is applicable only to the CS traffic cases where 
 		-- the available location information is the one received from the the MME.
+	civicAddress		[11] CivicAddress OPTIONAL
+		-- Every elements that describe civicAddress are based on IETF RFC 4776 or IETF
+		-- 5139, ISO.3166-1 and -2, ISO 639-1, UPU SB42-4 ([71]to [75]) Such element is to
+		-- enrich IRI
+		-- Messages to LEMF by civic elements on the location of a H(e)NodeB or a WLAN hotspot,
+		-- instead of geographical location  of the target or any geo-coordinates. Please, look
+		-- at the 5.11 location information of TS 33 106 and 4 functional architecture of TS
+		-- 33.107 on how such element can be used. 
 }

 GlobalCellID	::= OCTET STRING  (SIZE (5..7))
@@ -339,6 +347,85 @@ GA-Polygon ::= SEQUENCE (SIZE (1..maxNrOfPoints)) OF
 		...
 	}

+CivicAddress ::= CHOICE { 
+    detailedCivicAddress        SET OF DetailedCivicAddress, 
+	xmlCivicAddress				XmlCivicAddress, 
+	...
+}
+
+XmlCivicAddress ::= UTF8String 
+     -- Must conform to the February 2008 version of the XML format on the representation of 
+     -- civic location described in IETF RFC 5139[yy].
+
+
+DetailedCivicAddress ::= SEQUENCE {
+	building			[1] UTF8String OPTIONAL,
+		-- Building (structure), for example Hope Theatre
+	room				[2] UTF8String OPTIONAL,
+		-- Unit (apartment, suite), for example 12a
+	placeType			[3] UTF8String OPTIONAL,
+		-- Place-type, for example office
+	postalCommunityName	[4] UTF8String OPTIONAL,
+		-- Postal Community Name, for example Leonia
+	additionalCode	[5] UTF8String OPTIONAL,
+		-- Additional Code, for example 13203000003
+	seat				[6] UTF8String OPTIONAL,
+		-- Seat, desk, or cubicle, workstation, for example WS 181
+	primaryRoad		[7] UTF8String OPTIONAL,
+		-- RD is the primary road name, for example Broadway
+	primaryRoadDirection   [8] UTF8String OPTIONAL,
+		-- PRD is the leading road direction, for example N or North
+	trailingStreetSuffix [9] UTF8String OPTIONAL,
+		-- POD or trailing street suffix, for example SW or South West
+streetSuffix		[10] UTF8String OPTIONAL,
+		-- Street suffix or type, for example Avenue or Platz or Road
+	houseNumber			[11] UTF8String OPTIONAL,
+		-- House number, for example 123
+	houseNumberSuffix	[12] UTF8String OPTIONAL,
+		-- House number suffix, for example A or Ter
+	landmarkAddress		[13] UTF8String OPTIONAL, 
+		-- Landmark or vanity address, for example Columbia University
+	additionalLocation	[114] UTF8String OPTIONAL,
+		-- Additional location, for example South Wing
+	name 			[15] UTF8String OPTIONAL, 
+		-- Residence and office occupant, for example Joe's Barbershop
+	floor 			[16] UTF8String OPTIONAL, 
+		-- Floor, for example 4th floor
+	primaryStreet	[17] UTF8String OPTIONAL, 
+		-- Primary street name, for example Broadway 
+	primaryStreetDirection   [18] UTF8String OPTIONAL,
+		-- PSD is the leading street direction, for example N or North
+	roadSection		[19] UTF8String OPTIONAL, 
+		-- Road section, for example 14
+	roadBranch    	[20] UTF8String OPTIONAL, 
+		-- Road branch, for example Lane 7
+	roadSubBranch  	[21] UTF8String OPTIONAL, 
+		-- Road sub-branch, for example Alley 8
+	roadPreModifier [22] UTF8String OPTIONAL, 
+		-- Road pre-modifier, for example Old
+	roadPostModifier [23] UTF8String OPTIONAL,   
+		-- Road post-modifier, for example Extended
+	postalCode		[24]UTF8String OPTIONAL, 
+		-- Postal/zip code, for example 10027-1234
+	town			[25] UTF8String OPTIONAL, 
+	county			[26] UTF8String OPTIONAL, 
+		-- An administrative sub-section, often defined in ISO.3166-2[74]  International
+		-- Organization for Standardization, "Codes for the representation of names of
+		-- countries and their subdivisions -  Part 2: Country subdivision code"
+	country			[27] UTF8String,
+		-- Defined in ISO.3166-1 [39] International Organization for Standardization, "Codes for
+		-- the representation of names of countries and their subdivisions - Part 1: Country
+		-- codes". Such definition is not optional in case of civic address. It is the
+		-- minimum information needed to qualify and describe a civic address, when a
+		-- regulation of a specific country requires such information
+	language		[28] UTF8String, 
+		-- Language defined in the IANA registry according to the assignments found
+		-- in the standard ISO 639 Part 1, "ISO 639-1:2002[75], Codes for the representation of
+		-- names of languages - Part 1: Alpha-2 code" or using assignments subsequently made
+		-- by the ISO 639 Part 1 maintenance agency
+	...
+}
+
 SMS-report		::= SEQUENCE 
 {
 	sMS-Contents	[3] SEQUENCE
@@ -445,7 +532,7 @@ GPRS-parameters ::= SEQUENCE
    -- Include either Octets 3 and 4 of the Packet Data Protocol Address information element of 
    -- 3GPP TS 24.008 [9]or Octets 4 and 5 of the End User Address IE of 3GPP TS 29.060 [17].

-when PDP-type is IPv4 or IPv6, the IP address is carried by parameter
+	-- when PDP-type is IPv4 or IPv6, the IP address is carried by parameter
 	-- pDP-address-allocated-to-the-target
 	-- when PDP-type is IPv4v6, the additional IP address is carried by parameter
 	-- additionalIPaddress
@@ -518,7 +605,7 @@ PacketDataHeader ::= CHOICE
 ...
 }

-PacketDataHeaderMapped ::= SEQUENCE OF
+PacketDataHeaderMapped ::= SEQUENCE 
 {
 	sourceIPAddress			[1] IPAddress	OPTIONAL,
 	sourcePortNumber		[2] INTEGER (0..65535) OPTIONAL,	
@@ -543,7 +630,7 @@ TPDU-direction ::= ENUMERATED
 	unknown 		(3)
 }

-PacketDataHeaderCopy ::= SEQUENCE OF
+PacketDataHeaderCopy ::= SEQUENCE 
 {
 	direction				[1] TPDU-direction,
 	headerCopy				[2] OCTET STRING,	-- includes a copy of the packet header at the IP 
@@ -552,7 +639,7 @@ PacketDataHeaderCopy ::= SEQUENCE OF
 } 


-PacketDataSummary ::= SEQUENCE OF PacketFlowSummary
+PacketDataHeaderSummary ::= SEQUENCE OF PacketFlowSummary

 PacketFlowSummary ::= SEQUENCE
 {
@@ -566,7 +653,7 @@ PacketFlowSummary ::= SEQUENCE
 	-- Assigned Internet Protocol Numbers can be found at 
 	-- http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml
 	flowLabel				[6] INTEGER OPTIONAL,
-	summaryPeriod			[7] ReportInteval,
+	summaryPeriod			[7] ReportInterval,
 	packetCount				[8] INTEGER,
 	sumOfPacketSizes		[9] INTEGER,
 	packetDataSummaryReason	[10] ReportReason,
@@ -575,11 +662,11 @@ PacketFlowSummary ::= SEQUENCE

 ReportReason ::= ENUMERATED
 {
-	timerExpired			[0],	
-	countThresholdHit		[1],
-	pDPComtextDeactivated   [2],
-	pDPContextModification	[3],
-	other or unknown		[4],
+	timerExpired			(0),	
+	countThresholdHit		(1),
+	pDPComtextDeactivated   (2),
+	pDPContextModification	(3),
+	otherOrUnknown		(4),
 	...
 }