Skip to content
GitLab
Commit 11fdf3d2 authored by canterburym's avatar canterburym
Browse files

Merge branch 'r15/meeting/SA84' into 'rel15' 

R15/meeting/sa84

See merge request canterburym/ts33128_test!1
parents ed58eaff 47b7b866
Pipeline #3142 passed with stages
in 56 seconds
Show whitespace changes
Inline Side-by-side
3gppx1extensions.xsd
View file @ 11fdf3d2
......@@ -10,6 +10,46 @@
</xs:sequence>
</xs:complexType>
<xs:complexType name="UPFLIT3TargetIdentifierExtensions">
<xs:sequence>
<xs:element name="UPFLIT3TargetIdentifier" type="UPFLIT3TargetIdentifier" minOccurs="1" maxOccurs="unbounded"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="UPFLIT3TargetIdentifier">
<xs:choice>
<xs:element name="FSEID" type="FSEID"></xs:element>
<xs:element name="PDRID" type="xs:unsignedInt"></xs:element>
<xs:element name="QERID" type="xs:unsignedInt"></xs:element>
<xs:element name="NetworkInstance" type="xs:hexBinary"></xs:element>
<xs:element name="GTPTunnelDirection" type="GTPTunnelDirection"></xs:element>
<xs:element name="FTEID" type="FTEID"></xs:element>
</xs:choice>
</xs:complexType>
<xs:complexType name="FSEID">
<xs:sequence>
<xs:element name="SEID" type="xs:unsignedLong"></xs:element>
<xs:element name="IPv4Address" type="IPv4Address" minOccurs="0"></xs:element>
<xs:element name="IPv6Address" type="IPv6Address" minOccurs="0"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="FTEID">
<xs:sequence>
<xs:element name="TEID" type="xs:unsignedInt"></xs:element>
<xs:element name="IPv4Address" type="IPv4Address" minOccurs="0"></xs:element>
<xs:element name="IPv6Address" type="IPv6Address" minOccurs="0"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:simpleType name="GTPTunnelDirection">
<xs:restriction base="xs:string">
<xs:enumeration value="Outbound"></xs:enumeration>
<xs:enumeration value="Inbound"></xs:enumeration>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="X1Extension">
<xs:choice>
<xs:element name="LALSLILCSTargetProvisioning" type="LALSLILCSTargetProvisioningExtensions"></xs:element>
......
ts33128payloads.asn1
View file @ 11fdf3d2
TS33128Payloads
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r15(15) version0(0)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r15(15) version1(1)}
DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
......@@ -9,13 +9,13 @@ BEGIN
-- Relative OIDs
-- =============
xIRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version0(0) xIRI(1)}
xCCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version0(0) xCC(2)}
xIRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version1(1) xIRI(1)}
xCCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version1(1) xCC(2)}
iRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version0(0) iRI(3)}
cCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version0(0) cC(4)}
iRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version1(1) iRI(3)}
cCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version1(1) cC(4)}
lINotificationPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version0(0) lINotification(5)}
lINotificationPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version1(1) lINotification(5)}
-- ===============
-- X2 xIRI payload
......@@ -429,7 +429,7 @@ SMSMessage ::= SEQUENCE
location [6] Location OPTIONAL,
peerNFAddress [7] SMSNFAddress OPTIONAL,
peerNFType [8] SMSNFType OPTIONAL,
smsTPDUData [9] SMSTPDUData OPTIONAL
sMSTPDUData [9] SMSTPDUData OPTIONAL
}
-- ==================
......@@ -468,7 +468,7 @@ SMSNFType ::= ENUMERATED
SMSTPDUData ::= CHOICE
{
smsTPDU [1] SMSTPDU
sMSTPDU [1] SMSTPDU
}
SMSTPDU ::= OCTET STRING (SIZE(1..270))
......@@ -556,20 +556,17 @@ LINotificationType ::= ENUMERATED
LIAppliedDeliveryInformation ::= SEQUENCE
{
hi2DeliveryIpAddress [1] IPAddress OPTIONAL,
hi2DeliveryPortNumber [2] PortNumber OPTIONAL,
hi3DeliveryIpAddress [3] IPAddress OPTIONAL,
hi3DeliveryPortNumber [4] PortNumber OPTIONAL
hI2DeliveryIPAddress [1] IPAddress OPTIONAL,
hI2DeliveryPortNumber [2] PortNumber OPTIONAL,
hI3DeliveryIPAddress [3] IPAddress OPTIONAL,
hI3DeliveryPortNumber [4] PortNumber OPTIONAL
}
-- ===============
-- MDF definitions
-- ===============
MDFCellSiteReport ::= SEQUENCE
{
location [1] Location
}
MDFCellSiteReport ::= SEQUENCE OF CellInformation
-- =================
-- Common Parameters
......@@ -699,8 +696,8 @@ NSSAI ::= SEQUENCE OF SNSSAI
PLMNID ::= SEQUENCE
{
mcc [1] MCC,
mnc [1] MNC
mCC [1] MCC,
mNC [2] MNC
}
PDUSessionID ::= INTEGER (0..255)
......@@ -726,9 +723,9 @@ ProtectionSchemeID ::= INTEGER (0..15)
RATType ::= ENUMERATED
{
nr(1),
eutra(2),
wlan(3),
nR(1),
eUTRA(2),
wLAN(3),
virtual(4)
}
......@@ -834,138 +831,149 @@ LocationInfo ::= SEQUENCE
userLocation [1] UserLocation OPTIONAL,
currentLoc [2] BOOLEAN OPTIONAL,
geoInfo [3] GeographicArea OPTIONAL,
ratType [4] RATType OPTIONAL,
timezone [5] TimeZone OPTIONAL
rATType [4] RATType OPTIONAL,
timeZone [5] TimeZone OPTIONAL,
additionalCellIDs [6] SEQUENCE OF CellInformation OPTIONAL
}
-- TS 29.571 [17], clause 5.4.4.7
UserLocation ::= SEQUENCE
{
eutraLocation [1] EutraLocation OPTIONAL,
nrLocation [2] NrLocation OPTIONAL,
n3gaLocation [3] N3gaLocation OPTIONAL
eUTRALocation [1] EUTRALocation OPTIONAL,
nRLocation [2] NRLocation OPTIONAL,
n3GALocation [3] N3GALocation OPTIONAL
}
-- TS 29.571 [17], clause 5.4.4.8
EutraLocation ::= SEQUENCE
EUTRALocation ::= SEQUENCE
{
tai [1] Tai,
ecgi [2] Ecgi,
tAI [1] TAI,
eCGI [2] ECGI,
ageOfLocatonInfo [3] INTEGER OPTIONAL,
ueLocationTimestamp [4] Timestamp OPTIONAL,
uELocationTimestamp [4] Timestamp OPTIONAL,
geographicalInformation [5] UTF8String OPTIONAL,
geodeticInformation [6] UTF8String OPTIONAL,
globalNgenbId [7] GlobalRanNodeId OPTIONAL,
cellSiteinformation [8] CellSiteInformation OPTIONAL
globalNGENbID [7] GlobalRANNodeID OPTIONAL,
cellSiteInformation [8] CellSiteInformation OPTIONAL
}
-- TS 29.571 [17], clause 5.4.4.9
NrLocation ::= SEQUENCE
NRLocation ::= SEQUENCE
{
tai [1] Tai,
ncgi [2] Ncgi,
tAI [1] TAI,
nCGI [2] NCGI,
ageOfLocatonInfo [3] INTEGER OPTIONAL,
ueLocationTimestamp [4] Timestamp OPTIONAL,
uELocationTimestamp [4] Timestamp OPTIONAL,
geographicalInformation [5] UTF8String OPTIONAL,
geodeticInformation [6] UTF8String OPTIONAL,
globalGnbId [7] GlobalRanNodeId OPTIONAL,
cellSiteinformation [8] CellSiteInformation OPTIONAL
globalGNbID [7] GlobalRANNodeID OPTIONAL,
cellSiteInformation [8] CellSiteInformation OPTIONAL
}
-- TS 29.571 [17], clause 5.4.4.10
N3gaLocation ::= SEQUENCE
N3GALocation ::= SEQUENCE
{
tai [1] Tai OPTIONAL,
n3IwfId [2] N3IwfIdNgap OPTIONAL,
ueIpAddr [3] IpAddr OPTIONAL,
portNumber [5] INTEGER OPTIONAL
tAI [1] TAI OPTIONAL,
n3IWFID [2] N3IWFIDNGAP OPTIONAL,
uEIPAddr [3] IPAddr OPTIONAL,
portNumber [4] INTEGER OPTIONAL
}
-- TS 38.413 [23], clause 9.3.2.4
IpAddr ::= SEQUENCE
IPAddr ::= SEQUENCE
{
ipv4Addr [1] IPv4Address OPTIONAL,
ipv6Addr [2] IPv6Address OPTIONAL
iPv4Addr [1] IPv4Address OPTIONAL,
iPv6Addr [2] IPv6Address OPTIONAL
}
-- TS 29.571 [17], clause 5.4.4.28
GlobalRanNodeId ::= SEQUENCE
GlobalRANNodeID ::= SEQUENCE
{
plmnId [1] PlmnId,
anNodeId [2] CHOICE
pLMNID [1] PLMNID,
aNNodeID [2] CHOICE
{
n3IwfId [1] N3IwfIdSbi,
gNbId [2] GNbId,
ngeNbId [3] NgeNbId
n3IWFID [1] N3IWFIDSBI,
gNbID [2] GNbID,
nGENbID [3] NGENbID
}
}
-- TS 38.413 [23], clause 9.3.1.6
GNbId ::= BIT STRING(SIZE(22..32))
GNbID ::= BIT STRING(SIZE(22..32))
-- TS 29.571 [17], clause 5.4.4.4
Tai ::= SEQUENCE
TAI ::= SEQUENCE
{
plmnId [1] PlmnId,
tac [2] Tac
pLMNID [1] PLMNID,
tAC [2] TAC
}
-- TS 29.571 [17], clause 5.4.4.5
Ecgi ::= SEQUENCE
ECGI ::= SEQUENCE
{
plmnId [1] PlmnId,
eutraCellId [2] EutraCellId
pLMNID [1] PLMNID,
eUTRACellID [2] EUTRACellID
}
-- TS 29.571 [17], clause 5.4.4.6
Ncgi ::= SEQUENCE
NCGI ::= SEQUENCE
{
pLMNID [1] PLMNID,
nRCellID [2] NRCellID
}
RANCGI ::= CHOICE
{
plmnId [1] PlmnId,
nrCellId [2] NrCellId
eCGI [1] Ecgi,
nCGI [2] Ncgi
}
-- TS 38.413 [23], clause 9.3.3.5
PlmnId ::= OCTET STRING (SIZE(3))
CellInformation ::= SEQUENCE
{
rANCGI [1] RANCGI,
cellSiteinformation [2] CellSiteInformation OPTIONAL,
timeOfLocation [3] Timestamp OPTIONAL
}
-- TS 38.413 [23], clause 9.3.1.57
N3IwfIdNgap ::= BIT STRING (SIZE(16))
N3IWFIDNGAP ::= BIT STRING (SIZE(16))
-- TS 29.571 [17], clause 5.4.4.28
N3IwfIdSbi ::= UTF8String
N3IWFIDSBI ::= UTF8String
-- TS 29.571 [17], table 5.4.2-1
Tac ::= OCTET STRING (SIZE(2..3))
TAC ::= OCTET STRING (SIZE(2..3))
-- TS 38.413 [23], clause 9.3.1.9
EutraCellId ::= BIT STRING (SIZE(28))
EUTRACellID ::= BIT STRING (SIZE(28))
-- TS 38.413 [23], clause 9.3.1.7
NrCellId ::= BIT STRING (SIZE(36))
NRCellID ::= BIT STRING (SIZE(36))
-- TS 38.413 [23], clause 9.3.1.8
NgeNbId ::= CHOICE
NGENbID ::= CHOICE
{
macroNgeNbId [1] BIT STRING (SIZE(20)),
shortMacroNgeNbId [2] BIT STRING (SIZE(18)),
longMacroNgeNbId [3] BIT STRING (SIZE(21))
macroNGENbID [1] BIT STRING (SIZE(20)),
shortMacroNGENbID [2] BIT STRING (SIZE(18)),
longMacroNGENbID [3] BIT STRING (SIZE(21))
}
-- TS 29.518 [22], clause 6.4.6.2.3
PositioningInfo ::= SEQUENCE
{
positionInfo [1] LocationData OPTIONAL,
rawMlpResponse [2] RawMlpResponse OPTIONAL
rawMLPResponse [2] RawMLPResponse OPTIONAL
}
RawMlpResponse ::= CHOICE
RawMLPResponse ::= CHOICE
{
-- The following parameter contains a copy of unparsed XML code of the
-- MLP response message, i.e. the entire XML document containing
-- a <slia> (described in OMA-TS-MLP-V3-4-20150512-A [20], clause 5.2.3.2.2) or
-- a <slirep> (described in OMA-TS-MLP-V3-4-20150512-A [20], clause 5.2.3.2.3) MLP message.
mlpPositionData [1] UTF8String,
mLPPositionData [1] UTF8String,
-- OMA MLP result id, defined in OMA-TS-MLP-V3-4-20150512-A [20], Clause 5.4
mlpErrorCode [2] INTEGER (1..699)
mLPErrorCode [2] INTEGER (1..699)
}
-- TS 29.572 [24], clause 6.1.6.2.3
......@@ -977,9 +985,9 @@ LocationData ::= SEQUENCE
velocityEstimate [4] VelocityEstimate OPTIONAL,
civicAddress [5] CivicAddress OPTIONAL,
positioningDataList [6] SET OF PositioningMethodAndUsage OPTIONAL,
gnssPositioningDataList [7] SET OF GnnsPositioningMethodAndUsage OPTIONAL,
ecgi [8] Ecgi OPTIONAL,
ncgi [9] Ncgi OPTIONAL,
gNSSPositioningDataList [7] SET OF GNSSPositioningMethodAndUsage OPTIONAL,
eCGI [8] ECGI OPTIONAL,
nCGI [9] NCGI OPTIONAL,
altitude [10] Altitude OPTIONAL,
barometricPressure [11] BarometricPressure OPTIONAL
}
......@@ -987,45 +995,46 @@ LocationData ::= SEQUENCE
-- TS 29.518 [22], clause 6.2.6.2.5
LocationPresenceReport ::= SEQUENCE
{
type [1] AmfEventType,
timeStamp [2] Timestamp,
areaList [3] SET OF AmfEventArea OPTIONAL,
timezone [4] TimeZone OPTIONAL,
type [1] AMFEventType,
timestamp [2] Timestamp,
areaList [3] SET OF AMFEventArea OPTIONAL,
timeZone [4] TimeZone OPTIONAL,
accessTypes [5] SET OF AccessType OPTIONAL,
rmInfoList [6] SET OF RmInfo OPTIONAL,
cmInfoList [7] SET OF CmInfo OPTIONAL,
reachability [8] UeReachability OPTIONAL,
location [9] UserLocation OPTIONAL
rMInfoList [6] SET OF RMInfo OPTIONAL,
cMInfoList [7] SET OF CMInfo OPTIONAL,
reachability [8] UEReachability OPTIONAL,
location [9] UserLocation OPTIONAL,
additionalCellIDs [10] SEQUENCE OF CellInformation OPTIONAL
}
-- TS 29.518 [22], clause 6.2.6.3.3
AmfEventType ::= ENUMERATED
AMFEventType ::= ENUMERATED
{
locationReport(1),
presenceInAoiReport(2)
presenceInAOIReport(2)
}
-- TS 29.518 [22], clause 6.2.6.2.16
AmfEventArea ::= SEQUENCE
AMFEventArea ::= SEQUENCE
{
presenceInfo [1] PresenceInfo OPTIONAL,
ladnInfo [2] LadnInfo OPTIONAL
lADNInfo [2] LADNInfo OPTIONAL
}
-- TS 29.571 [17], clause 5.4.4.27
PresenceInfo ::= SEQUENCE
{
presenceState [1] PresenceState OPTIONAL,
trackingAreaList [2] SET OF Tai OPTIONAL,
ecgiList [3] SET OF Ecgi OPTIONAL,
ncgiList [4] SET OF Ncgi OPTIONAL,
globalRanNodeIdList [5] SET OF GlobalRanNodeId OPTIONAL
trackingAreaList [2] SET OF TAI OPTIONAL,
eCGIList [3] SET OF ECGI OPTIONAL,
nCGIList [4] SET OF NCGI OPTIONAL,
globalRANNodeIDList [5] SET OF GlobalRANNodeID OPTIONAL
}
-- TS 29.518 [22], clause 6.2.6.2.17
LadnInfo ::= SEQUENCE
LADNInfo ::= SEQUENCE
{
ladn [1] UTF8String,
lADN [1] UTF8String,
presence [2] PresenceState OPTIONAL
}
......@@ -1039,21 +1048,21 @@ PresenceState ::= ENUMERATED
}
-- TS 29.518 [22], clause 6.2.6.2.8
RmInfo ::= SEQUENCE
RMInfo ::= SEQUENCE
{
rmState [1] RmState,
rMState [1] RMState,
accessType [2] AccessType
}
-- TS 29.518 [22], clause 6.2.6.2.9
CmInfo ::= SEQUENCE
CMInfo ::= SEQUENCE
{
cmState [1] CmState,
cMState [1] CMState,
accessType [2] AccessType
}
-- TS 29.518 [22], clause 6.2.6.3.7
UeReachability ::= ENUMERATED
UEReachability ::= ENUMERATED
{
unreachable(1),
reachable(2),
......@@ -1061,14 +1070,14 @@ UeReachability ::= ENUMERATED
}
-- TS 29.518 [22], clause 6.2.6.3.9
RmState ::= ENUMERATED
RMState ::= ENUMERATED
{
registered(1),
deregistered(2)
}
-- TS 29.518 [22], clause 6.2.6.3.10
CmState ::= ENUMERATED
CMState ::= ENUMERATED
{
idle(1),
connected(2)
......@@ -1145,10 +1154,10 @@ PositioningMethodAndUsage ::= SEQUENCE
}
-- TS 29.572 [24], clause 6.1.6.2.16
GnnsPositioningMethodAndUsage ::= SEQUENCE
GNSSPositioningMethodAndUsage ::= SEQUENCE
{
mode [1] PositioningMode,
gnss [2] GnssId,
gNSS [2] GNSSID,
usage [3] Usage
}
......@@ -1257,7 +1266,7 @@ HorizontalWithVerticalVelocityAndUncertainty ::= SEQUENCE
vUncertainty [6] SpeedUncertainty
}
--The following types are described in TS 29.572 [24], table 6.1.6.3.2-1
-- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1
Altitude ::= UTF8String
Angle ::= INTEGER (0..360)
Uncertainty ::= INTEGER (0..127)
......@@ -1280,32 +1289,32 @@ VerticalDirection ::= ENUMERATED
-- TS 29.572 [24], clause 6.1.6.3.6
PositioningMethod ::= ENUMERATED
{
cellid(1),
ecid(2),
otdoa(3),
cellID(1),
eCID(2),
oTDOA(3),
barometricPresure(4),
wlan(5),
wLAN(5),
bluetooth(6),
mbs(7)
mBS(7)
}
-- TS 29.572 [24], clause 6.1.6.3.7
PositioningMode ::= ENUMERATED
{
ueBased(1),
ueAssisted(2),
uEBased(1),
uEAssisted(2),
conventional(3)
}
-- TS 29.572 [24], clause 6.1.6.3.8
GnssId ::= ENUMERATED
GNSSID ::= ENUMERATED
{
gps(1),
gPS(1),
galileo(2),
sbas(3),
modernizedGps(4),
qzss(5),
glonass(6)
sBAS(3),
modernizedGPS(4),
qZSS(5),
gLONASS(6)
}
-- TS 29.572 [24], clause 6.1.6.3.9
......
Supports Markdown
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