SOURCES (LINUX_2_6): linux-2.6-pom-ng-branch.diff - updated.
pluto
pluto at pld-linux.org
Thu Jul 28 20:43:23 CEST 2005
Author: pluto Date: Thu Jul 28 18:43:23 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated.
---- Files affected:
SOURCES:
linux-2.6-pom-ng-branch.diff (1.1.2.13 -> 1.1.2.14)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-pom-ng-branch.diff
diff -u SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.13 SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.14
--- SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.13 Wed Jun 22 15:43:13 2005
+++ SOURCES/linux-2.6-pom-ng-branch.diff Thu Jul 28 20:43:16 2005
@@ -1,186 +1,183 @@
- include/linux/netfilter.h | 2
- include/linux/netfilter/ipv4/nf_conntrack_icmp.h | 17
- include/linux/netfilter/ipv4/nf_conntrack_ipv4.h | 40
- include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h | 27
- include/linux/netfilter/nf_conntrack.h | 302 ++
- include/linux/netfilter/nf_conntrack_core.h | 72
- include/linux/netfilter/nf_conntrack_ftp.h | 59
- include/linux/netfilter/nf_conntrack_helper.h | 50
- include/linux/netfilter/nf_conntrack_l3proto.h | 93
- include/linux/netfilter/nf_conntrack_protocol.h | 105 +
- include/linux/netfilter/nf_conntrack_sctp.h | 30
- include/linux/netfilter/nf_conntrack_tcp.h | 63
- include/linux/netfilter/nf_conntrack_tuple.h | 201 +
- include/linux/netfilter/nfnetlink.h | 123 +
- include/linux/netfilter_ipv4.h | 28
- include/linux/netfilter_ipv4/ip_conntrack.h | 207 +
- include/linux/netfilter_ipv4/ip_conntrack_amanda.h | 2
- include/linux/netfilter_ipv4/ip_conntrack_core.h | 8
- include/linux/netfilter_ipv4/ip_conntrack_ftp.h | 2
- include/linux/netfilter_ipv4/ip_conntrack_h323.h | 38
- include/linux/netfilter_ipv4/ip_conntrack_helper.h | 7
- include/linux/netfilter_ipv4/ip_conntrack_mms.h | 37
- include/linux/netfilter_ipv4/ip_conntrack_netlink.h | 113 +
- include/linux/netfilter_ipv4/ip_conntrack_protocol.h | 17
- include/linux/netfilter_ipv4/ip_queue.h | 13
- include/linux/netfilter_ipv4/ip_set.h | 489 ++++
- include/linux/netfilter_ipv4/ip_set_iphash.h | 30
- include/linux/netfilter_ipv4/ip_set_ipmap.h | 56
- include/linux/netfilter_ipv4/ip_set_iptree.h | 39
- include/linux/netfilter_ipv4/ip_set_jhash.h | 148 +
- include/linux/netfilter_ipv4/ip_set_macipmap.h | 38
- include/linux/netfilter_ipv4/ip_set_malloc.h | 34
- include/linux/netfilter_ipv4/ip_set_nethash.h | 55
- include/linux/netfilter_ipv4/ip_set_portmap.h | 25
- include/linux/netfilter_ipv4/ip_set_prime.h | 34
- include/linux/netfilter_ipv4/ip_tables.h | 14
- include/linux/netfilter_ipv4/ipt_ACCOUNT.h | 100
- include/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 2
- include/linux/netfilter_ipv4/ipt_IPMARK.h | 13
- include/linux/netfilter_ipv4/ipt_ROUTE.h | 23
- include/linux/netfilter_ipv4/ipt_TTL.h | 21
- include/linux/netfilter_ipv4/ipt_XOR.h | 9
- include/linux/netfilter_ipv4/ipt_account.h | 26
- include/linux/netfilter_ipv4/ipt_addrtype.h | 4
- include/linux/netfilter_ipv4/ipt_connlimit.h | 12
- include/linux/netfilter_ipv4/ipt_fuzzy.h | 21
- include/linux/netfilter_ipv4/ipt_geoip.h | 50
- include/linux/netfilter_ipv4/ipt_ipp2p.h | 29
- include/linux/netfilter_ipv4/ipt_ipv4options.h | 21
- include/linux/netfilter_ipv4/ipt_layer7.h | 26
- include/linux/netfilter_ipv4/ipt_nth.h | 19
- include/linux/netfilter_ipv4/ipt_osf.h | 150 +
- include/linux/netfilter_ipv4/ipt_policy.h | 52
- include/linux/netfilter_ipv4/ipt_psd.h | 40
- include/linux/netfilter_ipv4/ipt_quota.h | 12
- include/linux/netfilter_ipv4/ipt_recent.h | 2
- include/linux/netfilter_ipv4/ipt_set.h | 21
- include/linux/netfilter_ipv4/ipt_string.h | 21
- include/linux/netfilter_ipv4/ipt_time.h | 15
- include/linux/netfilter_ipv4/ipt_u32.h | 40
- include/linux/netfilter_ipv6.h | 3
- include/linux/netfilter_ipv6/ip6t_HL.h | 22
- include/linux/netfilter_ipv6/ip6t_REJECT.h | 18
- include/linux/netfilter_ipv6/ip6t_ROUTE.h | 23
- include/linux/netfilter_ipv6/ip6t_fuzzy.h | 21
- include/linux/netfilter_ipv6/ip6t_nth.h | 19
- include/linux/netfilter_ipv6/ip6t_policy.h | 52
- include/linux/netlink.h | 1
- include/linux/skbuff.h | 19
- include/linux/sysctl.h | 37
- net/Kconfig | 1
- net/Makefile | 1
- net/core/skbuff.c | 11
- net/ipv4/ip_input.c | 1
- net/ipv4/ipmr.c | 1
- net/ipv4/netfilter/Kconfig | 497 ++++
- net/ipv4/netfilter/Makefile | 50
- net/ipv4/netfilter/asn1_per.c | 353 +++
- net/ipv4/netfilter/asn1_per.h | 83
- net/ipv4/netfilter/ip_conntrack_amanda.c | 1
- net/ipv4/netfilter/ip_conntrack_core.c | 238 +-
- net/ipv4/netfilter/ip_conntrack_ftp.c | 14
- net/ipv4/netfilter/ip_conntrack_h323.c | 448 ++++
- net/ipv4/netfilter/ip_conntrack_h323_core.c | 38
- net/ipv4/netfilter/ip_conntrack_h323_h225.c | 406 +++
- net/ipv4/netfilter/ip_conntrack_h323_h245.c | 960 +++++++++
- net/ipv4/netfilter/ip_conntrack_irc.c | 2
- net/ipv4/netfilter/ip_conntrack_mms.c | 353 +++
- net/ipv4/netfilter/ip_conntrack_netlink.c | 1378 +++++++++++++
- net/ipv4/netfilter/ip_conntrack_proto_generic.c | 2
- net/ipv4/netfilter/ip_conntrack_proto_icmp.c | 29
- net/ipv4/netfilter/ip_conntrack_proto_sctp.c | 8
- net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 8
- net/ipv4/netfilter/ip_conntrack_proto_udp.c | 7
- net/ipv4/netfilter/ip_conntrack_standalone.c | 25
- net/ipv4/netfilter/ip_conntrack_tftp.c | 1
- net/ipv4/netfilter/ip_nat_h323.c | 197 +
- net/ipv4/netfilter/ip_nat_mms.c | 197 +
- net/ipv4/netfilter/ip_queue.c | 35
- net/ipv4/netfilter/ip_set.c | 1989 +++++++++++++++++++
- net/ipv4/netfilter/ip_set_iphash.c | 379 +++
- net/ipv4/netfilter/ip_set_ipmap.c | 313 ++
- net/ipv4/netfilter/ip_set_iptree.c | 510 ++++
- net/ipv4/netfilter/ip_set_macipmap.c | 338 +++
- net/ipv4/netfilter/ip_set_nethash.c | 449 ++++
- net/ipv4/netfilter/ip_set_portmap.c | 325 +++
- net/ipv4/netfilter/ip_tables.c | 2
- net/ipv4/netfilter/ipt_ACCOUNT.c | 1103 ++++++++++
- net/ipv4/netfilter/ipt_CLASSIFY.c | 29
- net/ipv4/netfilter/ipt_CLUSTERIP.c | 9
- net/ipv4/netfilter/ipt_IPMARK.c | 81
- net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c | 89
- net/ipv4/netfilter/ipt_NETMAP.c | 8
- net/ipv4/netfilter/ipt_REJECT.c | 13
- net/ipv4/netfilter/ipt_ROUTE.c | 464 ++++
- net/ipv4/netfilter/ipt_SAME.c | 25
- net/ipv4/netfilter/ipt_SET.c | 128 +
- net/ipv4/netfilter/ipt_TARPIT.c | 295 ++
- net/ipv4/netfilter/ipt_TTL.c | 120 +
- net/ipv4/netfilter/ipt_ULOG.c | 4
- net/ipv4/netfilter/ipt_XOR.c | 117 +
- net/ipv4/netfilter/ipt_account.c | 937 ++++++++
- net/ipv4/netfilter/ipt_addrtype.c | 4
- net/ipv4/netfilter/ipt_connlimit.c | 228 ++
- net/ipv4/netfilter/ipt_fuzzy.c | 185 +
- net/ipv4/netfilter/ipt_geoip.c | 275 ++
- net/ipv4/netfilter/ipt_hashlimit.c | 9
- net/ipv4/netfilter/ipt_ipp2p.c | 641 ++++++
- net/ipv4/netfilter/ipt_iprange.c | 12
- net/ipv4/netfilter/ipt_ipv4options.c | 172 +
- net/ipv4/netfilter/ipt_layer7.c | 552 +++++
- net/ipv4/netfilter/ipt_nth.c | 166 +
- net/ipv4/netfilter/ipt_osf.c | 807 +++++++
- net/ipv4/netfilter/ipt_policy.c | 176 +
- net/ipv4/netfilter/ipt_psd.c | 358 +++
- net/ipv4/netfilter/ipt_quota.c | 96
- net/ipv4/netfilter/ipt_realm.c | 12
- net/ipv4/netfilter/ipt_recent.c | 11
- net/ipv4/netfilter/ipt_sctp.c | 34
- net/ipv4/netfilter/ipt_set.c | 112 +
- net/ipv4/netfilter/ipt_string.c | 183 +
- net/ipv4/netfilter/ipt_time.c | 191 +
- net/ipv4/netfilter/ipt_u32.c | 231 ++
- net/ipv4/netfilter/ipt_unclean.c | 611 +++++
- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 549 +++++
- net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 299 ++
- net/ipv4/netfilter/regexp/regexp.c | 1195 +++++++++++
- net/ipv4/netfilter/regexp/regexp.h | 27
- net/ipv4/netfilter/regexp/regmagic.h | 5
- net/ipv4/netfilter/regexp/regsub.c | 95
- net/ipv6/ip6_output.c | 6
- net/ipv6/ipv6_syms.c | 2
- net/ipv6/netfilter/Kconfig | 107 +
- net/ipv6/netfilter/Makefile | 13
- net/ipv6/netfilter/ip6t_HL.c | 112 +
- net/ipv6/netfilter/ip6t_LOG.c | 54
- net/ipv6/netfilter/ip6t_REJECT.c | 303 ++
- net/ipv6/netfilter/ip6t_ROUTE.c | 308 ++
- net/ipv6/netfilter/ip6t_ULOG.c | 142 +
- net/ipv6/netfilter/ip6t_fuzzy.c | 187 +
- net/ipv6/netfilter/ip6t_nth.c | 171 +
- net/ipv6/netfilter/ip6t_policy.c | 199 +
- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 630 ++++++
- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 271 ++
- net/ipv6/netfilter/nf_conntrack_reasm.c | 887 ++++++++
- net/netfilter/Kconfig | 74
- net/netfilter/Makefile | 9
- net/netfilter/nf_conntrack_core.c | 1390 +++++++++++++
- net/netfilter/nf_conntrack_ftp.c | 690 ++++++
- net/netfilter/nf_conntrack_l3proto_generic.c | 99
- net/netfilter/nf_conntrack_proto_generic.c | 85
- net/netfilter/nf_conntrack_proto_sctp.c | 668 ++++++
- net/netfilter/nf_conntrack_proto_tcp.c | 1146 ++++++++++
- net/netfilter/nf_conntrack_proto_udp.c | 212 ++
- net/netfilter/nf_conntrack_standalone.c | 821 +++++++
- net/netfilter/nfnetlink.c | 349 +++
- status | 45
- 177 files changed, 32601 insertions(+), 249 deletions(-)
+ include/linux/netfilter.h | 2
+ include/linux/netfilter/ipv4/nf_conntrack_icmp.h | 17
+ include/linux/netfilter/ipv4/nf_conntrack_ipv4.h | 40
+ include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h | 27
+ include/linux/netfilter/nf_conntrack.h | 302 ++
+ include/linux/netfilter/nf_conntrack_core.h | 72
+ include/linux/netfilter/nf_conntrack_ftp.h | 59
+ include/linux/netfilter/nf_conntrack_helper.h | 50
+ include/linux/netfilter/nf_conntrack_l3proto.h | 93
+ include/linux/netfilter/nf_conntrack_protocol.h | 105
+ include/linux/netfilter/nf_conntrack_sctp.h | 30
+ include/linux/netfilter/nf_conntrack_tcp.h | 63
+ include/linux/netfilter/nf_conntrack_tuple.h | 201 +
+ include/linux/netfilter/nfnetlink.h | 145 +
+ include/linux/netfilter_ipv4.h | 28
+ include/linux/netfilter_ipv4/ip_conntrack.h | 161 +
+ include/linux/netfilter_ipv4/ip_conntrack_core.h | 15
+ include/linux/netfilter_ipv4/ip_conntrack_h323.h | 38
+ include/linux/netfilter_ipv4/ip_conntrack_mms.h | 37
+ include/linux/netfilter_ipv4/ip_conntrack_pptp.h | 336 +++
+ include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h | 114 +
+ include/linux/netfilter_ipv4/ip_conntrack_protocol.h | 2
+ include/linux/netfilter_ipv4/ip_conntrack_quake3.h | 22
+ include/linux/netfilter_ipv4/ip_conntrack_tuple.h | 6
+ include/linux/netfilter_ipv4/ip_nat_pptp.h | 11
+ include/linux/netfilter_ipv4/ip_queue.h | 13
+ include/linux/netfilter_ipv4/ip_set.h | 489 ++++
+ include/linux/netfilter_ipv4/ip_set_iphash.h | 30
+ include/linux/netfilter_ipv4/ip_set_ipmap.h | 56
+ include/linux/netfilter_ipv4/ip_set_iptree.h | 39
+ include/linux/netfilter_ipv4/ip_set_jhash.h | 148 +
+ include/linux/netfilter_ipv4/ip_set_macipmap.h | 38
+ include/linux/netfilter_ipv4/ip_set_malloc.h | 34
+ include/linux/netfilter_ipv4/ip_set_nethash.h | 55
+ include/linux/netfilter_ipv4/ip_set_portmap.h | 25
+ include/linux/netfilter_ipv4/ip_set_prime.h | 34
+ include/linux/netfilter_ipv4/ip_tables.h | 14
+ include/linux/netfilter_ipv4/ipt_ACCOUNT.h | 100
+ include/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 2
+ include/linux/netfilter_ipv4/ipt_IPMARK.h | 13
+ include/linux/netfilter_ipv4/ipt_ROUTE.h | 23
+ include/linux/netfilter_ipv4/ipt_TTL.h | 21
+ include/linux/netfilter_ipv4/ipt_XOR.h | 9
+ include/linux/netfilter_ipv4/ipt_account.h | 26
+ include/linux/netfilter_ipv4/ipt_addrtype.h | 4
+ include/linux/netfilter_ipv4/ipt_connlimit.h | 12
+ include/linux/netfilter_ipv4/ipt_fuzzy.h | 21
+ include/linux/netfilter_ipv4/ipt_geoip.h | 50
+ include/linux/netfilter_ipv4/ipt_ipp2p.h | 29
+ include/linux/netfilter_ipv4/ipt_ipv4options.h | 21
+ include/linux/netfilter_ipv4/ipt_layer7.h | 26
+ include/linux/netfilter_ipv4/ipt_nth.h | 19
+ include/linux/netfilter_ipv4/ipt_osf.h | 151 +
+ include/linux/netfilter_ipv4/ipt_policy.h | 52
+ include/linux/netfilter_ipv4/ipt_psd.h | 40
+ include/linux/netfilter_ipv4/ipt_quota.h | 12
+ include/linux/netfilter_ipv4/ipt_recent.h | 2
+ include/linux/netfilter_ipv4/ipt_set.h | 21
+ include/linux/netfilter_ipv4/ipt_string.h | 21
+ include/linux/netfilter_ipv4/ipt_time.h | 18
+ include/linux/netfilter_ipv4/ipt_u32.h | 40
+ include/linux/netfilter_ipv6.h | 3
+ include/linux/netfilter_ipv6/ip6t_HL.h | 22
+ include/linux/netfilter_ipv6/ip6t_REJECT.h | 18
+ include/linux/netfilter_ipv6/ip6t_ROUTE.h | 23
+ include/linux/netfilter_ipv6/ip6t_fuzzy.h | 21
+ include/linux/netfilter_ipv6/ip6t_nth.h | 19
+ include/linux/netfilter_ipv6/ip6t_policy.h | 52
+ include/linux/netlink.h | 1
+ include/linux/skbuff.h | 19
+ include/linux/sysctl.h | 37
+ net/Kconfig | 1
+ net/Makefile | 1
+ net/core/skbuff.c | 11
+ net/ipv4/netfilter/Kconfig | 574 +++++
+ net/ipv4/netfilter/Makefile | 69
+ net/ipv4/netfilter/asn1_per.c | 353 +++
+ net/ipv4/netfilter/asn1_per.h | 83
+ net/ipv4/netfilter/ip_conntrack_core.c | 50
+ net/ipv4/netfilter/ip_conntrack_ftp.c | 12
+ net/ipv4/netfilter/ip_conntrack_h323.c | 448 ++++
+ net/ipv4/netfilter/ip_conntrack_h323_core.c | 38
+ net/ipv4/netfilter/ip_conntrack_h323_h225.c | 406 +++
+ net/ipv4/netfilter/ip_conntrack_h323_h245.c | 960 ++++++++
+ net/ipv4/netfilter/ip_conntrack_mms.c | 353 +++
+ net/ipv4/netfilter/ip_conntrack_pptp.c | 790 +++++++
+ net/ipv4/netfilter/ip_conntrack_pptp_priv.h | 24
+ net/ipv4/netfilter/ip_conntrack_proto_generic.c | 2
+ net/ipv4/netfilter/ip_conntrack_proto_gre.c | 369 +++
+ net/ipv4/netfilter/ip_conntrack_proto_icmp.c | 3
+ net/ipv4/netfilter/ip_conntrack_proto_sctp.c | 4
+ net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 6
+ net/ipv4/netfilter/ip_conntrack_proto_udp.c | 5
+ net/ipv4/netfilter/ip_conntrack_quake3.c | 202 +
+ net/ipv4/netfilter/ip_conntrack_standalone.c | 14
+ net/ipv4/netfilter/ip_nat_h323.c | 197 +
+ net/ipv4/netfilter/ip_nat_mms.c | 197 +
+ net/ipv4/netfilter/ip_nat_pptp.c | 388 +++
+ net/ipv4/netfilter/ip_nat_proto_gre.c | 214 +
+ net/ipv4/netfilter/ip_nat_quake3.c | 97
+ net/ipv4/netfilter/ip_queue.c | 35
+ net/ipv4/netfilter/ip_set.c | 1989 ++++++++++++++++++
+ net/ipv4/netfilter/ip_set_iphash.c | 379 +++
+ net/ipv4/netfilter/ip_set_ipmap.c | 313 ++
+ net/ipv4/netfilter/ip_set_iptree.c | 510 ++++
+ net/ipv4/netfilter/ip_set_macipmap.c | 338 +++
+ net/ipv4/netfilter/ip_set_nethash.c | 449 ++++
+ net/ipv4/netfilter/ip_set_portmap.c | 325 ++
+ net/ipv4/netfilter/ip_tables.c | 2
+ net/ipv4/netfilter/ipt_ACCOUNT.c | 1103 +++++++++
+ net/ipv4/netfilter/ipt_CLASSIFY.c | 31
+ net/ipv4/netfilter/ipt_CLUSTERIP.c | 7
+ net/ipv4/netfilter/ipt_IPMARK.c | 81
+ net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c | 89
+ net/ipv4/netfilter/ipt_REJECT.c | 147 +
+ net/ipv4/netfilter/ipt_ROUTE.c | 464 ++++
+ net/ipv4/netfilter/ipt_SET.c | 128 +
+ net/ipv4/netfilter/ipt_TARPIT.c | 295 ++
+ net/ipv4/netfilter/ipt_TTL.c | 120 +
+ net/ipv4/netfilter/ipt_ULOG.c | 4
+ net/ipv4/netfilter/ipt_XOR.c | 117 +
+ net/ipv4/netfilter/ipt_account.c | 937 ++++++++
+ net/ipv4/netfilter/ipt_addrtype.c | 4
+ net/ipv4/netfilter/ipt_connlimit.c | 228 ++
+ net/ipv4/netfilter/ipt_fuzzy.c | 185 +
+ net/ipv4/netfilter/ipt_geoip.c | 275 ++
+ net/ipv4/netfilter/ipt_ipp2p.c | 644 +++++
+ net/ipv4/netfilter/ipt_iprange.c | 12
+ net/ipv4/netfilter/ipt_ipv4options.c | 172 +
+ net/ipv4/netfilter/ipt_layer7.c | 552 ++++
+ net/ipv4/netfilter/ipt_nth.c | 166 +
+ net/ipv4/netfilter/ipt_osf.c | 854 +++++++
+ net/ipv4/netfilter/ipt_policy.c | 176 +
+ net/ipv4/netfilter/ipt_psd.c | 358 +++
+ net/ipv4/netfilter/ipt_quota.c | 96
+ net/ipv4/netfilter/ipt_realm.c | 12
+ net/ipv4/netfilter/ipt_recent.c | 11
+ net/ipv4/netfilter/ipt_set.c | 112 +
+ net/ipv4/netfilter/ipt_string.c | 183 +
+ net/ipv4/netfilter/ipt_time.c | 179 +
+ net/ipv4/netfilter/ipt_u32.c | 231 ++
+ net/ipv4/netfilter/ipt_unclean.c | 611 +++++
+ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 549 ++++
+ net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 299 ++
+ net/ipv4/netfilter/regexp/regexp.c | 1195 ++++++++++
+ net/ipv4/netfilter/regexp/regexp.h | 40
+ net/ipv4/netfilter/regexp/regmagic.h | 5
+ net/ipv4/netfilter/regexp/regsub.c | 95
+ net/ipv6/ip6_output.c | 6
+ net/ipv6/ipv6_syms.c | 2
+ net/ipv6/netfilter/Kconfig | 109
+ net/ipv6/netfilter/Makefile | 14
+ net/ipv6/netfilter/ip6t_HL.c | 111 +
+ net/ipv6/netfilter/ip6t_REJECT.c | 304 ++
+ net/ipv6/netfilter/ip6t_ROUTE.c | 308 ++
+ net/ipv6/netfilter/ip6t_ULOG.c | 142 +
+ net/ipv6/netfilter/ip6t_fuzzy.c | 188 +
+ net/ipv6/netfilter/ip6t_nth.c | 173 +
+ net/ipv6/netfilter/ip6t_policy.c | 200 +
+ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 630 +++++
+ net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 271 ++
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 887 ++++++++
+ net/netfilter/Kconfig | 74
+ net/netfilter/Makefile | 9
+ net/netfilter/nf_conntrack_core.c | 1390 ++++++++++++
+ net/netfilter/nf_conntrack_ftp.c | 690 ++++++
+ net/netfilter/nf_conntrack_l3proto_generic.c | 99
+ net/netfilter/nf_conntrack_proto_generic.c | 85
+ net/netfilter/nf_conntrack_proto_sctp.c | 668 ++++++
+ net/netfilter/nf_conntrack_proto_tcp.c | 1146 ++++++++++
+ net/netfilter/nf_conntrack_proto_udp.c | 212 +
+ net/netfilter/nf_conntrack_standalone.c | 821 +++++++
+ net/netfilter/nfnetlink.c | 343 +++
+ status | 44
+ 174 files changed, 33701 insertions(+), 102 deletions(-)
Index: include/linux/netfilter_ipv6/ip6t_fuzzy.h
===================================================================
--- include/linux/netfilter_ipv6/ip6t_fuzzy.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_fuzzy.h (.../trunk) (revision 6171)
++++ include/linux/netfilter_ipv6/ip6t_fuzzy.h (.../trunk) (revision 6277)
@@ -0,0 +1,21 @@
+#ifndef _IP6T_FUZZY_H
+#define _IP6T_FUZZY_H
@@ -206,7 +203,7 @@
Index: include/linux/netfilter_ipv6/ip6t_nth.h
===================================================================
--- include/linux/netfilter_ipv6/ip6t_nth.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_nth.h (.../trunk) (revision 6171)
++++ include/linux/netfilter_ipv6/ip6t_nth.h (.../trunk) (revision 6277)
@@ -0,0 +1,19 @@
+#ifndef _IP6T_NTH_H
+#define _IP6T_NTH_H
@@ -230,7 +227,7 @@
Index: include/linux/netfilter_ipv6/ip6t_ROUTE.h
===================================================================
--- include/linux/netfilter_ipv6/ip6t_ROUTE.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_ROUTE.h (.../trunk) (revision 6171)
++++ include/linux/netfilter_ipv6/ip6t_ROUTE.h (.../trunk) (revision 6277)
@@ -0,0 +1,23 @@
+/* Header file for iptables ip6t_ROUTE target
+ *
@@ -258,7 +255,7 @@
Index: include/linux/netfilter_ipv6/ip6t_policy.h
===================================================================
--- include/linux/netfilter_ipv6/ip6t_policy.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_policy.h (.../trunk) (revision 6171)
++++ include/linux/netfilter_ipv6/ip6t_policy.h (.../trunk) (revision 6277)
@@ -0,0 +1,52 @@
+#ifndef _IP6T_POLICY_H
+#define _IP6T_POLICY_H
@@ -315,7 +312,7 @@
Index: include/linux/netfilter_ipv6/ip6t_HL.h
===================================================================
--- include/linux/netfilter_ipv6/ip6t_HL.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_HL.h (.../trunk) (revision 6171)
++++ include/linux/netfilter_ipv6/ip6t_HL.h (.../trunk) (revision 6277)
@@ -0,0 +1,22 @@
+/* Hop Limit modification module for ip6tables
+ * Maciej Soltysiak <solt at dns.toxicfilms.tv>
@@ -342,7 +339,7 @@
Index: include/linux/netfilter_ipv6/ip6t_REJECT.h
===================================================================
--- include/linux/netfilter_ipv6/ip6t_REJECT.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_REJECT.h (.../trunk) (revision 6171)
++++ include/linux/netfilter_ipv6/ip6t_REJECT.h (.../trunk) (revision 6277)
@@ -0,0 +1,18 @@
+#ifndef _IP6T_REJECT_H
+#define _IP6T_REJECT_H
@@ -364,8 +361,8 @@
+#endif /*_IP6T_REJECT_H*/
Index: include/linux/netfilter.h
===================================================================
---- include/linux/netfilter.h (.../branches/vanilla-2.6.12.x) (revision 6171)
-+++ include/linux/netfilter.h (.../trunk) (revision 6171)
+--- include/linux/netfilter.h (.../branches/vanilla-2.6.12.x) (revision 6277)
++++ include/linux/netfilter.h (.../trunk) (revision 6277)
@@ -22,7 +22,7 @@
#define NF_MAX_VERDICT NF_STOP
@@ -377,8 +374,8 @@
Index: include/linux/netfilter_ipv4.h
===================================================================
---- include/linux/netfilter_ipv4.h (.../branches/vanilla-2.6.12.x) (revision 6171)
-+++ include/linux/netfilter_ipv4.h (.../trunk) (revision 6171)
+--- include/linux/netfilter_ipv4.h (.../branches/vanilla-2.6.12.x) (revision 6277)
++++ include/linux/netfilter_ipv4.h (.../trunk) (revision 6277)
@@ -8,34 +8,6 @@
#include <linux/config.h>
#include <linux/netfilter.h>
@@ -416,8 +413,8 @@
#define NF_IP_PRE_ROUTING 0
Index: include/linux/netfilter_ipv6.h
===================================================================
---- include/linux/netfilter_ipv6.h (.../branches/vanilla-2.6.12.x) (revision 6171)
-+++ include/linux/netfilter_ipv6.h (.../trunk) (revision 6171)
+--- include/linux/netfilter_ipv6.h (.../branches/vanilla-2.6.12.x) (revision 6277)
++++ include/linux/netfilter_ipv6.h (.../trunk) (revision 6277)
@@ -56,6 +56,7 @@
enum nf_ip6_hook_priorities {
@@ -435,8 +432,8 @@
#endif /*__LINUX_IP6_NETFILTER_H*/
Index: include/linux/skbuff.h
===================================================================
---- include/linux/skbuff.h (.../branches/vanilla-2.6.12.x) (revision 6171)
-+++ include/linux/skbuff.h (.../trunk) (revision 6171)
+--- include/linux/skbuff.h (.../branches/vanilla-2.6.12.x) (revision 6277)
++++ include/linux/skbuff.h (.../trunk) (revision 6277)
@@ -264,6 +264,9 @@
__u32 nfcache;
__u32 nfctinfo;
@@ -476,8 +473,8 @@
#endif
Index: include/linux/sysctl.h
===================================================================
---- include/linux/sysctl.h (.../branches/vanilla-2.6.12.x) (revision 6171)
-+++ include/linux/sysctl.h (.../trunk) (revision 6171)
+--- include/linux/sysctl.h (.../branches/vanilla-2.6.12.x) (revision 6277)
++++ include/linux/sysctl.h (.../trunk) (revision 6277)
@@ -193,6 +193,7 @@
NET_DECNET=15,
NET_ECONET=16,
@@ -531,8 +528,8 @@
{
Index: include/linux/netlink.h
===================================================================
---- include/linux/netlink.h (.../branches/vanilla-2.6.12.x) (revision 6171)
-+++ include/linux/netlink.h (.../trunk) (revision 6171)
+--- include/linux/netlink.h (.../branches/vanilla-2.6.12.x) (revision 6277)
++++ include/linux/netlink.h (.../trunk) (revision 6277)
@@ -14,6 +14,7 @@
#define NETLINK_SELINUX 7 /* SELinux event notifications */
#define NETLINK_ARPD 8
@@ -544,7 +541,7 @@
Index: include/linux/netfilter/nf_conntrack_tcp.h
===================================================================
--- include/linux/netfilter/nf_conntrack_tcp.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_tcp.h (.../trunk) (revision 6171)
++++ include/linux/netfilter/nf_conntrack_tcp.h (.../trunk) (revision 6277)
@@ -0,0 +1,63 @@
+/*
+ * TCP tracking.
@@ -612,7 +609,7 @@
Index: include/linux/netfilter/ipv4/nf_conntrack_icmp.h
===================================================================
--- include/linux/netfilter/ipv4/nf_conntrack_icmp.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/ipv4/nf_conntrack_icmp.h (.../trunk) (revision 6171)
++++ include/linux/netfilter/ipv4/nf_conntrack_icmp.h (.../trunk) (revision 6277)
@@ -0,0 +1,17 @@
+/*
+ * ICMP tracking.
@@ -634,7 +631,7 @@
Index: include/linux/netfilter/ipv4/nf_conntrack_ipv4.h
===================================================================
--- include/linux/netfilter/ipv4/nf_conntrack_ipv4.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/ipv4/nf_conntrack_ipv4.h (.../trunk) (revision 6171)
++++ include/linux/netfilter/ipv4/nf_conntrack_ipv4.h (.../trunk) (revision 6277)
@@ -0,0 +1,40 @@
+/*
+ * IPv4 support for nf_conntrack.
@@ -679,7 +676,7 @@
Index: include/linux/netfilter/nf_conntrack_core.h
===================================================================
--- include/linux/netfilter/nf_conntrack_core.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_core.h (.../trunk) (revision 6171)
++++ include/linux/netfilter/nf_conntrack_core.h (.../trunk) (revision 6277)
@@ -0,0 +1,72 @@
+/*
+ * This header is used to share core functionality between the
@@ -756,7 +753,7 @@
Index: include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h
===================================================================
--- include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h (.../trunk) (revision 6171)
++++ include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h (.../trunk) (revision 6277)
@@ -0,0 +1,27 @@
+/*
+ * ICMPv6 tracking.
@@ -788,7 +785,7 @@
Index: include/linux/netfilter/nf_conntrack_ftp.h
===================================================================
--- include/linux/netfilter/nf_conntrack_ftp.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_ftp.h (.../trunk) (revision 6171)
++++ include/linux/netfilter/nf_conntrack_ftp.h (.../trunk) (revision 6277)
@@ -0,0 +1,59 @@
+/*
+ * nf_conntrack_ftp.h
@@ -852,7 +849,7 @@
Index: include/linux/netfilter/nf_conntrack_sctp.h
===================================================================
--- include/linux/netfilter/nf_conntrack_sctp.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_sctp.h (.../trunk) (revision 6171)
++++ include/linux/netfilter/nf_conntrack_sctp.h (.../trunk) (revision 6277)
@@ -0,0 +1,30 @@
+/*
+ * SCTP tracking.
@@ -887,7 +884,7 @@
Index: include/linux/netfilter/nf_conntrack_tuple.h
===================================================================
--- include/linux/netfilter/nf_conntrack_tuple.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_tuple.h (.../trunk) (revision 6171)
++++ include/linux/netfilter/nf_conntrack_tuple.h (.../trunk) (revision 6277)
@@ -0,0 +1,201 @@
+/*
+ * Definitions and Declarations for tuple.
@@ -1093,7 +1090,7 @@
Index: include/linux/netfilter/nf_conntrack_helper.h
===================================================================
--- include/linux/netfilter/nf_conntrack_helper.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_helper.h (.../trunk) (revision 6171)
++++ include/linux/netfilter/nf_conntrack_helper.h (.../trunk) (revision 6277)
@@ -0,0 +1,50 @@
+/*
+ * connection tracking helpers.
@@ -1148,7 +1145,7 @@
Index: include/linux/netfilter/nf_conntrack.h
===================================================================
--- include/linux/netfilter/nf_conntrack.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack.h (.../trunk) (revision 6171)
++++ include/linux/netfilter/nf_conntrack.h (.../trunk) (revision 6277)
@@ -0,0 +1,302 @@
+/*
+ * Connection state tracking for netfilter. This is separated from,
@@ -1370,7 +1367,7 @@
+}
+
+/* decrement reference count on a conntrack */
-+extern void nf_ct_put(struct nf_conn *ct);
++extern inline void nf_ct_put(struct nf_conn *ct);
+
+/* call to create an explicit dependency on nf_conntrack. */
+extern void need_nf_conntrack(void);
@@ -1455,7 +1452,7 @@
Index: include/linux/netfilter/nf_conntrack_protocol.h
===================================================================
--- include/linux/netfilter/nf_conntrack_protocol.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_protocol.h (.../trunk) (revision 6171)
++++ include/linux/netfilter/nf_conntrack_protocol.h (.../trunk) (revision 6277)
@@ -0,0 +1,105 @@
+/*
+ * Header for use in defining a given protocol for connection tracking.
@@ -1565,7 +1562,7 @@
Index: include/linux/netfilter/nf_conntrack_l3proto.h
===================================================================
--- include/linux/netfilter/nf_conntrack_l3proto.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_l3proto.h (.../trunk) (revision 6171)
++++ include/linux/netfilter/nf_conntrack_l3proto.h (.../trunk) (revision 6277)
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C)2003,2004 USAGI/WIDE Project
@@ -1663,12 +1660,20 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-pom-ng-branch.diff?r1=1.1.2.13&r2=1.1.2.14&f=u
More information about the pld-cvs-commit
mailing list