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

ipvs: Pass ipvs not net to ip_vs_fill_conn 



ipvs is what is actually desired so change the parameter and the modify
the callers to pass struct netns_ipvs.

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 e64e2b46

include/net/ip_vs.h

+2 −2
Original line number Diff line number Diff line
@@ -1201,14 +1201,14 @@ enum { 
	IP_VS_DIR_LAST,

};



static inline void ip_vs_conn_fill_param(struct net *net, int af, int protocol,

static inline void ip_vs_conn_fill_param(struct netns_ipvs *ipvs, int af, int protocol,

					 const union nf_inet_addr *caddr,

					 __be16 cport,

					 const union nf_inet_addr *vaddr,

					 __be16 vport,

					 struct ip_vs_conn_param *p)

{

	p->ipvs = net_ipvs(net);

	p->ipvs = ipvs;

	p->af = af;

	p->protocol = protocol;

	p->caddr = caddr;

net/netfilter/ipvs/ip_vs_conn.c

+4 −4
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static unsigned int ip_vs_conn_hashkey_conn(const struct ip_vs_conn *cp) 
{

	struct ip_vs_conn_param p;



	ip_vs_conn_fill_param(cp->ipvs->net, cp->af, cp->protocol,

	ip_vs_conn_fill_param(cp->ipvs, cp->af, cp->protocol,

			      &cp->caddr, cp->cport, NULL, 0, &p);



	if (cp->pe) {
@@ -319,17 +319,17 @@ ip_vs_conn_fill_param_proto(int af, const struct sk_buff *skb, 
			    struct ip_vs_conn_param *p)

{

	__be16 _ports[2], *pptr;

	struct net *net = skb_net(skb);

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



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

	if (pptr == NULL)

		return 1;



	if (likely(!ip_vs_iph_inverse(iph)))

		ip_vs_conn_fill_param(net, af, iph->protocol, &iph->saddr,

		ip_vs_conn_fill_param(ipvs, af, iph->protocol, &iph->saddr,

				      pptr[0], &iph->daddr, pptr[1], p);

	else

		ip_vs_conn_fill_param(net, af, iph->protocol, &iph->daddr,

		ip_vs_conn_fill_param(ipvs, af, iph->protocol, &iph->daddr,

				      pptr[1], &iph->saddr, pptr[0], p);

	return 0;

}

net/netfilter/ipvs/ip_vs_core.c

+4 −4
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ ip_vs_conn_fill_param_persist(const struct ip_vs_service *svc, 
			      const union nf_inet_addr *vaddr, __be16 vport,

			      struct ip_vs_conn_param *p)

{

	ip_vs_conn_fill_param(svc->net, svc->af, protocol, caddr, cport, vaddr,

	ip_vs_conn_fill_param(net_ipvs(svc->net), svc->af, protocol, caddr, cport, vaddr,

			      vport, p);

	p->pe = rcu_dereference(svc->pe);

	if (p->pe && p->pe->fill_param)
@@ -376,7 +376,7 @@ ip_vs_sched_persist(struct ip_vs_service *svc, 
	/*

	 *    Create a new connection according to the template

	 */

	ip_vs_conn_fill_param(svc->net, svc->af, iph->protocol, src_addr,

	ip_vs_conn_fill_param(net_ipvs(svc->net), svc->af, iph->protocol, src_addr,

			      src_port, dst_addr, dst_port, &param);



	cp = ip_vs_conn_new(&param, dest->af, &dest->addr, dport, flags, dest,
@@ -524,7 +524,7 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb, 
	{

		struct ip_vs_conn_param p;



		ip_vs_conn_fill_param(svc->net, svc->af, iph->protocol,

		ip_vs_conn_fill_param(net_ipvs(svc->net), svc->af, iph->protocol,

				      caddr, cport, vaddr, vport, &p);

		cp = ip_vs_conn_new(&p, dest->af, &dest->addr,

				    dest->port ? dest->port : vport,
@@ -600,7 +600,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, 
		IP_VS_DBG(6, "%s(): create a cache_bypass entry\n", __func__);

		{

			struct ip_vs_conn_param p;

			ip_vs_conn_fill_param(svc->net, svc->af, iph->protocol,

			ip_vs_conn_fill_param(net_ipvs(svc->net), svc->af, iph->protocol,

					      &iph->saddr, pptr[0],

					      &iph->daddr, pptr[1], &p);

			cp = ip_vs_conn_new(&p, svc->af, &daddr, 0,

net/netfilter/ipvs/ip_vs_ftp.c

+3 −3
Original line number Diff line number Diff line
@@ -223,14 +223,14 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp, 
		 */

		{

			struct ip_vs_conn_param p;

			ip_vs_conn_fill_param(cp->ipvs->net, AF_INET,

			ip_vs_conn_fill_param(cp->ipvs, AF_INET,

					      iph->protocol, &from, port,

					      &cp->caddr, 0, &p);

			n_cp = ip_vs_conn_out_get(&p);

		}

		if (!n_cp) {

			struct ip_vs_conn_param p;

			ip_vs_conn_fill_param(cp->ipvs->net,

			ip_vs_conn_fill_param(cp->ipvs,

					      AF_INET, IPPROTO_TCP, &cp->caddr,

					      0, &cp->vaddr, port, &p);

			/* As above, this is ipv4 only */
@@ -392,7 +392,7 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp, 


	{

		struct ip_vs_conn_param p;

		ip_vs_conn_fill_param(cp->ipvs->net, AF_INET,

		ip_vs_conn_fill_param(cp->ipvs, AF_INET,

				      iph->protocol, &to, port, &cp->vaddr,

				      htons(ntohs(cp->vport)-1), &p);

		n_cp = ip_vs_conn_in_get(&p);

net/netfilter/ipvs/ip_vs_nfct.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static void ip_vs_nfct_expect_callback(struct nf_conn *ct, 


	/* RS->CLIENT */

	orig = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple;

	ip_vs_conn_fill_param(net, exp->tuple.src.l3num, orig->dst.protonum,

	ip_vs_conn_fill_param(net_ipvs(net), exp->tuple.src.l3num, orig->dst.protonum,

			      &orig->src.u3, orig->src.u.tcp.port,

			      &orig->dst.u3, orig->dst.u.tcp.port, &p);

	cp = ip_vs_conn_out_get(&p);