From ea3358ede17483d59b5e5665447c77650ef8a3c0 Mon Sep 17 00:00:00 2001 From: Chris Chapman Date: Wed, 8 Jun 2022 09:31:57 +0000 Subject: [PATCH 1/5] Added import of UserLocation from TS 33.128 and added it to Common Parameters, Location --- 102232-1/LI-PS-PDU.asn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 714ecf8..fe3e0ec 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -190,7 +190,8 @@ IMPORTS -- from 3GPP TS 33.128 [46] LINotificationPayload, IRIPayload, - CCPayload + CCPayload, + UserLocation 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) @@ -667,7 +668,8 @@ Location ::= SEQUENCE epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, ..., wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, - eTSI671HI2Location [3] HI2Operations.Location OPTIONAL + eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, + userLocation [4] TS33128Payloads.UserLocation OPTIONAL } WlanLocationAttributes ::= SEQUENCE -- GitLab From 7eba9761a6aa843509bcf63d4e8fb9d543977cb9 Mon Sep 17 00:00:00 2001 From: Chris Chapman Date: Fri, 10 Jun 2022 09:09:11 +0000 Subject: [PATCH 2/5] Update 102232-1/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 fe3e0ec..0a2efe7 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version33(33)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version34(34)} DEFINITIONS IMPLICIT TAGS ::= @@ -205,7 +205,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version33(33)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version34(34)} -- ==================== -- Top-level definition -- GitLab From 3f35ad72f6fe42cc886b34e8ac65acdc154cb8d0 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 10 Jun 2022 09:21:40 +0000 Subject: [PATCH 3/5] Renaming field from 'userLocation' to 'threeGPP33128UserLocation' --- 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 0a2efe7..50327d8 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -669,7 +669,7 @@ Location ::= SEQUENCE ..., wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, - userLocation [4] TS33128Payloads.UserLocation OPTIONAL + threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL } WlanLocationAttributes ::= SEQUENCE -- GitLab From 31b507cfbd1bfbf83a83af3d3127d441c8a9a685 Mon Sep 17 00:00:00 2001 From: Chris Chapman Date: Fri, 24 Jun 2022 04:41:13 +0000 Subject: [PATCH 4/5] Update 102232-1/LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 50327d8..002e228 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -664,12 +664,12 @@ EncryptedPayloadType ::= ENUMERATED Location ::= SEQUENCE -- This is a common parameter, the use of this parameter is described in clause 4.5 { - umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, - epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, ..., - wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, - eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, - threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, + eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, + threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL } WlanLocationAttributes ::= SEQUENCE -- GitLab From 1f87ed46d27c978d1fd691311bd86ea3b9dde7d1 Mon Sep 17 00:00:00 2001 From: Chris Chapman Date: Fri, 24 Jun 2022 13:36:30 +0000 Subject: [PATCH 5/5] Revert "Update 102232-1/LI-PS-PDU.asn" This reverts commit 476aca7e6b7d3ab4fc028075e4577a17beb57bde --- 102232-1/LI-PS-PDU.asn | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 002e228..50327d8 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -664,12 +664,12 @@ EncryptedPayloadType ::= ENUMERATED Location ::= SEQUENCE -- This is a common parameter, the use of this parameter is described in clause 4.5 { - umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, - epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, ..., - wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, - eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, - threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, + eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, + threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL } WlanLocationAttributes ::= SEQUENCE -- GitLab