summaryrefslogtreecommitdiffstats
path: root/proto/ospf
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2008-10-28 16:10:42 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2008-10-28 16:10:42 +0100
commitf0ad56f4414fef2781339cfa41704f7bf4c61ad2 (patch)
treefda76b659f94388f79bcbf955df1a104120dffd7 /proto/ospf
parenta98fbf0f12b5e83e25afa0f585ca6a4d4ac5f6bf (diff)
downloadbird-f0ad56f4414fef2781339cfa41704f7bf4c61ad2.tar
bird-f0ad56f4414fef2781339cfa41704f7bf4c61ad2.zip
Fixes some sloppiness of commit a3b70dc499b64f41aa776b5b4afee5c7bfb8dfa6.
Diffstat (limited to 'proto/ospf')
-rw-r--r--proto/ospf/ospf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 1fce709..cd510bc 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -1052,16 +1052,16 @@ show_lsa_router(struct top_hash_entry *he)
cli_msg(-1016, "\t\tnetwork %I/%d metric %u ", ipa_and(ipa_from_u32(net_lsa->id), net_ln->netmask), ipa_mklen(net_ln->netmask), rr[i].metric);
}
else
- cli_msg(-1016, "\t\tnetwork ??? metric %u ", rr[i].id, ipa_mklen(rr[i].data), rr[i].metric);
+ cli_msg(-1016, "\t\tnetwork ??? metric %u ", rr[i].metric);
}
for (i = 0; i < rt->links; i++)
if (rr[i].type == LSART_STUB)
- cli_msg(-1016, "\t\tstubnet %I/%d metric %u ", rr[i].id, ipa_mklen(rr[i].data), rr[i].metric);
+ cli_msg(-1016, "\t\tstubnet %I/%d metric %u ", ipa_from_u32(rr[i].id), ipa_mklen(ipa_from_u32(rr[i].data)), rr[i].metric);
for (i = 0; i < rt->links; i++)
if (rr[i].type == LSART_VLNK)
- cli_msg(-1016, "\t\tvlink %I metric %u ", rr[i].id, rr[i].metric);
+ cli_msg(-1016, "\t\tvlink %I metric %u ", ipa_from_u32(rr[i].id), rr[i].metric);
}
static inline void
@@ -1107,7 +1107,7 @@ show_lsa_external(struct top_hash_entry *he)
char str_via[STD_ADDRESS_P_LENGTH + 8] = "";
char str_tag[16] = "";
- if (et->fwaddr)
+ if (ipa_nonzero(et->fwaddr))
bsprintf(str_via, " via %I", et->fwaddr);
if (et->tag)