[PATCH 1/2] iptables: fix wrong error messages

[PATCH 1/2] iptables: fix wrong error messages

[pablo]

From: Pablo Neira Ayuso <pablo@netfilter.org>

iptables -P INPUT
iptables v1.4.15: -X requires a chain and a policy
Try `iptables -h' or 'iptables --help' for more information.

Note that it says -X when we have used -P.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 iptables/ip6tables.c |    2 +-
 iptables/iptables.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c
index b191d5d..7a16b97 100644
--- a/iptables/ip6tables.c
+++ b/iptables/ip6tables.c
@@ -85,7 +85,7 @@
 #define CMD_CHECK		0x4000U
 #define NUMBER_OF_CMD	16
 static const char cmdflags[] = { 'I', 'D', 'D', 'R', 'A', 'L', 'F', 'Z',
-				 'Z', 'N', 'X', 'P', 'E', 'S', 'C' };
+				 'N', 'X', 'P', 'E', 'S', 'Z', 'C' };
 
 #define NUMBER_OF_OPT	ARRAY_SIZE(optflags)
 static const char optflags[]
diff --git a/iptables/iptables.c b/iptables/iptables.c
index 03ac63b..9e3d696 100644
--- a/iptables/iptables.c
+++ b/iptables/iptables.c
@@ -81,7 +81,7 @@
 #define CMD_CHECK		0x4000U
 #define NUMBER_OF_CMD	16
 static const char cmdflags[] = { 'I', 'D', 'D', 'R', 'A', 'L', 'F', 'Z',
-				 'Z', 'N', 'X', 'P', 'E', 'S', 'C' };
+				 'N', 'X', 'P', 'E', 'S', 'Z', 'C' };
 
 #define OPT_FRAGMENT    0x00800U
 #define NUMBER_OF_OPT	ARRAY_SIZE(optflags)
-- 
1.7.10.4

[PATCH 2/2] extensions: libxt_addrtype: fix type in help message

[pablo]

From: Pablo Neira Ayuso <pablo@netfilter.org>

 --limit-iface-out          Match only on the packet's incoming device

Note that it says "incoming" when it should say "outcoming"

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 extensions/libxt_addrtype.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/libxt_addrtype.c b/extensions/libxt_addrtype.c
index 59072b3..d57865b 100644
--- a/extensions/libxt_addrtype.c
+++ b/extensions/libxt_addrtype.c
@@ -60,7 +60,7 @@ static void addrtype_help_v1(void)
 " [!] --src-type type[,...]      Match source address type\n"
 " [!] --dst-type type[,...]      Match destination address type\n"
 "     --limit-iface-in           Match only on the packet's incoming device\n"
-"     --limit-iface-out          Match only on the packet's incoming device\n"
+"     --limit-iface-out          Match only on the packet's outcoming device\n"
 "\n"
 "Valid types:           \n");
 	addrtype_help_types();
-- 
1.7.10.4

Re: [PATCH 2/2] extensions: libxt_addrtype: fix type in help message

[Jan Engelhardt]

On Friday 2012-09-07 10:55, pablo@netfilter.org wrote:

>From: Pablo Neira Ayuso <pablo@netfilter.org>
>
> --limit-iface-out          Match only on the packet's incoming device
>
>Note that it says "incoming" when it should say "outcoming"

Language time! :D

"to come" is a movement of an object into the direction of the 
speaker/viewer, "to go" the movement away from the viewer.

Since iptables as a viewer is always at the machine, "outgoing" is the 
term that is being used.

Re: [PATCH 2/2] extensions: libxt_addrtype: fix type in help message

[Pablo Neira Ayuso]

On Fri, Sep 07, 2012 at 05:01:44PM +0200, Jan Engelhardt wrote:
> On Friday 2012-09-07 10:55, pablo@netfilter.org wrote:
> 
> >From: Pablo Neira Ayuso <pablo@netfilter.org>
> >
> > --limit-iface-out          Match only on the packet's incoming device
> >
> >Note that it says "incoming" when it should say "outcoming"
> 
> Language time! :D
> 
> "to come" is a movement of an object into the direction of the 
> speaker/viewer, "to go" the movement away from the viewer.
> 
> Since iptables as a viewer is always at the machine, "outgoing" is the 
> term that is being used.

You're quite right :-), while writing it with my Spanish mind it
looked to me quite reasonable.

Of course, it's not. I'll fix it, thanks Jan.