Commit c03683db authored by canterburym's avatar canterburym
Browse files

TS 33108 v12.3.0 (2013-12-20) agreed at SA#62

parent 5b67421a
EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r12(12) version-2(2)}
EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r12(12) version-3(3)}
DEFINITIONS IMPLICIT TAGS ::=
......@@ -34,7 +34,7 @@ securityDomain(2) lawfulIntercept(2)}
-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2epsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2eps(8) r12(12) version-2(2)}
hi2epsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2eps(8) r12(12) version-3(3)}
eps-sending-of-IRI OPERATION ::=
{
......@@ -172,6 +172,9 @@ IRI-Parameters ::= SEQUENCE
sipMessageHeaderAnswer [45] OCTET STRING OPTIONAL,
sdpOffer [46] OCTET STRING OPTIONAL,
sdpAnswer [47] OCTET STRING OPTIONAL,
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,
national-HI2-ASN1parameters [255] National-HI2-ASN1parameters OPTIONAL
......@@ -425,7 +428,8 @@ EPSEvent ::= ENUMERATED
mIPResourceAllocationDeactivation (39),
pMIPsessionModification (40),
startOfInterceptWithEUTRANAttachedUE (41),
dSMIPSessionModification (42)
dSMIPSessionModification (42) ,
packetDataHeaderInformation (43)
}
-- see [19]
......@@ -545,13 +549,17 @@ EPS-GTPV2-SpecificParameters ::= SEQUENCE
-- coded according to TS 24.301 [47]
uEReqPDNConnFailReason [26] OCTET STRING (SIZE (1)) OPTIONAL,
-- coded according to TS 24.301 [47]
extendedHandoverIndication [27] OCTET STRING (SIZE (1)) OPTIONAL
extendedHandoverIndication [27] OCTET STRING (SIZE (1)) OPTIONAL,
-- This parameter with value 1 indicates handover based on the flags in the TS 29.274 [46].
-- Otherwise set to the value 0.
-- The use of extendedHandoverIndication and handoverIndication parameters is
-- mutually exclusive and depends on the actual ASN.1 encoding method.
} -- All the parameters within EPS-GTPV2-SpecificParameters are coded as the corresponding IEs
uLITimestamp [28] OCTET STRING (SIZE (8)) OPTIONAL
}
-- All the parameters within EPS-GTPV2-SpecificParameters are coded as the corresponding IEs
-- without the octets containing type and length. Unless differently stated, they are coded
-- according to 3GPP TS 29.274 [46]; in this case the octet containing the instance
-- shall also be not included.
......@@ -672,4 +680,95 @@ CCKeyInfo ::= SEQUENCE
...
}
PacketDataHeaderInformation ::= CHOICE
{
packetDataHeader [1] PacketDataHeader,
packetDataHeaderSummary [2] PacketDataHeaderSummary,
...
}
PacketDataHeader ::= CHOICE
{
packetDataHeaderMapped [1] PacketDataHeaderMapped,
packetDataHeaderCopy [2] PacketDataHeaderCopy,
...
}
PacketDataHeaderMapped ::= SEQUENCE OF
{
sourceIPAddress [1] IPAddress OPTIONAL,
sourcePortNumber [2] INTEGER (0..65535) OPTIONAL,
destinationIPAddress [3] IPAddress OPTIONAL,
destinationPortNumber [4] INTEGER (0..65535) OPTIONAL,
transportProtocol [5] INTEGER OPTIONAL,
-- 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
packetsize [6] INTEGER OPTIONAL,
flowLabel [7] INTEGER OPTIONAL,
packetCount [8] INTEGER OPTIONAL,
direction [9] TPDU-direction,
...
}
TPDU-direction ::= ENUMERATED
{
from-target (1),
to-target (2),
unknown (3)
}
PacketDataHeaderCopy ::= SEQUENCE OF
{
direction [1] TPDU-direction,
headerCopy [2] OCTET STRING, -- includes a copy of the packet header at the IP
-- network layer and above including extension headers, but excluding contents.
...
}
PacketDataSummary ::= SEQUENCE OF PacketFlowSummary
PacketFlowSummary ::= SEQUENCE
{
sourceIPAddress [1] IPAddress,
sourcePortNumber [2] INTEGER (0..65535) OPTIONAL,
destinationIPAddress [3] IPAddress,
destinationPortNumber [4] INTEGER (0..65535) 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
flowLabel [6] INTEGER OPTIONAL,
summaryPeriod [7] ReportInteval,
packetCount [8] INTEGER,
sumOfPacketSizes [9] INTEGER,
packetDataSummaryReason [10] ReportReason,
...
}
ReportReason ::= ENUMERATED
{
timerExpired [0],
countThresholdHit [1],
pDPComtextDeactivated [2],
pDPContextModification [3],
other or unknown [4],
...
}
ReportInterval ::= SEQUENCE
{
firstPacketTimeStamp [0] TimeStamp,
lastPacketTimeStamp [1] TimeStamp,
...
}
END
\ No newline at end of file
IWLANUmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2wlan(6) r8(8) version-1 (1)}
IWLANUmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2wlan(6) r12 (12) version-1 (1)}
DEFINITIONS IMPLICIT TAGS ::=
......@@ -32,7 +32,7 @@ securityDomain(2) lawfulIntercept(2)}
-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2wlanDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2wlan(6) r8(8) version-1(1)}
hi2wlanDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2wlan(6) r12 (12) version-1(1)}
iwlan-umts-sending-of-IRI OPERATION ::=
{
......@@ -117,9 +117,10 @@ IRI-Parameters ::= SEQUENCE
visitedPLMNID [12] VisitedPLMNID OPTIONAL,
national-HI2-ASN1parameters [255] National-HI2-ASN1parameters OPTIONAL,
...,
nSAPI [13] OCTET STRING (SIZE (1)) OPTIONAL
nSAPI [13] OCTET STRING (SIZE (1)) OPTIONAL,
-- Include either Octet 2 of the NSAPI IE of 3GPP TS 24.008 [9]
-- or Octet 2 of the NSAPI IE of 3GPP TS 29.060 [17].
packetDataHeaderInformation [14] PacketDataHeaderInformation OPTIONAL
}
......@@ -167,6 +168,8 @@ I-WLANEvent ::= ENUMERATED
i-WLANTunnelDisconnect (4),
startOfInterceptionCommunicationActive (5),
...
packetDataHeaderInformation (6)
}
-- see [19]
......@@ -197,7 +200,7 @@ I-WLANOperationErrorCode ::= OCTET STRING
I-WLANinformation ::= SEQUENCE
{
wLANOperatorName [1] OCTET STRING OPTIONAL,
wLANLocationName [2] OCTET STRING OPTIONAL,
wLANLocationData [2] OCTET STRING OPTIONAL,
wLANLocationInformation [3] OCTET STRING OPTIONAL,
nASIPIPv6Address [4] IPAddress OPTIONAL,
wLANMACAddress [5] OCTET STRING OPTIONAL,
......@@ -217,4 +220,103 @@ SessionAliveTime ::= OCTET STRING
--The parameter shall carry the SessionAliveTime as defined in 3GPP TS 29.234.
PacketDataHeaderInformation ::= CHOICE
{
packetDataHeader [1] PacketDataHeader,
packetDataHeaderSummary [2] PacketDataHeaderSummary,
...
}
PacketDataHeader ::= CHOICE
{
packetDataHeaderMapped [1] PacketDataHeaderMapped,
packetDataHeaderCopy [2] PacketDataHeaderCopy,
...
}
PacketDataHeaderMapped ::= SEQUENCE OF
{
sourceIPAddress [1] IPAddress OPTIONAL,
sourcePortNumber [2] INTEGER (0..65535) OPTIONAL,
destinationIPAddress [3] IPAddress OPTIONAL,
destinationPortNumber [4] INTEGER (0..65535) OPTIONAL,
transportProtocol [5] INTEGER OPTIONAL,
-- 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
packetsize [6] INTEGER OPTIONAL,
flowLabel [7] INTEGER OPTIONAL,
packetCount [8] INTEGER OPTIONAL,
direction [9] TPDU-direction,
...
}
TPDU-direction ::= ENUMERATED
{
from-target (1),
to-target (2),
unknown (3)
}
PacketDataHeaderCopy ::= SEQUENCE OF
{
direction [1] TPDU-direction,
headerCopy [2] OCTET STRING, -- includes a copy of the packet header at the IP
-- network layer and above including extension headers, but excluding contents.
...
}
PacketDataSummary ::= SEQUENCE OF PacketFlowSummary
PacketFlowSummary ::= SEQUENCE
{
sourceIPAddress [1] IPAddress,
sourcePortNumber [2] INTEGER (0..65535) OPTIONAL,
destinationIPAddress [3] IPAddress,
destinationPortNumber [4] INTEGER (0..65535) 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
flowLabel [6] INTEGER OPTIONAL,
summaryPeriod [7] ReportInteval,
packetCount [8] INTEGER,
sumOfPacketSizes [9] INTEGER,
packetDataSummaryReason [10] ReportReason,
...
}
ReportReason ::= ENUMERATED
{
timerExpired [0],
countThresholdHit [1],
pDPComtextDeactivated [2],
pDPContextModification [3],
other or unknown [4],
...
}
ReportInterval ::= SEQUENCE
{
firstPacketTimeStamp [0] TimeStamp,
lastPacketTimeStamp [1] TimeStamp,
...
}
END
\ No newline at end of file
UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r12(12) version-1 (1)}
UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r12(12) version-2 (2)}
DEFINITIONS IMPLICIT TAGS ::=
......@@ -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-1 (1)}
hi2DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2(1) r12(12) version-2 (2)}
umts-sending-of-IRI OPERATION ::=
{
......@@ -167,6 +167,9 @@ IRI-Parameters ::= SEQUENCE
sipMessageHeaderAnswer [39] OCTET STRING OPTIONAL,
sdpOffer [40] OCTET STRING OPTIONAL,
sdpAnswer [41] OCTET STRING OPTIONAL,
uLITimestamp [42] OCTET STRING (SIZE (8)) OPTIONAL,
-- Coded according to 3GPP TS 29.060 [17]; Only the ULI Timestamp value is reported.
packetDataHeaderInformation [43] PacketDataHeaderInformation OPTIONAL,
national-HI2-ASN1parameters [255] National-HI2-ASN1parameters OPTIONAL
......@@ -398,7 +401,9 @@ GPRSEvent ::= ENUMERATED
pDPContextModification (13),
servingSystem (14),
... ,
startOfInterceptionWithMSAttached (15)
startOfInterceptionWithMSAttached (15) ,
packetDataHeaderInformation (16)
}
-- see [19]
......@@ -489,5 +494,92 @@ CCKeyInfo ::= SEQUENCE
...
}
PacketDataHeaderInformation ::= CHOICE
{
packetDataHeader [1] PacketDataHeader,
packetDataHeaderSummary [2] PacketDataHeaderSummary,
...
}
PacketDataHeader ::= CHOICE
{
packetDataHeaderMapped [1] PacketDataHeaderMapped,
packetDataHeaderCopy [2] PacketDataHeaderCopy,
...
}
PacketDataHeaderMapped ::= SEQUENCE OF
{
sourceIPAddress [1] IPAddress OPTIONAL,
sourcePortNumber [2] INTEGER (0..65535) OPTIONAL,
destinationIPAddress [3] IPAddress OPTIONAL,
destinationPortNumber [4] INTEGER (0..65535) OPTIONAL,
transportProtocol [5] INTEGER OPTIONAL,
-- 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
packetsize [6] INTEGER OPTIONAL,
flowLabel [7] INTEGER OPTIONAL,
packetCount [8] INTEGER OPTIONAL,
direction [9] TPDU-direction,
...
}
TPDU-direction ::= ENUMERATED
{
from-target (1),
to-target (2),
unknown (3)
}
PacketDataHeaderCopy ::= SEQUENCE OF
{
direction [1] TPDU-direction,
headerCopy [2] OCTET STRING, -- includes a copy of the packet header at the IP
-- network layer and above including extension headers, but excluding contents.
...
}
PacketDataSummary ::= SEQUENCE OF PacketFlowSummary
PacketFlowSummary ::= SEQUENCE
{
sourceIPAddress [1] IPAddress,
sourcePortNumber [2] INTEGER (0..65535) OPTIONAL,
destinationIPAddress [3] IPAddress,
destinationPortNumber [4] INTEGER (0..65535) 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
flowLabel [6] INTEGER OPTIONAL,
summaryPeriod [7] ReportInteval,
packetCount [8] INTEGER,
sumOfPacketSizes [9] INTEGER,
packetDataSummaryReason [10] ReportReason,
...
}
ReportReason ::= ENUMERATED
{
timerExpired [0],
countThresholdHit [1],
pDPComtextDeactivated [2],
pDPContextModification [3],
other or unknown [4],
...
}
ReportInterval ::= SEQUENCE
{
firstPacketTimeStamp [0] TimeStamp,
lastPacketTimeStamp [1] TimeStamp,
...
}
END
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment