SOURCES (LINUX_2_6): linux-2.6-nf-random.patch - snap 20051028 for...
cieciwa
cieciwa at pld-linux.org
Fri Oct 28 14:48:06 CEST 2005
Author: cieciwa Date: Fri Oct 28 12:48:06 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- snap 20051028 for 2.6.14.
---- Files affected:
SOURCES:
linux-2.6-nf-random.patch (1.1.2.2 -> 1.1.2.3)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-nf-random.patch
diff -u SOURCES/linux-2.6-nf-random.patch:1.1.2.2 SOURCES/linux-2.6-nf-random.patch:1.1.2.3
--- SOURCES/linux-2.6-nf-random.patch:1.1.2.2 Sat Sep 17 13:39:22 2005
+++ SOURCES/linux-2.6-nf-random.patch Fri Oct 28 14:48:01 2005
@@ -8,9 +8,9 @@
net/ipv6/netfilter/ip6t_random.c | 96 +++++++++++++++++++++++++++++
8 files changed, 234 insertions(+)
-diff -uNr linux-2.6.13.1/include.orig/linux/netfilter_ipv4/ipt_random.h linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_random.h
---- linux-2.6.13.1/include.orig/linux/netfilter_ipv4/ipt_random.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_random.h 2005-09-15 10:28:07.534573250 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_random.h linux-2.6.14/include/linux/netfilter_ipv4/ipt_random.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_random.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/include/linux/netfilter_ipv4/ipt_random.h 2005-10-28 14:33:00.000000000 +0200
@@ -0,0 +1,11 @@
+#ifndef _IPT_RAND_H
+#define _IPT_RAND_H
@@ -23,9 +23,9 @@
+};
+
+#endif /*_IPT_RAND_H*/
-diff -uNr linux-2.6.13.1/include.orig/linux/netfilter_ipv6/ip6t_random.h linux-2.6.13.1/include/linux/netfilter_ipv6/ip6t_random.h
---- linux-2.6.13.1/include.orig/linux/netfilter_ipv6/ip6t_random.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/include/linux/netfilter_ipv6/ip6t_random.h 2005-09-15 10:28:07.538573500 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/include/linux/netfilter_ipv6/ip6t_random.h linux-2.6.14/include/linux/netfilter_ipv6/ip6t_random.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv6/ip6t_random.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/include/linux/netfilter_ipv6/ip6t_random.h 2005-10-28 14:33:00.000000000 +0200
@@ -0,0 +1,11 @@
+#ifndef _IP6T_RAND_H
+#define _IP6T_RAND_H
@@ -38,9 +38,34 @@
+};
+
+#endif /*_IP6T_RAND_H*/
-diff -uNr linux-2.6.13.1/net.orig/ipv4/netfilter/ipt_random.c linux-2.6.13.1/net/ipv4/netfilter/ipt_random.c
---- linux-2.6.13.1/net.orig/ipv4/netfilter/ipt_random.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv4/netfilter/ipt_random.c 2005-09-15 10:28:07.538573500 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/Kconfig linux-2.6.14/net/ipv4/netfilter/Kconfig
+--- linux-2.6.14.org/net/ipv4/netfilter/Kconfig 2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/net/ipv4/netfilter/Kconfig 2005-10-28 14:33:00.000000000 +0200
+@@ -821,5 +821,16 @@
+ Allows altering the ARP packet payload: source and destination
+ hardware and network addresses.
+
++config IP_NF_MATCH_RANDOM
++ tristate 'random match support'
++ depends on IP_NF_IPTABLES
++ help
++ This option adds a `random' match,
++ which allow you to match packets randomly
++ following a given probability.
++
++ If you want to compile it as a module, say M here and read
++ Documentation/modules.txt. If unsure, say `N'.
++
+ endmenu
+
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/Makefile linux-2.6.14/net/ipv4/netfilter/Makefile
+--- linux-2.6.14.org/net/ipv4/netfilter/Makefile 2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/net/ipv4/netfilter/Makefile 2005-10-28 14:33:00.000000000 +0200
+@@ -0,0 +0,1 @@
++obj-$(CONFIG_IP_NF_MATCH_RANDOM) += ipt_random.o
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/ipt_random.c linux-2.6.14/net/ipv4/netfilter/ipt_random.c
+--- linux-2.6.14.org/net/ipv4/netfilter/ipt_random.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv4/netfilter/ipt_random.c 2005-10-28 14:33:00.000000000 +0200
@@ -0,0 +1,92 @@
+/*
+ This is a module which is used for a "random" match support.
@@ -95,8 +120,8 @@
+ const struct ipt_rand_info *info = matchinfo;
+
+ if (matchsize != IPT_ALIGN(sizeof(struct ipt_rand_info))) {
-+ printk("ipt_random: matchsize %u != %u\n", matchsize,
-+ (unsigned)IPT_ALIGN(sizeof(struct ipt_rand_info)));
++ printk("ipt_random: matchsize %u != %Zd\n", matchsize,
++ IPT_ALIGN(sizeof(struct ipt_rand_info)));
+ return 0;
+ }
+
@@ -134,16 +159,16 @@
+
+module_init(init);
+module_exit(fini);
-diff -uNr linux-2.6.13.1/net.orig/ipv4/netfilter/Kconfig linux-2.6.13.1/net/ipv4/netfilter/Kconfig
---- linux-2.6.13.1/net.orig/ipv4/netfilter/Kconfig 2005-09-15 10:25:42.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Kconfig 2005-09-15 10:28:07.546574000 +0200
-@@ -758,5 +758,16 @@
- Documentation/modules.txt. If unsure, say `N'.
-
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv6/netfilter/Kconfig linux-2.6.14/net/ipv6/netfilter/Kconfig
+--- linux-2.6.14.org/net/ipv6/netfilter/Kconfig 2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/net/ipv6/netfilter/Kconfig 2005-10-28 14:33:00.000000000 +0200
+@@ -278,5 +278,16 @@
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. If unsure, say `N'.
-+config IP_NF_MATCH_RANDOM
-+ tristate 'random match support'
-+ depends on IP_NF_IPTABLES
++config IP6_NF_MATCH_RANDOM
++ tristate 'Random match support'
++ depends on IP6_NF_IPTABLES
+ help
+ This option adds a `random' match,
+ which allow you to match packets randomly
@@ -154,14 +179,14 @@
+
endmenu
-diff -uNr linux-2.6.13.1/net.orig/ipv4/netfilter/Makefile linux-2.6.13.1/net/ipv4/netfilter/Makefile
---- linux-2.6.13.1/net.orig/ipv4/netfilter/Makefile 2005-09-15 10:25:42.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Makefile 2005-09-15 10:28:07.546574000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv6/netfilter/Makefile linux-2.6.14/net/ipv6/netfilter/Makefile
+--- linux-2.6.14.org/net/ipv6/netfilter/Makefile 2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/net/ipv6/netfilter/Makefile 2005-10-28 14:33:00.000000000 +0200
@@ -0,0 +0,1 @@
-+obj-$(CONFIG_IP_NF_MATCH_RANDOM) += ipt_random.o
-diff -uNr linux-2.6.13.1/net.orig/ipv6/netfilter/ip6t_random.c linux-2.6.13.1/net/ipv6/netfilter/ip6t_random.c
---- linux-2.6.13.1/net.orig/ipv6/netfilter/ip6t_random.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv6/netfilter/ip6t_random.c 2005-09-15 10:28:07.538573500 +0200
++obj-$(CONFIG_IP6_NF_MATCH_RANDOM) += ip6t_random.o
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv6/netfilter/ip6t_random.c linux-2.6.14/net/ipv6/netfilter/ip6t_random.c
+--- linux-2.6.14.org/net/ipv6/netfilter/ip6t_random.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv6/netfilter/ip6t_random.c 2005-10-28 14:33:00.000000000 +0200
@@ -0,0 +1,96 @@
+/*
+ This is a module which is used for a "random" match support.
@@ -190,7 +215,7 @@
+ const struct net_device *out,
+ const void *matchinfo,
+ int offset,
-+ unsigned protoff,
++ unsigned int protoff,
+ int *hotdrop)
+{
+ /* Parameters from userspace */
@@ -218,8 +243,8 @@
+ const struct ip6t_rand_info *info = matchinfo;
+
+ if (matchsize != IP6T_ALIGN(sizeof(struct ip6t_rand_info))) {
-+ printk("ip6t_random: matchsize %u != %u\n", matchsize,
-+ (unsigned)IP6T_ALIGN(sizeof(struct ip6t_rand_info)));
++ printk("ip6t_random: matchsize %u != %Zd\n", matchsize,
++ IP6T_ALIGN(sizeof(struct ip6t_rand_info)));
+ return 0;
+ }
+
@@ -259,28 +284,3 @@
+
+module_init(init);
+module_exit(fini);
-diff -uNr linux-2.6.13.1/net.orig/ipv6/netfilter/Kconfig linux-2.6.13.1/net/ipv6/netfilter/Kconfig
---- linux-2.6.13.1/net.orig/ipv6/netfilter/Kconfig 2005-09-15 10:12:52.000000000 +0200
-+++ linux-2.6.13.1/net/ipv6/netfilter/Kconfig 2005-09-15 10:28:07.550574250 +0200
-@@ -262,5 +262,16 @@
- If you want to compile it as a module, say M here and read
- Documentation/modules.txt. If unsure, say `N'.
-
-+config IP6_NF_MATCH_RANDOM
-+ tristate 'Random match support'
-+ depends on IP6_NF_IPTABLES
-+ help
-+ This option adds a `random' match,
-+ which allow you to match packets randomly
-+ following a given probability.
-+
-+ If you want to compile it as a module, say M here and read
-+ Documentation/modules.txt. If unsure, say `N'.
-+
- endmenu
-
-diff -uNr linux-2.6.13.1/net.orig/ipv6/netfilter/Makefile linux-2.6.13.1/net/ipv6/netfilter/Makefile
---- linux-2.6.13.1/net.orig/ipv6/netfilter/Makefile 2005-09-15 10:12:52.000000000 +0200
-+++ linux-2.6.13.1/net/ipv6/netfilter/Makefile 2005-09-15 10:28:07.554574500 +0200
-@@ -0,0 +0,1 @@
-+obj-$(CONFIG_IP6_NF_MATCH_RANDOM) += ip6t_random.o
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-nf-random.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
More information about the pld-cvs-commit
mailing list