From 347606ed319744c5b09161ce736a11f5443d91e2 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 5 Apr 2020 13:21:44 +0200
Subject: wireguard: T2206: split endpoint node into address and port

WireGuard has been the only subsystem combining a remote ip address and a
remote port number into a single node. This is bad as there is no possiblity
for the XML based input validation for IP address and port numbers.

That's the reason the peer endpoint node goets migrated into a peer address
and a peer port node utilizing the embedded syntax node checking for IP
addresses and port ranges.
---
 interface-definitions/interfaces-wireguard.xml.in | 24 ++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'interface-definitions/interfaces-wireguard.xml.in')

diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in
index d461156b3..87b38962d 100644
--- a/interface-definitions/interfaces-wireguard.xml.in
+++ b/interface-definitions/interfaces-wireguard.xml.in
@@ -97,10 +97,28 @@
                   <multi/>
                 </properties>
               </leafNode>
-              <!--  eventually check format IP:port -->
-              <leafNode name="endpoint">
+              <leafNode name="address">
                 <properties>
-                  <help>Remote endpoint (IP:port)</help>
+                  <help>IP address of tunnel remote end</help>
+                  <valueHelp>
+                    <format>ipv4</format>
+                    <description>IP address to listen for incoming connections</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ipv4-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="port">
+                <properties>
+                  <help>Port number on tunnel remote end</help>
+                  <valueHelp>
+                    <format>1024-65535</format>
+                    <description>Numeric IP port</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1024-65535"/>
+                  </constraint>
                 </properties>
               </leafNode>
               <leafNode name="persistent-keepalive">
-- 
cgit v1.2.3


From 5a02c36939a1dae7a12cea1bfb8cd1c8c32e85e9 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 5 Apr 2020 13:23:58 +0200
Subject: wireguard: T2206: add valueHelp for listen port

---
 interface-definitions/interfaces-wireguard.xml.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'interface-definitions/interfaces-wireguard.xml.in')

diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in
index 87b38962d..f0b5d8df6 100644
--- a/interface-definitions/interfaces-wireguard.xml.in
+++ b/interface-definitions/interfaces-wireguard.xml.in
@@ -21,7 +21,11 @@
           #include <include/interface-disable.xml.i>
           <leafNode name="port">
             <properties>
-              <help>Local port number to accept connections</help>
+              <help>Local port to listen for incoming connections</help>
+              <valueHelp>
+                <format>1024-65535</format>
+                <description>Numeric IP port</description>
+              </valueHelp>
               <constraint>
                 <validator name="numeric" argument="--range 1024-65535"/>
               </constraint>
-- 
cgit v1.2.3


From 792b5dcd5a33785c994065d2c7243c21470b3d29 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 5 Apr 2020 13:31:38 +0200
Subject: wireguard: T2228: support ports less then 1024

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

(limited to 'interface-definitions/interfaces-wireguard.xml.in')

diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in
index f0b5d8df6..d3f084774 100644
--- a/interface-definitions/interfaces-wireguard.xml.in
+++ b/interface-definitions/interfaces-wireguard.xml.in
@@ -23,11 +23,11 @@
             <properties>
               <help>Local port to listen for incoming connections</help>
               <valueHelp>
-                <format>1024-65535</format>
+                <format>1-65535</format>
                 <description>Numeric IP port</description>
               </valueHelp>
               <constraint>
-                <validator name="numeric" argument="--range 1024-65535"/>
+                <validator name="numeric" argument="--range 1-65535"/>
               </constraint>
             </properties>
           </leafNode>
@@ -117,11 +117,11 @@
                 <properties>
                   <help>Port number on tunnel remote end</help>
                   <valueHelp>
-                    <format>1024-65535</format>
+                    <format>1-65535</format>
                     <description>Numeric IP port</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="numeric" argument="--range 1024-65535"/>
+                    <validator name="numeric" argument="--range 1-65535"/>
                   </constraint>
                 </properties>
               </leafNode>
-- 
cgit v1.2.3