r4sas/ts3init_linux_netfilter_module
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wrap fixes for 4.10 in indef

Browse Source
This commit is contained in:
Stefan Schwarz 2018-05-03 10:19:16 +02:00
parent 8ac7ef3a5f
commit c1f62b56bd
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compat_xtables.h
View File

@ -89,8 +89,10 @@ static inline void proc_remove(struct proc_dir_entry *de)
static inline struct net *par_net(const struct xt_action_param *par)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
return xt_net(par);
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
return par->net;
#else
return dev_net((par->in != NULL) ? par->in : par->out);
#endif

4
src/ts3init_match.c
View File

@ -141,7 +141,11 @@ static inline __u8* get_payload(const struct sk_buff *skb, const struct xt_actio
static int calculate_cookie(const struct sk_buff *skb, const struct xt_action_param *par,
struct udphdr *udp, __u64 k0, __u64 k1, __u64* out)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
switch (xt_family(par))
#else
switch (par->family)
#endif
{
case NFPROTO_IPV4:
{

5
src/ts3init_target.c
View File

@ -47,7 +47,12 @@ ts3init_send_ipv6_reply(struct sk_buff *oldskb, const struct xt_action_param *pa
struct udphdr *udp;
struct flowi6 fl;
struct dst_entry *dst = NULL;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
struct net *net = dev_net((xt_in(par) != NULL) ? xt_in(par) : xt_out(par));
#else
struct net *net = dev_net((par->in != NULL) ? par->in : par->out);
#endif
skb = alloc_skb(LL_MAX_HEADER + sizeof(*ip) +
sizeof(*udp) + payload_size, GFP_ATOMIC);