Commit 9dd43a5f authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: ipvs: prepare for hook function reduction 



ipvs has multiple one-line wrappers for hooks, compact them.

To avoid a large patch make the two most common helpers use the same
function signature as hooks.

Next patches can then remove the oneline wrappers.

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 f0d6764f

net/netfilter/ipvs/ip_vs_core.c

+16 −10
Original line number Diff line number Diff line
@@ -1330,12 +1330,15 @@ handle_response(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, 
 *	Check if outgoing packet belongs to the established ip_vs_conn.

 */

static unsigned int

ip_vs_out(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int af)

ip_vs_out_hook(void *priv, struct sk_buff *skb, const struct nf_hook_state *state)

{

	struct netns_ipvs *ipvs = net_ipvs(state->net);

	unsigned int hooknum = state->hook;

	struct ip_vs_iphdr iph;

	struct ip_vs_protocol *pp;

	struct ip_vs_proto_data *pd;

	struct ip_vs_conn *cp;

	int af = state->pf;

	struct sock *sk;



	EnterFunction(11);
@@ -1477,7 +1480,7 @@ static unsigned int 
ip_vs_reply4(void *priv, struct sk_buff *skb,

	     const struct nf_hook_state *state)

{

	return ip_vs_out(net_ipvs(state->net), state->hook, skb, AF_INET);

	return ip_vs_out_hook(priv, skb, state);

}



/*
@@ -1488,7 +1491,7 @@ static unsigned int 
ip_vs_local_reply4(void *priv, struct sk_buff *skb,

		   const struct nf_hook_state *state)

{

	return ip_vs_out(net_ipvs(state->net), state->hook, skb, AF_INET);

	return ip_vs_out_hook(priv, skb, state);

}



#ifdef CONFIG_IP_VS_IPV6
@@ -1502,7 +1505,7 @@ static unsigned int 
ip_vs_reply6(void *priv, struct sk_buff *skb,

	     const struct nf_hook_state *state)

{

	return ip_vs_out(net_ipvs(state->net), state->hook, skb, AF_INET6);

	return ip_vs_out_hook(priv, skb, state);

}



/*
@@ -1513,7 +1516,7 @@ static unsigned int 
ip_vs_local_reply6(void *priv, struct sk_buff *skb,

		   const struct nf_hook_state *state)

{

	return ip_vs_out(net_ipvs(state->net), state->hook, skb, AF_INET6);

	return ip_vs_out_hook(priv, skb, state);

}



#endif
@@ -1957,8 +1960,10 @@ static int ip_vs_in_icmp_v6(struct netns_ipvs *ipvs, struct sk_buff *skb, 
 *	and send it on its way...

 */

static unsigned int

ip_vs_in(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int af)

ip_vs_in_hook(void *priv, struct sk_buff *skb, const struct nf_hook_state *state)

{

	struct netns_ipvs *ipvs = net_ipvs(state->net);

	unsigned int hooknum = state->hook;

	struct ip_vs_iphdr iph;

	struct ip_vs_protocol *pp;

	struct ip_vs_proto_data *pd;
@@ -1966,6 +1971,7 @@ ip_vs_in(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int 
	int ret, pkts;

	int conn_reuse_mode;

	struct sock *sk;

	int af = state->pf;



	/* Already marked as IPVS request or reply? */

	if (skb->ipvs_property)
@@ -2145,7 +2151,7 @@ static unsigned int 
ip_vs_remote_request4(void *priv, struct sk_buff *skb,

		      const struct nf_hook_state *state)

{

	return ip_vs_in(net_ipvs(state->net), state->hook, skb, AF_INET);

	return ip_vs_in_hook(priv, skb, state);

}



/*
@@ -2156,7 +2162,7 @@ static unsigned int 
ip_vs_local_request4(void *priv, struct sk_buff *skb,

		     const struct nf_hook_state *state)

{

	return ip_vs_in(net_ipvs(state->net), state->hook, skb, AF_INET);

	return ip_vs_in_hook(priv, skb, state);

}



#ifdef CONFIG_IP_VS_IPV6
@@ -2169,7 +2175,7 @@ static unsigned int 
ip_vs_remote_request6(void *priv, struct sk_buff *skb,

		      const struct nf_hook_state *state)

{

	return ip_vs_in(net_ipvs(state->net), state->hook, skb, AF_INET6);

	return ip_vs_in_hook(priv, skb, state);

}



/*
@@ -2180,7 +2186,7 @@ static unsigned int 
ip_vs_local_request6(void *priv, struct sk_buff *skb,

		     const struct nf_hook_state *state)

{

	return ip_vs_in(net_ipvs(state->net), state->hook, skb, AF_INET6);

	return ip_vs_in_hook(priv, skb, state);

}



#endif