From 7134ab4b9f03b6038d3129130582267cc39a9c22 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Thu, 1 Feb 2024 20:32:04 +0100
Subject: dns forwarding: T5687: add missing constraints on ecs-add-for CLI
 node

Completion help suggests only IPv4 and IPv6 prefixes are supported, thus add a
proper constraint enforcing this.

(cherry picked from commit 049560725b93de49ec2d5a779e391e61d568ceb6)
---
 interface-definitions/service_dns_forwarding.xml.in | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/service_dns_forwarding.xml.in b/interface-definitions/service_dns_forwarding.xml.in
index 788f0c18e..a54618e82 100644
--- a/interface-definitions/service_dns_forwarding.xml.in
+++ b/interface-definitions/service_dns_forwarding.xml.in
@@ -745,12 +745,26 @@
                       <help>Client netmask for which EDNS Client Subnet will be added</help>
                       <valueHelp>
                         <format>ipv4net</format>
-                        <description>IP addresses or subnets, negation supported</description>
+                        <description>IPv4 prefix to match</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>!ipv4net</format>
+                        <description>Match everything except the specified IPv4 prefix</description>
                       </valueHelp>
                       <valueHelp>
                         <format>ipv6net</format>
-                        <description>IPv6 addresses or subnets, negation supported</description>
+                        <description>IPv6 prefix to match</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>!ipv6net</format>
+                        <description>Match everything except the specified IPv6 prefix</description>
                       </valueHelp>
+                      <constraint>
+                        <validator name="ipv4-prefix"/>
+                        <validator name="ipv4-prefix-exclude"/>
+                        <validator name="ipv6-prefix"/>
+                        <validator name="ipv6-prefix-exclude"/>
+                      </constraint>
                       <multi/>
                     </properties>
                   </leafNode>
-- 
cgit v1.2.3