Commit 8a9941b4 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: ipvs: remove unneeded output wrappers 



After earlier patch we can use ip_vs_out_hook directly.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 9dd43a5f

net/netfilter/ipvs/ip_vs_core.c

+6 −56
Original line number Diff line number Diff line
@@ -1471,56 +1471,6 @@ ip_vs_out_hook(void *priv, struct sk_buff *skb, const struct nf_hook_state *stat 
	return NF_ACCEPT;

}



/*

 *	It is hooked at the NF_INET_FORWARD and NF_INET_LOCAL_IN chain,

 *	used only for VS/NAT.

 *	Check if packet is reply for established ip_vs_conn.

 */

static unsigned int

ip_vs_reply4(void *priv, struct sk_buff *skb,

	     const struct nf_hook_state *state)

{

	return ip_vs_out_hook(priv, skb, state);

}



/*

 *	It is hooked at the NF_INET_LOCAL_OUT chain, used only for VS/NAT.

 *	Check if packet is reply for established ip_vs_conn.

 */

static unsigned int

ip_vs_local_reply4(void *priv, struct sk_buff *skb,

		   const struct nf_hook_state *state)

{

	return ip_vs_out_hook(priv, skb, state);

}



#ifdef CONFIG_IP_VS_IPV6



/*

 *	It is hooked at the NF_INET_FORWARD and NF_INET_LOCAL_IN chain,

 *	used only for VS/NAT.

 *	Check if packet is reply for established ip_vs_conn.

 */

static unsigned int

ip_vs_reply6(void *priv, struct sk_buff *skb,

	     const struct nf_hook_state *state)

{

	return ip_vs_out_hook(priv, skb, state);

}



/*

 *	It is hooked at the NF_INET_LOCAL_OUT chain, used only for VS/NAT.

 *	Check if packet is reply for established ip_vs_conn.

 */

static unsigned int

ip_vs_local_reply6(void *priv, struct sk_buff *skb,

		   const struct nf_hook_state *state)

{

	return ip_vs_out_hook(priv, skb, state);

}



#endif



static unsigned int

ip_vs_try_to_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,

		      struct ip_vs_proto_data *pd,
@@ -2243,7 +2193,7 @@ ip_vs_forward_icmp_v6(void *priv, struct sk_buff *skb, 
static const struct nf_hook_ops ip_vs_ops4[] = {

	/* After packet filtering, change source only for VS/NAT */

	{

		.hook		= ip_vs_reply4,

		.hook		= ip_vs_out_hook,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_LOCAL_IN,

		.priority	= NF_IP_PRI_NAT_SRC - 2,
@@ -2259,7 +2209,7 @@ static const struct nf_hook_ops ip_vs_ops4[] = { 
	},

	/* Before ip_vs_in, change source only for VS/NAT */

	{

		.hook		= ip_vs_local_reply4,

		.hook		= ip_vs_out_hook,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_LOCAL_OUT,

		.priority	= NF_IP_PRI_NAT_DST + 1,
@@ -2281,7 +2231,7 @@ static const struct nf_hook_ops ip_vs_ops4[] = { 
	},

	/* After packet filtering, change source only for VS/NAT */

	{

		.hook		= ip_vs_reply4,

		.hook		= ip_vs_out_hook,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_FORWARD,

		.priority	= 100,
@@ -2292,7 +2242,7 @@ static const struct nf_hook_ops ip_vs_ops4[] = { 
static const struct nf_hook_ops ip_vs_ops6[] = {

	/* After packet filtering, change source only for VS/NAT */

	{

		.hook		= ip_vs_reply6,

		.hook		= ip_vs_out_hook,

		.pf		= NFPROTO_IPV6,

		.hooknum	= NF_INET_LOCAL_IN,

		.priority	= NF_IP6_PRI_NAT_SRC - 2,
@@ -2308,7 +2258,7 @@ static const struct nf_hook_ops ip_vs_ops6[] = { 
	},

	/* Before ip_vs_in, change source only for VS/NAT */

	{

		.hook		= ip_vs_local_reply6,

		.hook		= ip_vs_out_hook,

		.pf		= NFPROTO_IPV6,

		.hooknum	= NF_INET_LOCAL_OUT,

		.priority	= NF_IP6_PRI_NAT_DST + 1,
@@ -2330,7 +2280,7 @@ static const struct nf_hook_ops ip_vs_ops6[] = { 
	},

	/* After packet filtering, change source only for VS/NAT */

	{

		.hook		= ip_vs_reply6,

		.hook		= ip_vs_out_hook,

		.pf		= NFPROTO_IPV6,

		.hooknum	= NF_INET_FORWARD,

		.priority	= 100,