summaryrefslogtreecommitdiff
path: root/ospfd
diff options
context:
space:
mode:
Diffstat (limited to 'ospfd')
-rw-r--r--ospfd/ospf_packet.c3
-rw-r--r--ospfd/ospf_vty.c29
2 files changed, 23 insertions, 9 deletions
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 89d35c58..7bd48223 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -558,7 +558,8 @@ ospf_write (struct thread *thread)
ret = sendmsg (ospf->fd, &msg, flags);
if (ret < 0)
- zlog_warn ("*** sendmsg in ospf_write failed with %s", strerror (errno));
+ zlog_warn ("*** sendmsg in ospf_write to %s failed with %s",
+ inet_ntoa (iph.ip_dst), strerror (errno));
/* Retrieve OSPF packet type. */
stream_set_getp (op->s, 1);
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index d02214dd..392b7ae0 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -3196,13 +3196,32 @@ char *show_database_header[] =
#endif /* HAVE_OPAQUE_LSA */
};
+char *show_lsa_flags[] =
+{
+ "Self-originated",
+ "Checked",
+ "Received",
+ "Approved",
+ "Discard",
+#ifdef HAVE_NSSA
+ "Translated",
+#endif
+};
+
void
show_ip_ospf_database_header (struct vty *vty, struct ospf_lsa *lsa)
{
struct router_lsa *rlsa = (struct router_lsa*) lsa->data;
-
+
vty_out (vty, " LS age: %d%s", LS_AGE (lsa), VTY_NEWLINE);
- vty_out (vty, " Options: %d%s", lsa->data->options, VTY_NEWLINE);
+ vty_out (vty, " Options: 0x%-2x : %s%s",
+ lsa->data->options,
+ ospf_options_dump(lsa->data->options),
+ VTY_NEWLINE);
+ vty_out (vty, " LS Flags: 0x%-2x %s%s",
+ lsa->flags,
+ ((lsa->flags & OSPF_LSA_LOCAL_XLT) ? "(Translated from Type-7)" : ""),
+ VTY_NEWLINE);
if (lsa->data->type == OSPF_ROUTER_LSA)
{
@@ -3534,12 +3553,6 @@ show_lsa_detail_proc (struct vty *vty, struct route_table *rt,
for (rn = start; rn; rn = route_next_until (rn, start))
if ((lsa = rn->info))
{
-#ifdef HAVE_NSSA
- /* Stay away from any Local Translated Type-7 LSAs */
- if (CHECK_FLAG (lsa->flags, OSPF_LSA_LOCAL_XLT))
- continue;
-#endif /* HAVE_NSSA */
-
if (show_function[lsa->data->type] != NULL)
show_function[lsa->data->type] (vty, lsa);
}