Re: Call for testing: patch-o-matic-ng (condition filter)

[Tim Gardner <timg@tpi.com>]

[-- Attachment #1: Type: text/plain, Size: 619 bytes --]

Harald,

The condition filter (at least for 2.6) has extra files:

condition/linux/net/ipv6/Makefile.ladd
condition/linux/net/ipv6/Config.in.ladd

The presense of Makefile.ladd will not allow the filter to be applied. I 
suspect Config.in.ladd will cause a similar problem for 2.4.

Attached is a patch that removes these files as well as patches 
ipt_condition.c for 2.6.

ipv6/netfilter/ipt_condition.c compiles with warnings. Since I'm not using it 
(and I'm basically lazy), I'll leave it up to the authors to make it correct 
for 2.6

rtg
-- 
Tim Gardner - timg@tpi.com
www.tpi.com 406-443-5357

[-- Attachment #2: condition.diffs --]
[-- Type: text/x-diff, Size: 2285 bytes --]

diff -r -u --new-file netfilter/patch-o-matic-ng/condition/linux/net/ipv4/netfilter/ipt_condition.c netfilter.wrk/patch-o-matic-ng/condition/linux/net/ipv4/netfilter/ipt_condition.c
--- netfilter/patch-o-matic-ng/condition/linux/net/ipv4/netfilter/ipt_condition.c	2003-12-18 11:47:55.000000000 -0700
+++ netfilter.wrk/patch-o-matic-ng/condition/linux/net/ipv4/netfilter/ipt_condition.c	2003-12-23 07:45:30.000000000 -0700
@@ -17,6 +17,7 @@
 \*-------------------------------------------*/
 
 #include<linux/module.h>
+#include <linux/version.h>
 #include<linux/proc_fs.h>
 #include<linux/spinlock.h>
 #include<linux/string.h>
@@ -90,9 +91,17 @@
 
 
 static int
-match(const struct sk_buff *skb, const struct net_device *in,
-      const struct net_device *out, const void *matchinfo, int offset,
-      const void *hdr, u_int16_t datalen, int *hotdrop)
+match(
+	const struct sk_buff *skb,
+	const struct net_device *in,
+	const struct net_device *out,
+	const void *matchinfo,
+	int offset,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+	const void *hdr,
+	u_int16_t datalen,
+#endif
+	int *hotdrop)
 {
 	const struct condition_info *info =
 	    (const struct condition_info *) matchinfo;
diff -r -u --new-file netfilter/patch-o-matic-ng/condition/linux/net/ipv6/Config.in.ladd netfilter.wrk/patch-o-matic-ng/condition/linux/net/ipv6/Config.in.ladd
--- netfilter/patch-o-matic-ng/condition/linux/net/ipv6/Config.in.ladd	2003-12-20 09:38:19.000000000 -0700
+++ netfilter.wrk/patch-o-matic-ng/condition/linux/net/ipv6/Config.in.ladd	1969-12-31 17:00:00.000000000 -0700
@@ -1,2 +0,0 @@
-  dep_tristate '  MAC address match support' CONFIG_IP6_NF_MATCH_MAC $CONFIG_IP6_NF_IPTABLES
-  dep_tristate '  Condition variable match support' CONFIG_IP6_NF_MATCH_CONDITION $CONFIG_IP6_NF_IPTABLES
diff -r -u --new-file netfilter/patch-o-matic-ng/condition/linux/net/ipv6/Makefile.ladd netfilter.wrk/patch-o-matic-ng/condition/linux/net/ipv6/Makefile.ladd
--- netfilter/patch-o-matic-ng/condition/linux/net/ipv6/Makefile.ladd	2003-12-20 09:38:19.000000000 -0700
+++ netfilter.wrk/patch-o-matic-ng/condition/linux/net/ipv6/Makefile.ladd	1969-12-31 17:00:00.000000000 -0700
@@ -1,2 +0,0 @@
-obj-$(CONFIG_IP6_NF_MATCH_MARK) += ip6t_mark.o
-obj-$(CONFIG_IP6_NF_MATCH_CONDITION) += ip6t_condition.o