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

[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
...@@ -415,7 +415,7 @@ void ip6_route_input(struct sk_buff *skb) ...@@ -415,7 +415,7 @@ void ip6_route_input(struct sk_buff *skb)
int attempts = 3; int attempts = 3;
int err; 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: relookup:
read_lock_bh(&rt6_lock); read_lock_bh(&rt6_lock);
...@@ -427,12 +427,16 @@ restart: ...@@ -427,12 +427,16 @@ restart:
rt = fn->leaf; rt = fn->leaf;
if ((rt->rt6i_flags & RTF_CACHE)) { 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(); BACKTRACK();
goto out; 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(); BACKTRACK();
dst_hold(&rt->u.dst); dst_hold(&rt->u.dst);
...@@ -497,7 +501,9 @@ restart: ...@@ -497,7 +501,9 @@ restart:
rt = fn->leaf; rt = fn->leaf;
if ((rt->rt6i_flags & RTF_CACHE)) { 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(); BACKTRACK();
goto out; goto out;
} }
...@@ -506,7 +512,9 @@ restart: ...@@ -506,7 +512,9 @@ restart:
if (rt == &ip6_null_entry) if (rt == &ip6_null_entry)
rt = rt6_select(&fn->leaf, fl->oif, strict); rt = rt6_select(&fn->leaf, fl->oif, strict);
} else { } 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(); BACKTRACK();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment