anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-06 04:35:12 +02:00
Code Issues Releases Wiki Activity

build: additional compilation fixes for Linux 3.2/3.3

Browse Source
This commit is contained in:
Jan Engelhardt
2012-01-04 21:34:52 +01:00
parent 7a1ad32d1a
commit 076610e3af
6 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/compat_xtables.c
View File

@@ -8,7 +8,9 @@
*/ */
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/kmod.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/version.h> #include <linux/version.h>
@@ -17,6 +19,9 @@
#include <linux/netfilter_arp.h> #include <linux/netfilter_arp.h>
#include <net/ip.h> #include <net/ip.h>
#include <net/route.h> #include <net/route.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
# include <linux/export.h>
#endif
#include "compat_skbuff.h" #include "compat_skbuff.h"
#include "compat_xtnu.h" #include "compat_xtnu.h"

2
extensions/compat_xtables.h
View File

@@ -92,7 +92,7 @@
# define rt_dst(rt) (&(rt)->u.dst) # define rt_dst(rt) (&(rt)->u.dst)
#endif #endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
# define nf_nat_ipv4_multi_range_compat nf_nat_multi_range_compat # define nf_nat_ipv4_multi_range_compat nf_nat_multi_range_compat
# define nf_nat_ipv4_range nf_nat_range # define nf_nat_ipv4_range nf_nat_range
# define NF_NAT_RANGE_MAP_IPS IP_NAT_RANGE_MAP_IPS # define NF_NAT_RANGE_MAP_IPS IP_NAT_RANGE_MAP_IPS

7
extensions/xt_DNETMAP.c
View File

@@ -31,8 +31,13 @@
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include <net/netns/generic.h> #include <net/netns/generic.h>
#endif #endif
#include "xt_DNETMAP.h" #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
# include <net/netfilter/nf_nat.h>
#else
# include <linux/netfilter/nf_nat.h>
#endif
#include "compat_xtables.h" #include "compat_xtables.h"
#include "xt_DNETMAP.h"
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Marek Kierdelewicz <marek@koba.pl>"); MODULE_AUTHOR("Marek Kierdelewicz <marek@koba.pl>");

4
extensions/xt_DNETMAP.h
View File

@@ -8,7 +8,11 @@ enum {
}; };
struct xt_DNETMAP_tginfo { struct xt_DNETMAP_tginfo {
#ifdef __KERNEL__
struct nf_nat_ipv4_multi_range_compat prefix; struct nf_nat_ipv4_multi_range_compat prefix;
#else
struct nf_nat_multi_range_compat prefix;
#endif
__u8 flags; __u8 flags;
__s16 ttl; __s16 ttl;
}; };

1
extensions/xt_STEAL.c
View File

@@ -3,6 +3,7 @@
* written by Jan Engelhardt <jengelh [at] medozas de>, 2008 - 2009 * written by Jan Engelhardt <jengelh [at] medozas de>, 2008 - 2009
* placed in the Public Domain * placed in the Public Domain
*/ */
#include <linux/module.h>
#include <linux/netfilter.h> #include <linux/netfilter.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include "compat_xtables.h" #include "compat_xtables.h"

1
extensions/xt_quota2.c
View File

@@ -12,6 +12,7 @@
* version 2, as published by the Free Software Foundation. * version 2, as published by the Free Software Foundation.
*/ */
#include <linux/list.h> #include <linux/list.h>
#include <linux/module.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>