From ec188eedeb370b4433a0bdb5b958f72588894fc7 Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Mon, 11 Feb 2008 15:14:29 -0800
Subject: use common implementation of source/destination handling for NAT and
 firewall.

---
 .../service/nat/rule/node.tag/destination/address/node.def       | 9 +++------
 templates-cfg/service/nat/rule/node.tag/source/address/node.def  | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'templates-cfg/service')

diff --git a/templates-cfg/service/nat/rule/node.tag/destination/address/node.def b/templates-cfg/service/nat/rule/node.tag/destination/address/node.def
index 48da82b..9c81afa 100644
--- a/templates-cfg/service/nat/rule/node.tag/destination/address/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/destination/address/node.def
@@ -1,12 +1,9 @@
 type: txt
-help: Destination address or subnet
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl \
-                           -q ipv4_negate '$VAR(@)' \
-                         || /opt/vyatta/sbin/vyatta-validate-type.pl \
-                              -q ipv4net_negate '$VAR(@)'" \
-                   ; "invalid destination address \"$VAR(@)\""
+help: Destination IP address, subnet, or range
 comp_help: Possible completions:
   <IP address>                  IP address to match
   <IP address>/<prefix length>  Subnet to match
+  <IP address>-<IP address>     IP range to match
   !<IP address>                 Match everything except the specified address
   !<IP address>/<prefix length> Match everything except the specified subnet
+  !<IP address>-<IP address>    Match everything except the specified range
diff --git a/templates-cfg/service/nat/rule/node.tag/source/address/node.def b/templates-cfg/service/nat/rule/node.tag/source/address/node.def
index a9dda73..ae18e02 100644
--- a/templates-cfg/service/nat/rule/node.tag/source/address/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/source/address/node.def
@@ -1,12 +1,9 @@
 type: txt
-help: Source address or subnet
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl \
-                           -q ipv4_negate '$VAR(@)' \
-                         || /opt/vyatta/sbin/vyatta-validate-type.pl \
-                              -q ipv4net_negate '$VAR(@)'" \
-                   ; "invalid source address \"$VAR(@)\""
+help: Source IP address, subnet, or range
 comp_help: Possible completions:
   <IP address>                  IP address to match
   <IP address>/<prefix length>  Subnet to match
+  <IP address>-<IP address>     IP range to match
   !<IP address>                 Match everything except the specified address
   !<IP address>/<prefix length> Match everything except the specified subnet
+  !<IP address>-<IP address>    Match everything except the specified range
-- 
cgit v1.2.3