update help text to use val_help

7 files changed, 65 insertions, 70 deletions

diff --git a/templates/firewall/name/node.tag/default-action/node.def b/templates/firewall/name/node.tag/default-action/node.def
index db160f0..bb61c41 100644
--- a/templates/firewall/name/node.tag/default-action/node.def
+++ b/templates/firewall/name/node.tag/default-action/node.def
@@ -7,7 +7,6 @@ default: "drop"
 syntax:expression: $VAR(@) in "drop", "accept", "reject";
                    "default-action must be drop, reject or accept"
 
-comp_help: possible completions:
-  drop            Drop if no prior rules are hit (default)
-  reject          Drop and notify source if no prior rules are hit
-  accept          Accept if no prior rules are hit
+val_help: drop; Drop if no prior rules are hit (default)
+val_help: reject; Drop and notify source if no prior rules are hit
+val_help: accept; Accept if no prior rules are hit
diff --git a/templates/firewall/name/node.tag/rule/node.tag/destination/address/node.def b/templates/firewall/name/node.tag/rule/node.tag/destination/address/node.def
index 99d7b8a..83d7514 100644
--- a/templates/firewall/name/node.tag/rule/node.tag/destination/address/node.def
+++ b/templates/firewall/name/node.tag/rule/node.tag/destination/address/node.def
@@ -2,10 +2,9 @@ type: txt
 
 help: Destination IP address, subnet, or range
 
-comp_help: Possible completions:
-  <x.x.x.x>                 IPv4 address to match
-  <x.x.x.x/x>               IPv4 Subnet to match
-  <x.x.x.x>-<x.x.x.x>       IPv4 range to match
-  !<x.x.x.x>                Match everything except the specified address
-  !<x.x.x.x/x>              Match everything except the specified subnet
-  !<x.x.x.x>-<x.x.x.x>      Match everything except the specified range 
+val_help: ipv4; IP address to match
+val_help: ipv4net; Subnet to match
+val_help: ipv4range; IP range to match
+val_help: !ipv4; Match everything except the specified address
+val_help: !ipv4net; Match everything except the specified subnet
+val_help: !ipv4range; Match everything except the specified range
diff --git a/templates/firewall/name/node.tag/rule/node.tag/destination/port/node.def b/templates/firewall/name/node.tag/rule/node.tag/destination/port/node.def
index 760c0e8..2b2d8c7 100644
--- a/templates/firewall/name/node.tag/rule/node.tag/destination/port/node.def
+++ b/templates/firewall/name/node.tag/rule/node.tag/destination/port/node.def
@@ -2,9 +2,9 @@ type: txt
 
 help: Destination port
 
-comp_help: Destination port(s) can be specified as a comma-separated list of:
-  <port name>           Named port (any name in /etc/services, e.g., http)
-  <1-65535>             Numbered port
-  <start>-<end>         Numbered port range (e.g., 1001-1005)
+val_help: <port name>; Named port (any name in /etc/services, e.g., http)
+val_help: u32:1-65535; Numbered port
+val_help: range; Numbered port range (e.g., 1001-1005)
+comp_help: Multiple destination ports can be specified as a comma-separated list.
 The whole list can also be "negated" using '!'. For example:
   '!22,telnet,http,123,1001-1005'
diff --git a/templates/firewall/name/node.tag/rule/node.tag/icmp/type-name/node.def b/templates/firewall/name/node.tag/rule/node.tag/icmp/type-name/node.def
index c3d4420..669df14 100644
--- a/templates/firewall/name/node.tag/rule/node.tag/icmp/type-name/node.def
+++ b/templates/firewall/name/node.tag/rule/node.tag/icmp/type-name/node.def
@@ -37,41 +37,40 @@ done
 echo Invalid ICMP type-name [$VAR(@)]
 exit 1 "
 
