diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2008-02-01 19:13:18 -0800 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2008-02-01 19:13:18 -0800 |
| commit | 21b09233076a75bed7cd31177a5f52af40f572f9 (patch) | |
| tree | 6e601e3a5abd2bcb5f74cfc0cc4a7475ce0c99f0 /templates-cfg | |
| parent | bdc9858374b41b9d622dcea386a4b4bb82becbe0 (diff) | |
| download | vyatta-nat-21b09233076a75bed7cd31177a5f52af40f572f9.tar.gz vyatta-nat-21b09233076a75bed7cd31177a5f52af40f572f9.zip | |
fix for bug 2528: collapse source/destination "address" and "network".
Diffstat (limited to 'templates-cfg')
4 files changed, 22 insertions, 10 deletions
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 7244fda..48da82b 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,3 +1,12 @@ type: txt -help: Destination address -syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv4_negate '$VAR(@)'" ; "invalid destination address \"$VAR(@)\"" +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(@)\"" +comp_help: Possible completions: + <IP address> IP address to match + <IP address>/<prefix length> Subnet to match + !<IP address> Match everything except the specified address + !<IP address>/<prefix length> Match everything except the specified subnet diff --git a/templates-cfg/service/nat/rule/node.tag/destination/network/node.def b/templates-cfg/service/nat/rule/node.tag/destination/network/node.def deleted file mode 100644 index 8a52eec..0000000 --- a/templates-cfg/service/nat/rule/node.tag/destination/network/node.def +++ /dev/null @@ -1,3 +0,0 @@ -type: txt -help: Destination network -syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv4net_negate '$VAR(@)'" ; "invalid destination network \"$VAR(@)\"" 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 6be2e29..a9dda73 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,3 +1,12 @@ type: txt -help: Source address -syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv4_negate '$VAR(@)'" ; "invalid source address \"$VAR(@)\"" +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(@)\"" +comp_help: Possible completions: + <IP address> IP address to match + <IP address>/<prefix length> Subnet to match + !<IP address> Match everything except the specified address + !<IP address>/<prefix length> Match everything except the specified subnet diff --git a/templates-cfg/service/nat/rule/node.tag/source/network/node.def b/templates-cfg/service/nat/rule/node.tag/source/network/node.def deleted file mode 100644 index 2da1647..0000000 --- a/templates-cfg/service/nat/rule/node.tag/source/network/node.def +++ /dev/null @@ -1,3 +0,0 @@ -type: txt -help: Inside network -syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv4net_negate '$VAR(@)'" ; "invalid source network \"$VAR(@)\"" |