From 336a70ec6ead065da15eb1607f88257571627aab Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Fri, 5 Jun 2026 11:21:11 +1000 Subject: [PATCH 1/6] LI-PS-PDU: add HI4Notification --- 102232-1/LI-PS-PDU.asn | 52 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 47b30ce..c6c588e 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -269,7 +269,8 @@ TimeStampQualifier ::= ENUMERATED HI4Payload ::= CHOICE { threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload, - ... + ..., + hi4Notification [2] HI4Notification } -- ==================================== @@ -478,7 +479,6 @@ GcseIRI ::= CHOICE ... } - -- =========================== -- Definitions for TRI Payload -- =========================== @@ -671,6 +671,54 @@ EncryptedPayloadType ::= ENUMERATED -- encrypted payload is ETSI TS 102 232-1 (the present document) } +-- ================================= +-- Definitions for HI4 notifications +-- ================================= + +HI4Notification ::= CHOICE +{ + liActivated [1] HI4LINotification, + liDeactivated [2] HI4LINotification, + liModified [3] HI4LINotification, + ... +} + +HI4LINotification ::= SEQUENCE +{ + startTime [1] GeneralizedTime OPTIONAL, + endTime [2] GeneralizedTime OPTIONAL, + targetIdentifier [3] SEQUENCE OF LITargetIdentifier OPTIONAL, + interceptType [4] LIInterceptType OPTIONAL, + agencyIdentifier [5] UTF8String OPTIONAL, -- TODO? "ownerIdentifier" per TS 103 120 table 7.1? + authorizationIdentifier [6] UTF8String OPTIONAL, + ... +} + +LITargetIdentifier ::= CHOICE +{ + extensionFormat [1] LITargetIdentifierFormat, + -- TargetIdentifier formats from ETSI TS 103 120 table C.1 +-- TODO + ... +} + + +LITargetIdentifierFormat ::= SEQUENCE +{ + formatOwner [1] UTF8String SIZE (1..255), -- see ETSI TS 103 120 clause 8.2.6.3 + formatName [2] UTF8String SIZE (1..255), -- see ETSI TS 103 120 clause 8.2.6.3 + targetValue [3] UTF8String, -- see ETSI TS 103 120 clause 8.2.6.2 + ... +} + +LIInterceptType ::= ENUMERATED +{ + iriAndCc(1), + iriOnly(2), + ccOnly(3), + ... +} + -- =================================== -- Common Parameters -- =================================== -- GitLab From a79d79ee87d6bdbfe759efc43dcc86c6f4710355 Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Fri, 5 Jun 2026 11:24:01 +1000 Subject: [PATCH 2/6] LI-PS-PDU: fix SIZE syntax --- 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 c6c588e..19bb38e 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -705,8 +705,8 @@ LITargetIdentifier ::= CHOICE LITargetIdentifierFormat ::= SEQUENCE { - formatOwner [1] UTF8String SIZE (1..255), -- see ETSI TS 103 120 clause 8.2.6.3 - formatName [2] UTF8String SIZE (1..255), -- see ETSI TS 103 120 clause 8.2.6.3 + formatOwner [1] UTF8String (SIZE (1..255)), -- see ETSI TS 103 120 clause 8.2.6.3 + formatName [2] UTF8String (SIZE (1..255)), -- see ETSI TS 103 120 clause 8.2.6.3 targetValue [3] UTF8String, -- see ETSI TS 103 120 clause 8.2.6.2 ... } -- GitLab From c05942fc4e861d1c9bc329e68b31b93e5bee775d Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Fri, 5 Jun 2026 11:34:21 +1000 Subject: [PATCH 3/6] LI-PS-PDU: extend LITargetIdentifier --- 102232-1/LI-PS-PDU.asn | 62 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 19bb38e..f6e6dbb 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -11,7 +11,27 @@ IMPORTS -- from ETSI TS 103 280 [44] LIID, WGS84CoordinateDecimal, - GNSSLocation + GNSSLocation, + InternationalE164, + IMSI, + IMEI, + IMEICheckDigit, + IMEISV, + TCPPort, + TCPPortRange, + UDPPort, + UDPPortRange, + Port, + PortRange, + NAI, + SUPIIMSI, + SUPINAI, + PEIIMEI, + PEIIMEICheckDigit, + PEIIMEISV, + GPSIMSISDN, + GPSINAI, + ServiceAccessIdentifier FROM Common-Parameters {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version271(271)} @@ -698,7 +718,45 @@ LITargetIdentifier ::= CHOICE { extensionFormat [1] LITargetIdentifierFormat, -- TargetIdentifier formats from ETSI TS 103 120 table C.1 --- TODO + internationalE164 [2] Common-Parameters.InternationalE164, + iMSI [3] Common-Parameters.IMSI, + iMEI [4] Common-Parameters.IMEI, + iMEICheckDigit [5] Common-Parameters.IMEICheckDigit, + iMEISV [6] Common-Parameters.IMEISV, + mACAddress [7] UTF8String, -- validate per TS 103 280 clause 6.25 + iPv4Address [8] UTF8String, -- validate per TS 103 280 clause 6.11 + iPv6Address [9] UTF8String, -- validate per TS 103 280 clause 6.13 + iPv4CIDR [10] UTF8String, -- validate per TS 103 280 clause 6.12 + iPv6CIDR [11] UTF8String, -- validate per TS 103 280 clause 6.14 + tCPPort [12] Common-Parameters.TCPPort, + tCPPortRange [13] Common-Parameters.TCPPortRange, + uDPPort [14] Common-Parameters.UDPPort, + uDPPortRange [15] Common-Parameters.UDPPortRange, + port [16] Common-Parameters.Port, + portRange [17] Common-Parameters.PortRange, + emailAddress [18] UTF8String, -- validate per TS 103 280 clause 6.26 + internationalizedEmailAddress [19] UTF8String, -- validate per TS 103 280 clause 6.49 + sIPURI [20] UTF8String, -- validate per TS 103 280 clause 6.31 + tELURI [21] UTF8String, -- validate per TS 103 280 clause 6.32 + h323URI [22] UTF8String, -- validate per TS 103 280 clause 6.62 + iMPU [23] UTF8String, -- validate per TS 103 280 clause 6.63 + iMPI [24] UTF8String, -- validate per TS 103 280 clause 6.64 + nAI [25] Common-Parameters.NAI, + sUPIIMSI [26] Common-Parameters.SUPIIMSI, + sUPINAI [27] Common-Parameters.SUPINAI, + pEIIMEI [28] Common-Parameters.PEIIMEI, + pEIIMEICheckDigit [29] Common-Parameters.PEIIMEICheckDigit, + pEIIMEISV [30] Common-Parameters.PEIIMEISV, + gPSIMSISDN [31] Common-Parameters.GPSIMSISDN, + gPSINAI [32] Common-Parameters.GPSINAI, + eUI64 [33] UTF8String, -- validate per TS 103 280 clause 6.50 + cGI [34] UTF8String, -- validate per TS 103 280 clause 6.51 + eCGI [35] UTF8String, -- validate per TS 103 280 clause 6.52 + nCGI [36] UTF8String, -- validate per TS 103 280 clause 6.53 + iCCID [37] UTF8String, -- validate per TS 103 280 clause 6.54 + vIN [38] UTF8String, -- validate per TS 103 280 clause 6.57 + serviceAccessIdentifier [39] Common-Parameters.ServiceAccessIdentifier, + eUICCID [40] UTF8String, -- validate per TS 103 280 clause 6.58 ... } -- GitLab From 2b4649c3881e8e87ad62f87c43c1fe9de2b36ab0 Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Fri, 5 Jun 2026 15:18:26 +1000 Subject: [PATCH 4/6] LI-PS-PDU: HI4 targetIdentifiers is plural --- 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 f6e6dbb..af5ad13 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -707,7 +707,7 @@ HI4LINotification ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, endTime [2] GeneralizedTime OPTIONAL, - targetIdentifier [3] SEQUENCE OF LITargetIdentifier OPTIONAL, + targetIdentifiers [3] SEQUENCE OF LITargetIdentifier OPTIONAL, interceptType [4] LIInterceptType OPTIONAL, agencyIdentifier [5] UTF8String OPTIONAL, -- TODO? "ownerIdentifier" per TS 103 120 table 7.1? authorizationIdentifier [6] UTF8String OPTIONAL, -- GitLab From 5e775ac0f14f65e0be03166ef707e430b5cb1334 Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Fri, 5 Jun 2026 16:34:14 +1000 Subject: [PATCH 5/6] LI-PS-PDU: comment and whitespace tweaks --- 102232-1/LI-PS-PDU.asn | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index af5ad13..fba824b 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -709,7 +709,7 @@ HI4LINotification ::= SEQUENCE endTime [2] GeneralizedTime OPTIONAL, targetIdentifiers [3] SEQUENCE OF LITargetIdentifier OPTIONAL, interceptType [4] LIInterceptType OPTIONAL, - agencyIdentifier [5] UTF8String OPTIONAL, -- TODO? "ownerIdentifier" per TS 103 120 table 7.1? + agencyIdentifier [5] UTF8String OPTIONAL, authorizationIdentifier [6] UTF8String OPTIONAL, ... } @@ -760,12 +760,11 @@ LITargetIdentifier ::= CHOICE ... } - LITargetIdentifierFormat ::= SEQUENCE { - formatOwner [1] UTF8String (SIZE (1..255)), -- see ETSI TS 103 120 clause 8.2.6.3 - formatName [2] UTF8String (SIZE (1..255)), -- see ETSI TS 103 120 clause 8.2.6.3 - targetValue [3] UTF8String, -- see ETSI TS 103 120 clause 8.2.6.2 + formatOwner [1] UTF8String (SIZE (1..255)), + formatName [2] UTF8String (SIZE (1..255)), + targetValue [3] UTF8String, ... } -- GitLab From bc9b09c18b89c488e941d5cb1cc88efb997ee457 Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Tue, 9 Jun 2026 08:53:03 +1000 Subject: [PATCH 6/6] LI-PS-PDU: simplify HI4 Remove "LI" prefix on various types added for HI4. Remove all TargetIdentifier CHOICEs except for TargetIdentifierFormat. --- 102232-1/LI-PS-PDU.asn | 82 ++++++------------------------------------ 1 file changed, 11 insertions(+), 71 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index fba824b..4aebb06 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -11,27 +11,7 @@ IMPORTS -- from ETSI TS 103 280 [44] LIID, WGS84CoordinateDecimal, - GNSSLocation, - InternationalE164, - IMSI, - IMEI, - IMEICheckDigit, - IMEISV, - TCPPort, - TCPPortRange, - UDPPort, - UDPPortRange, - Port, - PortRange, - NAI, - SUPIIMSI, - SUPINAI, - PEIIMEI, - PEIIMEICheckDigit, - PEIIMEISV, - GPSIMSISDN, - GPSINAI, - ServiceAccessIdentifier + GNSSLocation FROM Common-Parameters {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version271(271)} @@ -707,60 +687,20 @@ HI4LINotification ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, endTime [2] GeneralizedTime OPTIONAL, - targetIdentifiers [3] SEQUENCE OF LITargetIdentifier OPTIONAL, - interceptType [4] LIInterceptType OPTIONAL, + targetIdentifiers [3] SEQUENCE OF TargetIdentifier OPTIONAL, + interceptType [4] InterceptType OPTIONAL, agencyIdentifier [5] UTF8String OPTIONAL, authorizationIdentifier [6] UTF8String OPTIONAL, - ... -} - -LITargetIdentifier ::= CHOICE -{ - extensionFormat [1] LITargetIdentifierFormat, - -- TargetIdentifier formats from ETSI TS 103 120 table C.1 - internationalE164 [2] Common-Parameters.InternationalE164, - iMSI [3] Common-Parameters.IMSI, - iMEI [4] Common-Parameters.IMEI, - iMEICheckDigit [5] Common-Parameters.IMEICheckDigit, - iMEISV [6] Common-Parameters.IMEISV, - mACAddress [7] UTF8String, -- validate per TS 103 280 clause 6.25 - iPv4Address [8] UTF8String, -- validate per TS 103 280 clause 6.11 - iPv6Address [9] UTF8String, -- validate per TS 103 280 clause 6.13 - iPv4CIDR [10] UTF8String, -- validate per TS 103 280 clause 6.12 - iPv6CIDR [11] UTF8String, -- validate per TS 103 280 clause 6.14 - tCPPort [12] Common-Parameters.TCPPort, - tCPPortRange [13] Common-Parameters.TCPPortRange, - uDPPort [14] Common-Parameters.UDPPort, - uDPPortRange [15] Common-Parameters.UDPPortRange, - port [16] Common-Parameters.Port, - portRange [17] Common-Parameters.PortRange, - emailAddress [18] UTF8String, -- validate per TS 103 280 clause 6.26 - internationalizedEmailAddress [19] UTF8String, -- validate per TS 103 280 clause 6.49 - sIPURI [20] UTF8String, -- validate per TS 103 280 clause 6.31 - tELURI [21] UTF8String, -- validate per TS 103 280 clause 6.32 - h323URI [22] UTF8String, -- validate per TS 103 280 clause 6.62 - iMPU [23] UTF8String, -- validate per TS 103 280 clause 6.63 - iMPI [24] UTF8String, -- validate per TS 103 280 clause 6.64 - nAI [25] Common-Parameters.NAI, - sUPIIMSI [26] Common-Parameters.SUPIIMSI, - sUPINAI [27] Common-Parameters.SUPINAI, - pEIIMEI [28] Common-Parameters.PEIIMEI, - pEIIMEICheckDigit [29] Common-Parameters.PEIIMEICheckDigit, - pEIIMEISV [30] Common-Parameters.PEIIMEISV, - gPSIMSISDN [31] Common-Parameters.GPSIMSISDN, - gPSINAI [32] Common-Parameters.GPSINAI, - eUI64 [33] UTF8String, -- validate per TS 103 280 clause 6.50 - cGI [34] UTF8String, -- validate per TS 103 280 clause 6.51 - eCGI [35] UTF8String, -- validate per TS 103 280 clause 6.52 - nCGI [36] UTF8String, -- validate per TS 103 280 clause 6.53 - iCCID [37] UTF8String, -- validate per TS 103 280 clause 6.54 - vIN [38] UTF8String, -- validate per TS 103 280 clause 6.57 - serviceAccessIdentifier [39] Common-Parameters.ServiceAccessIdentifier, - eUICCID [40] UTF8String, -- validate per TS 103 280 clause 6.58 ... } -LITargetIdentifierFormat ::= SEQUENCE +TargetIdentifier ::= CHOICE +{ + targetIdentifierFormat [1] TargetIdentifierFormat, + ... +} + +TargetIdentifierFormat ::= SEQUENCE { formatOwner [1] UTF8String (SIZE (1..255)), formatName [2] UTF8String (SIZE (1..255)), @@ -768,7 +708,7 @@ LITargetIdentifierFormat ::= SEQUENCE ... } -LIInterceptType ::= ENUMERATED +InterceptType ::= ENUMERATED { iriAndCc(1), iriOnly(2), -- GitLab