Fixes some sloppiness of commit a3b70dc499b64f41aa776b5b4afee5c7bfb8dfa6.

diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 1fce7091de57c9ad1a18dde0cc942b197d3d012f..cd510bc8e95a451c1e09ddd154167f4fada7a106 100644 (file)
--- 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)