diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2008-02-08 17:44:14 -0800 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2008-02-08 17:44:14 -0800 |
| commit | fcd610142e718d135c73b4d49d5acbe7276dbb97 (patch) | |
| tree | 92d25b288efb704a5b5585da1c900288ce36524b /templates | |
| parent | 5ee67d46c47e241cf909509632e0f7ccca42adea (diff) | |
| download | vyatta-cfg-firewall-fcd610142e718d135c73b4d49d5acbe7276dbb97.tar.gz vyatta-cfg-firewall-fcd610142e718d135c73b4d49d5acbe7276dbb97.zip | |
merge address range into address
Diffstat (limited to 'templates')
8 files changed, 6 insertions, 22 deletions
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 48da82b..d6f1723 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 @@ -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/firewall/name/node.tag/rule/node.tag/destination/range/node.def b/templates/firewall/name/node.tag/rule/node.tag/destination/range/node.def deleted file mode 100644 index 7954a1a..0000000 --- a/templates/firewall/name/node.tag/rule/node.tag/destination/range/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Configure destination address range diff --git a/templates/firewall/name/node.tag/rule/node.tag/destination/range/start/node.def b/templates/firewall/name/node.tag/rule/node.tag/destination/range/start/node.def deleted file mode 100644 index e202887..0000000 --- a/templates/firewall/name/node.tag/rule/node.tag/destination/range/start/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: ipv4; "destination range start should be an IPv4 address" -help: Configure destination range start diff --git a/templates/firewall/name/node.tag/rule/node.tag/destination/range/stop/node.def b/templates/firewall/name/node.tag/rule/node.tag/destination/range/stop/node.def deleted file mode 100644 index a58a3fb..0000000 --- a/templates/firewall/name/node.tag/rule/node.tag/destination/range/stop/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: ipv4; "destination range stop should be an IPv4 address" -help: Configure destination range stop 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 a9dda73..ae18e02 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,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 diff --git a/templates/firewall/name/node.tag/rule/node.tag/source/range/node.def b/templates/firewall/name/node.tag/rule/node.tag/source/range/node.def deleted file mode 100644 index b9a0abd..0000000 --- a/templates/firewall/name/node.tag/rule/node.tag/source/range/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Configure source address range diff --git a/templates/firewall/name/node.tag/rule/node.tag/source/range/start/node.def b/templates/firewall/name/node.tag/rule/node.tag/source/range/start/node.def deleted file mode 100644 index 8916cd3..0000000 --- a/templates/firewall/name/node.tag/rule/node.tag/source/range/start/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: ipv4; "source range start should be an IPv4 address" -help: Configure source range start diff --git a/templates/firewall/name/node.tag/rule/node.tag/source/range/stop/node.def b/templates/firewall/name/node.tag/rule/node.tag/source/range/stop/node.def deleted file mode 100644 index 0f7f0e7..0000000 --- a/templates/firewall/name/node.tag/rule/node.tag/source/range/stop/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: ipv4; "source range stop should be an IPv4 address" -help: Configure source range stop |