TS 33108 v12.11.0 (2015-12-17) agreed at SA#70

748f0684 · canterburym · 4fbaf729 · 748f0684 · 748f0684 · 748f0684
Commit 748f0684 authored Dec 17, 2015 by canterburym
--- 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-59 (59)} 
+EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r12(12) version-60 (60)} 

 DEFINITIONS IMPLICIT TAGS ::=

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

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

 eps-sending-of-IRI  OPERATION ::= 
 {
@@ -216,7 +216,7 @@ DataNodeIdentifier ::= SEQUENCE
 {
 	dataNodeAddress		[1] DataNodeAddress OPTIONAL,
 	logicalFunctionType	[2] LogicalFunctionType OPTIONAL,
-	dataNodeName		[3] PrintableString((SIZE(7..25)) OPTIONAL,
+	dataNodeName		[3] PrintableString(SIZE(7..25)) OPTIONAL,
 	--Unique identifier of a Data Node within the CSP domain. Could be a name/number combination.
 ...
 }
@@ -285,7 +285,7 @@ PartyInformation 			::= SEQUENCE
        nai                    [10] OCTET STRING    OPTIONAL,
            -- NAI of the target, encoded in the same format as defined by [EPS stage 3 specs] 
 		x3GPPAssertedIdentity [11] OCTET STRING 	OPTIONAL,	
-		-- X3GPPIntendedIdentity header (3GPP TS 24 109 [79]) of the target, used in 
+		-- X3GPPAssertedIdentity header (3GPP TS 24 109 [79]) of the target, used in 
 		-- some XCAP transactions as a complement information to SIP URI or Tel URI.
 		xUI						[12] OCTET STRING 	OPTIONAL
 		-- XCAP User Identifier (XUI)is a string, valid as a path element in an XCAP URI, that is 
@@ -498,7 +498,7 @@ EPSEvent ::= ENUMERATED
    uERequestedBearerResourceModification   (22),
    uERequestedPDNConnectivity              (23),
    uERequestedPDNDisconnection             (24),
-    trackingAreaUpdate                      (25),
+    trackingAreaEpsLocationUpdate           (25),
    servingEvolvedPacketSystem              (26),
    pMIPAttachTunnelActivation              (27),
    pMIPDetachTunnelDeactivation            (28),
@@ -556,6 +556,10 @@ GPRS-parameters ::= SEQUENCE
 {
 	pDP-address-allocated-to-the-target 	[1] DataNodeAddress OPTIONAL,
 	aPN 					[2] OCTET STRING (SIZE(1..100)) OPTIONAL,
+	    -- The Access Point Name (APN) is coded in accordance with
+		-- 3GPP TS 24.008 [9] without the APN IEI (only the last 100 octets are used).
+		-- Octets are coded according to 3GPP TS 23.003 [25].
+
 	pDP-type 				[3] OCTET STRING (SIZE(2)) OPTIONAL, 
   -- 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].
@@ -632,7 +636,7 @@ EPS-GTPV2-SpecificParameters ::= SEQUENCE
    bearerDeactivationCause              [22]  OCTET STRING (SIZE (1))            OPTIONAL,
    ePSlocationOfTheTarget               [23]  EPSLocation                        OPTIONAL,
      -- the use of ePSLocationOfTheTarget is mutually exclusive with the use of locationOfTheTarget
-      -- ePSlocationOfTheTarget allows using the coding of the paramater according to SAE stage 3.
+      -- ePSlocationOfTheTarget allows using the coding of the parameter according to SAE stage 3.
    ...,
 	pDNType                              [24]   OCTET STRING (SIZE (1))           OPTIONAL,
    -- coded according to TS 24.301 [47]
@@ -799,11 +803,11 @@ PacketDataHeader ::= CHOICE

 PacketDataHeaderMapped ::= SEQUENCE 
 {
-	sourceIPAddress			[1] IPAddress	OPTIONAL,
+	sourceIPAddress			[1] IPAddress,
 	sourcePortNumber		[2] INTEGER (0..65535) OPTIONAL,	
-	destinationIPAddress	[3] IPAddress	OPTIONAL,
+	destinationIPAddress	[3] IPAddress,
 	destinationPortNumber	[4] INTEGER (0..65535) OPTIONAL,
-	transportProtocol		[5] INTEGER  OPTIONAL,
+	transportProtocol		[5] INTEGER,
 	-- For IPv4, report the "Protocol" field and for IPv6 report "Next Header" field.
 	-- Assigned Internet Protocol Numbers can be found at 
 	-- http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml

--- a/33108/r12/ThreeGPP-HI1NotificationOperations.asn
+++ b/33108/r12/ThreeGPP-HI1NotificationOperations.asn
 ThreeGPP-HI1NotificationOperations
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1) r12(12)version-1 (1)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1) r12(12)version-2 (2)}

 DEFINITIONS IMPLICIT TAGS ::=

@@ -35,7 +35,7 @@ lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(
 threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
 -- hi1 Domain
 threeGPP-hi1NotificationOperationsId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi1(0) notificationOperations(1)}
-threeGPP-hi1OperationId OBJECT IDENTIFIER ::= {threeGPP-hi1NotificationOperationsId r12(12) version1(1)}
+threeGPP-hi1OperationId OBJECT IDENTIFIER ::= {threeGPP-hi1NotificationOperationsId r12(12)  version2 (2)}

 threeGPP-sending-of-HI1-Notification OPERATION ::=
 {
@@ -60,7 +60,7 @@ Error-ThreeGPP-HI1Notifications ERROR ::=
 	missing-parameter |
 	unknown-parameter |
 	erroneous-parameter
-...}
+}


 ThreeGPP-HI1-Operation ::= CHOICE

--- 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-8 (8)} 
+UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r12(12) version-9 (9)} 

 DEFINITIONS IMPLICIT TAGS ::=

@@ -240,7 +240,7 @@ PartyInformation 			::= SEQUENCE
 		tel-uri					[9] OCTET STRING 	OPTIONAL,
 			-- See [67]
 																										x3GPPAssertedIdentity [10] OCTET STRING 	OPTIONAL,	
-																										-- X3GPPIntendedIdentity header (3GPP TS 24 109 [79]) of the target, used in 
+																										-- X3GPPAssertedIdentity header (3GPP TS 24 109 [79]) of the target, used in 
 																										-- some XCAP transactions. This information complement SIP URI or Tel URI of the target.
 																										xUI						[11] OCTET STRING 	OPTIONAL
 																										-- XCAP User Identifier (XUI)is a string, valid as a path element in an XCAP URI, that 
@@ -655,11 +655,11 @@ PacketDataHeader ::= CHOICE

 PacketDataHeaderMapped ::= SEQUENCE 
 {
-	sourceIPAddress			[1] IPAddress	OPTIONAL,
+	sourceIPAddress			[1] IPAddress,
 	sourcePortNumber		[2] INTEGER (0..65535) OPTIONAL,	
-	destinationIPAddress	[3] IPAddress	OPTIONAL,
+	destinationIPAddress	[3] IPAddress,
 	destinationPortNumber	[4] INTEGER (0..65535) OPTIONAL,
-	transportProtocol		[5] INTEGER  OPTIONAL,
+	transportProtocol		[5] INTEGER,
 	-- For IPv4, report the "Protocol" field and for IPv6 report "Next Header" field.
 	-- Assigned Internet Protocol Numbers can be found at 
 	-- http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml