- syncing with kernel(netfilter) snap from 20040330.

Changed files:
    linux-libc-headers-netfilter.patch -> 1.5

diff --git a/linux-libc-headers-netfilter.patch b/linux-libc-headers-netfilter.patch
index e1f0d71d96eef0c389ec2f27bf1ce392312b0969..0101ad98dd4887fb191e298ae4960b9a998fb84e 100644 (file)
--- a/linux-libc-headers-netfilter.patch
+++ b/linux-libc-headers-netfilter.patch
@@ -1,6 +1,29 @@
+diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipchains_core.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipchains_core.h
+--- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipchains_core.h       2004-01-05 19:42:34.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipchains_core.h    2004-04-08 14:13:44.921244976 +0200
+@@ -162,5 +162,4 @@
+ 
+ extern int ip_fw_masq_timeouts(void *, int);
+ 
+-
+ #endif /* _IP_FWCHAINS_H */
+diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ip_conntrack.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ip_conntrack.h
+--- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ip_conntrack.h        2004-01-18 00:04:34.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ip_conntrack.h     2004-04-08 14:14:32.678984696 +0200
+@@ -4,8 +4,10 @@
+    but required by, the NAT layer; it can also be used by an iptables
+    extension. */
+ 
++#include <linux/config.h>
+ #include <linux/netfilter_ipv4/ip_conntrack_tuple.h>
+ #include <linux/bitops.h>
++#include <linux/compiler.h>
+ #include <asm/atomic.h>
+ 
+ enum ip_conntrack_info
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ip_pool.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ip_pool.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ip_pool.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ip_pool.h  2004-03-28 17:56:33.830211432 +0200
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ip_pool.h  2004-04-08 14:16:01.413495000 +0200
 @@ -0,0 +1,56 @@
 +#ifndef _IP_POOL_H
 +#define _IP_POOL_H
@@ -58,50 +81,9 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ip_pool.h
 +#define IP_POOL_TEST_ADDR     0x00000019      /* result (0/1) returned */
 +
 +#endif /*_IP_POOL_H*/
-diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_addrtype.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_addrtype.h
---- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_addrtype.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_addrtype.h     2004-03-22 21:13:43.000000000 +0100
-@@ -0,0 +1,11 @@
-+#ifndef _IPT_ADDRTYPE_H
-+#define _IPT_ADDRTYPE_H
-+
-+struct ipt_addrtype_info {
-+      u_int16_t       source;         /* source-type mask */
-+      u_int16_t       dest;           /* dest-type mask */
-+      int             invert_source;
-+      int             invert_dest;
-+};
-+
-+#endif
-diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_childlevel.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_childlevel.h
---- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_childlevel.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_childlevel.h   2004-03-22 21:13:43.000000000 +0100
-@@ -0,0 +1,22 @@
-+/* 
-+  By Matthew Strait <quadong@users.sf.net>, Dec 2003.
-+  http://l7-filter.sf.net
-+
-+  This program is free software; you can redistribute it and/or
-+  modify it under the terms of the GNU General Public License
-+  as published by the Free Software Foundation; either version
-+  2 of the License, or (at your option) any later version.
-+  http://www.gnu.org/licenses/gpl.txt
-+*/
-+
-+#ifndef _IPT_CHILDLEVEL_H
-+#define _IPT_CHILDLEVEL_H
-+
-+typedef char *(*proc_ipt_search) (u_int32_t, u_int8_t);
-+
-+struct ipt_childlevel_info {
-+      u_int32_t childlevel; 
-+      u_int8_t invert;
-+};
-+
-+#endif /* _IPT_CHILDLEVEL_H */
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_connlimit.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_connlimit.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_connlimit.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_connlimit.h    2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_connlimit.h    2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,12 @@
 +#ifndef _IPT_CONNLIMIT_H
 +#define _IPT_CONNLIMIT_H
@@ -117,7 +99,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_connl
 +#endif /* _IPT_CONNLIMIT_H */
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_connmark.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_connmark.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_connmark.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_connmark.h     2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_connmark.h     2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,18 @@
 +#ifndef _IPT_CONNMARK_H
 +#define _IPT_CONNMARK_H
