SOURCES (LINUX_2_6): linux-2.6-nf-u32.patch - snap 20051028 for 2....
cieciwa
cieciwa at pld-linux.org
Fri Oct 28 15:01:48 CEST 2005
Author: cieciwa Date: Fri Oct 28 13:01:48 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- snap 20051028 for 2.6.14.
---- Files affected:
SOURCES:
linux-2.6-nf-u32.patch (1.1.2.3 -> 1.1.2.4)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-nf-u32.patch
diff -u SOURCES/linux-2.6-nf-u32.patch:1.1.2.3 SOURCES/linux-2.6-nf-u32.patch:1.1.2.4
--- SOURCES/linux-2.6-nf-u32.patch:1.1.2.3 Fri Sep 16 15:44:09 2005
+++ SOURCES/linux-2.6-nf-u32.patch Fri Oct 28 15:01:43 2005
@@ -4,9 +4,9 @@
net/ipv4/netfilter/ipt_u32.c | 232 +++++++++++++++++++++++++++++++++
4 files changed, 286 insertions(+)
-diff -uNr linux-2.6.13.1/include.orig/linux/netfilter_ipv4/ipt_u32.h linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_u32.h
---- linux-2.6.13.1/include.orig/linux/netfilter_ipv4/ipt_u32.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_u32.h 2005-09-15 10:39:55.322807250 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_u32.h linux-2.6.14/include/linux/netfilter_ipv4/ipt_u32.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_u32.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/include/linux/netfilter_ipv4/ipt_u32.h 2005-10-28 14:47:05.000000000 +0200
@@ -0,0 +1,40 @@
+#ifndef _IPT_U32_H
+#define _IPT_U32_H
@@ -48,9 +48,36 @@
+};
+
+#endif /*_IPT_U32_H*/
-diff -uNr linux-2.6.13.1/net.orig/ipv4/netfilter/ipt_u32.c linux-2.6.13.1/net/ipv4/netfilter/ipt_u32.c
---- linux-2.6.13.1/net.orig/ipv4/netfilter/ipt_u32.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv4/netfilter/ipt_u32.c 2005-09-15 10:39:55.326807500 +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:47:05.000000000 +0200
+@@ -821,5 +821,18 @@
+ Allows altering the ARP packet payload: source and destination
+ hardware and network addresses.
+
++config IP_NF_MATCH_U32
++ tristate 'U32 match support'
++ depends on IP_NF_IPTABLES
++ help
++ U32 allows you to extract quantities of up to 4 bytes from a packet,
++ AND them with specified masks, shift them by specified amounts and
++ test whether the results are in any of a set of specified ranges.
++ The specification of what to extract is general enough to skip over
++ headers with lengths stored in the packet, as in IP or TCP header
++ lengths.
++
++ Details and examples are in the kernel module source.
++
+ 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:47:05.000000000 +0200
+@@ -0,0 +0,1 @@
++obj-$(CONFIG_IP_NF_MATCH_U32) += ipt_u32.o
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/ipt_u32.c linux-2.6.14/net/ipv4/netfilter/ipt_u32.c
+--- linux-2.6.14.org/net/ipv4/netfilter/ipt_u32.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv4/netfilter/ipt_u32.c 2005-10-28 14:47:05.000000000 +0200
@@ -0,0 +1,232 @@
+/* Kernel module to match u32 packet content. */
+
@@ -284,30 +311,3 @@
+
+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:39:20.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Kconfig 2005-09-15 10:39:55.330807750 +0200
-@@ -884,5 +884,18 @@
- If you want to compile it as a module, say M here and read
- Documentation/modules.txt. If unsure, say `N'.
-
-+config IP_NF_MATCH_U32
-+ tristate 'U32 match support'
-+ depends on IP_NF_IPTABLES
-+ help
-+ U32 allows you to extract quantities of up to 4 bytes from a packet,
-+ AND them with specified masks, shift them by specified amounts and
-+ test whether the results are in any of a set of specified ranges.
-+ The specification of what to extract is general enough to skip over
-+ headers with lengths stored in the packet, as in IP or TCP header
-+ lengths.
-+
-+ Details and examples are in the kernel module source.
-+
- 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:39:20.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Makefile 2005-09-15 10:39:55.334808000 +0200
-@@ -0,0 +0,1 @@
-+obj-$(CONFIG_IP_NF_MATCH_U32) += ipt_u32.o
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-nf-u32.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
More information about the pld-cvs-commit
mailing list