projects / packages / xtables-addons.git / blame
| Commit | Line | Data |
|---|---|---|
| 586530d0 JR |
1 | --- a/extensions/xt_TARPIT.c 2014-09-29 03:33:13.000000000 -0500 |
| 2 | +++ b/extensions/xt_TARPIT.c 2015-06-29 11:38:26.582851153 -0500 | |
| 3 | @@ -250,7 +250,11 @@ | |
| 4 | ||
| 5 | #ifdef CONFIG_BRIDGE_NETFILTER | |
| 6 | if (hook != NF_INET_FORWARD || (nskb->nf_bridge != NULL && | |
| 7 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) | |
| 8 | nskb->nf_bridge->mask & BRNF_BRIDGED)) | |
| 9 | +#else | |
| 10 | + nskb->nf_bridge->physoutdev)) | |
| 11 | +#endif | |
| 12 | #else | |
| 13 | if (hook != NF_INET_FORWARD) | |
| 14 | #endif | |
| 15 | @@ -279,7 +279,12 @@ | |
| 16 | ||
| 17 | nf_ct_attach(nskb, oldskb); | |
| 18 | ||
| 19 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) | |
| 20 | NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, nskb, NULL, | |
| 21 | skb_dst(nskb)->dev, dst_output); | |
| 22 | +#else | |
| 23 | + NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, NULL, nskb, NULL, | |
| 24 | + skb_dst(nskb)->dev, dst_output_sk); | |
| 25 | +#endif | |
| 26 | return; | |
| 27 | ||
| 28 | @@ -394,7 +394,12 @@ | |
| 29 | ||
| 30 | nf_ct_attach(nskb, oldskb); | |
| 31 | ||
| 32 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) | |
| 33 | NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, nskb, NULL, | |
| 34 | skb_dst(nskb)->dev, dst_output); | |
| 35 | +#else | |
| 36 | + NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, NULL, nskb, NULL, | |
| 37 | + skb_dst(nskb)->dev, dst_output_sk); | |
| 38 | +#endif | |
| 39 | return; | |
| 40 | ||
| 41 | --- a/extensions/xt_DELUDE.c 2014-09-29 03:33:13.000000000 -0500 | |
| 42 | +++ b/extensions/xt_DELUDE.c 2015-06-29 10:10:00.622867945 -0500 | |
| 43 | @@ -107,7 +107,11 @@ | |
| 44 | addr_type = RTN_UNSPEC; | |
| 45 | #ifdef CONFIG_BRIDGE_NETFILTER | |
| 46 | if (hook != NF_INET_FORWARD || (nskb->nf_bridge != NULL && | |
| 47 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) | |
| 48 | nskb->nf_bridge->mask & BRNF_BRIDGED)) | |
| 49 | +#else | |
| 50 | + nskb->nf_bridge->physoutdev)) | |
| 51 | +#endif | |
| 52 | #else | |
| 53 | if (hook != NF_INET_FORWARD) | |
| 54 | #endif |