@@ -139,7 +121,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_connm
 +#endif /*_IPT_CONNMARK_H*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_CONNMARK.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_CONNMARK.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_CONNMARK.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_CONNMARK.h     2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_CONNMARK.h     2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,25 @@
 +#ifndef _IPT_CONNMARK_H_target
 +#define _IPT_CONNMARK_H_target
@@ -168,7 +150,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_CONNM
 +#endif /*_IPT_CONNMARK_H_target*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_conntrack.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_conntrack.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_conntrack.h       2004-03-05 16:36:39.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_conntrack.h    2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_conntrack.h    2004-04-06 18:09:36.000000000 +0200
 @@ -10,6 +10,7 @@
  
  #define IPT_CONNTRACK_STATE_SNAT (1 << (IP_CT_NUMBER + 1))
@@ -179,7 +161,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_connt
  #define IPT_CONNTRACK_STATE   0x01
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_dstlimit.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_dstlimit.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_dstlimit.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_dstlimit.h     2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_dstlimit.h     2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,39 @@
 +#ifndef _IPT_DSTLIMIT_H
 +#define _IPT_DSTLIMIT_H
@@ -222,7 +204,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_dstli
 +#endif /*_IPT_DSTLIMIT_H*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_fuzzy.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_fuzzy.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_fuzzy.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_fuzzy.h        2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_fuzzy.h        2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,21 @@
 +#ifndef _IPT_FUZZY_H
 +#define _IPT_FUZZY_H
@@ -247,7 +229,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_fuzzy
 +#endif /*_IPT_FUZZY_H*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_IMQ.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_IMQ.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_IMQ.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_IMQ.h  2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_IMQ.h  2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,8 @@
 +#ifndef _IPT_IMQ_H
 +#define _IPT_IMQ_H
@@ -257,26 +239,9 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_IMQ.h
 +};
 +
 +#endif /* _IPT_IMQ_H */
-diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_IPMARK.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_IPMARK.h
---- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_IPMARK.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_IPMARK.h       2004-03-22 21:13:43.000000000 +0100
-@@ -0,0 +1,13 @@
-+#ifndef _IPT_IPMARK_H_target
-+#define _IPT_IPMARK_H_target
-+
-+struct ipt_ipmark_target_info {
-+      unsigned long andmask;
-+      unsigned long ormask;
-+      unsigned int addr;
-+};
-+
-+#define IPT_IPMARK_SRC    0
-+#define IPT_IPMARK_DST    1
-+
-+#endif /*_IPT_IPMARK_H_target*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_ipv4options.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_ipv4options.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_ipv4options.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_ipv4options.h  2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_ipv4options.h  2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,21 @@
 +#ifndef __ipt_ipv4options_h_included__
 +#define __ipt_ipv4options_h_included__
@@ -301,7 +266,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_ipv4o
 +#endif /* __ipt_ipv4options_h_included__ */
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_mport.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_mport.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_mport.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_mport.h        2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_mport.h        2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,24 @@
 +#ifndef _IPT_MPORT_H
 +#define _IPT_MPORT_H
@@ -327,9 +292,40 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_mport
 +      u_int16_t ports[IPT_MULTI_PORTS];       /* Ports */
 +};
 +#endif /*_IPT_MPORT_H*/
+diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_NETLINK.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_NETLINK.h
+--- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_NETLINK.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_NETLINK.h      2004-04-06 18:09:36.000000000 +0200
+@@ -0,0 +1,27 @@
++#ifndef _IPT_FWMON_H
++#define _IPT_FWMON_H
++
++/* Bitmask macros */
++#define MASK(x,y) (x & y)
++#define MASK_SET(x,y) x |= y
++#define MASK_UNSET(x,y) x &= ~y
++
++#define USE_MARK      0x00000001
++#define USE_DROP      0x00000002
++#define USE_SIZE      0x00000004
++
++struct ipt_nldata
++{     
++      unsigned int flags;
++      unsigned int mark;
++      unsigned int size;
++};
++
++/* Old header */
++struct netlink_t {
++      unsigned int len;
++      unsigned int mark;
++      char iface[IFNAMSIZ];
++};
++
++#endif /*_IPT_FWMON_H*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_nth.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_nth.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_nth.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_nth.h  2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_nth.h  2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,19 @@
 +#ifndef _IPT_NTH_H
 +#define _IPT_NTH_H
