From c4c183a16fe2ddc612ed947fc5513c87f30c7c27 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 2 Nov 2018 16:14:22 +0100
Subject: T939: Remove possibility to specify DHCP relay port

---
 interface-definitions/dhcp-relay.xml   | 13 -------------
 interface-definitions/dhcpv6-relay.xml | 13 -------------
 2 files changed, 26 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/dhcp-relay.xml b/interface-definitions/dhcp-relay.xml
index c918d25a3..f4cb36eea 100644
--- a/interface-definitions/dhcp-relay.xml
+++ b/interface-definitions/dhcp-relay.xml
@@ -49,19 +49,6 @@
                   <constraintErrorMessage>max-size must be a value between 64 and 1400</constraintErrorMessage>
                 </properties>
               </leafNode>
-              <leafNode name="port">
-                <properties>
-                  <help>Port number to listen on</help>
-                  <valueHelp>
-                    <format>1-65535</format>
-                    <description>Port to listen on</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-65535"/>
-                  </constraint>
-                  <constraintErrorMessage>port must be a value between 1 and 65535</constraintErrorMessage>
-                </properties>
-              </leafNode>
               <leafNode name="relay-agents-packets">
                 <properties>
                   <help>Policy to handle incoming DHCPv4 packets which already contain relay agent options (default: forward)</help>
diff --git a/interface-definitions/dhcpv6-relay.xml b/interface-definitions/dhcpv6-relay.xml
index d6e6daf51..15c76a098 100644
--- a/interface-definitions/dhcpv6-relay.xml
+++ b/interface-definitions/dhcpv6-relay.xml
@@ -31,19 +31,6 @@
               </leafNode>
             </children>
           </tagNode>
-          <leafNode name="listen-port">
-            <properties>
-              <help>UDP port to listen for requests on</help>
-              <valueHelp>
-                <format>1-65535</format>
-                <description>Port to listen on</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-65535"/>
-              </constraint>
-              <constraintErrorMessage>port must be a value between 1 and 65535</constraintErrorMessage>
-            </properties>
-          </leafNode>
           <leafNode name="max-hop-count">
             <properties>
               <help>Maximum hop count for which requests will be processed</help>
-- 
cgit v1.2.3


From d6c39f624a2ced96015d1e915d90e80acda3babb Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Sat, 3 Nov 2018 14:11:51 -0700
Subject: T958: Problems with wireguard description

---
 interface-definitions/wireguard.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/wireguard.xml b/interface-definitions/wireguard.xml
index 575637ac9..3bf7bcd33 100644
--- a/interface-definitions/wireguard.xml
+++ b/interface-definitions/wireguard.xml
@@ -34,7 +34,7 @@
             <properties>
               <help>description</help>
               <constraint>
-                <regex>.[^ ]{1,100}$</regex>
+                <regex>[^ ]{1,100}$</regex>
               </constraint>
               <constraintErrorMessage>interface description is too long (limit 100 characters)</constraintErrorMessage>
             </properties>
@@ -71,7 +71,7 @@
             <properties>
               <help>peer alias</help>
               <constraint>
-                <regex>.[^ ]{1,100}$</regex>
+                <regex>[^ ]{1,100}$</regex>
               </constraint>
               <constraintErrorMessage>peer alias too long (limit 100 characters)</constraintErrorMessage>
             </properties>
-- 
cgit v1.2.3