From cb90d1df9e68cc4cf870e1692e070234a89df547 Mon Sep 17 00:00:00 2001 From: canterburym Date: Mon, 22 Jun 2020 13:14:53 +0200 Subject: [PATCH 1/7] Update ts_103120_ETSIDictionaryDefinitions.xml --- .../ts_103120_ETSIDictionaryDefinitions.xml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index 477914c..69ed45a 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -363,4 +363,26 @@ + + ETSI + LDHandoverFormat + + + TS102657 + Handed over in ETSI TS 102 657 format, using HI-B + + + EncapsulatedTS102657 + Handed over as ETSI TS 102 657 format using the DeliveryObject as described in clause 10 + + + TS103120 + Handed over using the DeliveryObject as described in clause 10 + + + TS103707 + Handed over as ETSI TS 103 707, using the DeliveryObject as described in clause 10 + + + -- GitLab From d5a776f3e76dcc5d7ceec6116e6c4914b6e22c45 Mon Sep 17 00:00:00 2001 From: canterburym Date: Mon, 22 Jun 2020 13:26:18 +0200 Subject: [PATCH 2/7] Update ts_103120_ETSIDictionaryDefinitions.xml --- .../dictionaries/ts_103120_ETSIDictionaryDefinitions.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index 477914c..a5f7b17 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -361,6 +361,14 @@ IsEmergency Indicates if the LI Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + + IsNonLocal + Indicates that the current Task should be intercepted as a non-local interception. + + + IsLocal + Indicates that the current Task should be intercepted as local interception. If both the IsNonLocal and IsLocal flag are absent, interception should be assumed to be local unless otherwise agreed. + -- GitLab From 6e4a35e7d046189675d09125bcce402be1b58d05 Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 25 Jun 2020 16:08:19 +0200 Subject: [PATCH 3/7] Update ts_103120_ETSIDictionaryDefinitions.xml --- .../ts_103120_ETSIDictionaryDefinitions.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index 477914c..2ec3a3a 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -18,8 +18,16 @@ Task - A Task Object as defined in section 8.2 - + An LI Task Object as defined in section 8.2 + + + LDTask + An LD Task Object as defined in section 8.3 + + + Delivery + A Delivery Object as defined in section 10 + -- GitLab From 87cd35f2dd9d5a52a170181c2eb8908e44698315 Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 25 Jun 2020 17:10:11 +0200 Subject: [PATCH 4/7] Update ts_103120_ETSIDictionaryDefinitions.xml --- 103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index a5f7b17..b29eb4d 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -363,11 +363,11 @@ IsNonLocal - Indicates that the current Task should be intercepted as a non-local interception. + Indicates that the current Task shall be intercepted as a non-local identity. IsLocal - Indicates that the current Task should be intercepted as local interception. If both the IsNonLocal and IsLocal flag are absent, interception should be assumed to be local unless otherwise agreed. + Indicates that the current Task shall be intercepted as local identity. If both the IsNonLocal and IsLocal flag are absent, the Task shall be intercepted as a local identity unless otherwise agreed. -- GitLab From 04939f2e75bc8e89ac71a1e66d648138b5bac610 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 14 Sep 2020 15:59:55 +0100 Subject: [PATCH 5/7] TS 102 232-3 v3.8.1 (2020-08-31) agreed at LI#54-e --- 102232-3/IPAccessPDU.asn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index e4813de..5c84c65 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -6,7 +6,7 @@ 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)}; @@ -53,7 +53,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 +126,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 +241,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). ... -- GitLab From d033d12ca711dba3dab628ae268d0304cd391ab4 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 14 Sep 2020 16:03:52 +0100 Subject: [PATCH 6/7] TS 102 657 v1.26.1 (2020-08-10) agreed at LI#54-e --- 102657/RDMessage.asn | 121 ++++++++++++++++++++++++++++--------------- 102657/RDMessage.xsd | 38 ++++++++++++-- 2 files changed, 114 insertions(+), 45 deletions(-) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index e806118..9f4ff32 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version23(23)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version24(24)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version23(23)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version24(24)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -665,10 +665,13 @@ ICCIDInfo ::= SEQUENCE -- PUK2 code associated with the ICCID iMSI [5] IMSI OPTIONAL, sUPI [6] SUPI OPTIONAL, - gPSI [7] GPSI OPTIONAL + gPSI [7] GPSI OPTIONAL, + eID [8] NumericString (SIZE (32)) OPTIONAL + -- Identifier of the eUICC according to GSMA SGP.02, clause 2.2.2 [53] } + LoginInfo ::= SEQUENCE { login [1] UTF8String OPTIONAL, @@ -1322,10 +1325,12 @@ Location ::= SEQUENCE NCGI ::= SEQUENCE { - pLMNID [1] PLMNID, - nRCellID [2] NRCellID + pLMNID [1] PLMNID, + nRCellID [2] NRCellID, + ... } + N3gppaLocation ::= SEQUENCE { n3gppTai [1] OCTET STRING (SIZE (5..6)) OPTIONAL, @@ -2517,9 +2522,13 @@ NwAccessType ::= ENUMERATED wimax(6), mobilePacketData(7), -- Network access over GSM/3GPP GPRS, UMTS, etc. - ... + ..., + gPON(8) + -- Gigabit capable Passive Optical Network access, based on Optical Line Terminal, + -- see ITU-T G.984-1 [54] } + DialUpInformation ::= SEQUENCE { diallingNumber [1] PartyNumber OPTIONAL, @@ -2583,10 +2592,12 @@ EPSInformation ::= SEQUENCE -- RAT Type coding according to ETSI TS 129 274 [32] clause 8.17 -- NOTE - as of v1.23.1 of the present document, this field has changed to optional ePSEvent [15] EPSEvent OPTIONAL, - ... + ..., + uERadioCapID [16] UERadioCapID OPTIONAL } + IMSIUnauthenticatedFlag ::= BOOLEAN -- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI @@ -2628,59 +2639,65 @@ EPSEvent ::= ENUMERATED FIVEGSInformation ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - dNN [2] UTF8String OPTIONAL, - gPSI [3] GPSI OPTIONAL, - pEI [4] PEI OPTIONAL, + sUPI [1] SUPI OPTIONAL, + dNN [2] UTF8String OPTIONAL, + gPSI [3] GPSI OPTIONAL, + pEI [4] PEI OPTIONAL, pDUSessionID [6] INTEGER (0..255) OPTIONAL, - sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL, + sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL, pDUIpv4Address [8] IPAddress OPTIONAL, pDUIpv6Address [9] IPAddress OPTIONAL, - pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL, - rFSPIndex [11] INTEGER (1..255) OPTIONAL, + pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL, + rFSPIndex [11] INTEGER (1..255) OPTIONAL, applicationId [12] UTF8String OPTIONAL, - applicationServiceProviderIdentity [13] UTF8String OPTIONAL, - serviceId [14] INTEGER OPTIONAL, - chargingId [15] UTF8String OPTIONAL, - pDUType [16] PDUSessionType OPTIONAL, - sSCMode [17] SSCMode OPTIONAL, - vPLMNId [18] PLMNID OPTIONAL, - hPLMNId [19] PLMNID OPTIONAL, - chargingCharacteristics [20] UTF8String OPTIONAL, - chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL, + applicationServiceProviderIdentity [13] UTF8String OPTIONAL, + serviceId [14] INTEGER OPTIONAL, + chargingId [15] UTF8String OPTIONAL, + pDUType [16] PDUSessionType OPTIONAL, + sSCMode [17] SSCMode OPTIONAL, + vPLMNId [18] PLMNID OPTIONAL, + hPLMNId [19] PLMNID OPTIONAL, + chargingCharacteristics [20] UTF8String OPTIONAL, + chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL, pDUSessionStartTime [22] GeneralizedTime OPTIONAL, pDUSessionStopTime [23] GeneralizedTime OPTIONAL, - lowPriorityIndicator [24] BOOLEAN OPTIONAL, + lowPriorityIndicator [24] BOOLEAN OPTIONAL, dataOffStatus [25] BOOLEAN OPTIONAL, - diagnostics [26] INTEGER OPTIONAL, - uETimeZone [27] UTF8String OPTIONAL, - uPFAddress [28] IPAddress OPTIONAL, - aMFAddress [29] IPAddress OPTIONAL, - uDMAddress [30] IPAddress OPTIONAL, - sMFAddress [31] IPAddress OPTIONAL, - uPFId [32] UUID OPTIONAL, + diagnostics [26] INTEGER OPTIONAL, + uETimeZone [27] UTF8String OPTIONAL, + uPFAddress [28] IPAddress OPTIONAL, + aMFAddress [29] IPAddress OPTIONAL, + uDMAddress [30] IPAddress OPTIONAL, + sMFAddress [31] IPAddress OPTIONAL, + uPFId [32] UUID OPTIONAL, aMFIdentifier [33] AMFID OPTIONAL, uDMIdentifier [34] UUID OPTIONAL, sMFIdentifier [35] UUID OPTIONAL, uPFPDNAddress [36] IPAddress OPTIONAL, - uPFPDNAddressExtension [37] IPAddress OPTIONAL, + uPFPDNAddressExtension [37] IPAddress OPTIONAL, dynamicAddressFlag [38] BOOLEAN OPTIONAL, - dynamicAddressFlagExt [39] BOOLEAN OPTIONAL, - rAT5Type [40] RAT5Type OPTIONAL, - flowQosInfo [41] OCTET STRING OPTIONAL, - serviceID [42] INTEGER OPTIONAL - + dynamicAddressFlagExt [39] BOOLEAN OPTIONAL, + rAT5Type [40] RAT5Type OPTIONAL, + flowQosInfo [41] OCTET STRING OPTIONAL, + serviceID [42] INTEGER OPTIONAL, + ..., + uERadioCapID [43] UERadioCapID OPTIONAL, + rANSecondaryRATType [44] RAT5Type OPTIONAL } + + PDUSessionType ::= ENUMERATED { iPv4(1), iPv6(2), iPv4v6(3), unstructured(4), - ethernet(5) + ethernet(5), + ... } + -- ==================================== -- Definitions of Network Access Device -- ==================================== @@ -2699,9 +2716,11 @@ NADevice ::= SEQUENCE dslID [5] UTF8String OPTIONAL, imei [6] IMEI OPTIONAL, ..., - subscriberID [7] NaSubscriberID OPTIONAL + subscriberID [7] NaSubscriberID OPTIONAL, + uERadioCapID [8] UERadioCapID OPTIONAL } + SUPI ::= CHOICE { iMSI [1] IMSI, @@ -2719,9 +2738,11 @@ GPSI ::= CHOICE PEI ::= CHOICE { iMEI [1] IMEI, - iMEISV [2] IMEISV + iMEISV [2] IMEISV, + ... } + IMEI ::= OCTET STRING (SIZE(8)) -- format as per 3GPP TS 09.02 [8] -- NOTE: When comparing IMEIs, an IMEI can be considered "equal to" the requested IMEI even @@ -2734,6 +2755,9 @@ IMSI ::= OCTET STRING (SIZE(3..8)) NAI ::= UTF8String +UERadioCapID ::= UTF8String (SIZE(12..22)) + -- format as per ETSI TS 123 003 [41] clause 29.2 + -- ====================================== -- Definitions of Message Network element -- ====================================== @@ -2849,14 +2873,27 @@ RAT5Type ::= ENUMERATED eutra(2), wlan(3), virtual(4), - ... + ..., + nBIoT(5), + wireline(6), + wirelineCable(7), + wirelineDSL(8), + wirelinePON(9), + lTEM(10), + nRU(11), + eUTRAU(12), + trustedN3GA(13), + trustedWLAN(14), + uTRA(15), + gERA(16) } AMFID ::= SEQUENCE { aMFRegionID [1] AMFRegionID, aMFSetID [2] AMFSetID, - aMFPointer [3] AMFPointer + aMFPointer [3] AMFPointer, + ... } AMFRegionID ::= INTEGER (0..255) diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 0f6a4b5..f075f34 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.25.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.26.1 @@ -282,6 +282,7 @@ + @@ -665,6 +666,14 @@ + + + + + + + + @@ -1498,7 +1507,7 @@ - + @@ -2251,6 +2260,7 @@ + @@ -2354,6 +2364,9 @@ + + + @@ -2381,6 +2394,18 @@ + + + + + + + + + + + + @@ -2435,6 +2460,7 @@ + @@ -3240,4 +3266,10 @@ + + + + + + -- GitLab From c8a0aa84d555455c4ce5802a7c0469931ec059f8 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 14 Sep 2020 16:10:46 +0100 Subject: [PATCH 7/7] TS 103 120 v1.6.1 (2020-08-06) agreed at LI#54-e --- 103120/validate_examples.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/validate_examples.py b/103120/validate_examples.py index 60c611c..7aae339 100644 --- a/103120/validate_examples.py +++ b/103120/validate_examples.py @@ -25,7 +25,7 @@ if __name__ == '__main__': xs = xmlschema.XMLSchema(schemaFile, validation='skip') locations.append((xs.default_namespace, str(Path(schemaFile))[7:])) - coreSchema = xmlschema.XMLSchema('schema/ts_103120v010501p0_Core.xsd', locations=locations) + coreSchema = xmlschema.XMLSchema('schema/ts_103120v010601p0_Core.xsd', locations=locations) for schema in schemaFiles: newSchema = xmlschema.XMLSchema(schema, locations=locations) -- GitLab