Minor changes to default router ID calculation.
This commit is contained in:
parent
f3e5917850
commit
e4d179f2c2
1 changed files with 0 additions and 12 deletions
12
nest/iface.c
12
nest/iface.c
|
@ -600,22 +600,10 @@ if_choose_router_id(struct iface_patt *mask, u32 old_id)
|
||||||
if (a->scope <= SCOPE_LINK)
|
if (a->scope <= SCOPE_LINK)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* FIXME: This should go away */
|
|
||||||
if (a->flags & IA_PEER)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/* FIXME: This should go away too */
|
|
||||||
if (!mask && (a != i->addr))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/* Check pattern if specified */
|
/* Check pattern if specified */
|
||||||
if (mask && !iface_patt_match(mask, i, a))
|
if (mask && !iface_patt_match(mask, i, a))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* FIXME: This should go away too */
|
|
||||||
if ((i->flags & IF_IGNORE) && !mask)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/* No pattern or pattern matched */
|
/* No pattern or pattern matched */
|
||||||
if (!b || ipa_to_u32(a->ip) < ipa_to_u32(b->ip))
|
if (!b || ipa_to_u32(a->ip) < ipa_to_u32(b->ip))
|
||||||
b = a;
|
b = a;
|
||||||
|
|
Loading…
Reference in a new issue