UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[IPV6] ROUTE: Don't try less preferred routes for on-link routes. 

In addition to the real on-link routes, NONEXTHOP routes
should be considered on-link.

Problem reported by Meelis Roos <mroos@linux.ee>.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Acked-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki 2006-05-26 13:23:41 -07:00 committed by David S. Miller
parent 56bc348ce8
commit 4d0c591166
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/ipv6/route.c
View File

@ -280,10 +280,13 @@ static int inline rt6_check_neigh(struct rt6_info *rt)
{ {
struct neighbour *neigh = rt->rt6i_nexthop; struct neighbour *neigh = rt->rt6i_nexthop;
int m = 0; int m = 0;
if (neigh) { if (rt->rt6i_flags & RTF_NONEXTHOP ||
!(rt->rt6i_flags & RTF_GATEWAY))
m = 1;
else if (neigh) {
read_lock_bh(&neigh->lock); read_lock_bh(&neigh->lock);
if (neigh->nud_state & NUD_VALID) if (neigh->nud_state & NUD_VALID)
m = 1; m = 2;
read_unlock_bh(&neigh->lock); read_unlock_bh(&neigh->lock);
} }
return m; return m;
@ -292,15 +295,18 @@ static int inline rt6_check_neigh(struct rt6_info *rt)
static int rt6_score_route(struct rt6_info *rt, int oif, static int rt6_score_route(struct rt6_info *rt, int oif,
int strict) int strict)
{ {
int m = rt6_check_dev(rt, oif); int m, n;
m = rt6_check_dev(rt, oif);
if (!m && (strict & RT6_SELECT_F_IFACE)) if (!m && (strict & RT6_SELECT_F_IFACE))
return -1; return -1;
#ifdef CONFIG_IPV6_ROUTER_PREF #ifdef CONFIG_IPV6_ROUTER_PREF
m |= IPV6_DECODE_PREF(IPV6_EXTRACT_PREF(rt->rt6i_flags)) << 2; m |= IPV6_DECODE_PREF(IPV6_EXTRACT_PREF(rt->rt6i_flags)) << 2;
#endif #endif
if (rt6_check_neigh(rt)) n = rt6_check_neigh(rt);
if (n > 1)
m |= 16; m |= 16;
else if (strict & RT6_SELECT_F_REACHABLE) else if (!n && strict & RT6_SELECT_F_REACHABLE)
return -1; return -1;
return m; return m;
} }