-comp_help: Possible completions:
-any
-echo-reply (pong)
-destination-unreachable
-   network-unreachable
-   host-unreachable
-   protocol-unreachable
-   port-unreachable
-   fragmentation-needed
-   source-route-failed
-   network-unknown
-   host-unknown
-   network-prohibited
-   host-prohibited
-   TOS-network-unreachable
-   TOS-host-unreachable
-   communication-prohibited
-   host-precedence-violation
-   precedence-cutoff
-source-quench
-redirect
-   network-redirect
-   host-redirect
-   TOS-network-redirect
-   TOS-host-redirect
-echo-request (ping)
-router-advertisement
-router-solicitation
-time-exceeded (ttl-exceeded)
-   ttl-zero-during-transit
-   ttl-zero-during-reassembly
-parameter-problem
-   ip-header-bad
-   required-option-missing
-timestamp-request
-timestamp-reply
-address-mask-request
-address-mask-reply
+val_help: any; Any ICMP type/code
+val_help: echo-reply (pong); ICMP type/code name
+val_help: destination-unreachable; ICMP type/code name
+val_help: _ network-unreachable; ICMP type/code name
+val_help: _ host-unreachable; ICMP type/code name
+val_help: _ protocol-unreachable; ICMP type/code name
+val_help: _ port-unreachable; ICMP type/code name
+val_help: _ fragmentation-needed; ICMP type/code name
+val_help: _ source-route-failed; ICMP type/code name
+val_help: _ network-unknown; ICMP type/code name
+val_help: _ host-unknown; ICMP type/code name
+val_help: _ network-prohibited; ICMP type/code name
+val_help: _ host-prohibited; ICMP type/code name
+val_help: _ TOS-network-unreachable; ICMP type/code name
+val_help: _ TOS-host-unreachable; ICMP type/code name
+val_help: _ communication-prohibited; ICMP type/code name
+val_help: _ host-precedence-violation; ICMP type/code name
+val_help: _ precedence-cutoff; ICMP type/code name
+val_help: source-quench; ICMP type/code name
+val_help: redirect; ICMP type/code name
+val_help: _ network-redirect; ICMP type/code name
+val_help: _ host-redirect; ICMP type/code name
+val_help: _ TOS-network-redirect; ICMP type/code name
+val_help: _ TOS-host-redirect; ICMP type/code name
+val_help: echo-request (ping); ICMP type/code name
+val_help: router-advertisement; ICMP type/code name
+val_help: router-solicitation; ICMP type/code name
+val_help: time-exceeded (ttl-exceeded); ICMP type/code name
+val_help: _ ttl-zero-during-transit; ICMP type/code name
+val_help: _ ttl-zero-during-reassembly; ICMP type/code name
+val_help: parameter-problem; ICMP type/code name
+val_help: _ ip-header-bad; ICMP type/code name
+val_help: _ required-option-missing; ICMP type/code name
+val_help: timestamp-request; ICMP type/code name
+val_help: timestamp-reply; ICMP type/code name
+val_help: address-mask-request; ICMP type/code name
+val_help: address-mask-reply; ICMP type/code name
diff --git a/templates/firewall/name/node.tag/rule/node.tag/protocol/node.def b/templates/firewall/name/node.tag/rule/node.tag/protocol/node.def
index 1e9bf89..1f235f7 100644
--- a/templates/firewall/name/node.tag/rule/node.tag/protocol/node.def
+++ b/templates/firewall/name/node.tag/rule/node.tag/protocol/node.def
@@ -2,12 +2,11 @@ type: txt
 
 help: Protocol to match (protocol name in /etc/protocols or protocol number or "all")
 
-comp_help:Possible completions:
-  <text>        An IP protocol name from /etc/protocols (e.g. "tcp" or "udp")
-  <1-255>       An IP protocol number
-  tcp_udp       Both TCP and UDP
-  all           All IP protocols
-  !<protocol>   All IP protocols except for the specified name or number (negation)
+val_help: txt; IP protocol name from /etc/protocols (e.g. "tcp" or "udp")
+val_help: u32:0-255; IP protocol number
+val_help: tcp_udp; Both TCP and UDP
+val_help: all; All IP protocols
+val_help: !<protocol>; All IP protocols except for the specified name or number
 
 syntax:expression: exec "if [ -n \"`/opt/vyatta/sbin/vyatta-validate-type.pl protocol_negate '$VAR(@)'`\" ] \
                         && [ \"$VAR(@)\" != 'tcp_udp' ]; then \
diff --git a/templates/firewall/name/node.tag/rule/node.tag/source/address/node.def b/templates/firewall/name/node.tag/rule/node.tag/source/address/node.def
index eab1cb8..72d6a17 100644
--- a/templates/firewall/name/node.tag/rule/node.tag/source/address/node.def
+++ b/templates/firewall/name/node.tag/rule/node.tag/source/address/node.def
@@ -1,9 +1,8 @@
 type: txt
 help: Source IP address, subnet, or range
-comp_help: Possible completions:
-  <x.x.x.x>                  IP address to match
-  <x.x.x.x/x>                Subnet to match
-  <x.x.x.x>-<x.x.x.x>        IP range to match
-  !<x.x.x.x>                 Match everything except the specified address
-  !<x.x.x.x/x>               Match everything except the specified subnet
-  !<x.x.x.x>-<x.x.x.x>       Match everything except the specified range
+val_help: ipv4; IP address to match
+val_help: ipv4net; Subnet to match
+val_help: ipv4range; IP range to match
+val_help: !ipv4; Match everything except the specified address
+val_help: !ipv4net; Match everything except the specified subnet
+val_help: !ipv4range; Match everything except the specified range
diff --git a/templates/firewall/name/node.tag/rule/node.tag/source/port/node.def b/templates/firewall/name/node.tag/rule/node.tag/source/port/node.def
index 4cec3cf..adfae7a 100644
--- a/templates/firewall/name/node.tag/rule/node.tag/source/port/node.def
+++ b/templates/firewall/name/node.tag/rule/node.tag/source/port/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: Source port
-comp_help: Source port(s) can be specified as a comma-separated list of:
-  <port name>           Named port (any name in /etc/services, e.g., http)
-  <1-65535>             Numbered port
-  <start>-<end>         Numbered port range (e.g., 1001-1005)
+val_help: <port name>; Named port (any name in /etc/services, e.g., http)
+val_help: u32:1-65535; Numbered port
+val_help: range; Numbered port range (e.g., 1001-1005)
+comp_help: Multiple source ports can be specified as a comma-separated list.
 The whole list can also be "negated" using '!'. For example:
   '!22,telnet,http,123,1001-1005'