Author: cieciwa Date: Tue Mar 28 12:33:46 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- *-talk removed.
---- Files affected:
SOURCES:
pom-ng-20060328.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/pom-ng-20060328.patch
diff -u SOURCES/pom-ng-20060328.patch:1.1.2.1
SOURCES/pom-ng-20060328.patch:1.1.2.2
--- SOURCES/pom-ng-20060328.patch:1.1.2.1 Tue Mar 28 11:05:06 2006
+++ SOURCES/pom-ng-20060328.patch Tue Mar 28 14:33:41 2006
@@ -1,6 +1,114 @@
-diff -Nur linux-2.6.16.org/include/linux/netfilter_helpers.h
linux-2.6.16/include/linux/netfilter_helpers.h
+ include/linux/netfilter_helpers.h | 133 +
+ include/linux/netfilter_ipv4/ip_conntrack.h | 2
+ include/linux/netfilter_ipv4/ip_conntrack_h323.h | 38
+ include/linux/netfilter_ipv4/ip_conntrack_mms.h | 36
+ include/linux/netfilter_ipv4/ip_conntrack_quake3.h | 22
+ include/linux/netfilter_ipv4/ip_conntrack_rpc.h | 71
+ include/linux/netfilter_ipv4/ip_conntrack_rtsp.h | 56
+ include/linux/netfilter_ipv4/ip_conntrack_sip.h | 78
+ include/linux/netfilter_ipv4/ip_queue.h | 13
+ include/linux/netfilter_ipv4/ip_set.h | 498 +++++
+ include/linux/netfilter_ipv4/ip_set_iphash.h | 29
+ include/linux/netfilter_ipv4/ip_set_ipmap.h | 56
+ include/linux/netfilter_ipv4/ip_set_ipporthash.h | 33
+ include/linux/netfilter_ipv4/ip_set_iptree.h | 39
+ include/linux/netfilter_ipv4/ip_set_jhash.h | 148 +
+ include/linux/netfilter_ipv4/ip_set_macipmap.h | 38
+ include/linux/netfilter_ipv4/ip_set_malloc.h | 116 +
+ include/linux/netfilter_ipv4/ip_set_nethash.h | 54
+ include/linux/netfilter_ipv4/ip_set_portmap.h | 25
+ include/linux/netfilter_ipv4/ipt_IPMARK.h | 13
+ include/linux/netfilter_ipv4/ipt_ROUTE.h | 23
+ include/linux/netfilter_ipv4/ipt_XOR.h | 9
+ include/linux/netfilter_ipv4/ipt_account.h | 26
+ include/linux/netfilter_ipv4/ipt_connlimit.h | 12
+ include/linux/netfilter_ipv4/ipt_expire.h | 32
+ include/linux/netfilter_ipv4/ipt_fuzzy.h | 21
+ include/linux/netfilter_ipv4/ipt_geoip.h | 50
+ include/linux/netfilter_ipv4/ipt_ipp2p.h | 29
+ include/linux/netfilter_ipv4/ipt_ipv4options.h | 21
+ include/linux/netfilter_ipv4/ipt_nth.h | 19
+ include/linux/netfilter_ipv4/ipt_osf.h | 151 +
+ include/linux/netfilter_ipv4/ipt_policy.h | 38
+ include/linux/netfilter_ipv4/ipt_psd.h | 40
+ include/linux/netfilter_ipv4/ipt_quota.h | 12
+ include/linux/netfilter_ipv4/ipt_random.h | 11
+ include/linux/netfilter_ipv4/ipt_rpc.h | 35
+ include/linux/netfilter_ipv4/ipt_set.h | 21
+ include/linux/netfilter_ipv4/ipt_time.h | 18
+ include/linux/netfilter_ipv4/ipt_u32.h | 40
+ include/linux/netfilter_ipv6/ip6t_ROUTE.h | 23
+ include/linux/netfilter_ipv6/ip6t_expire.h | 32
+ include/linux/netfilter_ipv6/ip6t_fuzzy.h | 21
+ include/linux/netfilter_ipv6/ip6t_nth.h | 19
+ include/linux/netfilter_ipv6/ip6t_policy.h | 38
+ include/linux/netfilter_ipv6/ip6t_random.h | 11
+ include/linux/netfilter_mime.h | 89
+ net/ipv4/netfilter/Kconfig | 579 ++++++
+ net/ipv4/netfilter/Makefile | 68
+ net/ipv4/netfilter/asn1_per.c | 353 +++
+ net/ipv4/netfilter/asn1_per.h | 83
+ net/ipv4/netfilter/ip_conntrack_h323_core.c | 37
+ net/ipv4/netfilter/ip_conntrack_h323_h225.c | 408 ++++
+ net/ipv4/netfilter/ip_conntrack_h323_h245.c | 969 ++++++++++
+ net/ipv4/netfilter/ip_conntrack_mms.c | 352 +++
+ net/ipv4/netfilter/ip_conntrack_quake3.c | 201 ++
+ net/ipv4/netfilter/ip_conntrack_rpc_tcp.c | 554 +++++
+ net/ipv4/netfilter/ip_conntrack_rpc_udp.c | 527 +++++
+ net/ipv4/netfilter/ip_conntrack_rtsp.c | 531 +++++
+ net/ipv4/netfilter/ip_conntrack_sip.c | 412 ++++
+ net/ipv4/netfilter/ip_nat_h323.c | 196 ++
+ net/ipv4/netfilter/ip_nat_mms.c | 195 ++
+ net/ipv4/netfilter/ip_nat_quake3.c | 97 +
+ net/ipv4/netfilter/ip_nat_rtsp.c | 504 +++++
+ net/ipv4/netfilter/ip_nat_sip.c | 249 ++
+ net/ipv4/netfilter/ip_queue.c | 35
+ net/ipv4/netfilter/ip_set.c | 1992
+++++++++++++++++++++
+ net/ipv4/netfilter/ip_set_iphash.c | 398 ++++
+ net/ipv4/netfilter/ip_set_ipmap.c | 327 +++
+ net/ipv4/netfilter/ip_set_ipporthash.c | 524 +++++
+ net/ipv4/netfilter/ip_set_iptree.c | 544 +++++
+ net/ipv4/netfilter/ip_set_macipmap.c | 353 +++
+ net/ipv4/netfilter/ip_set_nethash.c | 466 ++++
+ net/ipv4/netfilter/ip_set_portmap.c | 334 +++
+ net/ipv4/netfilter/ipt_IPMARK.c | 79
+ net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c | 87
+ net/ipv4/netfilter/ipt_ROUTE.c | 463 ++++
+ net/ipv4/netfilter/ipt_SET.c | 128 +
+ net/ipv4/netfilter/ipt_TARPIT.c | 294 +++
+ net/ipv4/netfilter/ipt_XOR.c | 117 +
+ net/ipv4/netfilter/ipt_account.c | 937 +++++++++
+ net/ipv4/netfilter/ipt_connlimit.c | 228 ++
+ net/ipv4/netfilter/ipt_expire.c | 563 +++++
+ net/ipv4/netfilter/ipt_fuzzy.c | 185 +
+ net/ipv4/netfilter/ipt_geoip.c | 275 ++
+ net/ipv4/netfilter/ipt_ipp2p.c | 640 ++++++
+ net/ipv4/netfilter/ipt_iprange.c | 14
+ net/ipv4/netfilter/ipt_ipv4options.c | 172 +
+ net/ipv4/netfilter/ipt_nth.c | 166 +
+ net/ipv4/netfilter/ipt_osf.c | 862 +++++++++
+ net/ipv4/netfilter/ipt_policy.c | 60
+ net/ipv4/netfilter/ipt_psd.c | 358 +++
+ net/ipv4/netfilter/ipt_quota.c | 96 +
+ net/ipv4/netfilter/ipt_random.c | 92
+ net/ipv4/netfilter/ipt_rpc.c | 443 ++++
+ net/ipv4/netfilter/ipt_set.c | 112 +
+ net/ipv4/netfilter/ipt_time.c | 178 +
+ net/ipv4/netfilter/ipt_u32.c | 232 ++
+ net/ipv4/netfilter/ipt_unclean.c | 611 ++++++
+ net/ipv6/ipv6_syms.c | 1
+ net/ipv6/netfilter/Kconfig | 79
+ net/ipv6/netfilter/Makefile | 8
+ net/ipv6/netfilter/ip6t_ROUTE.c | 308 +++
+ net/ipv6/netfilter/ip6t_expire.c | 566 +++++
+ net/ipv6/netfilter/ip6t_fuzzy.c | 188 +
+ net/ipv6/netfilter/ip6t_nth.c | 173 +
+ net/ipv6/netfilter/ip6t_policy.c | 74
+ net/ipv6/netfilter/ip6t_random.c | 96 +
+ 107 files changed, 22404 insertions(+), 108 deletions(-)
+diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_helpers.h
linux-2.6.16/include/linux/netfilter_helpers.h
--- linux-2.6.16.org/include/linux/netfilter_helpers.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_helpers.h 2006-03-28
10:24:46.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_helpers.h 2006-03-28
14:21:43.000000000 +0200
@@ -0,0 +1,133 @@
+/*
+ * Helpers for netfiler modules. This file provides implementations for basic
@@ -135,30 +243,28 @@
+#endif /* __KERNEL__ */
+
+#endif /* _NETFILTER_HELPERS_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack.h
2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack.h 2006-03-28
10:24:50.000000000 +0200
-@@ -29,6 +29,8 @@
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack.h 2006-03-28
14:25:11.000000000 +0200
+@@ -29,6 +29,7 @@
};
/* Add protocol helper include file here */
-+#include <linux/netfilter_ipv4/ip_conntrack_talk.h>
+#include <linux/netfilter_ipv4/ip_conntrack_mms.h>
#include <linux/netfilter_ipv4/ip_conntrack_pptp.h>
#include <linux/netfilter_ipv4/ip_conntrack_amanda.h>
#include <linux/netfilter_ipv4/ip_conntrack_ftp.h>
-@@ -37,6 +39,8 @@
+@@ -37,6 +38,7 @@
/* 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_mms_master ct_mms_info;
struct ip_ct_pptp_master ct_pptp_info;
struct ip_ct_ftp_master ct_ftp_info;
struct ip_ct_irc_master ct_irc_info;
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_h323.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_h323.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_h323.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_h323.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_h323.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_h323.h
2006-03-28 10:23:03.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_h323.h
2006-03-28 14:21:43.000000000 +0200
@@ -0,0 +1,38 @@
+#ifndef _IP_CONNTRACK_H323_H
+#define _IP_CONNTRACK_H323_H
@@ -198,9 +304,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _IP_CONNTRACK_H323_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_mms.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_mms.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_mms.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_mms.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_mms.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_mms.h
2006-03-28 10:23:49.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_mms.h
2006-03-28 14:21:43.000000000 +0200
@@ -0,0 +1,36 @@
+#ifndef _IP_CONNTRACK_MMS_H
+#define _IP_CONNTRACK_MMS_H
@@ -238,9 +344,9 @@
+ struct ip_conntrack_expect *exp);
+#endif
+#endif /* _IP_CONNTRACK_MMS_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_quake3.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_quake3.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_quake3.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_quake3.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_quake3.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_quake3.h
2006-03-28 10:24:34.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_quake3.h
2006-03-28 14:21:43.000000000 +0200
@@ -0,0 +1,22 @@
+#ifndef _IP_CT_QUAKE3
+#define _IP_CT_QUAKE3
@@ -264,9 +370,9 @@
+
+extern unsigned int (*ip_nat_quake3_hook)(struct ip_conntrack_expect *exp);
+#endif /* _IP_CT_QUAKE3 */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_rpc.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_rpc.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_rpc.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_rpc.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_rpc.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_rpc.h
2006-03-28 10:24:39.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_rpc.h
2006-03-28 14:21:43.000000000 +0200
@@ -0,0 +1,71 @@
+/* RPC extension for IP connection tracking, Version 2.2
+ * (C) 2000 by Marcelo Barbosa Lima <[EMAIL PROTECTED]>
@@ -339,9 +445,9 @@
+}
+
+#endif /* _IP_CONNTRACK_RPC_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
2006-03-28 10:24:46.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
2006-03-28 14:21:43.000000000 +0200
@@ -0,0 +1,56 @@
+/*
+ * RTSP extension for IP connection tracking.
@@ -399,9 +505,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _IP_CONNTRACK_RTSP_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_sip.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_sip.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_sip.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_sip.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_sip.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_sip.h
2006-03-28 10:24:48.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_sip.h
2006-03-28 14:21:43.000000000 +0200
@@ -0,0 +1,78 @@
+#ifndef __IP_CONNTRACK_SIP_H__
+#define __IP_CONNTRACK_SIP_H__
@@ -481,176 +587,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* __IP_CONNTRACK_SIP_H__ */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_talk.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_talk.h
---- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_talk.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_talk.h
2006-03-28 10:24:50.000000000 +0200
-@@ -0,0 +1,163 @@
-+#ifndef _IP_CONNTRACK_TALK_H
-+#define _IP_CONNTRACK_TALK_H
-+/* TALK tracking. */
-+
-+#ifdef __KERNEL__
-+#include <linux/in.h>
-+#include <linux/netfilter_ipv4/lockhelp.h>
-+
-+/* Protects talk part of conntracks */
-+DECLARE_LOCK_EXTERN(ip_talk_lock);
-+#endif
-+
-+
-+#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 */
-+
-+/* This structure exists only once per master */
-+struct ip_ct_talk_master
-+{
-+};
-+
-+struct ip_conntrack;
-+struct ip_conntrack_expect;
-+
-+extern unsigned int (*ip_nat_talk_resp_hook)(struct sk_buff **pskb,
-+ struct ip_conntrack_expect *exp,
-+ u_char type,
-+ u_char answer,
-+ struct talk_addr *addr);
-+
-+extern unsigned int (*ip_nat_talk_msg_hook)(struct sk_buff **pskb,
-+ struct ip_conntrack *ct,
-+ u_char type,
-+ struct talk_addr *addr,
-+ struct talk_addr *ctl_addr);
-+
-+
-+void ip_ct_talk_expect(struct ip_conntrack *ct, struct ip_conntrack_expect
*exp);
-+void ip_ct_ntalk_expect(struct ip_conntrack *ct, struct ip_conntrack_expect
*exp);
-+#endif /* _IP_CONNTRACK_TALK_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_queue.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_queue.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_queue.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_queue.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_queue.h 2006-03-20
06:53:29.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_queue.h 2006-03-28
10:23:06.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_queue.h 2006-03-28
14:21:43.000000000 +0200
@@ -47,10 +47,20 @@
unsigned char payload[0]; /* Optional replacement packet */
} ipq_verdict_msg_t;
@@ -681,9 +620,9 @@
+#define IPQM_MAX (IPQM_BASE + 5)
#endif /*_IP_QUEUE_H*/
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set.h 2006-03-28
10:14:15.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set.h 2006-03-28
14:21:43.000000000 +0200
@@ -0,0 +1,498 @@
+#ifndef _IP_SET_H
+#define _IP_SET_H
@@ -1183,9 +1122,9 @@
+#endif /* __KERNEL__ */
+
+#endif /*_IP_SET_H*/
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_iphash.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iphash.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_iphash.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iphash.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_iphash.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iphash.h 2006-03-28
10:14:15.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iphash.h 2006-03-28
14:21:43.000000000 +0200
@@ -0,0 +1,29 @@
+#ifndef __IP_SET_IPHASH_H
+#define __IP_SET_IPHASH_H
@@ -1216,9 +1155,9 @@
+};
+
+#endif /* __IP_SET_IPHASH_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_ipmap.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipmap.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_ipmap.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipmap.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_ipmap.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipmap.h 2006-03-28
10:14:15.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipmap.h 2006-03-28
14:21:43.000000000 +0200
@@ -0,0 +1,56 @@
+#ifndef __IP_SET_IPMAP_H
+#define __IP_SET_IPMAP_H
@@ -1276,9 +1215,9 @@
+}
+
+#endif /* __IP_SET_IPMAP_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_ipporthash.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipporthash.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_ipporthash.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipporthash.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_ipporthash.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipporthash.h
2006-03-28 10:14:15.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipporthash.h
2006-03-28 14:21:43.000000000 +0200
@@ -0,0 +1,33 @@
+#ifndef __IP_SET_IPPORTHASH_H
+#define __IP_SET_IPPORTHASH_H
@@ -1313,9 +1252,9 @@
+};
+
+#endif /* __IP_SET_IPPORTHASH_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_iptree.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iptree.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_iptree.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iptree.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_iptree.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iptree.h 2006-03-28
10:14:15.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iptree.h 2006-03-28
14:21:43.000000000 +0200
@@ -0,0 +1,39 @@
+#ifndef __IP_SET_IPTREE_H
+#define __IP_SET_IPTREE_H
@@ -1356,9 +1295,9 @@
+};
+
+#endif /* __IP_SET_IPTREE_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_jhash.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_jhash.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_jhash.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_jhash.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_jhash.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_jhash.h 2006-03-28
10:14:15.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_jhash.h 2006-03-28
14:21:43.000000000 +0200
@@ -0,0 +1,148 @@
+#ifndef _LINUX_IPSET_JHASH_H
+#define _LINUX_IPSET_JHASH_H
@@ -1508,9 +1447,9 @@
+}
+
+#endif /* _LINUX_IPSET_JHASH_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_macipmap.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_macipmap.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_macipmap.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_macipmap.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_macipmap.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_macipmap.h
2006-03-28 10:14:15.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_macipmap.h
2006-03-28 14:21:43.000000000 +0200
@@ -0,0 +1,38 @@
+#ifndef __IP_SET_MACIPMAP_H
+#define __IP_SET_MACIPMAP_H
@@ -1550,9 +1489,9 @@
+};
+
+#endif /* __IP_SET_MACIPMAP_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_malloc.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_malloc.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_malloc.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_malloc.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_malloc.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_malloc.h 2006-03-28
10:14:15.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_malloc.h 2006-03-28
14:21:43.000000000 +0200
@@ -0,0 +1,116 @@
+#ifndef _IP_SET_MALLOC_H
+#define _IP_SET_MALLOC_H
@@ -1670,9 +1609,9 @@
+#endif /* __KERNEL__ */
+
+#endif /*_IP_SET_MALLOC_H*/
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_nethash.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_nethash.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_nethash.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_nethash.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_nethash.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_nethash.h 2006-03-28
10:14:15.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_nethash.h 2006-03-28
14:21:43.000000000 +0200
@@ -0,0 +1,54 @@
+#ifndef __IP_SET_NETHASH_H
+#define __IP_SET_NETHASH_H
@@ -1728,9 +1667,9 @@
+}
+
+#endif /* __IP_SET_NETHASH_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_portmap.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_portmap.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_portmap.h
linux-2.6.16/include/linux/netfilter_ipv4/ip_set_portmap.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_portmap.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_portmap.h 2006-03-28
10:14:15.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_portmap.h 2006-03-28
14:21:44.000000000 +0200
@@ -0,0 +1,25 @@
+#ifndef __IP_SET_PORTMAP_H
+#define __IP_SET_PORTMAP_H
@@ -1757,9 +1696,9 @@
+};
+
+#endif /* __IP_SET_PORTMAP_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_IPMARK.h
linux-2.6.16/include/linux/netfilter_ipv4/ipt_IPMARK.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_IPMARK.h
linux-2.6.16/include/linux/netfilter_ipv4/ipt_IPMARK.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_IPMARK.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_IPMARK.h 2006-03-28
10:17:07.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_IPMARK.h 2006-03-28
14:21:44.000000000 +0200
@@ -0,0 +1,13 @@
+#ifndef _IPT_IPMARK_H_target
+#define _IPT_IPMARK_H_target
@@ -1774,9 +1713,9 @@
+#define IPT_IPMARK_DST 1
+
+#endif /*_IPT_IPMARK_H_target*/
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_ROUTE.h
linux-2.6.16/include/linux/netfilter_ipv4/ipt_ROUTE.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_ROUTE.h
linux-2.6.16/include/linux/netfilter_ipv4/ipt_ROUTE.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_ROUTE.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_ROUTE.h 2006-03-28
10:20:12.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_ROUTE.h 2006-03-28
14:21:44.000000000 +0200
@@ -0,0 +1,23 @@
+/* Header file for iptables ipt_ROUTE target
+ *
@@ -1801,9 +1740,9 @@
+#define IPT_ROUTE_TEE 0x02
+
+#endif /*_IPT_ROUTE_H_target*/
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_XOR.h
linux-2.6.16/include/linux/netfilter_ipv4/ipt_XOR.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_XOR.h
linux-2.6.16/include/linux/netfilter_ipv4/ipt_XOR.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_XOR.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_XOR.h 2006-03-28
10:20:20.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_XOR.h 2006-03-28
14:21:44.000000000 +0200
@@ -0,0 +1,9 @@
+#ifndef _IPT_XOR_H
+#define _IPT_XOR_H
@@ -1814,9 +1753,9 @@
+};
+
+#endif /* _IPT_XOR_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_account.h
linux-2.6.16/include/linux/netfilter_ipv4/ipt_account.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_account.h
linux-2.6.16/include/linux/netfilter_ipv4/ipt_account.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_account.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_account.h 2006-03-28
10:20:22.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_account.h 2006-03-28
14:21:44.000000000 +0200
@@ -0,0 +1,26 @@
+/*
+ * accounting match (ipt_account.c)
@@ -1844,9 +1783,9 @@
+
+#endif
+
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_connlimit.h
linux-2.6.16/include/linux/netfilter_ipv4/ipt_connlimit.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_connlimit.h
linux-2.6.16/include/linux/netfilter_ipv4/ipt_connlimit.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_connlimit.h
1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_connlimit.h 2006-03-28
10:11:32.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_connlimit.h 2006-03-28
14:21:44.000000000 +0200
@@ -0,0 +1,12 @@
+#ifndef _IPT_CONNLIMIT_H
+#define _IPT_CONNLIMIT_H
@@ -1860,9 +1799,9 @@
+ struct ipt_connlimit_data *data;
+};
+#endif /* _IPT_CONNLIMIT_H */
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_expire.h
linux-2.6.16/include/linux/netfilter_ipv4/ipt_expire.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_expire.h
linux-2.6.16/include/linux/netfilter_ipv4/ipt_expire.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_expire.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_expire.h 2006-03-28
10:06:19.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_expire.h 2006-03-28
14:21:44.000000000 +0200
@@ -0,0 +1,32 @@
+/* This module matches until it expires, at which point the entire
+ * rule is deleted
@@ -1896,9 +1835,9 @@
+};
+
+#endif
-diff -Nur linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_fuzzy.h
linux-2.6.16/include/linux/netfilter_ipv4/ipt_fuzzy.h
+diff -Nur --exclude '*orig'
linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_fuzzy.h
linux-2.6.16/include/linux/netfilter_ipv4/ipt_fuzzy.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_fuzzy.h 1970-01-01
01:00:00.000000000 +0100
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/pom-ng-20060328.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
