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

ipvs: Pass ipvs through ip_vs_route_me_harder into sysctl_snat_reroute 



This removes the need to use the hack skb_net.

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 7b5f689a

net/netfilter/ipvs/ip_vs_core.c

+7 −8
Original line number Diff line number Diff line
@@ -651,9 +651,8 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, 


#ifdef CONFIG_SYSCTL



static int sysctl_snat_reroute(struct sk_buff *skb)

static int sysctl_snat_reroute(struct netns_ipvs *ipvs)

{

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

	return ipvs->sysctl_snat_reroute;

}
@@ -669,7 +668,7 @@ static int sysctl_expire_nodest_conn(struct netns_ipvs *ipvs) 


#else



static int sysctl_snat_reroute(struct sk_buff *skb) { return 0; }

static int sysctl_snat_reroute(struct netns_ipvs *ipvs) { return 0; }

static int sysctl_nat_icmp_send(struct netns_ipvs *ipvs) { return 0; }

static int sysctl_expire_nodest_conn(struct netns_ipvs *ipvs) { return 0; }
@@ -702,10 +701,10 @@ static inline int ip_vs_gather_frags(struct sk_buff *skb, u_int32_t user) 
	return err;

}



static int ip_vs_route_me_harder(int af, struct sk_buff *skb,

				 unsigned int hooknum)

static int ip_vs_route_me_harder(struct netns_ipvs *ipvs, int af,

				 struct sk_buff *skb, unsigned int hooknum)

{

	if (!sysctl_snat_reroute(skb))

	if (!sysctl_snat_reroute(ipvs))

		return 0;

	/* Reroute replies only to remote clients (FORWARD and LOCAL_OUT) */

	if (NF_INET_LOCAL_IN == hooknum)
@@ -873,7 +872,7 @@ static int handle_response_icmp(int af, struct sk_buff *skb, 
#endif

		ip_vs_nat_icmp(skb, pp, cp, 1);



	if (ip_vs_route_me_harder(af, skb, hooknum))

	if (ip_vs_route_me_harder(cp->ipvs, af, skb, hooknum))

		goto out;



	/* do the statistics and put it back */
@@ -1144,7 +1143,7 @@ handle_response(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, 
	 * if it came from this machine itself.  So re-compute

	 * the routing information.

	 */

	if (ip_vs_route_me_harder(af, skb, hooknum))

	if (ip_vs_route_me_harder(cp->ipvs, af, skb, hooknum))

		goto drop;



	IP_VS_DBG_PKT(10, af, pp, skb, iph->off, "After SNAT");

CRA Git | Maintained and supported by SUSTech CRA and CCSE