mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2025-01-08 18:11:54 +00:00
Merge commit 'cd3b02d198093abbbe671f647e4deb2470eb9cf1' into integrated
This commit is contained in:
commit
6679f15ef3
10
nest/iface.c
10
nest/iface.c
@ -589,7 +589,7 @@ if_choose_router_id(struct iface_patt *mask, u32 old_id)
|
||||
WALK_LIST(i, iface_list)
|
||||
{
|
||||
if (!(i->flags & IF_ADMIN_UP) ||
|
||||
(i->flags & (IF_IGNORE | IF_SHUTDOWN)))
|
||||
(i->flags & IF_SHUTDOWN))
|
||||
continue;
|
||||
|
||||
WALK_LIST(a, i->addrs)
|
||||
@ -600,14 +600,6 @@ if_choose_router_id(struct iface_patt *mask, u32 old_id)
|
||||
if (a->scope <= SCOPE_LINK)
|
||||
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 */
|
||||
if (mask && !iface_patt_match(mask, i, a))
|
||||
continue;
|
||||
|
Loading…
Reference in New Issue
Block a user