include/linux/netfilter/nf_conntrack_amanda.h | 10 include/linux/netfilter/nf_conntrack_ftp.h | 20 include/linux/netfilter/nf_conntrack_h323.h | 92 include/linux/netfilter/nf_conntrack_helper_h323_asn1.h | 98 include/linux/netfilter/nf_conntrack_helper_h323_types.h | 951 +++++++ include/linux/netfilter/nf_conntrack_irc.h | 15 include/linux/netfilter/nf_conntrack_sip.h | 44 include/linux/netfilter/nf_conntrack_tftp.h | 20 include/linux/netfilter_ipv4/ip_conntrack_ftp.h | 40 include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 20 include/net/netfilter/nf_conntrack.h | 30 include/net/netfilter/nf_conntrack_core.h | 3 include/net/netfilter/nf_conntrack_expect.h | 7 include/net/netfilter/nf_conntrack_tuple.h | 10 include/net/netfilter/nf_nat.h | 78 include/net/netfilter/nf_nat_core.h | 26 include/net/netfilter/nf_nat_helper.h | 33 include/net/netfilter/nf_nat_protocol.h | 74 include/net/netfilter/nf_nat_rule.h | 38 net/ipv4/netfilter/Kconfig | 98 net/ipv4/netfilter/Makefile | 19 net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c | 874 ------ net/ipv4/netfilter/ip_conntrack_helper_h323_types.c | 1926 -------------- net/ipv4/netfilter/ipt_MASQUERADE.c | 29 net/ipv4/netfilter/ipt_NETMAP.c | 4 net/ipv4/netfilter/ipt_REDIRECT.c | 6 net/ipv4/netfilter/ipt_SAME.c | 12 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 7 net/ipv4/netfilter/nf_nat_amanda.c | 79 net/ipv4/netfilter/nf_nat_core.c | 647 +++++ net/ipv4/netfilter/nf_nat_ftp.c | 183 + net/ipv4/netfilter/nf_nat_h323.c | 613 ++++ net/ipv4/netfilter/nf_nat_helper.c | 455 +++ net/ipv4/netfilter/nf_nat_irc.c | 101 net/ipv4/netfilter/nf_nat_proto_icmp.c | 89 net/ipv4/netfilter/nf_nat_proto_tcp.c | 150 + net/ipv4/netfilter/nf_nat_proto_udp.c | 141 + net/ipv4/netfilter/nf_nat_proto_unknown.c | 55 net/ipv4/netfilter/nf_nat_rule.c | 343 ++ net/ipv4/netfilter/nf_nat_sip.c | 251 + net/ipv4/netfilter/nf_nat_standalone.c | 422 +++ net/ipv4/netfilter/nf_nat_tftp.c | 52 net/netfilter/Kconfig | 122 net/netfilter/Makefile | 7 net/netfilter/nf_conntrack_amanda.c | 232 + net/netfilter/nf_conntrack_core.c | 20 net/netfilter/nf_conntrack_expect.c | 45 net/netfilter/nf_conntrack_ftp.c | 21 net/netfilter/nf_conntrack_helper_h323.c | 1812 ++++++++++++++ net/netfilter/nf_conntrack_helper_h323_asn1.c | 874 ++++++ net/netfilter/nf_conntrack_helper_h323_types.c | 1927 +++++++++++++++ net/netfilter/nf_conntrack_irc.c | 277 ++ net/netfilter/nf_conntrack_netlink.c | 48 net/netfilter/nf_conntrack_proto_tcp.c | 2 net/netfilter/nf_conntrack_sip.c | 489 +++ net/netfilter/nf_conntrack_standalone.c | 5 net/netfilter/nf_conntrack_tftp.c | 156 + net/netfilter/xt_CONNMARK.c | 2 58 files changed, 11293 insertions(+), 2911 deletions(-) Patrick McHardy: [NETFILTER]: Add NAT support for nf_conntrack [NETFILTER]: nf_conntrack: add helper function for expectation initialization [NETFILTER]: nf_conntrack/nf_nat: add SIP helper port [NETFILTER]: nf_conntrack/nf_nat: add TFTP helper port [NETFILTER]: nf_conntrack/nf_nat: add amanda helper port [NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port [NETFILTER]: nf_conntrack/nf_nat: add IRC helper port