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

Commit 118f8c16 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[IPV6]: ROUTE: Try selecting better route for non-default routes as well. 



Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 045927ff

net/ipv6/route.c

+13 −5
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ void ip6_route_input(struct sk_buff *skb) 
	int attempts = 3;

	int err;



	strict = ipv6_addr_type(&skb->nh.ipv6h->daddr) & (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL);

	strict = ipv6_addr_type(&skb->nh.ipv6h->daddr) & (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL) ? RT6_SELECT_F_IFACE : 0;



relookup:

	read_lock_bh(&rt6_lock);
@@ -427,12 +427,16 @@ void ip6_route_input(struct sk_buff *skb) 
	rt = fn->leaf;



	if ((rt->rt6i_flags & RTF_CACHE)) {

		rt = rt6_device_match(rt, skb->dev->ifindex, strict);

		rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict | RT6_SELECT_F_REACHABLE);

		if (rt == &ip6_null_entry)

			rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict);

		BACKTRACK();

		goto out;

	}



	rt = rt6_device_match(rt, skb->dev->ifindex, strict);

	rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict | RT6_SELECT_F_REACHABLE);

	if (rt == &ip6_null_entry)

		rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict);

	BACKTRACK();



	dst_hold(&rt->u.dst);
@@ -497,7 +501,9 @@ struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl) 
	rt = fn->leaf;



	if ((rt->rt6i_flags & RTF_CACHE)) {

		rt = rt6_device_match(rt, fl->oif, strict);

		rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE);

		if (rt == &ip6_null_entry)

			rt = rt6_select(&fn->leaf, fl->oif, strict);

		BACKTRACK();

		goto out;

	}
@@ -506,7 +512,9 @@ struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl) 
		if (rt == &ip6_null_entry)

			rt = rt6_select(&fn->leaf, fl->oif, strict);

	} else {

		rt = rt6_device_match(rt, fl->oif, strict);

		rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE);

		if (rt == &ip6_null_entry)

			rt = rt6_select(&fn->leaf, fl->oif, strict);

		BACKTRACK();

	}