From f33f40cd525a345bf581ff6204f10b9010150347 Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Wed, 21 Jul 2010 10:47:54 -0700 Subject: Convert to using new ipv4range and negatates. --- .../service/nat/rule/node.tag/destination/address/node.def | 8 ++++---- .../service/nat/rule/node.tag/destination/port/node.def | 9 +++------ .../nat/rule/node.tag/inside-address/address/node.def | 2 +- .../nat/rule/node.tag/outside-address/address/node.def | 2 +- templates-cfg/service/nat/rule/node.tag/protocol/node.def | 2 +- .../service/nat/rule/node.tag/source/address/node.def | 8 ++++---- templates-cfg/service/nat/rule/node.tag/source/port/node.def | 10 ++++------ templates-cfg/service/nat/rule/node.tag/type/node.def | 12 +++++++----- 8 files changed, 25 insertions(+), 28 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 4b5423b..e580b57 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 @@ -4,7 +4,7 @@ help: Destination IP address, subnet, or range val_help: ipv4 ; IP address to match val_help: ipv4net; Subnet to match -val_help: - ; IP range to match -val_help: ! ; Match everything except the specified address -val_help: ! ; Match everything except the specified subnet -val_help: !- ; Match everything except the specified range +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-cfg/service/nat/rule/node.tag/destination/port/node.def b/templates-cfg/service/nat/rule/node.tag/destination/port/node.def index 760c0e8..c49142a 100644 --- a/templates-cfg/service/nat/rule/node.tag/destination/port/node.def +++ b/templates-cfg/service/nat/rule/node.tag/destination/port/node.def @@ -2,9 +2,6 @@ type: txt help: Destination port -comp_help: Destination port(s) can be specified as a comma-separated list of: - Named port (any name in /etc/services, e.g., http) - <1-65535> Numbered port - - Numbered port range (e.g., 1001-1005) -The whole list can also be "negated" using '!'. For example: - '!22,telnet,http,123,1001-1005' +val_help: ; Named port (any name in /etc/services, e.g., http) +val_help: u32:1-65535 ; Numbered port +val_help: - ; Numbered port range (e.g., 1001-1005) diff --git a/templates-cfg/service/nat/rule/node.tag/inside-address/address/node.def b/templates-cfg/service/nat/rule/node.tag/inside-address/address/node.def index b776ef6..a00b483 100644 --- a/templates-cfg/service/nat/rule/node.tag/inside-address/address/node.def +++ b/templates-cfg/service/nat/rule/node.tag/inside-address/address/node.def @@ -3,5 +3,5 @@ type: txt help: Inside IP address or range for NAT val_help: ipv4 ; NAT to the specified IP address -val_help: - ; NAT to the specified IP range +val_help: ipv4range ; NAT to the specified IP range val_help: ipv4net ; NAT to the specified network address. Host part of the address will remain unchanged diff --git a/templates-cfg/service/nat/rule/node.tag/outside-address/address/node.def b/templates-cfg/service/nat/rule/node.tag/outside-address/address/node.def index 4b6d629..abd5d45 100644 --- a/templates-cfg/service/nat/rule/node.tag/outside-address/address/node.def +++ b/templates-cfg/service/nat/rule/node.tag/outside-address/address/node.def @@ -3,5 +3,5 @@ type: txt help: Outside IP address or range for NAT val_help: ipv4 ; NAT to the specified IP address -val_help: - ; NAT to the specified IP range +val_help: ipv4range ; NAT to the specified IP range val_help: ipv4net ; NAT to the specified network address. Host part of the address will remain unchanged diff --git a/templates-cfg/service/nat/rule/node.tag/protocol/node.def b/templates-cfg/service/nat/rule/node.tag/protocol/node.def index 9af7a8b..882581d 100644 --- a/templates-cfg/service/nat/rule/node.tag/protocol/node.def +++ b/templates-cfg/service/nat/rule/node.tag/protocol/node.def @@ -1,6 +1,6 @@ type: txt -help: Protocol to NAT (this can be a protocol name in /etc/protocols, a protocol number, or "all") +help: Protocol to NAT val_help: txt ; IP protocol name from /etc/protocols (e.g. "tcp" or "udp") val_help: u32:0-255 ; IP protocol number 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 b1957cc..08c0b41 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 @@ -4,7 +4,7 @@ help: Source IPv4 address, subnet, or range val_help: ipv4 ; IP address to match val_help: ipv4net ; Subnet to match -val_help: - ; IP range to match -val_help: ! ; Match everything except the specified address -val_help: ! ; Match everything except the specified subnet -val_help: !- ; Match everything except the specified range +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-cfg/service/nat/rule/node.tag/source/port/node.def b/templates-cfg/service/nat/rule/node.tag/source/port/node.def index 646232f..72071cd 100644 --- a/templates-cfg/service/nat/rule/node.tag/source/port/node.def +++ b/templates-cfg/service/nat/rule/node.tag/source/port/node.def @@ -2,9 +2,7 @@ type: txt help: Source port -comp_help: Source port(s) can be specified as a comma-separated list of: - Named port (any name in /etc/services, e.g., http) - <1-65535> Numbered port - - Numbered port range (e.g., 1001-1005) -The whole list can also be "negated" using '!'. For example: - '!22,telnet,http,123,1001-1005' +val_help: ; Named port (any name in /etc/services, e.g., http) +val_help: u32:1-65535 ; Numbered port +val_help: - ; Numbered port range (e.g., 1001-1005) + diff --git a/templates-cfg/service/nat/rule/node.tag/type/node.def b/templates-cfg/service/nat/rule/node.tag/type/node.def index 28744fa..3f65d88 100644 --- a/templates-cfg/service/nat/rule/node.tag/type/node.def +++ b/templates-cfg/service/nat/rule/node.tag/type/node.def @@ -1,7 +1,9 @@ type: txt -help: Type of NAT (source, destination, or masquerade) [REQUIRED] + +help: Type of NAT [REQUIRED] + syntax:expression: $VAR(@) in "source", "destination", "masquerade"; "invalid type $VAR(@)" -comp_help:Possible completions: - source Source NAT - destination Destination NAT - masquerade Masquerade NAT + +val_help: source ; Source NAT +val_help: destination ; Destination NAT +val_help: masquerade ; Masquerade NAT -- cgit v1.2.3