-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack.h 2004-01-18 00:04:34.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack.h 2004-06-20 12:25:47.132436408 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_conntrack.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_conntrack.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_conntrack.h 2004-01-18 00:04:34.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_conntrack.h 2004-07-03 22:43:07.851479552 +0200
@@ -49,10 +49,12 @@
#include <linux/netfilter_ipv4/ip_conntrack_tcp.h>
struct ip_ct_tcp tcp;
struct ip_ct_icmp icmp;
};
-@@ -62,6 +64,11 @@
- };
-
- /* Add protocol helper include file here */
-+#include <linux/netfilter_ipv4/ip_conntrack_talk.h>
-+#include <linux/netfilter_ipv4/ip_conntrack_rtsp.h>
-+#include <linux/netfilter_ipv4/ip_conntrack_rsh.h>
-+#include <linux/netfilter_ipv4/ip_conntrack_mms.h>
-+#include <linux/netfilter_ipv4/ip_conntrack_h323.h>
- #include <linux/netfilter_ipv4/ip_conntrack_amanda.h>
- #include <linux/netfilter_ipv4/ip_conntrack_ftp.h>
- #include <linux/netfilter_ipv4/ip_conntrack_irc.h>
-@@ -69,6 +76,11 @@
- /* per expectation: application helper private data */
- union ip_conntrack_expect_help {
- /* insert conntrack helper private data (expect) here */
-+ struct ip_ct_talk_expect exp_talk_info;
-+ struct ip_ct_rtsp_expect exp_rtsp_info;
-+ struct ip_ct_rsh_expect exp_rsh_info;
-+ struct ip_ct_mms_expect exp_mms_info;
-+ struct ip_ct_h225_expect exp_h225_info;
- struct ip_ct_amanda_expect exp_amanda_info;
- struct ip_ct_ftp_expect exp_ftp_info;
- struct ip_ct_irc_expect exp_irc_info;
-@@ -83,6 +95,11 @@
- /* per conntrack: application helper private data */
- union ip_conntrack_help {
- /* insert conntrack helper private data (master) here */
-+ struct ip_ct_talk_master ct_talk_info;
-+ struct ip_ct_rtsp_master ct_rtsp_info;
-+ struct ip_ct_rsh_master ct_rsh_info;
-+ struct ip_ct_mms_master ct_mms_info;
-+ struct ip_ct_h225_master ct_h225_info;
- struct ip_ct_ftp_master ct_ftp_info;
- struct ip_ct_irc_master ct_irc_info;
- };
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_h323.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_h323.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_h323.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_h323.h 2004-06-20 12:21:50.425421344 +0200
-@@ -0,0 +1,25 @@
-+#ifndef _IP_CONNTRACK_H323_H
-+#define _IP_CONNTRACK_H323_H
-+/* H.323 connection tracking. */
-+
-+/* Default H.225 port */
-+#define H225_PORT 1720
-+
-+/* This structure is per expected connection */
-+struct ip_ct_h225_expect {
-+ u_int16_t port; /* Port of the H.225 helper/RTCP/RTP channel */
-+ enum ip_conntrack_dir dir; /* Direction of the original connection */
-+ unsigned int offset; /* offset of the address in the payload */
-+};
-+
-+/* This structure exists only once per master */
-+struct ip_ct_h225_master {
-+ int is_h225; /* H.225 or H.245 connection */
-+#ifdef CONFIG_IP_NF_NAT_NEEDED
-+ enum ip_conntrack_dir dir; /* Direction of the original connection */
-+ u_int32_t seq[IP_CT_DIR_MAX]; /* Exceptional packet mangling for signal addressess... */
-+ unsigned int offset[IP_CT_DIR_MAX]; /* ...and the offset of the addresses in the payload */
-+#endif
-+};
-+
-+#endif /* _IP_CONNTRACK_H323_H */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_mms.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_mms.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_mms.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_mms.h 2004-06-20 12:22:07.693796152 +0200
-@@ -0,0 +1,16 @@
-+#ifndef _IP_CONNTRACK_MMS_H
-+#define _IP_CONNTRACK_MMS_H
-+/* MMS tracking. */
-+
-+/* This structure is per expected connection */
-+struct ip_ct_mms_expect {
-+ u_int32_t len;
-+ u_int32_t padding;
-+ u_int16_t port;
-+};
-+
-+/* This structure exists only once per master */
-+struct ip_ct_mms_master {
-+};
-+
-+#endif /* _IP_CONNTRACK_MMS_H */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_quake3.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_quake3.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_quake3.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_quake3.h 2004-06-20 12:02:52.000000000 +0200
-@@ -0,0 +1,21 @@
-+#ifndef _IP_CT_QUAKE3
-+#define _IP_CT_QUAKE3
-+
-+/* Don't confuse with 27960, often used as the Server Port */
-+#define QUAKE3_MASTER_PORT 27950
-+
-+struct quake3_search {
-+ const char marker[4]; /* always 0xff 0xff 0xff 0xff ? */
-+ const char *pattern;
-+ size_t plen;
-+};
-+
-+/* This structure is per expected connection */
-+struct ip_ct_quake3_expect {
-+};
-+
-+/* This structure exists only once per master */
-+struct ip_ct_quake3_master {
-+};
-+
-+#endif /* _IP_CT_QUAKE3 */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_rsh.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_rsh.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_rsh.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_rsh.h 2004-06-20 12:22:14.346784744 +0200
-@@ -0,0 +1,28 @@
-+/* RSH extension for IP connection tracking, Version 1.0
-+ * (C) 2002 by Ian (Larry) Latter <Ian.Latter@mq.edu.au>
-+ * based on HW's ip_conntrack_irc.c
-+ *
-+ * ip_conntrack_rsh.c,v 1.0 2002/07/17 14:49:26
-+ *
-+ * 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.
-+ */
-+#ifndef _IP_CONNTRACK_RSH_H
-+#define _IP_CONNTRACK_RSH_H
-+
-+#define RSH_PORT 514
-+
-+/* This structure is per expected connection */
-+struct ip_ct_rsh_expect
-+{
-+ u_int16_t port;
-+};
-+
-+/* This structure exists only once per master */
-+struct ip_ct_rsh_master {
-+};
-+
-+#endif /* _IP_CONNTRACK_RSH_H */
-+
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h 2004-06-20 12:22:20.382867120 +0200
-@@ -0,0 +1,56 @@
-+/*
-+ * RTSP extension for IP connection tracking.
-+ * (C) 2003 by Tom Marshall <tmarshall@real.com>
-+ * based on ip_conntrack_irc.h
-+ *
-+ * 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.
-+ */
-+#ifndef _IP_CONNTRACK_RTSP_H
-+#define _IP_CONNTRACK_RTSP_H
-+
-+/* #define IP_NF_RTSP_DEBUG */
-+#define IP_NF_RTSP_VERSION "0.01"
-+
-+/* port block types */
-+typedef enum {
-+ pb_single, /* client_port=x */
-+ pb_range, /* client_port=x-y */
-+ pb_discon /* client_port=x/y (rtspbis) */
-+} portblock_t;
-+
-+/* We record seq number and length of rtsp headers here, all in host order. */
-+
-+/*
-+ * This structure is per expected connection. It is a member of struct
-+ * ip_conntrack_expect. The TCP SEQ for the conntrack expect is stored
-+ * there and we are expected to only store the length of the data which
-+ * needs replaced. If a packet contains multiple RTSP messages, we create
-+ * one expected connection per message.
-+ *
-+ * We use these variables to mark the entire header block. This may seem
-+ * like overkill, but the nature of RTSP requires it. A header may appear
-+ * multiple times in a message. We must treat two Transport headers the
-+ * same as one Transport header with two entries.
-+ */
-+struct ip_ct_rtsp_expect
-+{
-+ u_int32_t len; /* length of header block */
-+ portblock_t pbtype; /* Type of port block that was requested */
-+ u_int16_t loport; /* Port that was requested, low or first */
-+ u_int16_t hiport; /* Port that was requested, high or second */
-+#if 0
-+ uint method; /* RTSP method */
-+ uint cseq; /* CSeq from request */
-+#endif
-+};
-+
-+/* This structure exists only once per master */
-+struct ip_ct_rtsp_master
-+{
-+ /* Empty (?) */
-+};
-+
-+#endif /* _IP_CONNTRACK_RTSP_H */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_sctp.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_sctp.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_sctp.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_sctp.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_conntrack_sctp.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_conntrack_sctp.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_conntrack_sctp.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_conntrack_sctp.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,25 @@
+#ifndef _IP_CONNTRACK_SCTP_H
+#define _IP_CONNTRACK_SCTP_H
+};
+
+#endif /* _IP_CONNTRACK_SCTP_H */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_talk.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_talk.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_talk.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_talk.h 2004-06-20 12:22:28.016706600 +0200
-@@ -0,0 +1,143 @@
-+#ifndef _IP_CONNTRACK_TALK_H
-+#define _IP_CONNTRACK_TALK_H
-+/* TALK tracking. */
-+
-+#define TALK_PORT 517
-+#define NTALK_PORT 518
-+
-+/* talk structures and constants from <protocols/talkd.h> */
-+
-+/*
-+ * 4.3BSD struct sockaddr
-+ */
-+struct talk_addr {
-+ u_int16_t ta_family;
-+ u_int16_t ta_port;
-+ u_int32_t ta_addr;
-+ u_int32_t ta_junk1;
-+ u_int32_t ta_junk2;
-+};
-+
-+#define TALK_OLD_NSIZE 9
-+#define TALK_NSIZE 12
-+#define TALK_TTY_NSIZE 16
-+
-+/*
-+ * Client->server request message formats.
-+ */
-+struct talk_msg {
-+ u_char type; /* request type, see below */
-+ char l_name[TALK_OLD_NSIZE];/* caller's name */
-+ char r_name[TALK_OLD_NSIZE];/* callee's name */
-+ u_char pad;
-+ u_int32_t id_num; /* message id */
-+ int32_t pid; /* caller's process id */
-+ char r_tty[TALK_TTY_NSIZE];/* callee's tty name */
-+ struct talk_addr addr; /* old (4.3) style */
-+ struct talk_addr ctl_addr; /* old (4.3) style */
-+};
-+
-+struct ntalk_msg {
-+ u_char vers; /* protocol version */
-+ u_char type; /* request type, see below */
-+ u_char answer; /* not used */
-+ u_char pad;
-+ u_int32_t id_num; /* message id */
-+ struct talk_addr addr; /* old (4.3) style */
-+ struct talk_addr ctl_addr; /* old (4.3) style */
-+ int32_t pid; /* caller's process id */
-+ char l_name[TALK_NSIZE];/* caller's name */
-+ char r_name[TALK_NSIZE];/* callee's name */
-+ char r_tty[TALK_TTY_NSIZE];/* callee's tty name */
-+};
-+
-+struct ntalk2_msg {
-+ u_char vers; /* talk protocol version */
-+ u_char type; /* request type */
-+ u_char answer; /* */
-+ u_char extended; /* !0 if additional parts */
-+ u_int32_t id_num; /* message id number (dels) */
-+ struct talk_addr addr; /* target address */
-+ struct talk_addr ctl_addr; /* reply to address */
-+ int32_t pid; /* caller's process id */
-+ char l_name[TALK_NSIZE]; /* caller's name */
-+ char r_name[TALK_NSIZE]; /* callee's name */
-+ char r_tty[TALK_TTY_NSIZE]; /* callee's tty */
-+};
-+
-+/*
-+ * Server->client response message formats.
-+ */
-+struct talk_response {
-+ u_char type; /* type of request message, see below */
-+ u_char answer; /* response to request message, see below */
-+ u_char pad[2];
-+ u_int32_t id_num; /* message id */
-+ struct talk_addr addr; /* address for establishing conversation */
-+};
-+
-+struct ntalk_response {
-+ u_char vers; /* protocol version */
-+ u_char type; /* type of request message, see below */
-+ u_char answer; /* response to request message, see below */
-+ u_char pad;
-+ u_int32_t id_num; /* message id */
-+ struct talk_addr addr; /* address for establishing conversation */
-+};
-+
-+struct ntalk2_response {
-+ u_char vers; /* protocol version */
-+ u_char type; /* type of request message */
-+ u_char answer; /* response to request */
-+ u_char rvers; /* Version of answering vers*/
-+ u_int32_t id_num; /* message id number */
-+ struct talk_addr addr; /* address for connection */
-+ /* This is at the end to compatiblize this with NTALK version. */
-+ char r_name[TALK_NSIZE]; /* callee's name */
-+};
-+
-+#define TALK_STR(data, talk_str, member) ((struct talk_str *)data)->member)
-+#define TALK_RESP(data, ver, member) (ver ? ((struct ntalk_response *)data)->member : ((struct talk_response *)data)->member)
-+#define TALK_MSG(data, ver, member) (ver ? ((struct ntalk_msg *)data)->member : ((struct talk_msg *)data)->member)
-+
-+#define TALK_VERSION 0 /* protocol versions */
-+#define NTALK_VERSION 1
-+#define NTALK2_VERSION 2
-+
-+/* message type values */
-+#define LEAVE_INVITE 0 /* leave invitation with server */
-+#define LOOK_UP 1 /* check for invitation by callee */
-+#define DELETE 2 /* delete invitation by caller */
-+#define ANNOUNCE 3 /* announce invitation by caller */
-+/* NTALK2 */
-+#define REPLY_QUERY 4 /* request reply data from local daemon */
-+
-+/* answer values */
-+#define SUCCESS 0 /* operation completed properly */
-+#define NOT_HERE 1 /* callee not logged in */
-+#define FAILED 2 /* operation failed for unexplained reason */
-+#define MACHINE_UNKNOWN 3 /* caller's machine name unknown */
-+#define PERMISSION_DENIED 4 /* callee's tty doesn't permit announce */
-+#define UNKNOWN_REQUEST 5 /* request has invalid type value */
-+#define BADVERSION 6 /* request has invalid protocol version */
-+#define BADADDR 7 /* request has invalid addr value */
-+#define BADCTLADDR 8 /* request has invalid ctl_addr value */
-+/* NTALK2 */
-+#define NO_CALLER 9 /* no-one calling answer from REPLY */
-+#define TRY_HERE 10 /* Not on this machine, try this */
-+#define SELECTIVE_REFUSAL 11 /* User Filter refusal. */
-+#define MAX_RESPONSE_TYPE 11 /* Make sure this is updated */
-+
-+/* We don't really need much for talk */
-+struct ip_ct_talk_expect
-+{
-+ /* Port that was to be used */
-+ u_int16_t port;
-+};
-+
-+/* This structure exists only once per master */
-+struct ip_ct_talk_master
-+{
-+};
-+
-+#endif /* _IP_CONNTRACK_TALK_H */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_tuple.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2004-01-05 19:42:34.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2004-06-20 12:22:38.036183408 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_conntrack_tuple.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2004-01-05 19:42:34.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2004-07-03 22:36:24.788754400 +0200
@@ -25,6 +25,9 @@
struct {
u_int16_t id;
} u;
/* The protocol. */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_logging.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_logging.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_logging.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_logging.h 2004-06-20 12:23:04.351182920 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_logging.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_logging.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_logging.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_logging.h 2004-07-03 22:37:10.810757992 +0200
@@ -0,0 +1,5 @@
+/* IPv4 macros for the internal logging interface. */
+#ifndef __IP_LOGGING_H
+#define __IP_LOGGING_H
+
+#endif /*__IP_LOGGING_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_pool.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_pool.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_pool.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_pool.h 2004-06-20 12:23:32.177952608 +0200
-@@ -0,0 +1,56 @@
-+#ifndef _IP_POOL_H
-+#define _IP_POOL_H
-+
-+/***************************************************************************/
-+/* 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. */
-+/* */
-+/* This program is distributed in the hope that it will be useful, */
-+/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-+/* GNU General Public License for more details. */
-+/* */
-+/* You should have received a copy of the GNU General Public License */
-+/* along with this program; if not, write to the Free Software */
-+/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA*/
-+/***************************************************************************/
-+
-+/* A sockopt of such quality has hardly ever been seen before on the open
-+ * market! This little beauty, hardly ever used: above 64, so it's
-+ * traditionally used for firewalling, not touched (even once!) by the
-+ * 2.0, 2.2 and 2.4 kernels!
-+ *
-+ * Comes with its own certificate of authenticity, valid anywhere in the
-+ * Free world!
-+ *
-+ * Rusty, 19.4.2000
-+ */
-+#define SO_IP_POOL 81
-+
-+typedef int ip_pool_t; /* pool index */
-+#define IP_POOL_NONE ((ip_pool_t)-1)
-+
-+struct ip_pool_request {
-+ int op;
-+ ip_pool_t index;
-+ u_int32_t addr;
-+ u_int32_t addr2;
-+};
-+
-+/* NOTE: I deliberately break the first cut ippool utility. Nobody uses it. */
-+
-+#define IP_POOL_BAD001 0x00000010
-+
-+#define IP_POOL_FLUSH 0x00000011 /* req.index, no arguments */
-+#define IP_POOL_INIT 0x00000012 /* from addr to addr2 incl. */
-+#define IP_POOL_DESTROY 0x00000013 /* req.index, no arguments */
-+#define IP_POOL_ADD_ADDR 0x00000014 /* add addr to pool */
-+#define IP_POOL_DEL_ADDR 0x00000015 /* del addr from pool */
-+#define IP_POOL_HIGH_NR 0x00000016 /* result in req.index */
-+#define IP_POOL_LOOKUP 0x00000017 /* result in addr and addr2 */
-+#define IP_POOL_USAGE 0x00000018 /* result in addr */
-+#define IP_POOL_TEST_ADDR 0x00000019 /* result (0/1) returned */
-+
-+#endif /*_IP_POOL_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_queue.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_queue.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ip_queue.h 2004-06-09 14:00:52.000000000 +0200
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ip_queue.h 2004-06-20 12:23:43.764191232 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_queue.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_queue.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_queue.h 2004-06-09 14:00:52.000000000 +0200
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_queue.h 2004-07-03 22:37:35.223046760 +0200
@@ -7,7 +7,7 @@
#ifndef _IP_QUEUE_H
#define _IP_QUEUE_H
/* Messages sent from kernel */
typedef struct ipq_packet_msg {
-@@ -39,10 +47,20 @@
+@@ -39,10 +39,20 @@
unsigned char payload[0]; /* Optional replacement packet */
} ipq_verdict_msg_t;
} msg;
} ipq_peer_msg_t;
-@@ -59,6 +77,7 @@
+@@ -59,6 +69,7 @@
#define IPQM_MODE (IPQM_BASE + 1) /* Mode request from peer */
#define IPQM_VERDICT (IPQM_BASE + 2) /* Verdict from peer */
#define IPQM_PACKET (IPQM_BASE + 3) /* Packet from kernel */
+#define IPQM_MAX (IPQM_BASE + 5)
#endif /*_IP_QUEUE_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_account.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_account.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_account.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_account.h 2004-06-20 12:02:53.000000000 +0200
-@@ -0,0 +1,21 @@
-+/*
-+ * accounting match (ipt_account.c)
-+ * (C) 2003,2004 by Piotr Gasid³o (quaker@barbara.eu.org)
-+ *
-+ * Version: 0.1.5
-+ *
-+ * This software is distributed under the terms of GNU GPL
-+ */
-+
-+#ifndef _IPT_ACCOUNT_H_
-+#define _IPT_ACCOUNT_H_
-+
-+#define IPT_ACCOUNT_NAME_LEN 64
-+
-+struct t_ipt_account_info {
-+ char name[IPT_ACCOUNT_NAME_LEN];
-+ u_int32_t network;
-+ u_int32_t netmask;
-+};
-+
-+#endif
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_addrtype.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_addrtype.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_addrtype.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_addrtype.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_addrtype.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_addrtype.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_addrtype.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_addrtype.h 2004-07-03 16:56:45.000000000 +0200
@@ -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;
++ u_int32_t invert_source;
++ u_int32_t invert_dest;
+};
+
+#endif
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_connlimit.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_connlimit.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_connlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_connlimit.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_connlimit.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_connlimit.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_connlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_connlimit.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,12 @@
+#ifndef _IPT_CONNLIMIT_H
+#define _IPT_CONNLIMIT_H
+ struct ipt_connlimit_data *data;
+};
+#endif /* _IPT_CONNLIMIT_H */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_connmark.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_connmark.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_connmark.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_connmark.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_connmark.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_connmark.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_connmark.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_connmark.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,18 @@
+#ifndef _IPT_CONNMARK_H
+#define _IPT_CONNMARK_H
+};
+
+#endif /*_IPT_CONNMARK_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_CONNMARK.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_CONNMARK.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_CONNMARK.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_CONNMARK.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_CONNMARK.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_CONNMARK.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_CONNMARK.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_CONNMARK.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,25 @@
+#ifndef _IPT_CONNMARK_H_target
+#define _IPT_CONNMARK_H_target
+};
+
+#endif /*_IPT_CONNMARK_H_target*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_dstlimit.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_dstlimit.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_dstlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_dstlimit.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_dstlimit.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_dstlimit.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_dstlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_dstlimit.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,39 @@
+#ifndef _IPT_DSTLIMIT_H
+#define _IPT_DSTLIMIT_H
+ } u;
+};
+#endif /*_IPT_DSTLIMIT_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_fuzzy.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_fuzzy.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_fuzzy.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_fuzzy.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_fuzzy.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_fuzzy.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_fuzzy.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_fuzzy.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef _IPT_FUZZY_H
+#define _IPT_FUZZY_H
+};
+
+#endif /*_IPT_FUZZY_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_IMQ.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_IMQ.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_IMQ.h 2004-06-20 12:02:53.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_IMQ.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_IMQ.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_IMQ.h 2004-07-03 16:57:42.000000000 +0200
@@ -0,0 +1,8 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
+};
+
+#endif /* _IPT_IMQ_H */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_IPMARK.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_IPMARK.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_IPMARK.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_IPMARK.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_IPMARK.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_IPMARK.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_IPMARK.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_IPMARK.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,13 @@
+#ifndef _IPT_IPMARK_H_target
+#define _IPT_IPMARK_H_target
+#define IPT_IPMARK_DST 1
+
+#endif /*_IPT_IPMARK_H_target*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_ipv4options.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_ipv4options.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_ipv4options.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_ipv4options.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_ipv4options.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_ipv4options.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_ipv4options.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_ipv4options.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef __ipt_ipv4options_h_included__
+#define __ipt_ipv4options_h_included__
+
+
+#endif /* __ipt_ipv4options_h_included__ */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_mport.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_mport.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_mport.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_mport.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_mport.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_mport.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_mport.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_mport.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,24 @@
+#ifndef _IPT_MPORT_H
+#define _IPT_MPORT_H
+ u_int16_t ports[IPT_MULTI_PORTS]; /* Ports */
+};
+#endif /*_IPT_MPORT_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_NETLINK.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_NETLINK.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_NETLINK.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_NETLINK.h 2004-06-20 12:02:52.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.6.0.orig/include/linux/netfilter_ipv4/ipt_nth.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_nth.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_nth.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_nth.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_nth.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_nth.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_nth.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_nth.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,19 @@
+#ifndef _IPT_NTH_H
+#define _IPT_NTH_H
+};
+
+#endif /*_IPT_NTH_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_osf.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_osf.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_osf.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_osf.h 2004-06-20 12:26:56.140945520 +0200
-@@ -0,0 +1,94 @@
-+/*
-+ * ipt_osf.h
-+ *
-+ * Copyright (c) 2003 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
-+ *
-+ *
-+ * 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ */
-+
-+#ifndef _IPT_OSF_H
-+#define _IPT_OSF_H
-+
-+#define MAXGENRELEN 32
-+#define MAXDETLEN 64
-+
-+#define IPT_OSF_GENRE 1
-+#define IPT_OSF_SMART 2
-+#define IPT_OSF_LOG 4
-+#define IPT_OSF_NETLINK 8
-+
-+#define IPT_OSF_LOGLEVEL_ALL 0
-+#define IPT_OSF_LOGLEVEL_FIRST 1
-+
-+#include <netinet/ip.h>
-+#include <netinet/tcp.h>
-+
-+struct list_head
-+{
-+ struct list_head *prev, *next;
-+};
-+
-+struct ipt_osf_info
-+{
-+ char genre[MAXGENRELEN];
-+ int len;
-+ unsigned long flags;
-+ int loglevel;
-+ int invert; /* UNSUPPORTED */
-+};
-+
-+struct osf_wc
-+{
-+ char wc;
-+ unsigned long val;
-+};
-+
-+/* This struct represents IANA options
-+ * http://www.iana.org/assignments/tcp-parameters
-+ */
-+struct osf_opt
-+{
-+ unsigned char kind;
-+ unsigned char length;
-+ struct osf_wc wc;
-+};
-+
-+struct osf_finger
-+{
-+ struct list_head flist;
-+ struct osf_wc wss;
-+ unsigned char ttl;
-+ unsigned char df;
-+ unsigned long ss;
-+ unsigned char genre[MAXGENRELEN];
-+ unsigned char version[MAXGENRELEN], subtype[MAXGENRELEN];
-+
-+ /* Not needed, but for consistency with original table from Michal Zalewski */
-+ unsigned char details[MAXDETLEN];
-+
-+ int opt_num;
-+ struct osf_opt opt[MAX_IPOPTLEN]; /* In case it is all NOP or EOL */
-+
-+};
-+
-+struct ipt_osf_nlmsg
-+{
-+ struct osf_finger f;
-+ struct iphdr ip;
-+ struct tcphdr tcp;
-+};
-+
-+#endif /* _IPT_OSF_H */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_policy.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_policy.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_policy.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_policy.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_policy.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_policy.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_policy.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_policy.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,52 @@
+#ifndef _IPT_POLICY_H
+#define _IPT_POLICY_H
+};
+
+#endif /* _IPT_POLICY_H */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_pool.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_pool.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_pool.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_pool.h 2004-06-20 12:02:52.000000000 +0200
-@@ -0,0 +1,25 @@
-+#ifndef _IPT_POOL_H
-+#define _IPT_POOL_H
-+
-+#include <linux/netfilter_ipv4/ip_pool.h>
-+
-+#define IPT_POOL_INV_SRC 0x00000001
-+#define IPT_POOL_INV_DST 0x00000002
-+#define IPT_POOL_DEL_SRC 0x00000004
-+#define IPT_POOL_DEL_DST 0x00000008
-+#define IPT_POOL_INV_MOD_SRC 0x00000010
-+#define IPT_POOL_INV_MOD_DST 0x00000020
-+#define IPT_POOL_MOD_SRC_ACCEPT 0x00000040
-+#define IPT_POOL_MOD_DST_ACCEPT 0x00000080
-+#define IPT_POOL_MOD_SRC_DROP 0x00000100
-+#define IPT_POOL_MOD_DST_DROP 0x00000200
-+
-+/* match info */
-+struct ipt_pool_info
-+{
-+ ip_pool_t src;
-+ ip_pool_t dst;
-+ unsigned flags;
-+};
-+
-+#endif /*_IPT_POOL_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_psd.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_psd.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_psd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_psd.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_psd.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_psd.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_psd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_psd.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,40 @@
+#ifndef _IPT_PSD_H
+#define _IPT_PSD_H
+};
+
+#endif /*_IPT_PSD_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_quota.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_quota.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_quota.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_quota.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_quota.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_quota.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_quota.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_quota.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,11 @@
+#ifndef _IPT_QUOTA_H
+#define _IPT_QUOTA_H
+};
+
+#endif /*_IPT_QUOTA_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_random.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_random.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_random.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_random.h 2004-06-20 12:02:52.000000000 +0200
-@@ -0,0 +1,11 @@
-+#ifndef _IPT_RAND_H
-+#define _IPT_RAND_H
-+
-+#include <linux/param.h>
-+#include <linux/types.h>
-+
-+struct ipt_rand_info {
-+ u_int8_t average;
-+};
-+
-+#endif /*_IPT_RAND_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_realm.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_realm.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_realm.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_realm.h 2004-06-20 12:02:52.000000000 +0200
-@@ -0,0 +1,9 @@
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_realm.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_realm.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_realm.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_realm.h 2004-07-03 16:56:45.000000000 +0200
+@@ -0,0 +1,10 @@
+#ifndef _IPT_REALM_H
+#define _IPT_REALM_H
+
+ u_int32_t mask;
+ u_int8_t invert;
+};
-+#endif /*_IPT_REALM_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_ROUTE.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_ROUTE.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_ROUTE.h 2004-06-20 12:02:52.000000000 +0200
++
++#endif /* _IPT_REALM_H */
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_ROUTE.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_ROUTE.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_ROUTE.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,22 @@
+/* Header file for iptables ipt_ROUTE target
+ *
+#define IPT_ROUTE_CONTINUE 0x01
+
+#endif /*_IPT_ROUTE_H_target*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_sctp.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_sctp.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_sctp.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_sctp.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_sctp.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_sctp.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_sctp.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_sctp.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,107 @@
+#ifndef _IPT_SCTP_H_
+#define _IPT_SCTP_H_
+
+#endif /* _IPT_SCTP_H_ */
+
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_string.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_string.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_string.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_string.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_string.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_string.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_string.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_string.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef _IPT_STRING_H
+#define _IPT_STRING_H
+};
+
+#endif /* _IPT_STRING_H */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_time.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_time.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_time.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_time.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_time.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_time.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_time.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef __ipt_time_h_included__
+#define __ipt_time_h_included__
+
+
+#endif /* __ipt_time_h_included__ */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_TTL.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_TTL.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_TTL.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_TTL.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_TTL.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_TTL.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_TTL.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_TTL.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,21 @@
+/* TTL modification module for IP tables
+ * (C) 2000 by Harald Welte <laforge@gnumonks.org> */
+
+
+#endif
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_u32.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_u32.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_u32.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_u32.h 2004-06-20 12:02:52.000000000 +0200
-@@ -0,0 +1,40 @@
-+#ifndef _IPT_U32_H
-+#define _IPT_U32_H
-+#include <linux/netfilter_ipv4/ip_tables.h>
-+
-+enum ipt_u32_ops
-+{
-+ IPT_U32_AND,
-+ IPT_U32_LEFTSH,
-+ IPT_U32_RIGHTSH,
-+ IPT_U32_AT
-+};
-+
-+struct ipt_u32_location_element
-+{
-+ u_int32_t number;
-+ u_int8_t nextop;
-+};
-+struct ipt_u32_value_element
-+{
-+ u_int32_t min;
-+ u_int32_t max;
-+};
-+/* *** any way to allow for an arbitrary number of elements?
-+ for now I settle for a limit of 10 of each */
-+#define U32MAXSIZE 10
-+struct ipt_u32_test
-+{
-+ u_int8_t nnums;
-+ struct ipt_u32_location_element location[U32MAXSIZE+1];
-+ u_int8_t nvalues;
-+ struct ipt_u32_value_element value[U32MAXSIZE+1];
-+};
-+
-+struct ipt_u32
-+{
-+ u_int8_t ntests;
-+ struct ipt_u32_test tests[U32MAXSIZE+1];
-+};
-+
-+#endif /*_IPT_U32_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_XOR.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_XOR.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv4/ipt_XOR.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv4/ipt_XOR.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_XOR.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_XOR.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_XOR.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_XOR.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,9 @@
+#ifndef _IPT_XOR_H
+#define _IPT_XOR_H
+};
+
+#endif /* _IPT_XOR_H */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6_logging.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6_logging.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6_logging.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6_logging.h 2004-06-20 12:10:49.995821904 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6_logging.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6_logging.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6_logging.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6_logging.h 2004-07-03 22:38:16.163822816 +0200
@@ -0,0 +1,5 @@
+/* IPv6 macros for the nternal logging interface. */
+#ifndef __IP6_LOGGING_H
+#define __IP6_LOGGING_H
+
+#endif /*__IP6_LOGGING_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_fuzzy.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_fuzzy.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_fuzzy.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_fuzzy.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6_tables.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6_tables.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6_tables.h 2004-06-23 23:52:58.000000000 +0200
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6_tables.h 2004-07-03 22:41:42.681427368 +0200
+@@ -99,8 +99,6 @@
+ u_int64_t pcnt, bcnt; /* Packet and byte counters */
+ };
+
+-static DECLARE_MUTEX(ip6t_mutex);
+-
+ /* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
+ #define IP6T_F_PROTO 0x01 /* Set if rule cares about upper
+ protocols */
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_fuzzy.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_fuzzy.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_fuzzy.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_fuzzy.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef _IP6T_FUZZY_H
+#define _IP6T_FUZZY_H
+};
+
+#endif /*_IP6T_FUZZY_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_HL.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_HL.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_HL.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_HL.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_HL.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_HL.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_HL.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_HL.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,22 @@
+/* Hop Limit modification module for ip6tables
+ * Maciej Soltysiak <solt@dns.toxicfilms.tv>
+
+
+#endif
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_nth.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_nth.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_nth.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_nth.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_nth.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_nth.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_nth.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_nth.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,19 @@
+#ifndef _IP6T_NTH_H
+#define _IP6T_NTH_H
+};
+
+#endif /*_IP6T_NTH_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_owner.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_owner.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_owner.h 2003-12-15 19:46:58.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_owner.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_owner.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_owner.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_owner.h 2003-12-15 19:46:58.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_owner.h 2004-07-03 16:57:41.000000000 +0200
@@ -6,12 +6,14 @@
#define IP6T_OWNER_GID 0x02
#define IP6T_OWNER_PID 0x04
u_int8_t match, invert; /* flags */
};
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_policy.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_policy.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_policy.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_policy.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_policy.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_policy.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_policy.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_policy.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,52 @@
+#ifndef _IP6T_POLICY_H
+#define _IP6T_POLICY_H
+};
+
+#endif /* _IP6T_POLICY_H */
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_random.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_random.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_random.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_random.h 2004-06-20 12:02:52.000000000 +0200
-@@ -0,0 +1,11 @@
-+#ifndef _IP6T_RAND_H
-+#define _IP6T_RAND_H
-+
-+#include <linux/param.h>
-+#include <linux/types.h>
-+
-+struct ip6t_rand_info {
-+ u_int8_t average;
-+};
-+
-+#endif /*_IP6T_RAND_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_REJECT.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_REJECT.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_REJECT.h 2004-03-05 16:36:39.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_REJECT.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_REJECT.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_REJECT.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_REJECT.h 2004-03-05 16:36:39.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_REJECT.h 2004-07-03 16:57:41.000000000 +0200
@@ -2,15 +2,17 @@
#define _IP6T_REJECT_H
-#endif /*_IPT_REJECT_H*/
+#endif /*_IP6T_REJECT_H*/
-diff -uNr linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_ROUTE.h
---- linux-libc-headers-2.6.6.0.orig/include/linux/netfilter_ipv6/ip6t_ROUTE.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.6.0/include/linux/netfilter_ipv6/ip6t_ROUTE.h 2004-06-20 12:02:52.000000000 +0200
+diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_ROUTE.h
+--- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_ROUTE.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_ROUTE.h 2004-07-03 16:57:41.000000000 +0200
@@ -0,0 +1,22 @@
+/* Header file for iptables ip6t_ROUTE target
+ *
projects / packages / linux-libc-headers.git / commitdiff