From 97d3ef13a3585c2fdc6f2917551f25b5ebd6bff3 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 13:09:33 +0000 Subject: [PATCH 01/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 53 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 7d187add..0372b39e 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -386,10 +386,12 @@ IRIPayload ::= SEQUENCE -- If the sessionDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details - payloadDirection [6] PayloadDirection OPTIONAL + payloadDirection [6] PayloadDirection OPTIONAL, -- If the payloadDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details + locations [7] Locations OPTIONAL + -- This field is only required to be used when there are multiple locations to be reported out of an NF. } IRIType ::= ENUMERATED @@ -479,6 +481,41 @@ GcseIRI ::= CHOICE ... } +Locations ::= SEQUENCE +{ + networkProvidedLocations [1] LocationList OPTIONAL, + cPEProvidedLocations [2] LocationList OPTIONAL, + otherLocations [3] LocationList OPTIONAL --I hate this name but needed somewhere for the locations that are not known to be CPE provided or NPLI +} + +LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below +{ + usingLocation [1] SEQUENCE (SIZE (1..MAX)) OF Location + usingNewLocation [2] SEQUENCE (SIZE (1..MAX)) OF NewLocation +} + + +--These would only be needed if we chose [2] in LocationList + +NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat + +NewLocationFormat ::= SEQUENCE +{ + location [1] NewLocations, + -- locationProvenance [2] LocationProvenance +} + +NewLocations ::= CHOICE +{ + umtsHI2Location [0] UmtsHI2Operations.Location, + epsLocation [1] EpsHI2Operations.EPSLocation, + wlanLocationAttributes [2] WlanLocationAttributes, + eTSI671HI2Location [3] HI2Operations.Location, + threeGPP33128UserLocation [4] TS33128Payloads.UserLocation, + wGS84CoordinateDecimal [5] wGS84CoordinateDecimal, + pIDF-LO [6] XMLType +} + -- =========================== -- Definitions for TRI Payload @@ -685,7 +722,9 @@ Location ::= SEQUENCE wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL, - cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL + cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL, + wGS84CoordinateDecimal [6] wGS84CoordinateDecimal OPTIONAL, + pIDF-LO [7] XMLType OPTIONAL } WlanLocationAttributes ::= SEQUENCE @@ -759,4 +798,14 @@ LawfulInterceptionIdentifier ::= Common-Parameters.LIID -- module to preserve the original type name during the -- removal of imports from ETSI TS 101 671 [4]. +XMLType ::= SEQUENCE +{ + xMLNamespace [1] XMLNamespace, + xMLValue [2] XMLValue +} + +XMLNamespace ::= UTF8String + +XMLValue ::= UTF8String + END -- end of LI-PS-PDU -- GitLab From 2e2999979a479e5a79431cf1877ed3c0d8f7c304 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 13:16:02 +0000 Subject: [PATCH 02/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 0372b39e..e044f253 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -514,6 +514,11 @@ NewLocations ::= CHOICE threeGPP33128UserLocation [4] TS33128Payloads.UserLocation, wGS84CoordinateDecimal [5] wGS84CoordinateDecimal, pIDF-LO [6] XMLType + --I just realized that we probably don't need the Namespace element of this. The description of this would read something like what they say in 29.171: + --"This IE contains a UTF-8 encoded PIDF-LO XML document as defined in IETF RFC 4119 [13]. + --The document shall only contain a civic address using the namespaces + --"urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr" per IETF RFC 5139 [14] and + --"urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr:ext" per IETF RFC 6848 [15]. } -- GitLab From 6b1b9ed13ddcfe3092d5d9ebd2eacab19a250ff9 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 13:23:13 +0000 Subject: [PATCH 03/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index e044f253..6babd1e4 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -490,7 +490,7 @@ Locations ::= SEQUENCE LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below { - usingLocation [1] SEQUENCE (SIZE (1..MAX)) OF Location + usingLocation [1] SEQUENCE (SIZE (1..MAX)) OF Location, usingNewLocation [2] SEQUENCE (SIZE (1..MAX)) OF NewLocation } -- GitLab From d76e25a6002667ad4297603c1983a3234d0b02dd Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 13:34:46 +0000 Subject: [PATCH 04/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 6babd1e4..09455e8f 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -501,7 +501,7 @@ NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat NewLocationFormat ::= SEQUENCE { - location [1] NewLocations, + location [1] NewLocations--, -- locationProvenance [2] LocationProvenance } -- GitLab From ab91e8208375db9493a6eca61bf331b15b937e74 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 13:53:06 +0000 Subject: [PATCH 05/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 09455e8f..85571086 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -512,7 +512,7 @@ NewLocations ::= CHOICE wlanLocationAttributes [2] WlanLocationAttributes, eTSI671HI2Location [3] HI2Operations.Location, threeGPP33128UserLocation [4] TS33128Payloads.UserLocation, - wGS84CoordinateDecimal [5] wGS84CoordinateDecimal, + wGS84CoordinateDecimal [5] Common-Parameters.WGS84CoordinateDecimal, pIDF-LO [6] XMLType --I just realized that we probably don't need the Namespace element of this. The description of this would read something like what they say in 29.171: --"This IE contains a UTF-8 encoded PIDF-LO XML document as defined in IETF RFC 4119 [13]. @@ -728,7 +728,7 @@ Location ::= SEQUENCE eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL, cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL, - wGS84CoordinateDecimal [6] wGS84CoordinateDecimal OPTIONAL, + wGS84CoordinateDecimal [6] Common-Parameters.WGS84CoordinateDecimal OPTIONAL, pIDF-LO [7] XMLType OPTIONAL } -- GitLab From d54a88a958cb49ba0dc3d82455f41d57422bc601 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 15:25:58 +0000 Subject: [PATCH 06/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 85571086..26298da4 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -490,7 +490,7 @@ Locations ::= SEQUENCE LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below { - usingLocation [1] SEQUENCE (SIZE (1..MAX)) OF Location, + usingLocation [1] SEQUENCE OF Location, usingNewLocation [2] SEQUENCE (SIZE (1..MAX)) OF NewLocation } -- GitLab From 9b317517dcee775dbd3cf54e66e10a848260bf31 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 15:30:50 +0000 Subject: [PATCH 07/45] Update file asn_process.py --- testing/asn_process.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/asn_process.py b/testing/asn_process.py index 5ca7aa5b..81300ab4 100644 --- a/testing/asn_process.py +++ b/testing/asn_process.py @@ -82,7 +82,7 @@ def fixDuplicateObjects(filename): stringContent = filename.read_text() for object in duplicateObjects[filename.as_posix()]: stringContent = stringContent.replace(f'{object} ::=', f'Native{object} ::=', 1) - stringContent = stringContent.replace(f'SEQUENCE OF {object}', f'SEQUENCE OF Native{object}') + stringContent = stringContent.replace(f'SEQUENCE OF {object}', f'SEQUENCE OF Native{object}', 1) #stringContent = sub(f"]\\w{object}", f"] Native{object}", stringContent) Path('temp.asn').write_text(stringContent) -- GitLab From be599834cbc68bce4d01f4ce4a5e3daba17b7be6 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 15:32:15 +0000 Subject: [PATCH 08/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 26298da4..594f95d1 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -490,12 +490,12 @@ Locations ::= SEQUENCE LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below { - usingLocation [1] SEQUENCE OF Location, - usingNewLocation [2] SEQUENCE (SIZE (1..MAX)) OF NewLocation + usingNewLocation [1] SEQUENCE (SIZE (1..MAX)) OF NewLocation, +-- usingLocation [2] SEQUENCE OF Location } ---These would only be needed if we chose [2] in LocationList +--These would only be needed if we chose [1] in LocationList NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat -- GitLab From e2c4b432d116f45ab7c620ab8ff8f9ce4b50c6c2 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 15:33:09 +0000 Subject: [PATCH 09/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 594f95d1..45078c4f 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -490,7 +490,7 @@ Locations ::= SEQUENCE LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below { - usingNewLocation [1] SEQUENCE (SIZE (1..MAX)) OF NewLocation, + usingNewLocation [1] SEQUENCE (SIZE (1..MAX)) OF NewLocation--, -- usingLocation [2] SEQUENCE OF Location } -- GitLab From 510ee90b4fc7590459f17ff8c0f8f6cf56e21900 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 15:40:36 +0000 Subject: [PATCH 10/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 45078c4f..4025f8f1 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -490,8 +490,7 @@ Locations ::= SEQUENCE LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below { - usingNewLocation [1] SEQUENCE (SIZE (1..MAX)) OF NewLocation--, --- usingLocation [2] SEQUENCE OF Location + usingNewLocation [1] SEQUENCE (SIZE (1..MAX)) OF NewLocation } -- GitLab From 2d81b3dbd9ffaba1c1465805c27522873fd2033e Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 15:43:51 +0000 Subject: [PATCH 11/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 57 +++--------------------------------------- 1 file changed, 3 insertions(+), 54 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 4025f8f1..822cf516 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -386,12 +386,10 @@ IRIPayload ::= SEQUENCE -- If the sessionDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details - payloadDirection [6] PayloadDirection OPTIONAL, + payloadDirection [6] PayloadDirection OPTIONAL -- If the payloadDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details - locations [7] Locations OPTIONAL - -- This field is only required to be used when there are multiple locations to be reported out of an NF. } IRIType ::= ENUMERATED @@ -481,45 +479,6 @@ GcseIRI ::= CHOICE ... } -Locations ::= SEQUENCE -{ - networkProvidedLocations [1] LocationList OPTIONAL, - cPEProvidedLocations [2] LocationList OPTIONAL, - otherLocations [3] LocationList OPTIONAL --I hate this name but needed somewhere for the locations that are not known to be CPE provided or NPLI -} - -LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below -{ - usingNewLocation [1] SEQUENCE (SIZE (1..MAX)) OF NewLocation -} - - ---These would only be needed if we chose [1] in LocationList - -NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat - -NewLocationFormat ::= SEQUENCE -{ - location [1] NewLocations--, - -- locationProvenance [2] LocationProvenance -} - -NewLocations ::= CHOICE -{ - umtsHI2Location [0] UmtsHI2Operations.Location, - epsLocation [1] EpsHI2Operations.EPSLocation, - wlanLocationAttributes [2] WlanLocationAttributes, - eTSI671HI2Location [3] HI2Operations.Location, - threeGPP33128UserLocation [4] TS33128Payloads.UserLocation, - wGS84CoordinateDecimal [5] Common-Parameters.WGS84CoordinateDecimal, - pIDF-LO [6] XMLType - --I just realized that we probably don't need the Namespace element of this. The description of this would read something like what they say in 29.171: - --"This IE contains a UTF-8 encoded PIDF-LO XML document as defined in IETF RFC 4119 [13]. - --The document shall only contain a civic address using the namespaces - --"urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr" per IETF RFC 5139 [14] and - --"urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr:ext" per IETF RFC 6848 [15]. -} - -- =========================== -- Definitions for TRI Payload @@ -726,9 +685,7 @@ Location ::= SEQUENCE wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL, - cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL, - wGS84CoordinateDecimal [6] Common-Parameters.WGS84CoordinateDecimal OPTIONAL, - pIDF-LO [7] XMLType OPTIONAL + cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL } WlanLocationAttributes ::= SEQUENCE @@ -802,14 +759,6 @@ LawfulInterceptionIdentifier ::= Common-Parameters.LIID -- module to preserve the original type name during the -- removal of imports from ETSI TS 101 671 [4]. -XMLType ::= SEQUENCE -{ - xMLNamespace [1] XMLNamespace, - xMLValue [2] XMLValue -} - -XMLNamespace ::= UTF8String - -XMLValue ::= UTF8String +-- just checking that this will compile END -- end of LI-PS-PDU -- GitLab From 09b269b372d3af1f2eb6e67b234cd0016f5ce055 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 15:49:21 +0000 Subject: [PATCH 12/45] Revert "Update file LI-PS-PDU.asn" This reverts commit 2d81b3dbd9ffaba1c1465805c27522873fd2033e --- 102232-1/LI-PS-PDU.asn | 57 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 822cf516..4025f8f1 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -386,10 +386,12 @@ IRIPayload ::= SEQUENCE -- If the sessionDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details - payloadDirection [6] PayloadDirection OPTIONAL + payloadDirection [6] PayloadDirection OPTIONAL, -- If the payloadDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details + locations [7] Locations OPTIONAL + -- This field is only required to be used when there are multiple locations to be reported out of an NF. } IRIType ::= ENUMERATED @@ -479,6 +481,45 @@ GcseIRI ::= CHOICE ... } +Locations ::= SEQUENCE +{ + networkProvidedLocations [1] LocationList OPTIONAL, + cPEProvidedLocations [2] LocationList OPTIONAL, + otherLocations [3] LocationList OPTIONAL --I hate this name but needed somewhere for the locations that are not known to be CPE provided or NPLI +} + +LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below +{ + usingNewLocation [1] SEQUENCE (SIZE (1..MAX)) OF NewLocation +} + + +--These would only be needed if we chose [1] in LocationList + +NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat + +NewLocationFormat ::= SEQUENCE +{ + location [1] NewLocations--, + -- locationProvenance [2] LocationProvenance +} + +NewLocations ::= CHOICE +{ + umtsHI2Location [0] UmtsHI2Operations.Location, + epsLocation [1] EpsHI2Operations.EPSLocation, + wlanLocationAttributes [2] WlanLocationAttributes, + eTSI671HI2Location [3] HI2Operations.Location, + threeGPP33128UserLocation [4] TS33128Payloads.UserLocation, + wGS84CoordinateDecimal [5] Common-Parameters.WGS84CoordinateDecimal, + pIDF-LO [6] XMLType + --I just realized that we probably don't need the Namespace element of this. The description of this would read something like what they say in 29.171: + --"This IE contains a UTF-8 encoded PIDF-LO XML document as defined in IETF RFC 4119 [13]. + --The document shall only contain a civic address using the namespaces + --"urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr" per IETF RFC 5139 [14] and + --"urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr:ext" per IETF RFC 6848 [15]. +} + -- =========================== -- Definitions for TRI Payload @@ -685,7 +726,9 @@ Location ::= SEQUENCE wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL, - cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL + cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL, + wGS84CoordinateDecimal [6] Common-Parameters.WGS84CoordinateDecimal OPTIONAL, + pIDF-LO [7] XMLType OPTIONAL } WlanLocationAttributes ::= SEQUENCE @@ -759,6 +802,14 @@ LawfulInterceptionIdentifier ::= Common-Parameters.LIID -- module to preserve the original type name during the -- removal of imports from ETSI TS 101 671 [4]. --- just checking that this will compile +XMLType ::= SEQUENCE +{ + xMLNamespace [1] XMLNamespace, + xMLValue [2] XMLValue +} + +XMLNamespace ::= UTF8String + +XMLValue ::= UTF8String END -- end of LI-PS-PDU -- GitLab From caa6b626f8ddecbf14dd4098fd64485537024945 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:07:09 +0000 Subject: [PATCH 13/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 4025f8f1..3413ff72 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -490,13 +490,13 @@ Locations ::= SEQUENCE LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below { - usingNewLocation [1] SEQUENCE (SIZE (1..MAX)) OF NewLocation + usingLocation [1] SEQUENCE OF Location } --These would only be needed if we chose [1] in LocationList -NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat +N--ewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat NewLocationFormat ::= SEQUENCE { -- GitLab From 979351107227819a0ddbe15c8260601634e8c0b0 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:08:54 +0000 Subject: [PATCH 14/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 3413ff72..5d719d28 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -496,7 +496,7 @@ LocationList ::= CHOICE --This won't be a choice, but one of the two alternates --These would only be needed if we chose [1] in LocationList -N--ewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat +NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat NewLocationFormat ::= SEQUENCE { -- GitLab From f5333450e957d6c8fa66e178b73544160c1525f9 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:10:11 +0000 Subject: [PATCH 15/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 5d719d28..a0b91292 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -496,7 +496,7 @@ LocationList ::= CHOICE --This won't be a choice, but one of the two alternates --These would only be needed if we chose [1] in LocationList -NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat +--NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat NewLocationFormat ::= SEQUENCE { -- GitLab From c13b47afa8b037ffde108925bbf04ca3cdb24f67 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:11:11 +0000 Subject: [PATCH 16/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index a0b91292..86cba006 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -386,11 +386,11 @@ IRIPayload ::= SEQUENCE -- If the sessionDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details - payloadDirection [6] PayloadDirection OPTIONAL, + payloadDirection [6] PayloadDirection OPTIONAL--, -- If the payloadDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details - locations [7] Locations OPTIONAL +-- locations [7] Locations OPTIONAL -- This field is only required to be used when there are multiple locations to be reported out of an NF. } -- GitLab From 3a6ce56c2357c61b5d2668e9540cbdd2ad2a183f Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:13:03 +0000 Subject: [PATCH 17/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 86cba006..7c0f15f4 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -481,12 +481,12 @@ GcseIRI ::= CHOICE ... } -Locations ::= SEQUENCE -{ - networkProvidedLocations [1] LocationList OPTIONAL, - cPEProvidedLocations [2] LocationList OPTIONAL, - otherLocations [3] LocationList OPTIONAL --I hate this name but needed somewhere for the locations that are not known to be CPE provided or NPLI -} +--Locations ::= SEQUENCE +--{ +-- networkProvidedLocations [1] LocationList OPTIONAL, +-- cPEProvidedLocations [2] LocationList OPTIONAL, +-- otherLocations [3] LocationList OPTIONAL --I hate this name but needed somewhere for the locations that are not known to be CPE provided or NPLI +--} LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below { @@ -726,9 +726,9 @@ Location ::= SEQUENCE wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL, - cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL, - wGS84CoordinateDecimal [6] Common-Parameters.WGS84CoordinateDecimal OPTIONAL, - pIDF-LO [7] XMLType OPTIONAL + cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL--, + -- wGS84CoordinateDecimal [6] Common-Parameters.WGS84CoordinateDecimal OPTIONAL, + -- pIDF-LO [7] XMLType OPTIONAL } WlanLocationAttributes ::= SEQUENCE -- GitLab From dbc4141459fba247f2523515a6eab92dc9c038a3 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:14:01 +0000 Subject: [PATCH 18/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 7c0f15f4..ec4f9ec0 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -485,7 +485,8 @@ GcseIRI ::= CHOICE --{ -- networkProvidedLocations [1] LocationList OPTIONAL, -- cPEProvidedLocations [2] LocationList OPTIONAL, --- otherLocations [3] LocationList OPTIONAL --I hate this name but needed somewhere for the locations that are not known to be CPE provided or NPLI +-- otherLocations [3] LocationList OPTIONAL +--I hate this name but needed somewhere for the locations that are not known to be CPE provided or NPLI --} LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below -- GitLab From 8dcf08e76d5d0a84eb206552f2c9cab6f9ad07e9 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:19:44 +0000 Subject: [PATCH 19/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index ec4f9ec0..be74429c 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -489,31 +489,31 @@ GcseIRI ::= CHOICE --I hate this name but needed somewhere for the locations that are not known to be CPE provided or NPLI --} -LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below -{ - usingLocation [1] SEQUENCE OF Location -} +--LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below +--{ +-- usingLocation [1] SEQUENCE OF Location +--} --These would only be needed if we chose [1] in LocationList --NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat -NewLocationFormat ::= SEQUENCE -{ - location [1] NewLocations--, +--NewLocationFormat ::= SEQUENCE +--{ +-- location [1] NewLocations--, -- locationProvenance [2] LocationProvenance -} +--} NewLocations ::= CHOICE { - umtsHI2Location [0] UmtsHI2Operations.Location, - epsLocation [1] EpsHI2Operations.EPSLocation, +-- umtsHI2Location [0] UmtsHI2Operations.Location, +-- epsLocation [1] EpsHI2Operations.EPSLocation, wlanLocationAttributes [2] WlanLocationAttributes, - eTSI671HI2Location [3] HI2Operations.Location, - threeGPP33128UserLocation [4] TS33128Payloads.UserLocation, - wGS84CoordinateDecimal [5] Common-Parameters.WGS84CoordinateDecimal, - pIDF-LO [6] XMLType +-- eTSI671HI2Location [3] HI2Operations.Location, +-- threeGPP33128UserLocation [4] TS33128Payloads.UserLocation, +-- wGS84CoordinateDecimal [5] Common-Parameters.WGS84CoordinateDecimal, +-- pIDF-LO [6] XMLType --I just realized that we probably don't need the Namespace element of this. The description of this would read something like what they say in 29.171: --"This IE contains a UTF-8 encoded PIDF-LO XML document as defined in IETF RFC 4119 [13]. --The document shall only contain a civic address using the namespaces @@ -803,14 +803,14 @@ LawfulInterceptionIdentifier ::= Common-Parameters.LIID -- module to preserve the original type name during the -- removal of imports from ETSI TS 101 671 [4]. -XMLType ::= SEQUENCE -{ - xMLNamespace [1] XMLNamespace, - xMLValue [2] XMLValue -} +--XMLType ::= SEQUENCE +--{ +-- xMLNamespace [1] XMLNamespace, +-- xMLValue [2] XMLValue +--} -XMLNamespace ::= UTF8String +--XMLNamespace ::= UTF8String -XMLValue ::= UTF8String +--XMLValue ::= UTF8String END -- end of LI-PS-PDU -- GitLab From 0e5a0f936d3f3ee75aaf7a0b9ada1b2701193fe5 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:21:08 +0000 Subject: [PATCH 20/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index be74429c..b96ba21b 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -489,7 +489,8 @@ GcseIRI ::= CHOICE --I hate this name but needed somewhere for the locations that are not known to be CPE provided or NPLI --} ---LocationList ::= CHOICE --This won't be a choice, but one of the two alternates below +--LocationList ::= CHOICE +--This won't be a choice, but one of the two alternates below --{ -- usingLocation [1] SEQUENCE OF Location --} -- GitLab From 4856b1329d64a263e1ef01180db2e630b19e3d05 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:21:55 +0000 Subject: [PATCH 21/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index b96ba21b..e5d88b31 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -502,7 +502,7 @@ GcseIRI ::= CHOICE --NewLocationFormat ::= SEQUENCE --{ --- location [1] NewLocations--, +-- location [1] NewLocations, -- locationProvenance [2] LocationProvenance --} -- GitLab From f377b62c19a55a0faaf0f8560df342b897e761aa Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:22:48 +0000 Subject: [PATCH 22/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index e5d88b31..f0b6c3e7 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -510,7 +510,7 @@ NewLocations ::= CHOICE { -- umtsHI2Location [0] UmtsHI2Operations.Location, -- epsLocation [1] EpsHI2Operations.EPSLocation, - wlanLocationAttributes [2] WlanLocationAttributes, + wlanLocationAttributes [2] WlanLocationAttributes -- eTSI671HI2Location [3] HI2Operations.Location, -- threeGPP33128UserLocation [4] TS33128Payloads.UserLocation, -- wGS84CoordinateDecimal [5] Common-Parameters.WGS84CoordinateDecimal, -- GitLab From d928b7700ed1189dc8871efe943ed02bfc90d76c Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:24:39 +0000 Subject: [PATCH 23/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index f0b6c3e7..42399216 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -506,11 +506,11 @@ GcseIRI ::= CHOICE -- locationProvenance [2] LocationProvenance --} -NewLocations ::= CHOICE -{ +--NewLocations ::= CHOICE +--{ -- umtsHI2Location [0] UmtsHI2Operations.Location, -- epsLocation [1] EpsHI2Operations.EPSLocation, - wlanLocationAttributes [2] WlanLocationAttributes +-- wlanLocationAttributes [2] WlanLocationAttributes -- eTSI671HI2Location [3] HI2Operations.Location, -- threeGPP33128UserLocation [4] TS33128Payloads.UserLocation, -- wGS84CoordinateDecimal [5] Common-Parameters.WGS84CoordinateDecimal, @@ -520,7 +520,7 @@ NewLocations ::= CHOICE --The document shall only contain a civic address using the namespaces --"urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr" per IETF RFC 5139 [14] and --"urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr:ext" per IETF RFC 6848 [15]. -} +--} -- =========================== -- GitLab From 1bb48282388018550f83e82601048f00f69fc7ee Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:26:07 +0000 Subject: [PATCH 24/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 42399216..096ee430 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -728,9 +728,7 @@ Location ::= SEQUENCE wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL, - cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL--, - -- wGS84CoordinateDecimal [6] Common-Parameters.WGS84CoordinateDecimal OPTIONAL, - -- pIDF-LO [7] XMLType OPTIONAL + cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL } WlanLocationAttributes ::= SEQUENCE -- GitLab From 69cd5a3197c8028a2218748446d30a383bb37740 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:33:35 +0000 Subject: [PATCH 25/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 55 +----------------------------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 096ee430..7d187add 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -386,12 +386,10 @@ IRIPayload ::= SEQUENCE -- If the sessionDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details - payloadDirection [6] PayloadDirection OPTIONAL--, + payloadDirection [6] PayloadDirection OPTIONAL -- If the payloadDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details --- locations [7] Locations OPTIONAL - -- This field is only required to be used when there are multiple locations to be reported out of an NF. } IRIType ::= ENUMERATED @@ -481,47 +479,6 @@ GcseIRI ::= CHOICE ... } ---Locations ::= SEQUENCE ---{ --- networkProvidedLocations [1] LocationList OPTIONAL, --- cPEProvidedLocations [2] LocationList OPTIONAL, --- otherLocations [3] LocationList OPTIONAL ---I hate this name but needed somewhere for the locations that are not known to be CPE provided or NPLI ---} - ---LocationList ::= CHOICE ---This won't be a choice, but one of the two alternates below ---{ --- usingLocation [1] SEQUENCE OF Location ---} - - ---These would only be needed if we chose [1] in LocationList - ---NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat - ---NewLocationFormat ::= SEQUENCE ---{ --- location [1] NewLocations, - -- locationProvenance [2] LocationProvenance ---} - ---NewLocations ::= CHOICE ---{ --- umtsHI2Location [0] UmtsHI2Operations.Location, --- epsLocation [1] EpsHI2Operations.EPSLocation, --- wlanLocationAttributes [2] WlanLocationAttributes --- eTSI671HI2Location [3] HI2Operations.Location, --- threeGPP33128UserLocation [4] TS33128Payloads.UserLocation, --- wGS84CoordinateDecimal [5] Common-Parameters.WGS84CoordinateDecimal, --- pIDF-LO [6] XMLType - --I just realized that we probably don't need the Namespace element of this. The description of this would read something like what they say in 29.171: - --"This IE contains a UTF-8 encoded PIDF-LO XML document as defined in IETF RFC 4119 [13]. - --The document shall only contain a civic address using the namespaces - --"urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr" per IETF RFC 5139 [14] and - --"urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr:ext" per IETF RFC 6848 [15]. ---} - -- =========================== -- Definitions for TRI Payload @@ -802,14 +759,4 @@ LawfulInterceptionIdentifier ::= Common-Parameters.LIID -- module to preserve the original type name during the -- removal of imports from ETSI TS 101 671 [4]. ---XMLType ::= SEQUENCE ---{ --- xMLNamespace [1] XMLNamespace, --- xMLValue [2] XMLValue ---} - ---XMLNamespace ::= UTF8String - ---XMLValue ::= UTF8String - END -- end of LI-PS-PDU -- GitLab From 35f4f79647cdbc72e7d528d91484eb027c92b255 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:36:43 +0000 Subject: [PATCH 26/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 1 + 1 file changed, 1 insertion(+) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 7d187add..8492e6ff 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -390,6 +390,7 @@ IRIPayload ::= SEQUENCE -- If the payloadDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details + location [7] Location OPTIONAL } IRIType ::= ENUMERATED -- GitLab From 059e7fba8bd5f8a524e66e11d88f664efc9bd2e7 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:37:18 +0000 Subject: [PATCH 27/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 8492e6ff..41d898e1 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -386,7 +386,7 @@ IRIPayload ::= SEQUENCE -- If the sessionDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details - payloadDirection [6] PayloadDirection OPTIONAL + payloadDirection [6] PayloadDirection OPTIONAL, -- If the payloadDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details -- GitLab From f477e96bbc4a7c28a5fd105bd09f1f76605a4ed4 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:39:02 +0000 Subject: [PATCH 28/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 41d898e1..3e1163f5 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -390,7 +390,12 @@ IRIPayload ::= SEQUENCE -- If the payloadDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details - location [7] Location OPTIONAL + locations [7] Locations OPTIONAL +} + +Locations ::= SEQUENCE +{ + networkProvidedLocations [1] Location OPTIONAL } IRIType ::= ENUMERATED -- GitLab From 5ddfe67a421264aad0ca0a82043c0d5d3ca8a416 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:48:55 +0000 Subject: [PATCH 29/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 3e1163f5..5330f920 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -395,7 +395,12 @@ IRIPayload ::= SEQUENCE Locations ::= SEQUENCE { - networkProvidedLocations [1] Location OPTIONAL + networkProvidedLocations [1] LocationList OPTIONAL +} + +LocationList ::= CHOICE +{ + usingLocation [1] Location } IRIType ::= ENUMERATED -- GitLab From a0e1aa64a377c1603c3820f51a1582b3b0b52849 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:49:44 +0000 Subject: [PATCH 30/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 5330f920..0542d0ca 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -400,7 +400,7 @@ Locations ::= SEQUENCE LocationList ::= CHOICE { - usingLocation [1] Location + usingLocation [1] SEQUENCE OF Location } IRIType ::= ENUMERATED -- GitLab From d2dede7a2ebe3c56c949fe505d9f95f7c356ce3d Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:51:45 +0000 Subject: [PATCH 31/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 0542d0ca..b9f4f4b6 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -395,7 +395,9 @@ IRIPayload ::= SEQUENCE Locations ::= SEQUENCE { - networkProvidedLocations [1] LocationList OPTIONAL + networkProvidedLocations [1] LocationList OPTIONAL, + cPEProvidedLocation [2] LocationList OPTIONAL, + otherLocations [3] LocationList OPTIONAL } LocationList ::= CHOICE -- GitLab From ac8e920019f577240eabbbb3fb9c0f58c62485b4 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:53:14 +0000 Subject: [PATCH 32/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index b9f4f4b6..d0024838 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -402,9 +402,12 @@ Locations ::= SEQUENCE LocationList ::= CHOICE { - usingLocation [1] SEQUENCE OF Location + usingLocation [1] SEQUENCE OF Location, + usingNewLocation [2] NewLocation } +NewLocation ::= Location + IRIType ::= ENUMERATED { iRI-Begin(1), -- GitLab From ee7768c46d1780f9387634ff26370ada323bc0d1 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:54:21 +0000 Subject: [PATCH 33/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index d0024838..e8c8c372 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -397,16 +397,16 @@ Locations ::= SEQUENCE { networkProvidedLocations [1] LocationList OPTIONAL, cPEProvidedLocation [2] LocationList OPTIONAL, - otherLocations [3] LocationList OPTIONAL + otherLocations [3] LocationList OPTIONAL } LocationList ::= CHOICE { usingLocation [1] SEQUENCE OF Location, - usingNewLocation [2] NewLocation + usingNewLocation [2] NewLocationj } -NewLocation ::= Location +NewLocationj ::= Location IRIType ::= ENUMERATED { -- GitLab From 57b742a8d5d03f9111c5c4c373178acf7ab89ff2 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 16:56:09 +0000 Subject: [PATCH 34/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index e8c8c372..9e6aab79 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -408,6 +408,8 @@ LocationList ::= CHOICE NewLocationj ::= Location +EchoLocation ::= INTEGER + IRIType ::= ENUMERATED { iRI-Begin(1), -- GitLab From f32f403265375e04bace0b91cc14629675f48754 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 17:18:23 +0000 Subject: [PATCH 35/45] Update file asn_process.py --- testing/asn_process.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testing/asn_process.py b/testing/asn_process.py index 81300ab4..a28666c2 100644 --- a/testing/asn_process.py +++ b/testing/asn_process.py @@ -1,5 +1,6 @@ import logging import json +import re from pathlib import Path from subprocess import run from shutil import which @@ -81,8 +82,9 @@ duplicateObjects = { def fixDuplicateObjects(filename): stringContent = filename.read_text() for object in duplicateObjects[filename.as_posix()]: - stringContent = stringContent.replace(f'{object} ::=', f'Native{object} ::=', 1) - stringContent = stringContent.replace(f'SEQUENCE OF {object}', f'SEQUENCE OF Native{object}', 1) + #stringContent = stringContent.replace(f'{object} ::=', f'Native{object} ::=', 1) + stringContent = re.sub(f"^({object} ::=)", 'fNative{object} ::=', stringContent, flags=re.MULTILINE) + stringContent = stringContent.replace(f'SEQUENCE OF {object}', f'SEQUENCE OF Native{object}') #stringContent = sub(f"]\\w{object}", f"] Native{object}", stringContent) Path('temp.asn').write_text(stringContent) -- GitLab From b3b6af26f244b28bd04556549058897bc841a8d4 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 17:19:33 +0000 Subject: [PATCH 36/45] Update file asn_process.py --- testing/asn_process.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/asn_process.py b/testing/asn_process.py index a28666c2..4bc6a68a 100644 --- a/testing/asn_process.py +++ b/testing/asn_process.py @@ -83,7 +83,7 @@ def fixDuplicateObjects(filename): stringContent = filename.read_text() for object in duplicateObjects[filename.as_posix()]: #stringContent = stringContent.replace(f'{object} ::=', f'Native{object} ::=', 1) - stringContent = re.sub(f"^({object} ::=)", 'fNative{object} ::=', stringContent, flags=re.MULTILINE) + stringContent = re.sub(f"^({object} ::=)", f"(Native{object} ::=)", stringContent, flags=re.MULTILINE) stringContent = stringContent.replace(f'SEQUENCE OF {object}', f'SEQUENCE OF Native{object}') #stringContent = sub(f"]\\w{object}", f"] Native{object}", stringContent) -- GitLab From c25da34122ea83a484365af00bd65ab1b95b3690 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 17:24:07 +0000 Subject: [PATCH 37/45] Update file asn_process.py --- testing/asn_process.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/asn_process.py b/testing/asn_process.py index 4bc6a68a..fc2fca28 100644 --- a/testing/asn_process.py +++ b/testing/asn_process.py @@ -83,7 +83,7 @@ def fixDuplicateObjects(filename): stringContent = filename.read_text() for object in duplicateObjects[filename.as_posix()]: #stringContent = stringContent.replace(f'{object} ::=', f'Native{object} ::=', 1) - stringContent = re.sub(f"^({object} ::=)", f"(Native{object} ::=)", stringContent, flags=re.MULTILINE) + stringContent = re.sub(f"^({object} ::=)", 'Native\\1', stringContent, flags=re.MULTILINE) stringContent = stringContent.replace(f'SEQUENCE OF {object}', f'SEQUENCE OF Native{object}') #stringContent = sub(f"]\\w{object}", f"] Native{object}", stringContent) -- GitLab From 187fe1df28b63f701cb38ca7968b1f59c407859c Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 17:47:43 +0000 Subject: [PATCH 38/45] Update file asn_process.py --- testing/asn_process.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/asn_process.py b/testing/asn_process.py index fc2fca28..b9014a88 100644 --- a/testing/asn_process.py +++ b/testing/asn_process.py @@ -84,7 +84,8 @@ def fixDuplicateObjects(filename): for object in duplicateObjects[filename.as_posix()]: #stringContent = stringContent.replace(f'{object} ::=', f'Native{object} ::=', 1) stringContent = re.sub(f"^({object} ::=)", 'Native\\1', stringContent, flags=re.MULTILINE) - stringContent = stringContent.replace(f'SEQUENCE OF {object}', f'SEQUENCE OF Native{object}') + #stringContent = stringContent.replace(f'SEQUENCE OF {object}', f'SEQUENCE OF Native{object}') + stringContent = re.sub(f"^SEQUENCE (\(SIZE\(\d+\.\.(\d+|MAX)\)\) )*OF ({object})", 'SEQUENCE '\\1'OF Native\\2', stringContent, flags=re.MULTILINE) #stringContent = sub(f"]\\w{object}", f"] Native{object}", stringContent) Path('temp.asn').write_text(stringContent) -- GitLab From 900311245ff06086816bf772ec0e72944e49de5f Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 17:48:45 +0000 Subject: [PATCH 39/45] Update file asn_process.py --- testing/asn_process.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/asn_process.py b/testing/asn_process.py index b9014a88..ed88294f 100644 --- a/testing/asn_process.py +++ b/testing/asn_process.py @@ -85,7 +85,7 @@ def fixDuplicateObjects(filename): #stringContent = stringContent.replace(f'{object} ::=', f'Native{object} ::=', 1) stringContent = re.sub(f"^({object} ::=)", 'Native\\1', stringContent, flags=re.MULTILINE) #stringContent = stringContent.replace(f'SEQUENCE OF {object}', f'SEQUENCE OF Native{object}') - stringContent = re.sub(f"^SEQUENCE (\(SIZE\(\d+\.\.(\d+|MAX)\)\) )*OF ({object})", 'SEQUENCE '\\1'OF Native\\2', stringContent, flags=re.MULTILINE) + stringContent = re.sub(f"^SEQUENCE (\(SIZE\(\d+\.\.(\d+|MAX)\)\) )*OF ({object})", 'SEQUENCE \\1OF Native\\2', stringContent, flags=re.MULTILINE) #stringContent = sub(f"]\\w{object}", f"] Native{object}", stringContent) Path('temp.asn').write_text(stringContent) -- GitLab From 682ff1d614534d163a0652452768d29ec64e5824 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 17:52:01 +0000 Subject: [PATCH 40/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 9e6aab79..c35215b2 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -403,12 +403,28 @@ Locations ::= SEQUENCE LocationList ::= CHOICE { usingLocation [1] SEQUENCE OF Location, - usingNewLocation [2] NewLocationj + usingNewLocation [2] NewLocation } -NewLocationj ::= Location +NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat + +NewLocationFormat ::= SEQUENCE +{ + location [1] NewLocations, + -- locationProvenance [2] LocationProvenance +} + +NewLocations ::= CHOICE +{ + umtsHI2Location [0] UmtsHI2Operations.Location, + epsLocation [1] EpsHI2Operations.EPSLocation, + wlanLocationAttributes [2] WlanLocationAttributes, + eTSI671HI2Location [3] HI2Operations.Location, + threeGPP33128UserLocation [4] TS33128Payloads.UserLocation, + wGS84CoordinateDecimal [5] wGS84CoordinateDecimal, + pIDF-LO [6] XMLType +} -EchoLocation ::= INTEGER IRIType ::= ENUMERATED { @@ -703,7 +719,9 @@ Location ::= SEQUENCE wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL, - cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL + cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL, + wGS84CoordinateDecimal [6] Common-Parameters.WGS84CoordinateDecimal OPTIONAL, + pIDF-LO [7] XMLType OPTIONAL } WlanLocationAttributes ::= SEQUENCE @@ -776,5 +794,14 @@ LawfulInterceptionIdentifier ::= Common-Parameters.LIID -- It is redefined as LawfulInterceptionIdentifier in this -- module to preserve the original type name during the -- removal of imports from ETSI TS 101 671 [4]. +XMLType ::= SEQUENCE +{ + xMLNamespace [1] XMLNamespace, + xMLValue [2] XMLValue +} + +XMLNamespace ::= UTF8String + +XMLValue ::= UTF8String END -- end of LI-PS-PDU -- GitLab From e29c458d126cabc6bf6943a52869815ea2f2fa0a Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 17:52:50 +0000 Subject: [PATCH 41/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index c35215b2..361d3cdd 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -410,7 +410,7 @@ NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat NewLocationFormat ::= SEQUENCE { - location [1] NewLocations, + location [1] NewLocations--, -- locationProvenance [2] LocationProvenance } -- GitLab From 532e4eb2a838be3a2b3c0924fa1417cd7e9b0487 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 23 May 2025 17:54:04 +0000 Subject: [PATCH 42/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 361d3cdd..7cf0901d 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -421,7 +421,7 @@ NewLocations ::= CHOICE wlanLocationAttributes [2] WlanLocationAttributes, eTSI671HI2Location [3] HI2Operations.Location, threeGPP33128UserLocation [4] TS33128Payloads.UserLocation, - wGS84CoordinateDecimal [5] wGS84CoordinateDecimal, + wGS84CoordinateDecimal [5] Common-Parameters.WGS84CoordinateDecimal, pIDF-LO [6] XMLType } -- GitLab From 505ebc70582bdab4a3ecd85577881223d0a61512 Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 27 May 2025 18:12:33 +0000 Subject: [PATCH 43/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 7cf0901d..56007ce4 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -390,7 +390,8 @@ IRIPayload ::= SEQUENCE -- If the payloadDirection field is to be used for a given service then -- the exact meaning and use of the field will be described in the -- relevant service-specific details - locations [7] Locations OPTIONAL + locations [7] Locations OPTIONAL, --Choose either this or the next one + nonSourceOption [8] AltOption OPTIONAL } Locations ::= SEQUENCE @@ -400,12 +401,15 @@ Locations ::= SEQUENCE otherLocations [3] LocationList OPTIONAL } -LocationList ::= CHOICE +LocationList ::= CHOICE --Only one of these would survive. These are simply alternatives. { usingLocation [1] SEQUENCE OF Location, usingNewLocation [2] NewLocation } +--========================================================================== +--NewLocation format option + NewLocation ::= SEQUENCE (SIZE(1..MAX)) OF NewLocationFormat NewLocationFormat ::= SEQUENCE @@ -422,9 +426,32 @@ NewLocations ::= CHOICE eTSI671HI2Location [3] HI2Operations.Location, threeGPP33128UserLocation [4] TS33128Payloads.UserLocation, wGS84CoordinateDecimal [5] Common-Parameters.WGS84CoordinateDecimal, - pIDF-LO [6] XMLType + pIDF-LO [6] XMLType +} + +--=============================================================================== + +--======================================================================== +--NonSource OPTION alt + +AltOption ::= SEQUENCE (SIZE(1..MAX)) OF AltLocationFormat + +AltLocationFormat ::= SEQUENCE +{ + location ::= NewLocations, + source ::= LocationSource, + -- locationProvenance [3] LocationProvenance +} + +LocationSource ::= ENUMERATED +{ + other(1), + unknown(2), + cPEOrClient(3), + network(4) } +--============================================================================ IRIType ::= ENUMERATED { -- GitLab From e9aecb464820e2a09f4b99864dafbab4c97fc736 Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 27 May 2025 18:14:54 +0000 Subject: [PATCH 44/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 56007ce4..0280b291 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -438,8 +438,8 @@ AltOption ::= SEQUENCE (SIZE(1..MAX)) OF AltLocationFormat AltLocationFormat ::= SEQUENCE { - location ::= NewLocations, - source ::= LocationSource, + location [1] NewLocations, + source [2] LocationSource, -- locationProvenance [3] LocationProvenance } -- GitLab From 68af6e9a4ef64ea0fad41470fd733dc532af54ae Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 27 May 2025 18:27:59 +0000 Subject: [PATCH 45/45] Update file LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 0280b291..8d5a89de 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -439,7 +439,7 @@ AltOption ::= SEQUENCE (SIZE(1..MAX)) OF AltLocationFormat AltLocationFormat ::= SEQUENCE { location [1] NewLocations, - source [2] LocationSource, + source [2] LocationSource -- locationProvenance [3] LocationProvenance } -- GitLab