diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-05-11 13:43:04 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-05-11 13:43:04 +0200 |
| commit | 77b6230adfe51836ad5b31b41638b43e9b0062e2 (patch) | |
| tree | 55320e24418910d86adefc4eeb8d8e1de0e1a25b | |
| parent | c29f7ef7cb5a31620060ef721d3c65b343eb537a (diff) | |
| parent | 58e9118dc61c9ff656c0140c429f0fa892c36ac5 (diff) | |
Merge branch 'master' of git://dev.medozas.de/iptables
| -rw-r--r-- | extensions/libipt_DNAT.c | 2 | ||||
| -rw-r--r-- | extensions/libipt_DNAT.man | 2 | ||||
| -rw-r--r-- | extensions/libipt_SNAT.c | 2 | ||||
| -rw-r--r-- | extensions/libipt_SNAT.man | 2 | ||||
| -rw-r--r-- | xshared.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c index 49c74e10..6eedca10 100644 --- a/extensions/libipt_DNAT.c +++ b/extensions/libipt_DNAT.c @@ -26,7 +26,7 @@ static void DNAT_help(void) { printf( "DNAT target options:\n" -" --to-destination <ipaddr>[-<ipaddr>][:port-port]\n" +" --to-destination [<ipaddr>[-<ipaddr>]][:port[-port]]\n" " Address to map destination to.\n" "[--random] [--persistent]\n"); } diff --git a/extensions/libipt_DNAT.man b/extensions/libipt_DNAT.man index d1e0a3a1..d5ded35b 100644 --- a/extensions/libipt_DNAT.man +++ b/extensions/libipt_DNAT.man @@ -10,7 +10,7 @@ should be modified (and all future packets in this connection will also be mangled), and rules should cease being examined. It takes one type of option: .TP -\fB\-\-to\-destination\fP [\fIipaddr\fP][\fB\-\fP\fIipaddr\fP][\fB:\fP\fIport\fP[\fB\-\fP\fIport\fP]] +\fB\-\-to\-destination\fP [\fIipaddr\fP[\fB\-\fP\fIipaddr\fP]][\fB:\fP\fIport\fP[\fB\-\fP\fIport\fP]] which can specify a single new destination IP address, an inclusive range of IP addresses, and optionally, a port range (which is only valid if the rule also specifies diff --git a/extensions/libipt_SNAT.c b/extensions/libipt_SNAT.c index 532770da..1a009548 100644 --- a/extensions/libipt_SNAT.c +++ b/extensions/libipt_SNAT.c @@ -26,7 +26,7 @@ static void SNAT_help(void) { printf( "SNAT target options:\n" -" --to-source <ipaddr>[-<ipaddr>][:port-port]\n" +" --to-source [<ipaddr>[-<ipaddr>]][:port[-port]]\n" " Address to map source to.\n" "[--random] [--persistent]\n"); } diff --git a/extensions/libipt_SNAT.man b/extensions/libipt_SNAT.man index 6b828fd4..80e2cb91 100644 --- a/extensions/libipt_SNAT.man +++ b/extensions/libipt_SNAT.man @@ -7,7 +7,7 @@ modified (and all future packets in this connection will also be mangled), and rules should cease being examined. It takes one type of option: .TP -\fB\-\-to\-source\fP \fIipaddr\fP[\fB\-\fP\fIipaddr\fP][\fB:\fP\fIport\fP[\fB\-\fP\fIport\fP]] +\fB\-\-to\-source\fP [\fIipaddr\fP[\fB\-\fP\fIipaddr\fP]][\fB:\fP\fIport\fP[\fB\-\fP\fIport\fP]] which can specify a single new source IP address, an inclusive range of IP addresses, and optionally, a port range (which is only valid if the rule also specifies @@ -92,7 +92,7 @@ static bool should_load_proto(struct iptables_command_state *cs) if (find_proto(cs->protocol, XTF_DONT_LOAD, cs->options & OPT_NUMERIC, NULL) == NULL) return true; - return cs->proto_used; + return !cs->proto_used; } struct xtables_match *load_proto(struct iptables_command_state *cs) |