From 86860b51ad0f3f6148b00804860aee2d55414274 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 20 Mar 2020 23:10:00 +0100
Subject: sstp: T2006: fix valueHelp and validators for numeric values

---
 interface-definitions/vpn-sstp.xml.in | 48 ++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/interface-definitions/vpn-sstp.xml.in b/interface-definitions/vpn-sstp.xml.in
index bb851608c..cf864b069 100644
--- a/interface-definitions/vpn-sstp.xml.in
+++ b/interface-definitions/vpn-sstp.xml.in
@@ -120,24 +120,56 @@
                     <children>
                       <leafNode name="fail-time">
                         <properties>
-                          <help>If server does not responds mark it as unavailable for this time (seconds)</help>
+                          <help>Mark server unavailable for &lt;n&gt; seconds on failure</help>
+                          <valueHelp>
+                            <format>0-600</format>
+                            <description>Fail time penalty</description>
+                          </valueHelp>
+                          <constraint>
+                            <validator name="numeric" argument="--range 0-600"/>
+                          </constraint>
+                          <constraintErrorMessage>Fail time must be between 0 and 600 seconds</constraintErrorMessage>
                         </properties>
                       </leafNode>
                     </children>
                   </tagNode>
                   <leafNode name="timeout">
                     <properties>
-                      <help>Timeout to wait response from server (seconds)</help>
+                      <help>Timeout in seconds to wait response from RADIUS server</help>
+                      <valueHelp>
+                        <format>1-60</format>
+                        <description>Timeout in seconds</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 1-60"/>
+                      </constraint>
+                      <constraintErrorMessage>Timeout must be between 1 and 60 seconds</constraintErrorMessage>
                     </properties>
                   </leafNode>
                   <leafNode name="acct-timeout">
                     <properties>
-                      <help>Timeout for Interim-Update packets (default 3 seconds)</help>
+                      <help>Timeout for Interim-Update packets, terminate session afterwards (default 3 seconds)</help>
+                      <valueHelp>
+                        <format>0-60</format>
+                        <description>Timeout in seconds, 0 to keep active</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 0-60"/>
+                      </constraint>
+                      <constraintErrorMessage>Timeout must be between 0 and 60 seconds</constraintErrorMessage>
                     </properties>
                   </leafNode>
                   <leafNode name="max-try">
                     <properties>
-                      <help>Maximum tries for Access-Request/Accounting-Request queries</help>
+                      <help>Number of tries to send Access-Request/Accounting-Request queries</help>
+                      <valueHelp>
+                        <format>1-20</format>
+                        <description>Maximum tries</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 1-20"/>
+                      </constraint>
+                      <constraintErrorMessage>Maximum tries must be between 1 and 20</constraintErrorMessage>
                     </properties>
                   </leafNode>
                   <leafNode name="nas-identifier">
@@ -151,10 +183,9 @@
                        <constraint>
                         <validator name="ipv4-address"/>
                       </constraint>
-                      <constraintErrorMessage>invalid IPv4 address</constraintErrorMessage>
                       <valueHelp>
                         <format>ipv4</format>
-                        <description>NAS-IP-Address Attribute Value</description>
+                        <description>NAS-IP-Address attribute</description>
                       </valueHelp>
                      </properties>
                    </leafNode>
@@ -169,10 +200,9 @@
                           <constraint>
                             <validator name="ipv4-address"/>
                           </constraint>
-                          <constraintErrorMessage>invalid IPv4 address</constraintErrorMessage>
                           <valueHelp>
                             <format>ipv4</format>
-                            <description>Specifies IP address for Dynamic Authorization Extension server (DM/CoA)</description>
+                            <description>IPv4 address for aynamic authorization server</description>
                           </valueHelp>
                         </properties>
                       </leafNode>
@@ -190,7 +220,7 @@
                       </leafNode>
                       <leafNode name="key">
                         <properties>
-                          <help>Secret for Dynamic Authorization Extension server (DM/CoA)</help>
+                          <help>Shared secret for Dynamic Authorization Extension server</help>
                         </properties>
                       </leafNode>
                     </children>
-- 
cgit v1.2.3