leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netfilter: ipvs: prepare for hook function reduction

Browse Source 
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: Florian Westphal <fw@strlen.de>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal
2021-10-12 19:29:56 +02:00
committed by Pablo Neira Ayuso
parent f0d6764f7d
commit 9dd43a5f4b
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
net/netfilter/ipvs/ip_vs_core.c
View File

@@ -1330,12 +1330,15 @@ drop:
* Check if outgoing packet belongs to the established ip_vs_conn. * Check if outgoing packet belongs to the established ip_vs_conn.
*/ */
static unsigned int 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_iphdr iph;
struct ip_vs_protocol *pp; struct ip_vs_protocol *pp;
struct ip_vs_proto_data *pd; struct ip_vs_proto_data *pd;
struct ip_vs_conn *cp; struct ip_vs_conn *cp;
int af = state->pf;
struct sock *sk; struct sock *sk;
EnterFunction(11); EnterFunction(11);
@@ -1477,7 +1480,7 @@ static unsigned int
ip_vs_reply4(void *priv, struct sk_buff *skb, ip_vs_reply4(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state) 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, ip_vs_local_reply4(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state) 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 #ifdef CONFIG_IP_VS_IPV6
@@ -1502,7 +1505,7 @@ static unsigned int
ip_vs_reply6(void *priv, struct sk_buff *skb, ip_vs_reply6(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state) 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, ip_vs_local_reply6(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state) 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 #endif
@@ -1957,8 +1960,10 @@ out:
* and send it on its way... * and send it on its way...
*/ */
static unsigned int 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_iphdr iph;
struct ip_vs_protocol *pp; struct ip_vs_protocol *pp;
struct ip_vs_proto_data *pd; 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 ret, pkts;
int conn_reuse_mode; int conn_reuse_mode;
struct sock *sk; struct sock *sk;
int af = state->pf;
/* Already marked as IPVS request or reply? */ /* Already marked as IPVS request or reply? */
if (skb->ipvs_property) if (skb->ipvs_property)
@@ -2145,7 +2151,7 @@ static unsigned int
ip_vs_remote_request4(void *priv, struct sk_buff *skb, ip_vs_remote_request4(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state) 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, ip_vs_local_request4(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state) 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 #ifdef CONFIG_IP_VS_IPV6
@@ -2169,7 +2175,7 @@ static unsigned int
ip_vs_remote_request6(void *priv, struct sk_buff *skb, ip_vs_remote_request6(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state) 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, ip_vs_local_request6(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state) 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 #endif