netfilter: add protocol independent NAT core
authorPatrick McHardy <kaber@trash.net>
Sun, 26 Aug 2012 17:14:06 +0000 (19:14 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 30 Aug 2012 01:00:14 +0000 (03:00 +0200)
commitc7232c9979cba684c50b64c513c4a83c9aa70563
treedbe0fdac62191d85935f5a3dfe815c1b1add60f9
parent051966c0c644a1c96092d4206e00704ade813c9a
netfilter: add protocol independent NAT core

Convert the IPv4 NAT implementation to a protocol independent core and
address family specific modules.

Signed-off-by: Patrick McHardy <kaber@trash.net>
49 files changed:
include/linux/netfilter.h
include/linux/netfilter/nf_nat.h
include/linux/netfilter/nfnetlink_conntrack.h
include/linux/netfilter_ipv4.h
include/net/netfilter/nf_conntrack_expect.h
include/net/netfilter/nf_nat.h
include/net/netfilter/nf_nat_core.h
include/net/netfilter/nf_nat_l3proto.h [new file with mode: 0644]
include/net/netfilter/nf_nat_l4proto.h [new file with mode: 0644]
include/net/netfilter/nf_nat_protocol.h [deleted file]
include/net/netfilter/nf_nat_rule.h [deleted file]
include/net/netns/conntrack.h
include/net/netns/ipv4.h
net/ipv4/netfilter.c
net/ipv4/netfilter/Kconfig
net/ipv4/netfilter/Makefile
net/ipv4/netfilter/ipt_MASQUERADE.c
net/ipv4/netfilter/ipt_NETMAP.c
net/ipv4/netfilter/ipt_REDIRECT.c
net/ipv4/netfilter/iptable_nat.c [moved from net/ipv4/netfilter/nf_nat_standalone.c with 52% similarity]
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
net/ipv4/netfilter/nf_nat_amanda.c
net/ipv4/netfilter/nf_nat_ftp.c
net/ipv4/netfilter/nf_nat_h323.c
net/ipv4/netfilter/nf_nat_irc.c
net/ipv4/netfilter/nf_nat_l3proto_ipv4.c [new file with mode: 0644]
net/ipv4/netfilter/nf_nat_pptp.c
net/ipv4/netfilter/nf_nat_proto_gre.c
net/ipv4/netfilter/nf_nat_proto_icmp.c
net/ipv4/netfilter/nf_nat_rule.c [deleted file]
net/ipv4/netfilter/nf_nat_sip.c
net/ipv4/netfilter/nf_nat_tftp.c
net/netfilter/Kconfig
net/netfilter/Makefile
net/netfilter/core.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_conntrack_proto_tcp.c
net/netfilter/nf_conntrack_sip.c
net/netfilter/nf_nat_core.c [moved from net/ipv4/netfilter/nf_nat_core.c with 51% similarity]
net/netfilter/nf_nat_helper.c [moved from net/ipv4/netfilter/nf_nat_helper.c with 83% similarity]
net/netfilter/nf_nat_proto_common.c [moved from net/ipv4/netfilter/nf_nat_proto_common.c with 62% similarity]
net/netfilter/nf_nat_proto_dccp.c [moved from net/ipv4/netfilter/nf_nat_proto_dccp.c with 61% similarity]
net/netfilter/nf_nat_proto_sctp.c [moved from net/ipv4/netfilter/nf_nat_proto_sctp.c with 61% similarity]
net/netfilter/nf_nat_proto_tcp.c [moved from net/ipv4/netfilter/nf_nat_proto_tcp.c with 65% similarity]
net/netfilter/nf_nat_proto_udp.c [moved from net/ipv4/netfilter/nf_nat_proto_udp.c with 60% similarity]
net/netfilter/nf_nat_proto_udplite.c [moved from net/ipv4/netfilter/nf_nat_proto_udplite.c with 58% similarity]
net/netfilter/nf_nat_proto_unknown.c [moved from net/ipv4/netfilter/nf_nat_proto_unknown.c with 76% similarity]
net/netfilter/xt_nat.c [new file with mode: 0644]