SOURCES (LINUX_2_6): linux-2.6-pom-ng-branch.diff, iptables-pom-ng...
pluto
pluto at pld-linux.org
Wed Jun 22 15:43:19 CEST 2005
Author: pluto Date: Wed Jun 22 13:43:19 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- regenerated from svn repo.
---- Files affected:
SOURCES:
linux-2.6-pom-ng-branch.diff (1.1.2.12 -> 1.1.2.13) , iptables-pom-ng-branch.diff (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-pom-ng-branch.diff
diff -u SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.12 SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.13
--- SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.12 Sat Jun 11 19:05:05 2005
+++ SOURCES/linux-2.6-pom-ng-branch.diff Wed Jun 22 15:43:13 2005
@@ -12,7 +12,7 @@
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 | 31
+ 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
@@ -71,12 +71,14 @@
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 | 224 +-
+ 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
@@ -88,14 +90,12 @@
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 | 10
- net/ipv4/netfilter/ip_conntrack_proto_udp.c | 6
- net/ipv4/netfilter/ip_conntrack_standalone.c | 76
+ 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_core.c | 9
net/ipv4/netfilter/ip_nat_h323.c | 197 +
net/ipv4/netfilter/ip_nat_mms.c | 197 +
- net/ipv4/netfilter/ip_nat_standalone.c | 54
net/ipv4/netfilter/ip_queue.c | 35
net/ipv4/netfilter/ip_set.c | 1989 +++++++++++++++++++
net/ipv4/netfilter/ip_set_iphash.c | 379 +++
@@ -107,10 +107,11 @@
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 | 7
+ 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 +
@@ -123,7 +124,7 @@
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 | 89
+ 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 +
@@ -134,14 +135,13 @@
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 | 21
+ 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/iptable_raw.c | 6
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 +++++++++++
@@ -153,7 +153,8 @@
net/ipv6/netfilter/Kconfig | 107 +
net/ipv6/netfilter/Makefile | 13
net/ipv6/netfilter/ip6t_HL.c | 112 +
- net/ipv6/netfilter/ip6t_REJECT.c | 305 ++
+ 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 +
@@ -174,12 +175,12 @@
net/netfilter/nf_conntrack_standalone.c | 821 +++++++
net/netfilter/nfnetlink.c | 349 +++
status | 45
- 176 files changed, 32719 insertions(+), 262 deletions(-)
+ 177 files changed, 32601 insertions(+), 249 deletions(-)
Index: include/linux/netfilter_ipv6/ip6t_fuzzy.h
===================================================================
---- include/linux/netfilter_ipv6/ip6t_fuzzy.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_fuzzy.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,21 @@
+#ifndef _IP6T_FUZZY_H
+#define _IP6T_FUZZY_H
@@ -204,8 +205,8 @@
+#endif /*_IP6T_FUZZY_H*/
Index: include/linux/netfilter_ipv6/ip6t_nth.h
===================================================================
---- include/linux/netfilter_ipv6/ip6t_nth.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_nth.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,19 @@
+#ifndef _IP6T_NTH_H
+#define _IP6T_NTH_H
@@ -228,8 +229,8 @@
+#endif /*_IP6T_NTH_H*/
Index: include/linux/netfilter_ipv6/ip6t_ROUTE.h
===================================================================
---- include/linux/netfilter_ipv6/ip6t_ROUTE.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_ROUTE.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,23 @@
+/* Header file for iptables ip6t_ROUTE target
+ *
@@ -256,8 +257,8 @@
+#endif /*_IP6T_ROUTE_H_target*/
Index: include/linux/netfilter_ipv6/ip6t_policy.h
===================================================================
---- include/linux/netfilter_ipv6/ip6t_policy.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_policy.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,52 @@
+#ifndef _IP6T_POLICY_H
+#define _IP6T_POLICY_H
@@ -313,8 +314,8 @@
+#endif /* _IP6T_POLICY_H */
Index: include/linux/netfilter_ipv6/ip6t_HL.h
===================================================================
---- include/linux/netfilter_ipv6/ip6t_HL.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_HL.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,22 @@
+/* Hop Limit modification module for ip6tables
+ * Maciej Soltysiak <solt at dns.toxicfilms.tv>
@@ -340,8 +341,8 @@
+#endif
Index: include/linux/netfilter_ipv6/ip6t_REJECT.h
===================================================================
---- include/linux/netfilter_ipv6/ip6t_REJECT.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_REJECT.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,18 @@
+#ifndef _IP6T_REJECT_H
+#define _IP6T_REJECT_H
@@ -363,10 +364,10 @@
+#endif /*_IP6T_REJECT_H*/
Index: include/linux/netfilter.h
===================================================================
---- include/linux/netfilter.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter.h (.../trunk) (revision 6073)
-@@ -21,7 +21,7 @@
- #define NF_MAX_VERDICT NF_REPEAT
+--- include/linux/netfilter.h (.../branches/vanilla-2.6.12.x) (revision 6171)
++++ include/linux/netfilter.h (.../trunk) (revision 6171)
+@@ -22,7 +22,7 @@
+ #define NF_MAX_VERDICT NF_STOP
/* Generic cache responses from hook functions.
- <= 0x2000 is used for protocol-flags. */
@@ -376,8 +377,8 @@
Index: include/linux/netfilter_ipv4.h
===================================================================
---- include/linux/netfilter_ipv4.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4.h (.../branches/vanilla-2.6.12.x) (revision 6171)
++++ include/linux/netfilter_ipv4.h (.../trunk) (revision 6171)
@@ -8,34 +8,6 @@
#include <linux/config.h>
#include <linux/netfilter.h>
@@ -413,20 +414,10 @@
/* IP Hooks */
/* After promisc drops, checksum checks. */
#define NF_IP_PRE_ROUTING 0
-@@ -62,6 +34,9 @@
- NF_IP_PRI_FILTER = 0,
- NF_IP_PRI_NAT_SRC = 100,
- NF_IP_PRI_SELINUX_LAST = 225,
-+ NF_IP_PRI_CONNTRACK_HELPER = INT_MAX - 2,
-+ NF_IP_PRI_NAT_SEQ_ADJUST = INT_MAX - 1,
-+ NF_IP_PRI_CONNTRACK_CONFIRM = INT_MAX,
- NF_IP_PRI_LAST = INT_MAX,
- };
-
Index: include/linux/netfilter_ipv6.h
===================================================================
---- include/linux/netfilter_ipv6.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv6.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv6.h (.../branches/vanilla-2.6.12.x) (revision 6171)
++++ include/linux/netfilter_ipv6.h (.../trunk) (revision 6171)
@@ -56,6 +56,7 @@
enum nf_ip6_hook_priorities {
@@ -444,9 +435,9 @@
#endif /*__LINUX_IP6_NETFILTER_H*/
Index: include/linux/skbuff.h
===================================================================
---- include/linux/skbuff.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/skbuff.h (.../trunk) (revision 6073)
-@@ -251,6 +251,9 @@
+--- include/linux/skbuff.h (.../branches/vanilla-2.6.12.x) (revision 6171)
++++ include/linux/skbuff.h (.../trunk) (revision 6171)
+@@ -264,6 +264,9 @@
__u32 nfcache;
__u32 nfctinfo;
struct nf_conntrack *nfct;
@@ -456,7 +447,7 @@
#ifdef CONFIG_NETFILTER_DEBUG
unsigned int nf_debug;
#endif
-@@ -1145,10 +1148,26 @@
+@@ -1215,10 +1218,26 @@
if (nfct)
atomic_inc(&nfct->use);
}
@@ -485,9 +476,9 @@
#endif
Index: include/linux/sysctl.h
===================================================================
---- include/linux/sysctl.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/sysctl.h (.../trunk) (revision 6073)
-@@ -192,6 +192,7 @@
+--- include/linux/sysctl.h (.../branches/vanilla-2.6.12.x) (revision 6171)
++++ include/linux/sysctl.h (.../trunk) (revision 6171)
+@@ -193,6 +193,7 @@
NET_DECNET=15,
NET_ECONET=16,
NET_SCTP=17,
@@ -495,7 +486,7 @@
};
/* /proc/sys/kernel/random */
-@@ -256,6 +257,42 @@
+@@ -257,6 +258,42 @@
NET_UNIX_MAX_DGRAM_QLEN=3,
};
@@ -540,8 +531,8 @@
{
Index: include/linux/netlink.h
===================================================================
---- include/linux/netlink.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netlink.h (.../trunk) (revision 6073)
+--- include/linux/netlink.h (.../branches/vanilla-2.6.12.x) (revision 6171)
++++ include/linux/netlink.h (.../trunk) (revision 6171)
@@ -14,6 +14,7 @@
#define NETLINK_SELINUX 7 /* SELinux event notifications */
#define NETLINK_ARPD 8
@@ -552,8 +543,8 @@
#define NETLINK_DNRTMSG 14 /* DECnet routing messages */
Index: include/linux/netfilter/nf_conntrack_tcp.h
===================================================================
---- include/linux/netfilter/nf_conntrack_tcp.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_tcp.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,63 @@
+/*
+ * TCP tracking.
@@ -620,8 +611,8 @@
+#endif /* _NF_CONNTRACK_TCP_H */
Index: include/linux/netfilter/ipv4/nf_conntrack_icmp.h
===================================================================
---- include/linux/netfilter/ipv4/nf_conntrack_icmp.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/ipv4/nf_conntrack_icmp.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,17 @@
+/*
+ * ICMP tracking.
@@ -642,8 +633,8 @@
+#endif /* _NF_CONNTRACK_ICMP_H */
Index: include/linux/netfilter/ipv4/nf_conntrack_ipv4.h
===================================================================
---- include/linux/netfilter/ipv4/nf_conntrack_ipv4.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/ipv4/nf_conntrack_ipv4.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,40 @@
+/*
+ * IPv4 support for nf_conntrack.
@@ -687,8 +678,8 @@
+#endif /*_NF_CONNTRACK_IPV4_H*/
Index: include/linux/netfilter/nf_conntrack_core.h
===================================================================
---- include/linux/netfilter/nf_conntrack_core.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_core.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,72 @@
+/*
+ * This header is used to share core functionality between the
@@ -764,8 +755,8 @@
+#endif /* _NF_CONNTRACK_CORE_H */
Index: include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h
===================================================================
---- include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,27 @@
+/*
+ * ICMPv6 tracking.
@@ -796,8 +787,8 @@
+#endif /* _NF_CONNTRACK_ICMPV6_H */
Index: include/linux/netfilter/nf_conntrack_ftp.h
===================================================================
---- include/linux/netfilter/nf_conntrack_ftp.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_ftp.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,59 @@
+/*
+ * nf_conntrack_ftp.h
@@ -860,8 +851,8 @@
+#endif /* _NF_CONNTRACK_FTP_H */
Index: include/linux/netfilter/nf_conntrack_sctp.h
===================================================================
---- include/linux/netfilter/nf_conntrack_sctp.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_sctp.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,30 @@
+/*
+ * SCTP tracking.
@@ -895,8 +886,8 @@
+#endif /* _NF_CONNTRACK_SCTP_H */
Index: include/linux/netfilter/nf_conntrack_tuple.h
===================================================================
---- include/linux/netfilter/nf_conntrack_tuple.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_tuple.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,201 @@
+/*
+ * Definitions and Declarations for tuple.
@@ -1101,8 +1092,8 @@
+#endif /* _NF_CONNTRACK_TUPLE_H */
Index: include/linux/netfilter/nf_conntrack_helper.h
===================================================================
---- include/linux/netfilter/nf_conntrack_helper.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_helper.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,50 @@
+/*
+ * connection tracking helpers.
@@ -1156,8 +1147,8 @@
+#endif /*_NF_CONNTRACK_HELPER_H*/
Index: include/linux/netfilter/nf_conntrack.h
===================================================================
---- include/linux/netfilter/nf_conntrack.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/nf_conntrack.h (.../branches/vanilla-2.6.12.x) (revision 0)
++++ include/linux/netfilter/nf_conntrack.h (.../trunk) (revision 6171)
@@ -0,0 +1,302 @@
+/*
+ * Connection state tracking for netfilter. This is separated from,
@@ -1463,8 +1454,8 @@
+#endif /* _NF_CONNTRACK_H */
Index: include/linux/netfilter/nf_conntrack_protocol.h
===================================================================
---- include/linux/netfilter/nf_conntrack_protocol.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_protocol.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,105 @@
+/*
+ * Header for use in defining a given protocol for connection tracking.
@@ -1573,8 +1564,8 @@
+#endif /*_NF_CONNTRACK_PROTOCOL_H*/
Index: include/linux/netfilter/nf_conntrack_l3proto.h
===================================================================
---- include/linux/netfilter/nf_conntrack_l3proto.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_l3proto.h (.../trunk) (revision 6073)
+--- 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)
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C)2003,2004 USAGI/WIDE Project
@@ -1671,8 +1662,8 @@
+#endif /*_NF_CONNTRACK_L3PROTO_H*/
Index: include/linux/netfilter/nfnetlink.h
===================================================================
---- include/linux/netfilter/nfnetlink.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nfnetlink.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/nfnetlink.h (.../branches/vanilla-2.6.12.x) (revision 0)
++++ include/linux/netfilter/nfnetlink.h (.../trunk) (revision 6171)
@@ -0,0 +1,123 @@
+#ifndef _NFNETLINK_H
+#define _NFNETLINK_H
@@ -1799,8 +1790,8 @@
+#endif /* _NFNETLINK_H */
Index: include/linux/netfilter_ipv4/ipt_recent.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_recent.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4/ipt_recent.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_recent.h (.../branches/vanilla-2.6.12.x) (revision 6171)
++++ include/linux/netfilter_ipv4/ipt_recent.h (.../trunk) (revision 6171)
@@ -2,7 +2,7 @@
#define _IPT_RECENT_H
@@ -1812,8 +1803,8 @@
#define IPT_RECENT_SET 2
Index: include/linux/netfilter_ipv4/ipt_set.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_set.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_set.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_set.h (.../branches/vanilla-2.6.12.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_set.h (.../trunk) (revision 6171)
@@ -0,0 +1,21 @@
+#ifndef _IPT_SET_H
+#define _IPT_SET_H
@@ -1838,8 +1829,8 @@
+#endif /*_IPT_SET_H*/
Index: include/linux/netfilter_ipv4/ipt_connlimit.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_connlimit.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_connlimit.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_connlimit.h (.../branches/vanilla-2.6.12.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_connlimit.h (.../trunk) (revision 6171)
@@ -0,0 +1,12 @@
+#ifndef _IPT_CONNLIMIT_H
+#define _IPT_CONNLIMIT_H
@@ -1855,8 +1846,8 @@
+#endif /* _IPT_CONNLIMIT_H */
Index: include/linux/netfilter_ipv4/ip_conntrack_h323.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack_h323.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_conntrack_h323.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_conntrack_h323.h (.../branches/vanilla-2.6.12.x) (revision 0)
++++ include/linux/netfilter_ipv4/ip_conntrack_h323.h (.../trunk) (revision 6171)
@@ -0,0 +1,38 @@
+#ifndef _IP_CONNTRACK_H323_H
+#define _IP_CONNTRACK_H323_H
@@ -1898,8 +1889,8 @@
+#endif /* _IP_CONNTRACK_H323_H */
Index: include/linux/netfilter_ipv4/ipt_ROUTE.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_ROUTE.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_ROUTE.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_ROUTE.h (.../branches/vanilla-2.6.12.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_ROUTE.h (.../trunk) (revision 6171)
@@ -0,0 +1,23 @@
+/* Header file for iptables ipt_ROUTE target
+ *
@@ -1926,8 +1917,8 @@
+#endif /*_IPT_ROUTE_H_target*/
Index: include/linux/netfilter_ipv4/ip_conntrack.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4/ip_conntrack.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_conntrack.h (.../branches/vanilla-2.6.12.x) (revision 6171)
++++ include/linux/netfilter_ipv4/ip_conntrack.h (.../trunk) (revision 6171)
@@ -65,15 +65,72 @@
/* Both together */
@@ -2227,8 +2218,8 @@
enum ip_nat_manip_type manip)
Index: include/linux/netfilter_ipv4/ipt_ipv4options.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_ipv4options.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_ipv4options.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_ipv4options.h (.../branches/vanilla-2.6.12.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_ipv4options.h (.../trunk) (revision 6171)
@@ -0,0 +1,21 @@
+#ifndef __ipt_ipv4options_h_included__
+#define __ipt_ipv4options_h_included__
@@ -2253,8 +2244,8 @@
+#endif /* __ipt_ipv4options_h_included__ */
Index: include/linux/netfilter_ipv4/ipt_policy.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_policy.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_policy.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_policy.h (.../branches/vanilla-2.6.12.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_policy.h (.../trunk) (revision 6171)
@@ -0,0 +1,52 @@
+#ifndef _IPT_POLICY_H
+#define _IPT_POLICY_H
@@ -2310,8 +2301,8 @@
+#endif /* _IPT_POLICY_H */
Index: include/linux/netfilter_ipv4/ipt_layer7.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_layer7.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_layer7.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_layer7.h (.../branches/vanilla-2.6.12.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_layer7.h (.../trunk) (revision 6171)
@@ -0,0 +1,26 @@
+/*
+ By Matthew Strait <quadong at users.sf.net>, Dec 2003.
@@ -2341,8 +2332,8 @@
+#endif /* _IPT_LAYER7_H */
Index: include/linux/netfilter_ipv4/ip_conntrack_core.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack_core.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4/ip_conntrack_core.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_conntrack_core.h (.../branches/vanilla-2.6.12.x) (revision 6171)
++++ include/linux/netfilter_ipv4/ip_conntrack_core.h (.../trunk) (revision 6171)
@@ -39,10 +39,14 @@
/* Confirm a connection: returns NF_DROP if packet must be dropped. */
static inline int ip_conntrack_confirm(struct sk_buff **pskb)
@@ -2362,8 +2353,8 @@
extern struct list_head *ip_conntrack_hash;
Index: include/linux/netfilter_ipv4/ip_conntrack_ftp.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack_ftp.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4/ip_conntrack_ftp.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_conntrack_ftp.h (.../branches/vanilla-2.6.12.x) (revision 6171)
++++ include/linux/netfilter_ipv4/ip_conntrack_ftp.h (.../trunk) (revision 6171)
@@ -31,6 +31,7 @@
struct ip_conntrack_expect;
@@ -2380,8 +2371,8 @@
#endif /* _IP_CONNTRACK_FTP_H */
Index: include/linux/netfilter_ipv4/ipt_addrtype.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_addrtype.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4/ipt_addrtype.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_addrtype.h (.../branches/vanilla-2.6.12.x) (revision 6171)
++++ include/linux/netfilter_ipv4/ipt_addrtype.h (.../trunk) (revision 6171)
@@ -4,8 +4,8 @@
struct ipt_addrtype_info {
u_int16_t source; /* source-type mask */
@@ -2395,8 +2386,8 @@
#endif
Index: include/linux/netfilter_ipv4/ip_conntrack_protocol.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack_protocol.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4/ip_conntrack_protocol.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_conntrack_protocol.h (.../branches/vanilla-2.6.12.x) (revision 6171)
++++ include/linux/netfilter_ipv4/ip_conntrack_protocol.h (.../trunk) (revision 6171)
@@ -10,6 +10,8 @@
/* Protocol number. */
u_int8_t proto;
@@ -2444,8 +2435,8 @@
{
Index: include/linux/netfilter_ipv4/ip_set_nethash.h
===================================================================
---- include/linux/netfilter_ipv4/ip_set_nethash.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_set_nethash.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_set_nethash.h (.../branches/vanilla-2.6.12.x) (revision 0)
++++ include/linux/netfilter_ipv4/ip_set_nethash.h (.../trunk) (revision 6171)
@@ -0,0 +1,55 @@
+#ifndef __IP_SET_NETHASH_H
+#define __IP_SET_NETHASH_H
@@ -2504,8 +2495,8 @@
+#endif /* __IP_SET_NETHASH_H */
Index: include/linux/netfilter_ipv4/ip_conntrack_netlink.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack_netlink.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_conntrack_netlink.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_conntrack_netlink.h (.../branches/vanilla-2.6.12.x) (revision 0)
++++ include/linux/netfilter_ipv4/ip_conntrack_netlink.h (.../trunk) (revision 6171)
@@ -0,0 +1,113 @@
+#ifndef _NFNETLINK_CONNTRACK_H
+#define _NFNETLINK_CONNTRACK_H
@@ -2622,8 +2613,8 @@
+#endif /* _NFNETLINK_CONNTRACK_H */
Index: include/linux/netfilter_ipv4/ipt_IPMARK.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_IPMARK.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_IPMARK.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_IPMARK.h (.../branches/vanilla-2.6.12.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_IPMARK.h (.../trunk) (revision 6171)
@@ -0,0 +1,13 @@
+#ifndef _IPT_IPMARK_H_target
+#define _IPT_IPMARK_H_target
@@ -2640,8 +2631,8 @@
+#endif /*_IPT_IPMARK_H_target*/
Index: include/linux/netfilter_ipv4/ip_set_jhash.h
===================================================================
---- include/linux/netfilter_ipv4/ip_set_jhash.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_set_jhash.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_set_jhash.h (.../branches/vanilla-2.6.12.x) (revision 0)
<<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.12&r2=1.1.2.13&f=u
http://cvs.pld-linux.org/SOURCES/iptables-pom-ng-branch.diff?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list