@@ -352,8 +348,8 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_nth.h
 +#endif /*_IPT_NTH_H*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_osf.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_osf.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_osf.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_osf.h  2004-03-28 18:01:24.309051936 +0200
-@@ -0,0 +1,95 @@
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_osf.h  2004-04-08 14:17:21.028391696 +0200
+@@ -0,0 +1,94 @@
 +/*
 + * ipt_osf.h
 + *
@@ -389,7 +385,6 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_osf.h
 +#define IPT_OSF_LOGLEVEL_ALL  0
 +#define IPT_OSF_LOGLEVEL_FIRST        1
 +
-+
 +#include <netinet/ip.h>
 +#include <netinet/tcp.h>
 +
@@ -449,65 +444,9 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_osf.h
 +};
 +
 +#endif /* _IPT_OSF_H */
-diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_policy.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_policy.h
---- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_policy.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_policy.h       2004-03-22 21:13:43.000000000 +0100
-@@ -0,0 +1,52 @@
-+#ifndef _IPT_POLICY_H
-+#define _IPT_POLICY_H
-+
-+#define POLICY_MAX_ELEM       4
-+
-+enum ipt_policy_flags
-+{
-+      POLICY_MATCH_IN         = 0x1,
-+      POLICY_MATCH_OUT        = 0x2,
-+      POLICY_MATCH_NONE       = 0x4,
-+      POLICY_MATCH_STRICT     = 0x8,
-+};
-+
-+enum ipt_policy_modes
-+{
-+      POLICY_MODE_TRANSPORT,
-+      POLICY_MODE_TUNNEL
-+};
-+
-+struct ipt_policy_spec
-+{
-+      u_int8_t        saddr:1,
-+                      daddr:1,
-+                      proto:1,
-+                      mode:1,
-+                      spi:1,
-+                      reqid:1;
-+};
-+
-+struct ipt_policy_elem
-+{
-+      u_int32_t       saddr;
-+      u_int32_t       smask;
-+      u_int32_t       daddr;
-+      u_int32_t       dmask;
-+      u_int32_t       spi;
-+      u_int32_t       reqid;
-+      u_int8_t        proto;
-+      u_int8_t        mode;
-+
-+      struct ipt_policy_spec  match;
-+      struct ipt_policy_spec  invert;
-+};
-+
-+struct ipt_policy_info
-+{
-+      struct ipt_policy_elem pol[POLICY_MAX_ELEM];
-+      u_int16_t flags;
-+      u_int16_t len;
-+};
-+
-+#endif /* _IPT_POLICY_H */
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_pool.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_pool.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_pool.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_pool.h 2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_pool.h 2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,25 @@
 +#ifndef _IPT_POOL_H
 +#define _IPT_POOL_H
@@ -536,7 +475,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_pool.
 +#endif /*_IPT_POOL_H*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_psd.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_psd.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_psd.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_psd.h  2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_psd.h  2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,40 @@
 +#ifndef _IPT_PSD_H
 +#define _IPT_PSD_H
@@ -580,7 +519,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_psd.h
 +#endif /*_IPT_PSD_H*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_quota.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_quota.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_quota.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_quota.h        2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_quota.h        2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,11 @@
 +#ifndef _IPT_QUOTA_H
 +#define _IPT_QUOTA_H
@@ -595,7 +534,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_quota
 +#endif /*_IPT_QUOTA_H*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_random.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_random.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_random.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_random.h       2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_random.h       2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,11 @@
 +#ifndef _IPT_RAND_H
 +#define _IPT_RAND_H
@@ -610,7 +549,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_rando
 +#endif /*_IPT_RAND_H*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_realm.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_realm.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_realm.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_realm.h        2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_realm.h        2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,9 @@
 +#ifndef _IPT_REALM_H
 +#define _IPT_REALM_H
@@ -623,7 +562,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_realm
 +#endif /*_IPT_REALM_H*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_sctp.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_sctp.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_sctp.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_sctp.h 2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_sctp.h 2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,107 @@
 +#ifndef _IPT_SCTP_H_
 +#define _IPT_SCTP_H_
@@ -734,7 +673,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_sctp.
 +
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_state.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_state.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_state.h   2004-03-05 16:36:39.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_state.h        2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_state.h        2004-04-06 18:09:36.000000000 +0200
 @@ -4,6 +4,8 @@
  #define IPT_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1))
  #define IPT_STATE_INVALID (1 << 0)
