mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-09 18:41:55 +00:00
Code Releases Activity

Merge commit 'cd3b02d198093abbbe671f647e4deb2470eb9cf1' into integrated

Browse Source
This commit is contained in:
Ondrej Zajicek 2013-05-23 00:00:32 +02:00
commit 6679f15ef3
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nest/iface.c
View File

@ -589,7 +589,7 @@ if_choose_router_id(struct iface_patt *mask, u32 old_id)
WALK_LIST(i, iface_list) WALK_LIST(i, iface_list)
{ {
if (!(i->flags & IF_ADMIN_UP) || if (!(i->flags & IF_ADMIN_UP) ||
(i->flags & (IF_IGNORE | IF_SHUTDOWN))) (i->flags & IF_SHUTDOWN))
continue; continue;
WALK_LIST(a, i->addrs) 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) 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;