Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f286586d authored by Máté Eckl's avatar Máté Eckl Committed by Pablo Neira Ayuso
Browse files

netfilter: nft_tproxy: Move nf_tproxy_assign_sock() to nf_tproxy.h 



This function is also necessary to implement nft tproxy support

Fixes: 45ca4e0c ("netfilter: Libify xt_TPROXY")
Signed-off-by: default avatarMáté Eckl <ecklm94@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent e97d9404

include/net/netfilter/nf_tproxy.h

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,14 @@ static inline bool nf_tproxy_sk_is_transparent(struct sock *sk) 
	return false;

}



/* assign a socket to the skb -- consumes sk */

static inline void nf_tproxy_assign_sock(struct sk_buff *skb, struct sock *sk)

{

	skb_orphan(skb);

	skb->sk = sk;

	skb->destructor = sock_edemux;

}



__be32 nf_tproxy_laddr4(struct sk_buff *skb, __be32 user_laddr, __be32 daddr);



/**

net/netfilter/xt_TPROXY.c

+0 −9
Original line number Diff line number Diff line
@@ -36,15 +36,6 @@ 
#include <net/netfilter/nf_tproxy.h>

#include <linux/netfilter/xt_TPROXY.h>



/* assign a socket to the skb -- consumes sk */

static void

nf_tproxy_assign_sock(struct sk_buff *skb, struct sock *sk)

{

	skb_orphan(skb);

	skb->sk = sk;

	skb->destructor = sock_edemux;

}



static unsigned int

tproxy_tg4(struct net *net, struct sk_buff *skb, __be32 laddr, __be16 lport,

	   u_int32_t mark_mask, u_int32_t mark_value)