From 817dd8d34bc07352bdbd82fe7348388babf1c196 Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Fri, 28 Aug 2026 12:02:44 +1000 Subject: [PATCH 1/8] LI-PS-PDU: add HI4 DeliveryDestination Restore changes not accepted in CR124. (These are being reworked from a new CR). --- 102232-1/LI-PS-PDU.asn | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 557ed700..b67771ec 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -695,7 +695,8 @@ HI4LINotification ::= SEQUENCE interceptType [6] InterceptType OPTIONAL, ownerIdentifier [7] Common-Parameters.ShortString OPTIONAL, authorizationReference [8] Common-Parameters.LongString OPTIONAL, - ... + ..., + deliveryDestinations [9] SEQUENCE OF DeliveryDestination OPTIONAL } TargetIdentifier ::= CHOICE @@ -728,6 +729,34 @@ DictionaryEntry ::= SEQUENCE ... } +DeliveryDestination ::= SEQUENCE +{ + deliveryInterface [1] DeliveryInterface, + deliveryPayloadTypes [2] SEQUENCE OF DeliveryPayloadType OPTIONAL, + ... +} + +DeliveryInterface ::= CHOICE +{ + hi2 [1] Common-Parameters.IPAddressPort, + hi3 [2] Common-Parameters.IPAddressPort, + hi4 [3] Common-Parameters.IPAddressPort, + ... +} + +DeliveryPayloadType ::= ENUMERATED +{ + part1(1), + part2(2), + part3(3), + part4(4), + part5(5), + part6(6), + part7(7), + unknown(8), + ... +} + -- =================================== -- Common Parameters -- =================================== -- GitLab From 242f3dabf34dd86d7acd9d58e990caa5e163daee Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Fri, 28 Aug 2026 12:12:07 +1000 Subject: [PATCH 2/8] LI-PS-PDU: provide IPAddressPort Temporary workaround during refactor --- 102232-1/LI-PS-PDU.asn | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index b67771ec..404b800c 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -13,6 +13,7 @@ IMPORTS LIID, LongString, ShortString, + TCPPort, WGS84CoordinateDecimal FROM Common-Parameters {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version281(281)} @@ -738,9 +739,9 @@ DeliveryDestination ::= SEQUENCE DeliveryInterface ::= CHOICE { - hi2 [1] Common-Parameters.IPAddressPort, - hi3 [2] Common-Parameters.IPAddressPort, - hi4 [3] Common-Parameters.IPAddressPort, + hi2 [1] IPAddressPort, + hi3 [2] IPAddressPort, + hi4 [3] IPAddressPort, ... } @@ -757,6 +758,14 @@ DeliveryPayloadType ::= ENUMERATED ... } +-- XXX temporary type +IPAddressPort ::= SEQUENCE +{ + address [1] IPAddress, + port [2] Common-Parameters.TCPPort, + ... +} + -- =================================== -- Common Parameters -- =================================== -- GitLab From 79b6884e1ab04f544c96b236d6afcf7f2ca47fe2 Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Fri, 28 Aug 2026 12:24:01 +1000 Subject: [PATCH 3/8] LI-PS-PDU: adapt to DeliveryEndpoint choice Support different DeliveryEndpoint choices: DeliveryAddressPort, DeliveryHostPort --- 102232-1/LI-PS-PDU.asn | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 404b800c..21d5b194 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -739,9 +739,30 @@ DeliveryDestination ::= SEQUENCE DeliveryInterface ::= CHOICE { - hi2 [1] IPAddressPort, - hi3 [2] IPAddressPort, - hi4 [3] IPAddressPort, + hi2 [1] DeliveryEndpoint, + hi3 [2] DeliveryEndpoint, + hi4 [3] DeliveryEndpoint, + ... +} + +DeliveryEndpoint ::= CHOICE +{ + deliveryAddressPort [1] DeliveryAddressPort, + deliveryHostPort [2] DeliveryHostPort, + ... +} + +DeliveryAddressPort ::= SEQUENCE +{ + address [1] IPAddress, + port [2] Common-Parameters.TCPPort, + ... +} + +DeliveryHostPort ::= SEQUENCE +{ + host [1] UTF8String, + port [2] Common-Parameters.TCPPort, ... } @@ -758,14 +779,6 @@ DeliveryPayloadType ::= ENUMERATED ... } --- XXX temporary type -IPAddressPort ::= SEQUENCE -{ - address [1] IPAddress, - port [2] Common-Parameters.TCPPort, - ... -} - -- =================================== -- Common Parameters -- =================================== -- GitLab From 6666fa91c9de84c321eec82a2b86edcf95005c7d Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Fri, 28 Aug 2026 12:25:54 +1000 Subject: [PATCH 4/8] LI-PS-PDU: remove DeliveryPayloadType unknown --- 102232-1/LI-PS-PDU.asn | 1 - 1 file changed, 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 21d5b194..10059598 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -775,7 +775,6 @@ DeliveryPayloadType ::= ENUMERATED part5(5), part6(6), part7(7), - unknown(8), ... } -- GitLab From 13eb9f28a7925b940089111c3f5717b6e4567cbb Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Fri, 28 Aug 2026 14:11:06 +1000 Subject: [PATCH 5/8] LI-PS-PDU: refactor DeliveryDestination Move deliveryEndpoint up to DeliveryDestination. Change DeliveryInterface to an enum --- 102232-1/LI-PS-PDU.asn | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 10059598..bf475379 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -732,16 +732,9 @@ DictionaryEntry ::= SEQUENCE DeliveryDestination ::= SEQUENCE { - deliveryInterface [1] DeliveryInterface, - deliveryPayloadTypes [2] SEQUENCE OF DeliveryPayloadType OPTIONAL, - ... -} - -DeliveryInterface ::= CHOICE -{ - hi2 [1] DeliveryEndpoint, - hi3 [2] DeliveryEndpoint, - hi4 [3] DeliveryEndpoint, + deliveryEndpoint [1] DeliveryEndpoint, + deliveryInterfaces [2] SEQUENCE OF DeliveryInterface OPTIONAL, + deliveryPayloadTypes [3] SEQUENCE OF DeliveryPayloadType OPTIONAL, ... } @@ -766,6 +759,14 @@ DeliveryHostPort ::= SEQUENCE ... } +DeliveryInterface ::= ENUMERATED +{ + hi2(1), + hi3(2), + hi4(3), + ... +} + DeliveryPayloadType ::= ENUMERATED { part1(1), -- GitLab From 40a7af5c5fb934a05ac2d050b538b1f3fe7d7a31 Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Mon, 31 Aug 2026 16:36:56 +1000 Subject: [PATCH 6/8] LI-PS-PDU: add other DeliveryInterface Add other(1) to DeliveryInterface, and renumber hi2,hi3,hi4. Has the side benefit that hi2 == 2, hi3 == 3, and hi4 == 4. --- 102232-1/LI-PS-PDU.asn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index bf475379..505d929a 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -761,9 +761,10 @@ DeliveryHostPort ::= SEQUENCE DeliveryInterface ::= ENUMERATED { - hi2(1), - hi3(2), - hi4(3), + other(1), + hi2(2), + hi3(3), + hi4(4), ... } -- GitLab From 29a16e532a9555427fbc08088bc996fba5729a1f Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Tue, 1 Sep 2026 17:57:46 +1000 Subject: [PATCH 7/8] LI-PS-PDU: rename DeliveryInterface.other(1) to hi(1) --- 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 505d929a..40103930 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -761,7 +761,7 @@ DeliveryHostPort ::= SEQUENCE DeliveryInterface ::= ENUMERATED { - other(1), + hi1(1), hi2(2), hi3(3), hi4(4), -- GitLab From 6bb9ca936552c1382c9a5b73bd21422fd038e537 Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Wed, 2 Sep 2026 09:19:43 +1000 Subject: [PATCH 8/8] LI-PS-PDU: use hi1Notification(1) instead of hi1(1) --- 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 40103930..b76ca476 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -761,7 +761,7 @@ DeliveryHostPort ::= SEQUENCE DeliveryInterface ::= ENUMERATED { - hi1(1), + hi1Notification(1), hi2(2), hi3(3), hi4(4), -- GitLab