SOURCES (LINUX_2_6): pom-ng-IPV4OPTSSTRIP-20061213.patch, pom-ng-i...
mguevara
mguevara at pld-linux.org
Thu May 3 17:32:40 CEST 2007
Author: mguevara Date: Thu May 3 15:32:40 2007 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- 2.6.21 netfilter changes
---- Files affected:
SOURCES:
pom-ng-IPV4OPTSSTRIP-20061213.patch (1.1.2.4 -> 1.1.2.5) , pom-ng-ipv4options-20061213.patch (1.1.2.2 -> 1.1.2.3) , pom-ng-set-20061213.patch (1.1.2.2 -> 1.1.2.3) , pom-ng-u32-20061213.patch (1.1.2.2 -> 1.1.2.3) , pom-ng-connlimit-20061213_nf_conntrack_port.patch (1.1.2.1 -> 1.1.2.1.2.1) , linux-2.6-layer7_nf_conntrack_port.patch (1.1.2.1 -> 1.1.2.1.2.1) , pom-ng-ROUTE-20061213.patch (1.1.2.4 -> 1.1.2.5) , pom-ng-TARPIT-20061213.patch (1.1.2.4 -> 1.1.2.5) , pom-ng-mms-conntrack-nat-20061213.patch (1.1.2.3 -> 1.1.2.4) , pom-ng-IPMARK-20061213.patch (1.1.2.4 -> 1.1.2.5) , pom-ng-connlimit-20061213.patch (1.1.2.3 -> 1.1.2.4) , pom-ng-geoip-20061213.patch (1.1.2.2 -> 1.1.2.3) , pom-ng-ipp2p-20061213.patch (1.1.2.3 -> 1.1.2.4) , pom-ng-time-20061213.patch (1.1.2.4 -> 1.1.2.5) , kernel-2.6.18-layer7-2.7.patch (1.1.2.1 -> 1.1.2.2) , linux-2.6.19-imq1.diff (1.1.2.6 -> 1.1.2.7)
---- Diffs:
================================================================
Index: SOURCES/pom-ng-IPV4OPTSSTRIP-20061213.patch
diff -u SOURCES/pom-ng-IPV4OPTSSTRIP-20061213.patch:1.1.2.4 SOURCES/pom-ng-IPV4OPTSSTRIP-20061213.patch:1.1.2.5
--- SOURCES/pom-ng-IPV4OPTSSTRIP-20061213.patch:1.1.2.4 Wed Dec 20 00:11:41 2006
+++ SOURCES/pom-ng-IPV4OPTSSTRIP-20061213.patch Thu May 3 17:32:35 2007
@@ -43,7 +43,7 @@
+#include <linux/skbuff.h>
+#include <net/ip.h>
+#include <net/checksum.h>
-+
++#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter_ipv4/ip_tables.h>
+
+MODULE_AUTHOR("Fabrice MARIE <fabrice at netfilter.org>");
@@ -109,12 +109,12 @@
+
+static int __init init(void)
+{
-+ return ipt_register_target(&ipt_ipv4optsstrip_reg);
++ return xt_register_target(&ipt_ipv4optsstrip_reg);
+}
+
+static void __exit fini(void)
+{
-+ ipt_unregister_target(&ipt_ipv4optsstrip_reg);
++ xt_unregister_target(&ipt_ipv4optsstrip_reg);
+}
+
+module_init(init);
================================================================
Index: SOURCES/pom-ng-ipv4options-20061213.patch
diff -u SOURCES/pom-ng-ipv4options-20061213.patch:1.1.2.2 SOURCES/pom-ng-ipv4options-20061213.patch:1.1.2.3
--- SOURCES/pom-ng-ipv4options-20061213.patch:1.1.2.2 Tue Dec 19 20:25:52 2006
+++ SOURCES/pom-ng-ipv4options-20061213.patch Thu May 3 17:32:35 2007
@@ -61,7 +61,7 @@
diff -NurpP --minimal /home/users/builder/linux-2.6.19/net/ipv4/netfilter/ipt_ipv4options.c linux-2.6.19/net/ipv4/netfilter/ipt_ipv4options.c
--- /home/users/builder/linux-2.6.19/net/ipv4/netfilter/ipt_ipv4options.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19/net/ipv4/netfilter/ipt_ipv4options.c 2006-12-14 10:09:19.000000000 +0100
-@@ -0,0 +1,176 @@
+@@ -0,0 +1,177 @@
+/*
+ This is a module which is used to match ipv4 options.
+ This file is distributed under the terms of the GNU General Public
@@ -78,7 +78,7 @@
+#include <linux/module.h>
+#include <linux/skbuff.h>
+#include <net/ip.h>
-+
++#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter_ipv4/ip_tables.h>
+#include <linux/netfilter_ipv4/ipt_ipv4options.h>
+
@@ -218,8 +218,9 @@
+ return 1;
+}
+
-+static struct ipt_match ipv4options_match = {
++static struct xt_match ipv4options_match = {
+ .name = "ipv4options",
++ .family = AF_INET,
+ .match = match,
+ .matchsize = sizeof(struct ipt_ipv4options_info),
+ .checkentry = checkentry,
@@ -228,12 +229,12 @@
+
+static int __init init(void)
+{
-+ return ipt_register_match(&ipv4options_match);
++ return xt_register_match(&ipv4options_match);
+}
+
+static void __exit fini(void)
+{
-+ ipt_unregister_match(&ipv4options_match);
++ xt_unregister_match(&ipv4options_match);
+}
+
+module_init(init);
================================================================
Index: SOURCES/pom-ng-set-20061213.patch
diff -u SOURCES/pom-ng-set-20061213.patch:1.1.2.2 SOURCES/pom-ng-set-20061213.patch:1.1.2.3
--- SOURCES/pom-ng-set-20061213.patch:1.1.2.2 Mon Apr 30 12:11:32 2007
+++ SOURCES/pom-ng-set-20061213.patch Thu May 3 17:32:35 2007
@@ -6288,7 +6288,7 @@
diff -NurpP --minimal /home/users/builder/linux-2.6.19/net/ipv4/netfilter/ipt_SET.c linux-2.6.19/net/ipv4/netfilter/ipt_SET.c
--- /home/users/builder/linux-2.6.19/net/ipv4/netfilter/ipt_SET.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19/net/ipv4/netfilter/ipt_SET.c 2006-12-14 10:13:41.000000000 +0100
-@@ -0,0 +1,160 @@
+@@ -0,0 +1,161 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem at linux.nu>
+ * Patrick Schaaf <bof at bof.de>
+ * Martin Josefsson <gandalf at wlug.westbo.se>
@@ -6312,6 +6312,7 @@
+#include <linux/version.h>
+#include <net/protocol.h>
+#include <net/checksum.h>
++#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter_ipv4.h>
+#include <linux/netfilter_ipv4/ip_nat_rule.h>
+#include <linux/netfilter_ipv4/ipt_set.h>
@@ -6439,12 +6440,12 @@
+
+static int __init ipt_SET_init(void)
+{
-+ return ipt_register_target(&SET_target);
++ return xt_register_target(&SET_target);
+}
+
+static void __exit ipt_SET_fini(void)
+{
-+ ipt_unregister_target(&SET_target);
++ xt_unregister_target(&SET_target);
+}
+
+module_init(ipt_SET_init);
@@ -6452,7 +6453,7 @@
diff -NurpP --minimal /home/users/builder/linux-2.6.19/net/ipv4/netfilter/ipt_set.c linux-2.6.19/net/ipv4/netfilter/ipt_set.c
--- /home/users/builder/linux-2.6.19/net/ipv4/netfilter/ipt_set.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19/net/ipv4/netfilter/ipt_set.c 2006-12-14 10:13:41.000000000 +0100
-@@ -0,0 +1,142 @@
+@@ -0,0 +1,143 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem at linux.nu>
+ * Patrick Schaaf <bof at bof.de>
+ * Martin Josefsson <gandalf at wlug.westbo.se>
@@ -6469,7 +6470,7 @@
+#include <linux/ip.h>
+#include <linux/skbuff.h>
+#include <linux/version.h>
-+
++#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter_ipv4/ip_tables.h>
+#include <linux/netfilter_ipv4/ip_set.h>
+#include <linux/netfilter_ipv4/ipt_set.h>
@@ -6568,8 +6569,9 @@
+ ip_set_put(info->match_set.index);
+}
+
-+static struct ipt_match set_match = {
++static struct xt_match set_match = {
+ .name = "set",
++ .family = AF_INET,
+ .match = &match,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
+ .matchsize = sizeof(struct ipt_set_info_match),
@@ -6585,12 +6587,12 @@
+
+static int __init ipt_ipset_init(void)
+{
-+ return ipt_register_match(&set_match);
++ return xt_register_match(&set_match);
+}
+
+static void __exit ipt_ipset_fini(void)
+{
-+ ipt_unregister_match(&set_match);
++ xt_unregister_match(&set_match);
+}
+
+module_init(ipt_ipset_init);
================================================================
Index: SOURCES/pom-ng-u32-20061213.patch
diff -u SOURCES/pom-ng-u32-20061213.patch:1.1.2.2 SOURCES/pom-ng-u32-20061213.patch:1.1.2.3
--- SOURCES/pom-ng-u32-20061213.patch:1.1.2.2 Tue Dec 19 20:29:48 2006
+++ SOURCES/pom-ng-u32-20061213.patch Thu May 3 17:32:35 2007
@@ -78,7 +78,7 @@
diff -NurpP --minimal /home/users/builder/linux-2.6.19/net/ipv4/netfilter/ipt_u32.c linux-2.6.19/net/ipv4/netfilter/ipt_u32.c
--- /home/users/builder/linux-2.6.19/net/ipv4/netfilter/ipt_u32.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19/net/ipv4/netfilter/ipt_u32.c 2006-12-14 10:16:23.000000000 +0100
-@@ -0,0 +1,236 @@
+@@ -0,0 +1,237 @@
+/* Kernel module to match u32 packet content. */
+
+/*
@@ -183,7 +183,7 @@
+
+#include <linux/module.h>
+#include <linux/skbuff.h>
-+
++#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter_ipv4/ipt_u32.h>
+#include <linux/netfilter_ipv4/ip_tables.h>
+
@@ -295,8 +295,9 @@
+ return 1;
+}
+
-+static struct ipt_match u32_match = {
++static struct xt_match u32_match = {
+ .name = "u32",
++ .family = AF_INET,
+ .match = &match,
+ .matchsize = sizeof(struct ipt_u32),
+ .checkentry = &checkentry,
@@ -305,12 +306,12 @@
+
+static int __init init(void)
+{
-+ return ipt_register_match(&u32_match);
++ return xt_register_match(&u32_match);
+}
+
+static void __exit fini(void)
+{
-+ ipt_unregister_match(&u32_match);
++ xt_unregister_match(&u32_match);
+}
+
+module_init(init);
================================================================
Index: SOURCES/pom-ng-connlimit-20061213_nf_conntrack_port.patch
diff -u SOURCES/pom-ng-connlimit-20061213_nf_conntrack_port.patch:1.1.2.1 SOURCES/pom-ng-connlimit-20061213_nf_conntrack_port.patch:1.1.2.1.2.1
--- SOURCES/pom-ng-connlimit-20061213_nf_conntrack_port.patch:1.1.2.1 Tue Feb 6 10:11:15 2007
+++ SOURCES/pom-ng-connlimit-20061213_nf_conntrack_port.patch Thu May 3 17:32:35 2007
@@ -10,9 +10,9 @@
* based on ...
*
@@ -14,9 +16,10 @@
- #include <linux/skbuff.h>
#include <linux/version.h>
#include <linux/list.h>
+ #include <linux/netfilter/x_tables.h>
-#include <linux/netfilter_ipv4/ip_conntrack.h>
-#include <linux/netfilter_ipv4/ip_conntrack_core.h>
-#include <linux/netfilter_ipv4/ip_conntrack_tcp.h>
================================================================
Index: SOURCES/linux-2.6-layer7_nf_conntrack_port.patch
diff -u SOURCES/linux-2.6-layer7_nf_conntrack_port.patch:1.1.2.1 SOURCES/linux-2.6-layer7_nf_conntrack_port.patch:1.1.2.1.2.1
--- SOURCES/linux-2.6-layer7_nf_conntrack_port.patch:1.1.2.1 Fri Feb 16 23:50:39 2007
+++ SOURCES/linux-2.6-layer7_nf_conntrack_port.patch Thu May 3 17:32:35 2007
@@ -59,11 +59,12 @@
packets) based on regular expression matching of their application
--- a/net/ipv4/netfilter/ipt_layer7.c 2007-02-16 23:58:06.000000000 +0100
+++ b/net/ipv4/netfilter/ipt_layer7.c 2007-02-17 00:04:09.000000000 +0100
-@@ -18,7 +18,8 @@
+@@ -18,7 +18,9 @@
#include <linux/module.h>
#include <linux/skbuff.h>
-#include <linux/netfilter_ipv4/ip_conntrack.h>
++#include <linux/netfilter/x_tables.h>
+#include <net/netfilter/nf_conntrack.h>
+#include <net/netfilter/nf_conntrack_core.h>
#include <linux/proc_fs.h>
================================================================
Index: SOURCES/pom-ng-ROUTE-20061213.patch
diff -u SOURCES/pom-ng-ROUTE-20061213.patch:1.1.2.4 SOURCES/pom-ng-ROUTE-20061213.patch:1.1.2.5
--- SOURCES/pom-ng-ROUTE-20061213.patch:1.1.2.4 Mon Apr 30 13:45:19 2007
+++ SOURCES/pom-ng-ROUTE-20061213.patch Thu May 3 17:32:35 2007
@@ -92,7 +92,7 @@
diff -NurpP --minimal /home/users/builder/linux-2.6.19/net/ipv4/netfilter/ipt_ROUTE.c linux-2.6.19/net/ipv4/netfilter/ipt_ROUTE.c
--- /home/users/builder/linux-2.6.19/net/ipv4/netfilter/ipt_ROUTE.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19/net/ipv4/netfilter/ipt_ROUTE.c 2006-12-14 10:26:46.000000000 +0100
-@@ -0,0 +1,457 @@
+@@ -0,0 +1,458 @@
+/*
+ * This implements the ROUTE target, which enables you to setup unusual
+ * routes not supported by the standard kernel routing table.
@@ -107,6 +107,7 @@
+#include <linux/module.h>
+#include <linux/skbuff.h>
+#include <linux/ip.h>
++#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter_ipv4/ip_tables.h>
+#include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/netfilter_ipv4/ipt_ROUTE.h>
@@ -539,13 +540,13 @@
+ /* Initialize fake conntrack so that NAT will skip it */
+ route_tee_track.status |= IPS_NAT_DONE_MASK;
+
-+ return ipt_register_target(&ipt_route_reg);
++ return xt_register_target(&ipt_route_reg);
+}
+
+
+static void __exit fini(void)
+{
-+ ipt_unregister_target(&ipt_route_reg);
++ xt_unregister_target(&ipt_route_reg);
+}
+
+module_init(init);
@@ -597,7 +598,7 @@
diff -NurpP --minimal /home/users/builder/linux-2.6.19/net/ipv6/netfilter/ip6t_ROUTE.c linux-2.6.19/net/ipv6/netfilter/ip6t_ROUTE.c
--- /home/users/builder/linux-2.6.19/net/ipv6/netfilter/ip6t_ROUTE.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19/net/ipv6/netfilter/ip6t_ROUTE.c 2006-12-14 10:26:46.000000000 +0100
-@@ -0,0 +1,307 @@
+@@ -0,0 +1,308 @@
+/*
+ * This implements the ROUTE v6 target, which enables you to setup unusual
+ * routes not supported by the standard kernel routing table.
@@ -612,6 +613,7 @@
+#include <linux/module.h>
+#include <linux/skbuff.h>
+#include <linux/ipv6.h>
++#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter_ipv6/ip6_tables.h>
+#include <linux/netfilter_ipv6/ip6t_ROUTE.h>
+#include <linux/netdevice.h>
@@ -890,7 +892,7 @@
+static int __init init(void)
+{
+ printk(KERN_DEBUG "registering ipv6 ROUTE target\n");
-+ if (ip6t_register_target(&ip6t_route_reg))
++ if (xt_register_target(&ip6t_route_reg))
+ return -EINVAL;
+
+ return 0;
@@ -899,7 +901,7 @@
+
+static void __exit fini(void)
+{
-+ ip6t_unregister_target(&ip6t_route_reg);
++ xt_unregister_target(&ip6t_route_reg);
+}
+
+module_init(init);
================================================================
Index: SOURCES/pom-ng-TARPIT-20061213.patch
diff -u SOURCES/pom-ng-TARPIT-20061213.patch:1.1.2.4 SOURCES/pom-ng-TARPIT-20061213.patch:1.1.2.5
--- SOURCES/pom-ng-TARPIT-20061213.patch:1.1.2.4 Mon Apr 30 12:11:32 2007
+++ SOURCES/pom-ng-TARPIT-20061213.patch Thu May 3 17:32:35 2007
@@ -76,7 +76,6 @@
+ * - Reply to TCP !SYN,!RST,!FIN with ACK, window 0 bytes, rate-limited
+ */
+
-+
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/skbuff.h>
@@ -88,6 +87,7 @@
+#include <net/route.h>
+#include <linux/random.h>
+#include <linux/netfilter_ipv4/ip_tables.h>
++#include <linux/netfilter/x_tables.h>
+
+#if 0
+#define DEBUGP printk
@@ -143,7 +143,7 @@
+ return;
+
+ /* Check checksum. */
-+ if (tcp_v4_check(otcph, otcplen, oskb->nh.iph->saddr,
++ if (tcp_v4_check(otcplen, oskb->nh.iph->saddr,
+ oskb->nh.iph->daddr,
+ csum_partial((char *)otcph, otcplen, 0)) != 0)
+ return;
@@ -201,7 +201,7 @@
+
+ /* Adjust TCP checksum */
+ ntcph->check = 0;
-+ ntcph->check = tcp_v4_check(ntcph, sizeof(struct tcphdr),
++ ntcph->check = tcp_v4_check(sizeof(struct tcphdr),
+ nskb->nh.iph->saddr,
+ nskb->nh.iph->daddr,
+ csum_partial((char *)ntcph,
@@ -321,12 +321,12 @@
+
+static int __init init(void)
+{
-+ return ipt_register_target(&ipt_tarpit_reg);
++ return xt_register_target(&ipt_tarpit_reg);
+}
+
+static void __exit fini(void)
+{
-+ ipt_unregister_target(&ipt_tarpit_reg);
++ xt_unregister_target(&ipt_tarpit_reg);
+}
+
+module_init(init);
================================================================
Index: SOURCES/pom-ng-mms-conntrack-nat-20061213.patch
diff -u SOURCES/pom-ng-mms-conntrack-nat-20061213.patch:1.1.2.3 SOURCES/pom-ng-mms-conntrack-nat-20061213.patch:1.1.2.4
--- SOURCES/pom-ng-mms-conntrack-nat-20061213.patch:1.1.2.3 Mon Apr 30 12:11:32 2007
+++ SOURCES/pom-ng-mms-conntrack-nat-20061213.patch Thu May 3 17:32:35 2007
@@ -308,7 +308,7 @@
+#if 0
+ /* Checksum invalid? Ignore. */
+ /* FIXME: Source route IP option packets --RR */
-+ if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
++ if (tcp_v4_check(tcplen, iph->saddr, iph->daddr,
+ csum_partial((char *)tcph, tcplen, 0))) {
+ DEBUGP("mms_help: bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
+ tcph, tcplen, NIPQUAD(iph->saddr),
================================================================
Index: SOURCES/pom-ng-IPMARK-20061213.patch
diff -u SOURCES/pom-ng-IPMARK-20061213.patch:1.1.2.4 SOURCES/pom-ng-IPMARK-20061213.patch:1.1.2.5
--- SOURCES/pom-ng-IPMARK-20061213.patch:1.1.2.4 Mon Apr 30 12:11:32 2007
+++ SOURCES/pom-ng-IPMARK-20061213.patch Thu May 3 17:32:35 2007
@@ -62,7 +62,7 @@
+#include <linux/version.h>
+#include <linux/ip.h>
+#include <net/checksum.h>
-+
++#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter_ipv4/ip_tables.h>
+#include <linux/netfilter_ipv4/ipt_IPMARK.h>
+
@@ -143,12 +143,12 @@
+
+static int __init init(void)
+{
-+ return ipt_register_target(&ipt_ipmark_reg);
++ return xt_register_target(&ipt_ipmark_reg);
+}
+
+static void __exit fini(void)
+{
-+ ipt_unregister_target(&ipt_ipmark_reg);
++ xt_unregister_target(&ipt_ipmark_reg);
+}
+
+module_init(init);
================================================================
Index: SOURCES/pom-ng-connlimit-20061213.patch
diff -u SOURCES/pom-ng-connlimit-20061213.patch:1.1.2.3 SOURCES/pom-ng-connlimit-20061213.patch:1.1.2.4
--- SOURCES/pom-ng-connlimit-20061213.patch:1.1.2.3 Tue Dec 19 21:06:21 2006
+++ SOURCES/pom-ng-connlimit-20061213.patch Thu May 3 17:32:35 2007
@@ -47,7 +47,7 @@
diff -NurpP --minimal linux-2.6.19-pom-ng/net/ipv4/netfilter/ipt_connlimit.c linux-2.6.19/net/ipv4/netfilter/ipt_connlimit.c
--- linux-2.6.19-pom-ng/net/ipv4/netfilter/ipt_connlimit.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19/net/ipv4/netfilter/ipt_connlimit.c 2006-12-14 16:21:04.000000000 +0100
-@@ -0,0 +1,255 @@
+@@ -0,0 +1,257 @@
+/*
+ * netfilter module to limit the number of parallel tcp
+ * connections per IP address.
@@ -64,6 +64,7 @@
+#include <linux/skbuff.h>
+#include <linux/version.h>
+#include <linux/list.h>
++#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/netfilter_ipv4/ip_conntrack_core.h>
+#include <linux/netfilter_ipv4/ip_conntrack_tcp.h>
@@ -280,8 +281,9 @@
+ kfree(info->data);
+}
+
-+static struct ipt_match connlimit_match = {
++static struct xt_match connlimit_match = {
+ .name = "connlimit",
++ .family = AF_INET,
+ .match = &match,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
+ .matchsize = sizeof(struct ipt_connlimit_info),
@@ -293,12 +295,12 @@
+
+static int __init init(void)
+{
-+ return ipt_register_match(&connlimit_match);
++ return xt_register_match(&connlimit_match);
+}
+
+static void __exit fini(void)
+{
-+ ipt_unregister_match(&connlimit_match);
++ xt_unregister_match(&connlimit_match);
+}
+
+module_init(init);
================================================================
Index: SOURCES/pom-ng-geoip-20061213.patch
diff -u SOURCES/pom-ng-geoip-20061213.patch:1.1.2.2 SOURCES/pom-ng-geoip-20061213.patch:1.1.2.3
--- SOURCES/pom-ng-geoip-20061213.patch:1.1.2.2 Thu Dec 14 16:37:19 2006
+++ SOURCES/pom-ng-geoip-20061213.patch Thu May 3 17:32:35 2007
@@ -91,7 +91,7 @@
diff -NurpP --minimal linux-2.6.19-pom-ng/net/ipv4/netfilter/ipt_geoip.c linux-2.6.19/net/ipv4/netfilter/ipt_geoip.c
--- linux-2.6.19-pom-ng/net/ipv4/netfilter/ipt_geoip.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19/net/ipv4/netfilter/ipt_geoip.c 2006-12-14 16:23:13.000000000 +0100
-@@ -0,0 +1,301 @@
+@@ -0,0 +1,302 @@
+/* iptables kernel module for the geoip match
+ *
+ * This program is free software; you can redistribute it and/or modify
@@ -108,7 +108,7 @@
+#include <linux/netdevice.h>
+#include <asm/uaccess.h>
+#include <asm/atomic.h>
-+
++#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter_ipv4/ipt_geoip.h>
+#include <linux/netfilter_ipv4/ip_tables.h>
+
@@ -369,8 +369,9 @@
+ return;
+}
+
-+static struct ipt_match geoip_match = {
++static struct xt_match geoip_match = {
+ .name = "geoip",
++ .family = AF_INET,
+ .match = &match,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
+ .matchsize = sizeof (struct ipt_geoip_info),
@@ -382,12 +383,12 @@
+
+static int __init init(void)
+{
-+ return ipt_register_match(&geoip_match);
++ return xt_register_match(&geoip_match);
+}
+
+static void __exit fini(void)
+{
-+ ipt_unregister_match(&geoip_match);
++ xt_unregister_match(&geoip_match);
+ return;
+}
+
================================================================
Index: SOURCES/pom-ng-ipp2p-20061213.patch
diff -u SOURCES/pom-ng-ipp2p-20061213.patch:1.1.2.3 SOURCES/pom-ng-ipp2p-20061213.patch:1.1.2.4
--- SOURCES/pom-ng-ipp2p-20061213.patch:1.1.2.3 Fri Dec 15 02:10:01 2006
+++ SOURCES/pom-ng-ipp2p-20061213.patch Thu May 3 17:32:35 2007
@@ -66,12 +66,13 @@
diff -NurpP --minimal linux-2.6.19-pom-ng/net/ipv4/netfilter/ipt_ipp2p.c linux-2.6.19/net/ipv4/netfilter/ipt_ipp2p.c
--- linux-2.6.19-pom-ng/net/ipv4/netfilter/ipt_ipp2p.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19/net/ipv4/netfilter/ipt_ipp2p.c 2006-12-14 16:25:11.000000000 +0100
-@@ -0,0 +1,886 @@
+@@ -0,0 +1,888 @@
+#if defined(MODVERSIONS)
+#include <linux/modversions.h>
+#endif
+#include <linux/module.h>
+#include <linux/version.h>
++#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter_ipv4/ip_tables.h>
+#include <linux/netfilter_ipv4/ipt_ipp2p.h>
+#include <net/tcp.h>
@@ -916,7 +917,7 @@
+
+
+
-+static struct ipt_match ipp2p_match = {
++static struct xt_match ipp2p_match = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ { NULL, NULL },
+ "ipp2p",
@@ -927,6 +928,7 @@
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ .name = "ipp2p",
++ .family = AF_INET,
+ .match = &match,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
+ .matchsize = sizeof(struct ipt_p2p_info),
@@ -940,12 +942,12 @@
+static int __init init(void)
+{
+ printk(KERN_INFO "IPP2P v%s loading\n", IPP2P_VERSION);
-+ return ipt_register_match(&ipp2p_match);
++ return xt_register_match(&ipp2p_match);
+}
+
+static void __exit fini(void)
+{
-+ ipt_unregister_match(&ipp2p_match);
++ xt_unregister_match(&ipp2p_match);
+ printk(KERN_INFO "IPP2P v%s unloaded\n", IPP2P_VERSION);
+}
+
================================================================
Index: SOURCES/pom-ng-time-20061213.patch
diff -u SOURCES/pom-ng-time-20061213.patch:1.1.2.4 SOURCES/pom-ng-time-20061213.patch:1.1.2.5
--- SOURCES/pom-ng-time-20061213.patch:1.1.2.4 Mon Apr 30 12:11:32 2007
+++ SOURCES/pom-ng-time-20061213.patch Thu May 3 17:32:35 2007
@@ -57,7 +57,7 @@
diff -NurpP --minimal linux-2.6.19-pom-ng/net/ipv4/netfilter/ipt_time.c linux-2.6.19/net/ipv4/netfilter/ipt_time.c
--- linux-2.6.19-pom-ng/net/ipv4/netfilter/ipt_time.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19/net/ipv4/netfilter/ipt_time.c 2006-12-14 16:26:45.000000000 +0100
-@@ -0,0 +1,198 @@
+@@ -0,0 +1,200 @@
+/*
+ This is a module which is used for time matching
+ It is using some modified code from dietlibc (localtime() function)
@@ -76,6 +76,7 @@
+#include <linux/module.h>
+#include <linux/skbuff.h>
+#include <linux/version.h>
++#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter_ipv4/ip_tables.h>
+#include <linux/netfilter_ipv4/ipt_time.h>
+#include <linux/time.h>
@@ -187,8 +188,9 @@
+ return 1;
+}
+
-+static struct ipt_match time_match = {
++static struct xt_match time_match = {
+ .name = "time",
++ .family = AF_INET,
+ .match = &match,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
+ .matchsize = sizeof(struct ipt_time_info),
@@ -200,12 +202,12 @@
+static int __init init(void)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/pom-ng-IPV4OPTSSTRIP-20061213.patch?r1=1.1.2.4&r2=1.1.2.5&f=u
http://cvs.pld-linux.org/SOURCES/pom-ng-ipv4options-20061213.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/SOURCES/pom-ng-set-20061213.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/SOURCES/pom-ng-u32-20061213.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/SOURCES/pom-ng-connlimit-20061213_nf_conntrack_port.patch?r1=1.1.2.1&r2=1.1.2.1.2.1&f=u
http://cvs.pld-linux.org/SOURCES/linux-2.6-layer7_nf_conntrack_port.patch?r1=1.1.2.1&r2=1.1.2.1.2.1&f=u
http://cvs.pld-linux.org/SOURCES/pom-ng-ROUTE-20061213.patch?r1=1.1.2.4&r2=1.1.2.5&f=u
http://cvs.pld-linux.org/SOURCES/pom-ng-TARPIT-20061213.patch?r1=1.1.2.4&r2=1.1.2.5&f=u
http://cvs.pld-linux.org/SOURCES/pom-ng-mms-conntrack-nat-20061213.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/SOURCES/pom-ng-IPMARK-20061213.patch?r1=1.1.2.4&r2=1.1.2.5&f=u
http://cvs.pld-linux.org/SOURCES/pom-ng-connlimit-20061213.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/SOURCES/pom-ng-geoip-20061213.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/SOURCES/pom-ng-ipp2p-20061213.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/SOURCES/pom-ng-time-20061213.patch?r1=1.1.2.4&r2=1.1.2.5&f=u
http://cvs.pld-linux.org/SOURCES/kernel-2.6.18-layer7-2.7.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/SOURCES/linux-2.6.19-imq1.diff?r1=1.1.2.6&r2=1.1.2.7&f=u
More information about the pld-cvs-commit
mailing list