summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2008-12-28 21:23:52 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2008-12-28 21:23:52 +0000
commit1a5f931fa5c3ba20666e1c2eccae21689047ad3a (patch)
treecdb8ff938df937a6eafd74f528e80d0a113cc898
parent3684c4395a911993090d613bab8b99c5685967b1 (diff)
Correctly display net lsa and the LSA type is now 16bit. This removes
the duplicate database headers seen all the time.
-rw-r--r--usr.sbin/ospf6ctl/ospf6ctl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/ospf6ctl/ospf6ctl.c b/usr.sbin/ospf6ctl/ospf6ctl.c
index 0d113e65216..e1979694527 100644
--- a/usr.sbin/ospf6ctl/ospf6ctl.c
+++ b/usr.sbin/ospf6ctl/ospf6ctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ospf6ctl.c,v 1.13 2008/12/28 18:31:52 claudio Exp $ */
+/* $OpenBSD: ospf6ctl.c,v 1.14 2008/12/28 21:23:51 claudio Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -562,7 +562,7 @@ int
show_database_msg(struct imsg *imsg)
{
static struct in_addr area_id;
- static u_int8_t lasttype;
+ static u_int16_t lasttype;
static char ifname[IF_NAMESIZE];
struct area *area;
struct iface *iface;
@@ -740,8 +740,8 @@ show_db_msg_detail(struct imsg *imsg)
if (lsa->hdr.type != lasttype)
show_database_head(area_id, ifname, lsa->hdr.type);
show_db_hdr_msg_detail(&lsa->hdr);
- addr.s_addr = lsa->data.net.mask;
- printf("Network Mask: %s\n", inet_ntoa(addr));
+ printf("Options: %s\n",
+ print_ospf_options(LSA_24_GETLO(ntohl(lsa->data.net.opts))));
nlinks = (ntohs(lsa->hdr.len) - sizeof(struct lsa_hdr)
- sizeof(u_int32_t)) / sizeof(struct lsa_net_link);