@@ -746,7 +685,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_state
        unsigned int statemask;
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_time.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_time.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_time.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_time.h 2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_time.h 2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,13 @@
 +#ifndef __ipt_time_h_included__
 +#define __ipt_time_h_included__
@@ -763,7 +702,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_time.
 +#endif /* __ipt_time_h_included__ */
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_TTL.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_TTL.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_TTL.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_TTL.h  2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_TTL.h  2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,21 @@
 +/* TTL modification module for IP tables
 + * (C) 2000 by Harald Welte <laforge@gnumonks.org> */
@@ -788,7 +727,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_TTL.h
 +#endif
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_u32.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_u32.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_u32.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_u32.h  2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_u32.h  2004-04-06 18:09:36.000000000 +0200
 @@ -0,0 +1,40 @@
 +#ifndef _IPT_U32_H
 +#define _IPT_U32_H
@@ -832,7 +771,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_u32.h
 +#endif /*_IPT_U32_H*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_ULOG.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_ULOG.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_ULOG.h    2004-03-05 16:36:39.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_ULOG.h 2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_ULOG.h 2004-04-06 18:09:35.000000000 +0200
 @@ -11,6 +11,9 @@
  #define NETLINK_NFLOG         5
  #endif
@@ -843,22 +782,9 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_ULOG.
  #define ULOG_MAC_LEN  80
  #define ULOG_PREFIX_LEN       32
  
-diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_XOR.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_XOR.h
---- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4.orig/ipt_XOR.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv4/ipt_XOR.h  2004-03-22 21:13:43.000000000 +0100
-@@ -0,0 +1,9 @@
-+#ifndef _IPT_XOR_H
-+#define _IPT_XOR_H
-+
-+struct ipt_XOR_info {
-+      char            key[30];
-+      u_int8_t        block_size;
-+};
-+
-+#endif /* _IPT_XOR_H */
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6.orig/ip6t_fuzzy.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_fuzzy.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6.orig/ip6t_fuzzy.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_fuzzy.h       2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_fuzzy.h       2004-04-06 18:09:35.000000000 +0200
 @@ -0,0 +1,21 @@
 +#ifndef _IP6T_FUZZY_H
 +#define _IP6T_FUZZY_H
@@ -883,7 +809,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6.orig/ip6t_fuzz
 +#endif /*_IP6T_FUZZY_H*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6.orig/ip6t_HL.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_HL.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6.orig/ip6t_HL.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_HL.h  2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_HL.h  2004-04-06 18:09:35.000000000 +0200
 @@ -0,0 +1,22 @@
 +/* Hop Limit modification module for ip6tables
 + * Maciej Soltysiak <solt@dns.toxicfilms.tv>
@@ -909,7 +835,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6.orig/ip6t_HL.h
 +#endif
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6.orig/ip6t_nth.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_nth.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6.orig/ip6t_nth.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_nth.h 2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_nth.h 2004-04-06 18:09:35.000000000 +0200
 @@ -0,0 +1,19 @@
 +#ifndef _IP6T_NTH_H
 +#define _IP6T_NTH_H
@@ -932,7 +858,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6.orig/ip6t_nth.
 +#endif /*_IP6T_NTH_H*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6.orig/ip6t_random.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_random.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6.orig/ip6t_random.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_random.h      2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_random.h      2004-04-06 18:09:35.000000000 +0200
 @@ -0,0 +1,11 @@
 +#ifndef _IP6T_RAND_H
 +#define _IP6T_RAND_H
@@ -947,7 +873,7 @@ diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6.orig/ip6t_rand
 +#endif /*_IP6T_RAND_H*/
 diff -uNr linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6.orig/ip6t_REJECT.h linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_REJECT.h
 --- linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6.orig/ip6t_REJECT.h 2004-03-05 16:36:39.000000000 +0100
-+++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_REJECT.h      2004-03-22 21:13:43.000000000 +0100
++++ linux-libc-headers-2.6.4.0/include/linux/netfilter_ipv6/ip6t_REJECT.h      2004-04-06 18:09:35.000000000 +0200
 @@ -2,15 +2,17 @@
  #define _IP6T_REJECT_H