summaryrefslogtreecommitdiff
path: root/nest
diff options
context:
space:
mode:
authorOndrej Zajicek (work) <santiago@crfreenet.org>2017-12-10 00:55:34 +0100
committerOndrej Zajicek (work) <santiago@crfreenet.org>2017-12-10 00:55:34 +0100
commit7fc55925beb06059759294e0e9b7bae45465395f (patch)
tree9f1ee1b354094aab25f64892f0f5dd1afeafdd26 /nest
parented1d853e5147376086e25f5edae9804cf242d6e0 (diff)
Several minor fixes
Diffstat (limited to 'nest')
-rw-r--r--nest/iface.c4
-rw-r--r--nest/rt-table.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/nest/iface.c b/nest/iface.c
index a876e9ff..303a52b2 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -849,7 +849,7 @@ if_show(void)
else if (i->master_index)
bsprintf(mbuf, " master=#%u", i->master_index);
- cli_msg(-1001, "%s %s (index=%d%s)", i->name, (i->flags & IF_UP) ? "Up" : "Down", i->index, mbuf);
+ cli_msg(-1001, "%s %s (index=%d%s)", i->name, (i->flags & IF_UP) ? "up" : "down", i->index, mbuf);
if (!(i->flags & IF_MULTIACCESS))
type = "PtP";
else
@@ -897,7 +897,7 @@ if_show_summary(void)
a6[0] = 0;
cli_msg(-1005, "%-10s %-6s %-18s %s",
- i->name, (i->flags & IF_UP) ? "Up" : "Down", a4, a6);
+ i->name, (i->flags & IF_UP) ? "up" : "down", a4, a6);
}
cli_msg(0, "");
}
diff --git a/nest/rt-table.c b/nest/rt-table.c
index c42d3a97..b0dd6d3f 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -897,7 +897,9 @@ rte_validate(rte *e)
return 0;
}
- c = net_classify(n->n.addr);
+ /* FIXME: better handling different nettypes */
+ c = !net_is_flow(n->n.addr) ?
+ net_classify(n->n.addr): (IADDR_HOST | SCOPE_UNIVERSE);
if ((c < 0) || !(c & IADDR_HOST) || ((c & IADDR_SCOPE_MASK) <= SCOPE_LINK))
{
log(L_WARN "Ignoring bogus route %N received via %s",