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

Commit f5099dd4 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Simon Horman
Browse files

ipvs: Pass ipvs into ip_vs_conn_fill_param_proto 



Move the ugly hack net_ipvs(skb_net(skb)) up a layer in the call stack
so it is easier to remove.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 1281a9c2

net/netfilter/ipvs/ip_vs_conn.c

+6 −4
Original line number Diff line number Diff line
@@ -314,12 +314,12 @@ struct ip_vs_conn *ip_vs_conn_in_get(const struct ip_vs_conn_param *p) 
}



static int

ip_vs_conn_fill_param_proto(int af, const struct sk_buff *skb,

ip_vs_conn_fill_param_proto(struct netns_ipvs *ipvs,

			    int af, const struct sk_buff *skb,

			    const struct ip_vs_iphdr *iph,

			    struct ip_vs_conn_param *p)

{

	__be16 _ports[2], *pptr;

	struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));



	pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports, iph);

	if (pptr == NULL)
@@ -338,9 +338,10 @@ struct ip_vs_conn * 
ip_vs_conn_in_get_proto(int af, const struct sk_buff *skb,

			const struct ip_vs_iphdr *iph)

{

	struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));

	struct ip_vs_conn_param p;



	if (ip_vs_conn_fill_param_proto(af, skb, iph, &p))

	if (ip_vs_conn_fill_param_proto(ipvs, af, skb, iph, &p))

		return NULL;



	return ip_vs_conn_in_get(&p);
@@ -442,9 +443,10 @@ struct ip_vs_conn * 
ip_vs_conn_out_get_proto(int af, const struct sk_buff *skb,

			 const struct ip_vs_iphdr *iph)

{

	struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));

	struct ip_vs_conn_param p;



	if (ip_vs_conn_fill_param_proto(af, skb, iph, &p))

	if (ip_vs_conn_fill_param_proto(ipvs, af, skb, iph, &p))

		return NULL;



	return ip_vs_conn_out_get(&p);