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

build: remove support for Linux 4.3

Browse Source
This commit is contained in:
Jan Engelhardt
2018-02-12 14:55:45 +01:00
parent 215b3c5b12
commit 7682cc8c34
5 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -59,7 +59,7 @@ if test -n "$kbuilddir"; then
echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 12; then if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 12; then
echo "WARNING: That kernel version is not officially supported yet. Continue at own luck."; echo "WARNING: That kernel version is not officially supported yet. Continue at own luck.";
elif test "$kmajor" -eq 4 -a "$kminor" -le 2; then elif test "$kmajor" -eq 4 -a "$kminor" -le 3; then
echo "WARNING: That kernel version is not officially supported."; echo "WARNING: That kernel version is not officially supported.";
elif test "$kmajor" -eq 4 -a "$kminor" -le 10; then elif test "$kmajor" -eq 4 -a "$kminor" -le 10; then
:; :;

2
doc/changelog.txt
View File

@@ -4,7 +4,7 @@ HEAD
Enhancements: Enhancements:
- support for Linux up to 4.15 - support for Linux up to 4.15
Changes: Changes:
- remove support for Linux 3.7--4.2 - remove support for Linux 3.7--4.3
v2.14 (2017-11-22) v2.14 (2017-11-22)

5
extensions/ACCOUNT/xt_ACCOUNT.c
View File

@@ -485,12 +485,7 @@ ipt_acc_target(struct sk_buff *skb, const struct xt_action_param *par)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
struct ipt_acc_net *ian = net_generic(par->state->net, ipt_acc_net_id); struct ipt_acc_net *ian = net_generic(par->state->net, ipt_acc_net_id);
#else #else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
struct ipt_acc_net *ian = net_generic(par->net, ipt_acc_net_id); struct ipt_acc_net *ian = net_generic(par->net, ipt_acc_net_id);
#else
struct net *net = dev_net(par->in ? par->in : par->out);
struct ipt_acc_net *ian = net_generic(net, ipt_acc_net_id);
#endif
#endif #endif
struct ipt_acc_table *ipt_acc_tables = ian->ipt_acc_tables; struct ipt_acc_table *ipt_acc_tables = ian->ipt_acc_tables;
const struct ipt_acc_info *info = const struct ipt_acc_info *info =

15
extensions/compat_xtables.h
View File

@@ -8,8 +8,8 @@
#define DEBUGP Use__pr_debug__instead #define DEBUGP Use__pr_debug__instead
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
# warning Kernels below 4.3 not supported. # warning Kernels below 4.4 not supported.
#endif #endif
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
@@ -42,23 +42,12 @@
# define NIPQUAD_FMT "%hhu.%hhu.%hhu.%hhu" # define NIPQUAD_FMT "%hhu.%hhu.%hhu.%hhu"
#endif #endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
# define ip6_local_out(xnet, xsk, xskb) ip6_local_out(xskb)
# define ip6_route_me_harder(xnet, xskb) ip6_route_me_harder(xskb)
# define ip_local_out(xnet, xsk, xskb) ip_local_out(xskb)
# define ip_route_me_harder(xnet, xskb, xaddrtype) ip_route_me_harder((xskb), (xaddrtype))
#endif
static inline struct net *par_net(const struct xt_action_param *par) static inline struct net *par_net(const struct xt_action_param *par)
{ {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
return par->state->net; return par->state->net;
#else #else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
return par->net; return par->net;
#else
return dev_net((par->in != NULL) ? par->in : par->out);
#endif
#endif #endif
} }

12
extensions/xt_TARPIT.c
View File

@@ -278,14 +278,8 @@ static void tarpit_tcp4(struct net *net, struct sk_buff *oldskb,
goto free_nskb; goto free_nskb;
nf_ct_attach(nskb, oldskb); nf_ct_attach(nskb, oldskb);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, net, nskb->sk, nskb, NULL, NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, net, nskb->sk, nskb, NULL,
skb_dst(nskb)->dev, dst_output); skb_dst(nskb)->dev, dst_output);
#else
NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, nskb->sk, nskb, NULL,
skb_dst(nskb)->dev, dst_output_sk);
#endif
return; return;
free_nskb: free_nskb:
@@ -398,14 +392,8 @@ static void tarpit_tcp6(struct net *net, struct sk_buff *oldskb,
nskb->ip_summed = CHECKSUM_NONE; nskb->ip_summed = CHECKSUM_NONE;
nf_ct_attach(nskb, oldskb); nf_ct_attach(nskb, oldskb);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, net, nskb->sk, nskb, NULL, NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, net, nskb->sk, nskb, NULL,
skb_dst(nskb)->dev, dst_output); skb_dst(nskb)->dev, dst_output);
#else
NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, nskb->sk, nskb, NULL,
skb_dst(nskb)->dev, dst_output_sk);
#endif
return; return;
free_nskb: free_nskb: