From b95e5d120fb13b7ade66db7523b56e3f55bf6439 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 22 Dec 2020 18:42:28 +0100
Subject: wireguard: T2206: improve help strings

---
 interface-definitions/include/port-number.xml.i   |  2 +-
 interface-definitions/interfaces-wireguard.xml.in | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/interface-definitions/include/port-number.xml.i b/interface-definitions/include/port-number.xml.i
index 0d0747811..81c192628 100644
--- a/interface-definitions/include/port-number.xml.i
+++ b/interface-definitions/include/port-number.xml.i
@@ -1,7 +1,7 @@
 <!-- included start from port-number.xml.i -->
 <leafNode name="port">
   <properties>
-    <help>Port number used to establish connection</help>
+    <help>Port number used by connection</help>
     <valueHelp>
       <format>u32:1-65535</format>
       <description>Numeric IP port</description>
diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in
index e54ef12f7..92c9f510c 100644
--- a/interface-definitions/interfaces-wireguard.xml.in
+++ b/interface-definitions/interfaces-wireguard.xml.in
@@ -90,21 +90,32 @@
               </leafNode>
               <leafNode name="address">
                 <properties>
-                  <help>IP address of tunnel remote end</help>
+                  <help>IP address of tunnel endpoint</help>
                   <valueHelp>
                     <format>ipv4</format>
-                    <description>IPv4 address to listen for incoming connections</description>
+                    <description>IPv4 address of remote tunnel endpoint</description>
                   </valueHelp>
                   <valueHelp>
                     <format>ipv6</format>
-                    <description>IPv6 address to listen for incoming connections</description>
+                    <description>IPv6 address of remote tunnel endpoint</description>
                   </valueHelp>
                   <constraint>
                     <validator name="ip-address"/>
                   </constraint>
                 </properties>
               </leafNode>
-              #include <include/port-number.xml.i>
+              <leafNode name="port">
+                <properties>
+                  <help>Port number used for tunnel endpoint</help>
+                  <valueHelp>
+                    <format>u32:1-65535</format>
+                    <description>Numeric IP port</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-65535"/>
+                  </constraint>
+                </properties>
+              </leafNode>
               <leafNode name="persistent-keepalive">
                 <properties>
                   <help>Interval to send keepalive messages</help>
-- 
cgit v1.2.3