summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nest/iface.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/nest/iface.c b/nest/iface.c
index da79b21f..b4ab70c3 100644
--- a/nest/iface.c
+++ b/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)
@@ -612,6 +612,10 @@ if_choose_router_id(struct iface_patt *mask, u32 old_id)
if (mask && !iface_patt_match(mask, i, a))
continue;
+ /* FIXME: This should go away too */
+ if ((i->flags & IF_IGNORE) && !mask)
+ continue;
+
/* No pattern or pattern matched */
if (!b || ipa_to_u32(a->ip) < ipa_to_u32(b->ip))
b = a;