From 3516565bfcd43ec6191cc56ab9681fd615f51ce6 Mon Sep 17 00:00:00 2001 From: Jason Graham Date: Mon, 20 Apr 2026 16:42:03 +0000 Subject: [PATCH 01/13] Update 4 files - /103280/TS_103_280.asn1 - /103280/TS_103_280_Location.asn1 - /testing/asn/asn_compile_targets.json - /testing/asn/asn_process.py --- 103280/TS_103_280.asn1 | 2 + 103280/TS_103_280_Location.asn1 | 164 +++++++++++++++++++++++++++ testing/asn/asn_compile_targets.json | 3 +- testing/asn/asn_process.py | 1 + 4 files changed, 169 insertions(+), 1 deletion(-) create mode 100644 103280/TS_103_280_Location.asn1 diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1 index ac8c776..c95dfc6 100644 --- a/103280/TS_103_280.asn1 +++ b/103280/TS_103_280.asn1 @@ -167,4 +167,6 @@ FixMode ::= ENUMERATED fix3D(3) } +MACAddress ::= OCTET STRING (SIZE(6)) + END diff --git a/103280/TS_103_280_Location.asn1 b/103280/TS_103_280_Location.asn1 new file mode 100644 index 0000000..7037c70 --- /dev/null +++ b/103280/TS_103_280_Location.asn1 @@ -0,0 +1,164 @@ +CommonLocations +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) commonLocations(39) genHeader(1) version1(1)} + +DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= + +BEGIN + +IMPORTS +-- from ETSI TS 103 280 Common-Parameters + WGS84CoordinateDecimal, + WGS84LatitudeDecimal, + WGS84LongitudeDecimal, + MACAddress + FROM Common-Parameters + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version271(271)} + + + -- previously from ETSI TS 101 671; now provided with this specification ETSI TS 102 232-1 [1] + Location + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(18)} + + -- from 3GPP TS 33.108 [AA] + Location + FROM UmtsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [AA] + EPSLocation + FROM EpsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.128 [46] + Location + FROM TS33128Payloads + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)}; + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. + +-- end of IMPORTS + +-- ============================= +-- Object Identifier Definitions +-- ============================= + +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +commonLocations OBJECT IDENTIFIER ::= {lawfulInterceptDomainId commonLocations(39) genHeader(1) version1(1)} + +-- ==================== +-- Top-level definition +-- ==================== + +Location ::= SEQUENCE +{ + locationInformation [1] LocationInformation, + locationProvenance [2] LocationProvenance, + ... +} + +LocationInformation ::= CHOICE +{ + umtsHI2Location [1] UmtsHI2Operations.Location, + epsLocation [2] EpsHI2Operations.EPSLocation, + wlanLocationAttributes [3] WlanLocationAttributes, + eTSI671HI2Location [4] HI2Operations.Location, + threeGPP33128Location [5] TS33128Payloads.Location, + wGS84CoordinateDecimal [6] Common-Parameters.WGS84CoordinateDecimal, + wGS84LatitudeDecimal [7] Common-Parameters.WGS84LatitudeDecimal, + wGS84LongitudeDecimal [8] Common-Parameters.WGS84LongitudeDecimal, + pIDF-LO [9] XMLType, + ... +} + +LocationProvenance ::= SEQUENCE +{ + locationNetworkProvenance [1] LocationNetworkProvenance, + locationLIProvenance [2] LocationLIProvenance, + ... +} + +LocationNetworkProvenance ::= SEQUENCE +{ + locationSource [1] LocationSource, + locationTimeStamps [2] SEQUENCE (SIZE (1..MAX)) OF LocationTimestamp, + additionalInformation [3] UTF8String OPTIONAL, + ... +} + +LocationLIProvenance ::= SEQUENCE +{ + lIProvenance [1] LIProvenance, + sourceNF [2] SourceNF, + locationTimeStamps [3] SEQUENCE (SIZE (1..MAX)) OF LocationTimestamp, + additionalInformation [4] UTF8String OPTIONAL, + ... +} + +LocationSource ::= ENUMERATED +{ + other(1), + unknown(2), + cPEOrClient(3), + network(4), + ... +} + +LocationTimestamp ::= SEQUENCE +{ + timeStamp [1] GeneralizedTime, + locationTimeStampQualifier [2] LocationTimeStampQualifier, + ... +} + +LIProvenance ::= ENUMERATED +{ + other(1), + observed(2), + nFContext(3), + nFLookup(4), + ... +} + +SourceNF ::= ENUMERATED +{ + aDMF(1), + tF(2), + pOI(3), + mDF(4), + ... +} + +LocationTimeStampQualifier ::= ENUMERATED +{ + unknown(1), + timeOfInterception(2), + timeOfMediation(3), + timeOfCalculation(4), + timeLastObserved(5), + ... +} + +WlanLocationAttributes ::= SEQUENCE +{ + wlanAPMACAddress [1] Common-Parameters.MACAddress OPTIONAL, + ... +} + +XMLType ::= SEQUENCE +{ + xMLNamespace [1] XMLNamespace, + xMLValue [2] XMLValue, + ... +} + +XMLNamespace ::= UTF8String + +XMLValue ::= UTF8String + +END diff --git a/testing/asn/asn_compile_targets.json b/testing/asn/asn_compile_targets.json index f12b657..44ccd7b 100644 --- a/testing/asn/asn_compile_targets.json +++ b/testing/asn/asn_compile_targets.json @@ -27,7 +27,8 @@ "./102232-3/IPAccessPDU.asn", "./102232-4/L2AccessPDU.asn", "./102232-5/IPMultimediaPDU.asn", - "./102232-6/PstnIsdnPDU.asn" + "./102232-6/PstnIsdnPDU.asn", + "./103280/TS_103_280_Location.asn1" ], [ "./102657/RDMessage.asn" diff --git a/testing/asn/asn_process.py b/testing/asn/asn_process.py index 0c76ee7..5628094 100644 --- a/testing/asn/asn_process.py +++ b/testing/asn/asn_process.py @@ -76,6 +76,7 @@ def syntaxCheckASN(fileList): duplicateObjects = { "102232-1/LI-PS-PDU.asn": ["CCPayload", "IRIPayload", "Location"], "testing/mod1.asn": ["ClashField"], + "103280/TS_103_280_Location.asn1": ["Location"] } -- GitLab From 6eedc51a1c443cfd1f0dcc64f8d29f08c8bc76ca Mon Sep 17 00:00:00 2001 From: Jason Graham Date: Tue, 28 Apr 2026 09:41:52 +0000 Subject: [PATCH 02/13] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Luke Mewburn --- 103280/TS_103_280_Location.asn1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/103280/TS_103_280_Location.asn1 b/103280/TS_103_280_Location.asn1 index 7037c70..bc27cdb 100644 --- a/103280/TS_103_280_Location.asn1 +++ b/103280/TS_103_280_Location.asn1 @@ -58,8 +58,7 @@ commonLocations OBJECT IDENTIFIER ::= {lawfulInterceptDomainId commonLocations(3 Location ::= SEQUENCE { locationInformation [1] LocationInformation, - locationProvenance [2] LocationProvenance, - ... + locationProvenance [2] LocationProvenance } LocationInformation ::= CHOICE -- GitLab From 7df506137679ee212b956dd049950422cd2c55da Mon Sep 17 00:00:00 2001 From: Jason Graham Date: Tue, 28 Apr 2026 09:41:58 +0000 Subject: [PATCH 03/13] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Luke Mewburn --- 103280/TS_103_280_Location.asn1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/103280/TS_103_280_Location.asn1 b/103280/TS_103_280_Location.asn1 index bc27cdb..6915519 100644 --- a/103280/TS_103_280_Location.asn1 +++ b/103280/TS_103_280_Location.asn1 @@ -71,8 +71,7 @@ LocationInformation ::= CHOICE wGS84CoordinateDecimal [6] Common-Parameters.WGS84CoordinateDecimal, wGS84LatitudeDecimal [7] Common-Parameters.WGS84LatitudeDecimal, wGS84LongitudeDecimal [8] Common-Parameters.WGS84LongitudeDecimal, - pIDF-LO [9] XMLType, - ... + pIDF-LO [9] XMLType } LocationProvenance ::= SEQUENCE -- GitLab From 145d35704fbbd3a66eaf455edc8f2f4ed76e2fa5 Mon Sep 17 00:00:00 2001 From: Jason Graham Date: Tue, 28 Apr 2026 09:42:03 +0000 Subject: [PATCH 04/13] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Luke Mewburn --- 103280/TS_103_280_Location.asn1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/103280/TS_103_280_Location.asn1 b/103280/TS_103_280_Location.asn1 index 6915519..d6ac59f 100644 --- a/103280/TS_103_280_Location.asn1 +++ b/103280/TS_103_280_Location.asn1 @@ -77,8 +77,7 @@ LocationInformation ::= CHOICE LocationProvenance ::= SEQUENCE { locationNetworkProvenance [1] LocationNetworkProvenance, - locationLIProvenance [2] LocationLIProvenance, - ... + locationLIProvenance [2] LocationLIProvenance } LocationNetworkProvenance ::= SEQUENCE -- GitLab From 63522e942c119ff58cdf5e09b07d3d2324b2bc68 Mon Sep 17 00:00:00 2001 From: Jason Graham Date: Tue, 28 Apr 2026 09:42:11 +0000 Subject: [PATCH 05/13] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Luke Mewburn --- 103280/TS_103_280_Location.asn1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/103280/TS_103_280_Location.asn1 b/103280/TS_103_280_Location.asn1 index d6ac59f..e290f0a 100644 --- a/103280/TS_103_280_Location.asn1 +++ b/103280/TS_103_280_Location.asn1 @@ -84,8 +84,7 @@ LocationNetworkProvenance ::= SEQUENCE { locationSource [1] LocationSource, locationTimeStamps [2] SEQUENCE (SIZE (1..MAX)) OF LocationTimestamp, - additionalInformation [3] UTF8String OPTIONAL, - ... + additionalInformation [3] UTF8String OPTIONAL } LocationLIProvenance ::= SEQUENCE -- GitLab From 94b903bf1eaf61fbc0aa264a9490dcd7957b3378 Mon Sep 17 00:00:00 2001 From: Jason Graham Date: Tue, 28 Apr 2026 09:42:14 +0000 Subject: [PATCH 06/13] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Luke Mewburn --- 103280/TS_103_280_Location.asn1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/103280/TS_103_280_Location.asn1 b/103280/TS_103_280_Location.asn1 index e290f0a..833ed17 100644 --- a/103280/TS_103_280_Location.asn1 +++ b/103280/TS_103_280_Location.asn1 @@ -92,8 +92,7 @@ LocationLIProvenance ::= SEQUENCE lIProvenance [1] LIProvenance, sourceNF [2] SourceNF, locationTimeStamps [3] SEQUENCE (SIZE (1..MAX)) OF LocationTimestamp, - additionalInformation [4] UTF8String OPTIONAL, - ... + additionalInformation [4] UTF8String OPTIONAL } LocationSource ::= ENUMERATED -- GitLab From f8a6aeec712285d0c31b54ad0e601c506f068592 Mon Sep 17 00:00:00 2001 From: Jason Graham Date: Tue, 28 Apr 2026 09:42:18 +0000 Subject: [PATCH 07/13] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Luke Mewburn --- 103280/TS_103_280_Location.asn1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/103280/TS_103_280_Location.asn1 b/103280/TS_103_280_Location.asn1 index 833ed17..a5c80bb 100644 --- a/103280/TS_103_280_Location.asn1 +++ b/103280/TS_103_280_Location.asn1 @@ -100,8 +100,7 @@ LocationSource ::= ENUMERATED other(1), unknown(2), cPEOrClient(3), - network(4), - ... + network(4) } LocationTimestamp ::= SEQUENCE -- GitLab From 3d9bedadf801ca5d655449db90b9107ddbb882cd Mon Sep 17 00:00:00 2001 From: Jason Graham Date: Tue, 28 Apr 2026 09:42:23 +0000 Subject: [PATCH 08/13] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Luke Mewburn --- 103280/TS_103_280_Location.asn1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/103280/TS_103_280_Location.asn1 b/103280/TS_103_280_Location.asn1 index a5c80bb..9014f5a 100644 --- a/103280/TS_103_280_Location.asn1 +++ b/103280/TS_103_280_Location.asn1 @@ -106,8 +106,7 @@ LocationSource ::= ENUMERATED LocationTimestamp ::= SEQUENCE { timeStamp [1] GeneralizedTime, - locationTimeStampQualifier [2] LocationTimeStampQualifier, - ... + locationTimeStampQualifier [2] LocationTimeStampQualifier } LIProvenance ::= ENUMERATED -- GitLab From 083d993413e0b4d3596013a501c24c88d702840f Mon Sep 17 00:00:00 2001 From: Jason Graham Date: Tue, 28 Apr 2026 09:42:28 +0000 Subject: [PATCH 09/13] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Luke Mewburn --- 103280/TS_103_280_Location.asn1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/103280/TS_103_280_Location.asn1 b/103280/TS_103_280_Location.asn1 index 9014f5a..acb106a 100644 --- a/103280/TS_103_280_Location.asn1 +++ b/103280/TS_103_280_Location.asn1 @@ -114,8 +114,7 @@ LIProvenance ::= ENUMERATED other(1), observed(2), nFContext(3), - nFLookup(4), - ... + nFLookup(4) } SourceNF ::= ENUMERATED -- GitLab From 704f0c13af55e598fdd0383c368c14cc514f4a35 Mon Sep 17 00:00:00 2001 From: Jason Graham Date: Tue, 28 Apr 2026 09:42:32 +0000 Subject: [PATCH 10/13] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Luke Mewburn --- 103280/TS_103_280_Location.asn1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/103280/TS_103_280_Location.asn1 b/103280/TS_103_280_Location.asn1 index acb106a..bd98c87 100644 --- a/103280/TS_103_280_Location.asn1 +++ b/103280/TS_103_280_Location.asn1 @@ -122,8 +122,7 @@ SourceNF ::= ENUMERATED aDMF(1), tF(2), pOI(3), - mDF(4), - ... + mDF(4) } LocationTimeStampQualifier ::= ENUMERATED -- GitLab From ae6baadcc64628a2eeb307fa311f39b9d8e270bf Mon Sep 17 00:00:00 2001 From: Jason Graham Date: Tue, 28 Apr 2026 09:42:36 +0000 Subject: [PATCH 11/13] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Luke Mewburn --- 103280/TS_103_280_Location.asn1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/103280/TS_103_280_Location.asn1 b/103280/TS_103_280_Location.asn1 index bd98c87..c61d198 100644 --- a/103280/TS_103_280_Location.asn1 +++ b/103280/TS_103_280_Location.asn1 @@ -131,8 +131,7 @@ LocationTimeStampQualifier ::= ENUMERATED timeOfInterception(2), timeOfMediation(3), timeOfCalculation(4), - timeLastObserved(5), - ... + timeLastObserved(5) } WlanLocationAttributes ::= SEQUENCE -- GitLab From 358acf5b8676604cd4e85d29a46d42abb117dc78 Mon Sep 17 00:00:00 2001 From: Jason Graham Date: Tue, 28 Apr 2026 09:42:40 +0000 Subject: [PATCH 12/13] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Luke Mewburn --- 103280/TS_103_280_Location.asn1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/103280/TS_103_280_Location.asn1 b/103280/TS_103_280_Location.asn1 index c61d198..c45b72d 100644 --- a/103280/TS_103_280_Location.asn1 +++ b/103280/TS_103_280_Location.asn1 @@ -136,8 +136,7 @@ LocationTimeStampQualifier ::= ENUMERATED WlanLocationAttributes ::= SEQUENCE { - wlanAPMACAddress [1] Common-Parameters.MACAddress OPTIONAL, - ... + wlanAPMACAddress [1] Common-Parameters.MACAddress OPTIONAL } XMLType ::= SEQUENCE -- GitLab From d20569fc9cf2d7eea0eaa22c2b6acf949f782824 Mon Sep 17 00:00:00 2001 From: Jason Graham Date: Tue, 28 Apr 2026 09:42:43 +0000 Subject: [PATCH 13/13] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Luke Mewburn --- 103280/TS_103_280_Location.asn1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/103280/TS_103_280_Location.asn1 b/103280/TS_103_280_Location.asn1 index c45b72d..928cb8c 100644 --- a/103280/TS_103_280_Location.asn1 +++ b/103280/TS_103_280_Location.asn1 @@ -142,8 +142,7 @@ WlanLocationAttributes ::= SEQUENCE XMLType ::= SEQUENCE { xMLNamespace [1] XMLNamespace, - xMLValue [2] XMLValue, - ... + xMLValue [2] XMLValue } XMLNamespace ::= UTF8String -- GitLab