IPVS: Add IPv6 support to xmit() support functions (38cdcc9a) · Commits · e / devices / android_kernel_oneplus_sm8150

net/ipv4/ipvs/ip_vs_xmit.c

+75 −7

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,9 @@
	#include <net/udp.h>		#include <net/udp.h>
	#include <net/icmp.h> /* for icmp_send */		#include <net/icmp.h> /* for icmp_send */
	#include <net/route.h> /* for ip_route_output */		#include <net/route.h> /* for ip_route_output */
			#include <net/ipv6.h>
			#include <net/ip6_route.h>
			#include <linux/icmpv6.h>
	#include <linux/netfilter.h>		#include <linux/netfilter.h>
	#include <linux/netfilter_ipv4.h>		#include <linux/netfilter_ipv4.h>

	@@ -47,7 +50,8 @@ __ip_vs_dst_check(struct ip_vs_dest *dest, u32 rtos, u32 cookie)

	if (!dst)		if (!dst)
	return NULL;		return NULL;
	if ((dst->obsolete \|\| rtos != dest->dst_rtos) &&		if ((dst->obsolete
			\|\| (dest->af == AF_INET && rtos != dest->dst_rtos)) &&
	dst->ops->check(dst, cookie) == NULL) {		dst->ops->check(dst, cookie) == NULL) {
	dest->dst_cache = NULL;		dest->dst_cache = NULL;
	dst_release(dst);		dst_release(dst);
	@@ -109,6 +113,70 @@ __ip_vs_get_out_rt(struct ip_vs_conn *cp, u32 rtos)
	return rt;		return rt;
	}		}

			#ifdef CONFIG_IP_VS_IPV6
			static struct rt6_info *
			__ip_vs_get_out_rt_v6(struct ip_vs_conn *cp)
			{
			struct rt6_info rt; / Route to the other host */
			struct ip_vs_dest *dest = cp->dest;

			if (dest) {
			spin_lock(&dest->dst_lock);
			rt = (struct rt6_info *)__ip_vs_dst_check(dest, 0, 0);
			if (!rt) {
			struct flowi fl = {
			.oif = 0,
			.nl_u = {
			.ip6_u = {
			.daddr = dest->addr.in6,
			.saddr = {
			.s6_addr32 =
			{ 0, 0, 0, 0 },
			},
			},
			},
			};

			rt = (struct rt6_info *)ip6_route_output(&init_net,
			NULL, &fl);
			if (!rt) {
			spin_unlock(&dest->dst_lock);
			IP_VS_DBG_RL("ip6_route_output error, "
			"dest: " NIP6_FMT "\n",
			NIP6(dest->addr.in6));
			return NULL;
			}
			__ip_vs_dst_set(dest, 0, dst_clone(&rt->u.dst));
			IP_VS_DBG(10, "new dst " NIP6_FMT ", refcnt=%d\n",
			NIP6(dest->addr.in6),
			atomic_read(&rt->u.dst.__refcnt));
			}
			spin_unlock(&dest->dst_lock);
			} else {
			struct flowi fl = {
			.oif = 0,
			.nl_u = {
			.ip6_u = {
			.daddr = cp->daddr.in6,
			.saddr = {
			.s6_addr32 = { 0, 0, 0, 0 },
			},
			},
			},
			};

			rt = (struct rt6_info *)ip6_route_output(&init_net, NULL, &fl);
			if (!rt) {
			IP_VS_DBG_RL("ip6_route_output error, dest: "
			NIP6_FMT "\n", NIP6(cp->daddr.in6));
			return NULL;
			}
			}

			return rt;
			}
			#endif


	/*		/*
	* Release dest->dst_cache before a dest is removed		* Release dest->dst_cache before a dest is removed
	@@ -123,11 +191,11 @@ ip_vs_dst_reset(struct ip_vs_dest *dest)
	dst_release(old_dst);		dst_release(old_dst);
	}		}

	#define IP_VS_XMIT(skb, rt) \		#define IP_VS_XMIT(pf, skb, rt) \
	do { \		do { \
	(skb)->ipvs_property = 1; \		(skb)->ipvs_property = 1; \
	skb_forward_csum(skb); \		skb_forward_csum(skb); \
	NF_HOOK(PF_INET, NF_INET_LOCAL_OUT, (skb), NULL, \		NF_HOOK(pf, NF_INET_LOCAL_OUT, (skb), NULL, \
	(rt)->u.dst.dev, dst_output); \		(rt)->u.dst.dev, dst_output); \
	} while (0)		} while (0)

	@@ -200,7 +268,7 @@ ip_vs_bypass_xmit(struct sk_buff skb, struct ip_vs_conn cp,
	/* Another hack: avoid icmp_send in ip_fragment */		/* Another hack: avoid icmp_send in ip_fragment */
	skb->local_df = 1;		skb->local_df = 1;

	IP_VS_XMIT(skb, rt);		IP_VS_XMIT(PF_INET, skb, rt);

	LeaveFunction(10);		LeaveFunction(10);
	return NF_STOLEN;		return NF_STOLEN;
	@@ -276,7 +344,7 @@ ip_vs_nat_xmit(struct sk_buff skb, struct ip_vs_conn cp,
	/* Another hack: avoid icmp_send in ip_fragment */		/* Another hack: avoid icmp_send in ip_fragment */
	skb->local_df = 1;		skb->local_df = 1;

	IP_VS_XMIT(skb, rt);		IP_VS_XMIT(PF_INET, skb, rt);

	LeaveFunction(10);		LeaveFunction(10);
	return NF_STOLEN;		return NF_STOLEN;
	@@ -467,7 +535,7 @@ ip_vs_dr_xmit(struct sk_buff skb, struct ip_vs_conn cp,
	/* Another hack: avoid icmp_send in ip_fragment */		/* Another hack: avoid icmp_send in ip_fragment */
	skb->local_df = 1;		skb->local_df = 1;

	IP_VS_XMIT(skb, rt);		IP_VS_XMIT(PF_INET, skb, rt);

	LeaveFunction(10);		LeaveFunction(10);
	return NF_STOLEN;		return NF_STOLEN;
	@@ -540,7 +608,7 @@ ip_vs_icmp_xmit(struct sk_buff skb, struct ip_vs_conn cp,
	/* Another hack: avoid icmp_send in ip_fragment */		/* Another hack: avoid icmp_send in ip_fragment */
	skb->local_df = 1;		skb->local_df = 1;

	IP_VS_XMIT(skb, rt);		IP_VS_XMIT(PF_INET, skb, rt);

	rc = NF_STOLEN;		rc = NF_STOLEN;
	goto out;		goto out;