Fixes to opts, docs

Fixes to opts, docs

[Jan Engelhardt]

The following changes since commit edc2b1adf32d2b11e126174f525293b3bca6e7bc:

  Merge branch 'opts' of git://dev.medozas.de/iptables (2011-05-09 11:26:32 +0200)

are available in the git repository at:

  git://dev.medozas.de/iptables master

Changli Gao (1):
      iptables: fix the dead loop when meeting unknown options

Jan Engelhardt (1):
      doc: S/DNAT allows to omit IP addresses

 extensions/libipt_DNAT.c   |    2 +-
 extensions/libipt_DNAT.man |    2 +-
 extensions/libipt_SNAT.c   |    2 +-
 extensions/libipt_SNAT.man |    2 +-
 xshared.c                  |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

[PATCH 1/2] iptables: fix the dead loop when meeting unknown options

[Jan Engelhardt]

From: Changli Gao <xiaosuo@gmail.com>

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
---
 xshared.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xshared.c b/xshared.c
index 404a9f5..87402b4 100644
--- a/xshared.c
+++ b/xshared.c
@@ -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)
-- 
1.7.1

[PATCH 2/2] doc: S/DNAT allows to omit IP addresses

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 extensions/libipt_DNAT.c   |    2 +-
 extensions/libipt_DNAT.man |    2 +-
 extensions/libipt_SNAT.c   |    2 +-
 extensions/libipt_SNAT.man |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c
index 49c74e1..6eedca1 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 d1e0a3a..d5ded35 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 532770d..1a00954 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 6b828fd..80e2cb9 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
-- 
1.7.1

Re: Fixes to opts, docs

[Patrick McHardy]

Am 09.05.2011 21:53, schrieb Jan Engelhardt:
> The following changes since commit edc2b1adf32d2b11e126174f525293b3bca6e7bc:
> 
>   Merge branch 'opts' of git://dev.medozas.de/iptables (2011-05-09 11:26:32 +0200)
> 
> are available in the git repository at:
> 
>   git://dev.medozas.de/iptables master
> 
> Changli Gao (1):
>       iptables: fix the dead loop when meeting unknown options
> 
> Jan Engelhardt (1):
>       doc: S/DNAT allows to omit IP addresses

Pulled, thanks Jan.