linux.git/include/net/netfilter, branch v2.6.26-rc2

netfilter: nf_conntrack: padding breaks conntrack hash on ARM

2008-04-29T10:35:10+00:00

commit 0794935e "[NETFILTER]: nf_conntrack: optimize hash_conntrack()"
results in ARM platforms hashing uninitialised padding.  This padding
doesn't exist on other architectures.

Fix this by replacing NF_CT_TUPLE_U_BLANK() with memset() to ensure
everything is initialised.  There were only 4 bytes that
NF_CT_TUPLE_U_BLANK() wasn't clearing anyway (or 12 bytes on ARM).

Signed-off-by: Philip Craig 
Signed-off-by: David S. Miller

[NETFILTER]: nf_conntrack: replace NF_CT_DUMP_TUPLE macro indrection by function call

2008-04-14T09:15:54+00:00

Directly call IPv4 and IPv6 variants where the address family is
easily known.

Signed-off-by: Jan Engelhardt 
Signed-off-by: Patrick McHardy

[NETFILTER]: nf_nat: use bool type in nf_nat_proto

2008-04-14T09:15:53+00:00

Signed-off-by: Jan Engelhardt 
Signed-off-by: Patrick McHardy

[NETFILTER]: nf_conntrack: use bool type in struct nf_conntrack_tuple.h

2008-04-14T09:15:53+00:00

Signed-off-by: Jan Engelhardt 
Signed-off-by: Patrick McHardy

[NETFILTER]: nf_conntrack: use bool type in struct nf_conntrack_l4proto

2008-04-14T09:15:53+00:00

Signed-off-by: Jan Engelhardt 
Signed-off-by: Patrick McHardy

[NETFILTER]: nf_conntrack: use bool type in struct nf_conntrack_l3proto

2008-04-14T09:15:52+00:00

Signed-off-by: Jan Engelhardt 
Signed-off-by: Patrick McHardy

[NETFILTER]: Remove unused callbacks in nf_conntrack_l3proto

2008-04-14T09:15:52+00:00

These functions are never called.

Signed-off-by: Jan Engelhardt 
Signed-off-by: Patrick McHardy

[NETFILTER]: nf_conntrack: add tuplehash l3num/protonum accessors

2008-04-14T09:15:52+00:00

Add accessors for l3num and protonum and get rid of some overly long
expressions.

Signed-off-by: Patrick McHardy

[NETFILTER]: nf_nat: kill helper and seq_adjust hooks

2008-04-14T09:15:52+00:00

Connection tracking helpers (specifically FTP) need to be called
before NAT sequence numbers adjustments are performed to be able
to compare them against previously seen ones. We've introduced
two new hooks around 2.6.11 to maintain this ordering when NAT
modules were changed to get called from conntrack helpers directly.

The cost of netfilter hooks is quite high and sequence number
adjustments are only rarely needed however. Add a RCU-protected
sequence number adjustment function pointer and call it from
IPv4 conntrack after calling the helper.

Signed-off-by: Patrick McHardy

[NETFILTER]: nf_conntrack_extend: warn on confirmed conntracks

2008-04-14T09:15:51+00:00

New extensions may only be added to unconfirmed conntracks to avoid races
when reallocating the storage.

Also change NF_CT_ASSERT to use WARN_ON to get backtraces.

Signed-off-by: Patrick McHardy