]> err.no Git - linux-2.6/commit
[NETFILTER]: nf_conntrack: reduce masks to a subset of tuples
authorPatrick McHardy <kaber@trash.net>
Sun, 8 Jul 2007 05:31:32 +0000 (22:31 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 11 Jul 2007 05:17:55 +0000 (22:17 -0700)
commitd4156e8cd93f5772483928aaf4960120caebd789
treee740e629df29d8ea1ad21244998851362b64a70e
parentdf43b4e7ca46952756b2fc039ed80469b1bff62d
[NETFILTER]: nf_conntrack: reduce masks to a subset of tuples

Since conntrack currently allows to use masks for every bit of both
helper and expectation tuples, we can't hash them and have to keep
them on two global lists that are searched for every new connection.

This patch removes the never used ability to use masks for the
destination part of the expectation tuple and completely removes
masks from helpers since the only reasonable choice is a full
match on l3num, protonum and src.u.all.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 files changed:
include/net/netfilter/nf_conntrack_expect.h
include/net/netfilter/nf_conntrack_helper.h
include/net/netfilter/nf_conntrack_tuple.h
net/ipv4/netfilter/nf_nat_snmp_basic.c
net/netfilter/nf_conntrack_amanda.c
net/netfilter/nf_conntrack_expect.c
net/netfilter/nf_conntrack_ftp.c
net/netfilter/nf_conntrack_h323_main.c
net/netfilter/nf_conntrack_helper.c
net/netfilter/nf_conntrack_irc.c
net/netfilter/nf_conntrack_netbios_ns.c
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_conntrack_pptp.c
net/netfilter/nf_conntrack_sane.c
net/netfilter/nf_conntrack_sip.c
net/netfilter/nf_conntrack_tftp.c