KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

netfilter: fix ipt_SET on 2.6.24

Browse source 
SVN-Revision: 10317
This commit is contained in:
Gabor Juhos 2008-01-30 07:03:02 +00:00
parent c4a4fff789
commit fecd04ea67
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
target/linux/generic-2.6/patches-2.6.24/130-netfilter_ipset.patch
View file

@ -7358,7 +7358,7 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_set.c linux-2.6.23.pom2patch.set/n
diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_SET.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_SET.c diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_SET.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_SET.c
--- linux-2.6.23/net/ipv4/netfilter/ipt_SET.c 1970-01-01 01:00:00.000000000 +0100 --- linux-2.6.23/net/ipv4/netfilter/ipt_SET.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_SET.c 2007-10-12 11:52:37.000000000 +0200 +++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_SET.c 2007-10-12 11:52:37.000000000 +0200
@@ -0,0 +1,172 @@ @@ -0,0 +1,179 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de> + * Patrick Schaaf <bof@bof.de>
+ * Martin Josefsson <gandalf@wlug.westbo.se> + * Martin Josefsson <gandalf@wlug.westbo.se>
@ -7387,7 +7387,11 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_SET.c linux-2.6.23.pom2patch.set/n
+#include <linux/netfilter_ipv4/ipt_set.h> +#include <linux/netfilter_ipv4/ipt_set.h>
+ +
+static unsigned int +static unsigned int
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
+target(struct sk_buff *skb,
+#else
+target(struct sk_buff **pskb, +target(struct sk_buff **pskb,
+#endif
+ const struct net_device *in, + const struct net_device *in,
+ const struct net_device *out, + const struct net_device *out,
+ unsigned int hooknum, + unsigned int hooknum,
@ -7402,14 +7406,17 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_SET.c linux-2.6.23.pom2patch.set/n
+#endif +#endif
+{ +{
+ const struct ipt_set_info_target *info = targinfo; + const struct ipt_set_info_target *info = targinfo;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ struct sk_buff *skb = *pskb;
+#endif
+ +
+ if (info->add_set.index != IP_SET_INVALID_ID) + if (info->add_set.index != IP_SET_INVALID_ID)
+ ip_set_addip_kernel(info->add_set.index, + ip_set_addip_kernel(info->add_set.index,
+ *pskb, + skb,
+ info->add_set.flags); + info->add_set.flags);
+ if (info->del_set.index != IP_SET_INVALID_ID) + if (info->del_set.index != IP_SET_INVALID_ID)
+ ip_set_delip_kernel(info->del_set.index, + ip_set_delip_kernel(info->del_set.index,
+ *pskb, + skb,
+ info->del_set.flags); + info->del_set.flags);
+ +
+ return IPT_CONTINUE; + return IPT_CONTINUE;