anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-08 13:44:56 +02:00
Code Issues Releases Wiki Activity

build: do not attempt to build IPv6 parts if CONFIG_IPV6=n

Browse Source
This commit is contained in:
Jan Engelhardt
2012-07-14 22:55:39 +02:00
parent 7e5a8b0501
commit 0c1375414d
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/changelog.txt
View File

@@ -3,6 +3,7 @@ HEAD
==== ====
Fixes: Fixes:
- SYSRQ: fix double target initialization at module load - SYSRQ: fix double target initialization at module load
- build: do not attempt to build IPv6 parts if CONFIG_IPV6=n
Enhancements: Enhancements:
- TARPIT gained IPv6 support - TARPIT gained IPv6 support

7
extensions/compat_xtables.c
View File

@@ -26,6 +26,9 @@
#endif #endif
#include "compat_skbuff.h" #include "compat_skbuff.h"
#include "compat_xtnu.h" #include "compat_xtnu.h"
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
# define WITH_IPV6 1
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 22) #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 22)
static int xtnu_match_run(const struct sk_buff *skb, static int xtnu_match_run(const struct sk_buff *skb,
@@ -614,7 +617,7 @@ void *HX_memmem(const void *space, size_t spacesize,
} }
EXPORT_SYMBOL_GPL(HX_memmem); EXPORT_SYMBOL_GPL(HX_memmem);
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && defined(WITH_IPV6)
int xtnu_ipv6_skip_exthdr(const struct sk_buff *skb, int start, int xtnu_ipv6_skip_exthdr(const struct sk_buff *skb, int start,
uint8_t *nexthdrp, __be16 *fragoffp) uint8_t *nexthdrp, __be16 *fragoffp)
{ {
@@ -622,7 +625,7 @@ int xtnu_ipv6_skip_exthdr(const struct sk_buff *skb, int start,
} }
#endif #endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) && defined(WITH_IPV6)
int xtnu_ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset, int xtnu_ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
int target, unsigned short *fragoff, int *fragflg) int target, unsigned short *fragoff, int *fragflg)
{ {

9
extensions/xt_TARPIT.c
View File

@@ -55,6 +55,9 @@
#include <net/tcp.h> #include <net/tcp.h>
#include "compat_xtables.h" #include "compat_xtables.h"
#include "xt_TARPIT.h" #include "xt_TARPIT.h"
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
# define WITH_IPV6 1
#endif
static bool xttarpit_tarpit(struct tcphdr *tcph, const struct tcphdr *oth) static bool xttarpit_tarpit(struct tcphdr *tcph, const struct tcphdr *oth)
{ {
@@ -298,6 +301,7 @@ static void tarpit_tcp4(struct sk_buff *oldskb, unsigned int hook,
kfree_skb(nskb); kfree_skb(nskb);
} }
#ifdef WITH_IPV6
static void tarpit_tcp6(struct sk_buff *oldskb, unsigned int hook, static void tarpit_tcp6(struct sk_buff *oldskb, unsigned int hook,
unsigned int mode) unsigned int mode)
{ {
@@ -420,6 +424,7 @@ static void tarpit_tcp6(struct sk_buff *oldskb, unsigned int hook,
free_nskb: free_nskb:
kfree_skb(nskb); kfree_skb(nskb);
} }
#endif
static unsigned int static unsigned int
tarpit_tg4(struct sk_buff **pskb, const struct xt_action_param *par) tarpit_tg4(struct sk_buff **pskb, const struct xt_action_param *par)
@@ -457,6 +462,7 @@ tarpit_tg4(struct sk_buff **pskb, const struct xt_action_param *par)
return NF_DROP; return NF_DROP;
} }
#ifdef WITH_IPV6
static unsigned int static unsigned int
tarpit_tg6(struct sk_buff **pskb, const struct xt_action_param *par) tarpit_tg6(struct sk_buff **pskb, const struct xt_action_param *par)
{ {
@@ -498,6 +504,7 @@ tarpit_tg6(struct sk_buff **pskb, const struct xt_action_param *par)
tarpit_tcp6(*pskb, par->hooknum, info->variant); tarpit_tcp6(*pskb, par->hooknum, info->variant);
return NF_DROP; return NF_DROP;
} }
#endif
static struct xt_target tarpit_tg_reg[] __read_mostly = { static struct xt_target tarpit_tg_reg[] __read_mostly = {
{ {
@@ -510,6 +517,7 @@ static struct xt_target tarpit_tg_reg[] __read_mostly = {
.targetsize = sizeof(struct xt_tarpit_tginfo), .targetsize = sizeof(struct xt_tarpit_tginfo),
.me = THIS_MODULE, .me = THIS_MODULE,
}, },
#ifdef WITH_IPV6
{ {
.name = "TARPIT", .name = "TARPIT",
.revision = 0, .revision = 0,
@@ -520,6 +528,7 @@ static struct xt_target tarpit_tg_reg[] __read_mostly = {
.targetsize = sizeof(struct xt_tarpit_tginfo), .targetsize = sizeof(struct xt_tarpit_tginfo),
.me = THIS_MODULE, .me = THIS_MODULE,
}, },
#endif
}; };
static int __init tarpit_tg_init(void) static int __init tarpit_tg_init(void)