Controller for the recently imported ospf6d(8) daemon.

Currently simple stuff like show interface works.
Not yet connected to the builds.

ok claudio@

6 files changed, 1849 insertions, 0 deletions

diff --git a/usr.sbin/ospf6ctl/Makefile b/usr.sbin/ospf6ctl/Makefile
new file mode 100644
index 00000000000..26d128b7e49
--- /dev/null
+++ b/usr.sbin/ospf6ctl/Makefile
@@ -0,0 +1,14 @@
+#	$OpenBSD: Makefile,v 1.1 2007/10/12 08:22:53 norby Exp $
+
+.PATH:		${.CURDIR}/../ospf6d
+
+PROG=	ospf6ctl
+SRCS=	buffer.c imsg.c log.c ospf6ctl.c parser.c
+CFLAGS+= -Wall
+CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
+CFLAGS+= -Wsign-compare
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../ospf6d
+MAN=	ospf6ctl.8
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/ospf6ctl/ospf6ctl.8 b/usr.sbin/ospf6ctl/ospf6ctl.8
new file mode 100644
index 00000000000..66c7fcf18a9
--- /dev/null
+++ b/usr.sbin/ospf6ctl/ospf6ctl.8
@@ -0,0 +1,120 @@
+.\"	$OpenBSD: ospf6ctl.8,v 1.1 2007/10/12 08:22:53 norby Exp $
+.\"
+.\" Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd $Mdocdate: October 12 2007 $
+.Dt OSPF6CTL 8
+.Os
+.Sh NAME
+.Nm ospf6ctl
+.Nd control the Open Shortest Path First daemon
+.Sh SYNOPSIS
+.Nm
+.Ar command
+.Op Ar arguments ...
+.Sh DESCRIPTION
+The
+.Nm
+program controls the
+.Xr ospf6d 8
+daemon.
+.Pp
+The following commands are available:
+.Bl -tag -width Ds
+.It Cm fib couple
+Insert the learned routes into the Forwarding Information Base
+a.k.a. the kernel routing table.
+.It Cm fib decouple
+Remove the learned routes from the Forwarding Information Base
+a.k.a. the kernel routing table.
+Decoupling the FIB from an OSPF router may create routing loops and could cause
+major routing issues in the complete OSPF cloud.
+Only routers with just one link to the OSPF cloud can safely decouple the FIB.
+.It Cm reload
+Reload the configuration file.
+.It Cm show database Op Ar filter
+Show the link state database.
+.Ar filter
+can be any one of the following:
+.Pp
+.Bl -tag -width "self-originatedXX" -compact
+.It Cm area Ar ID
+Show only LSAs from the specified area
+.Ar ID .
+.It Cm asbr
+Show only ASBR LSAs.
+.It Cm external
+Show only AS-External LSAs.
+.It Cm network
+Show only Network LSAs.
+.It Cm router
+Show only Router LSAs.
+.It Cm self-originated
+Show only self-originated LSAs.
+.It Cm summary
+Show only Summary LSAs.
+.El
+.It Cm show fib Op Ar destination | filter
+Show the Forwarding Information Base.
+.Ar destination
+can be specified to show the route matching a destination IP address.
+.Ar filter
+can be any of the following:
+.Pp
+.Bl -tag -width "interfaceXXinterfaceXX" -compact
+.It Cm connected
+Show only connected routes.
+.It Cm interface Op Ar interface
+Show only interfaces or the specified
+.Ar interface .
+.It Cm ospf
+Show only OSPF routes.
+.It Cm static
+Show only static routes.
+.El
+.Pp
+.Cm connected ,
+.Cm ospf
+and
+.Cm static
+may be specified together.
+.It Cm show interfaces Op Ar interface
+Show details for all interfaces or the specified
+.Ar interface .
+.It Cm show neighbor Op Cm detail
+Show neighbors.
+.Cm detail
+can be specified for additional detail.
+.It Cm show rib Op Cm detail
+Show the Routing Information Base.
+.Cm detail
+can be specified for additional detail.
+.It Cm show summary
+Show summary information.
+.El
+.Sh FILES
+.Bl -tag -width "/var/run/ospf6d.sockXX" -compact
+.It /var/run/ospf6d.sock
+Unix-domain socket used for communication with
+.Xr ospf6d 8 .
+.El
+.Sh SEE ALSO
+.Xr ospf6d.conf 5 ,
+.Xr ospf6d 8
+.Sh HISTORY
+The
+.Nm
+program first appeared in
+.Ox 4.2 .
diff --git a/usr.sbin/ospf6ctl/ospf6ctl.c b/usr.sbin/ospf6ctl/ospf6ctl.c
new file mode 100644
index 00000000000..8994e55c564
--- /dev/null
+++ b/usr.sbin/ospf6ctl/ospf6ctl.c
@@ -0,0 +1,1244 @@
+/*	$OpenBSD: ospf6ctl.c,v 1.1 2007/10/12 08:22:53 norby Exp $ */
+
+/*
+ * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
+ * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
+ * Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "ospf6.h"
+#include "ospf6d.h"
+#include "ospfe.h"
+#include "parser.h"
+#include "log.h"
+
+__dead void	 usage(void);
+int		 show_summary_msg(struct imsg *);
+int		 get_ifms_type(int);
+int		 show_interface_msg(struct imsg *);
+int		 show_interface_detail_msg(struct imsg *);
+const char	*print_link(int);
+const char	*fmt_timeframe(time_t t);
+const char	*fmt_timeframe_core(time_t t);
+const char	*log_id(u_int32_t );
+const char	*log_adv_rtr(u_int32_t);
+void		 show_database_head(struct in_addr, u_int8_t);
+int		 show_database_msg(struct imsg *);
+char		*print_ls_type(u_int8_t);
+void		 show_db_hdr_msg_detail(struct lsa_hdr *);
+char		*print_rtr_link_type(u_int8_t);
+const char	*print_ospf_flags(u_int8_t);
+int		 show_db_msg_detail(struct imsg *imsg);
+int		 show_nbr_msg(struct imsg *);
+const char	*print_ospf_options(u_int8_t);
+int		 show_nbr_detail_msg(struct imsg *);
+int		 show_rib_msg(struct imsg *);
+void		 show_rib_head(struct in_addr, u_int8_t, u_int8_t);
+const char	*print_ospf_rtr_flags(u_int8_t);
+int		 show_rib_detail_msg(struct imsg *);
+void		 show_fib_head(void);
+int		 show_fib_msg(struct imsg *);
+void		 show_interface_head(void);
+const char *	 get_media_descr(int);
+const char *	 get_linkstate(int, int);
+void		 print_baudrate(u_int64_t);
+int		 show_fib_interface_msg(struct imsg *);
+
+struct imsgbuf	*ibuf;
+
+__dead void
+usage(void)
+{
+	extern char *__progname;
+
+	fprintf(stderr, "usage: %s <command> [arg [...]]\n", __progname);
+	exit(1);
+}
+
+/* dummy function so that ospf6ctl does not need libevent */
+void
+imsg_event_add(struct imsgbuf *i)
+{
+	/* nothing */
+}
+
+int
+main(int argc, char *argv[])
+{
+	struct sockaddr_un	 sun;
+	struct parse_result	*res;
+	struct imsg		 imsg;
+	unsigned int		 ifidx = 0;
+	int			 ctl_sock;
+	int			 done = 0;
+	int			 n;
+
+	/* parse options */
+	if ((res = parse(argc - 1, argv + 1)) == NULL)
+		exit(1);
+
+	/* connect to ospf6d control socket */
+	if ((ctl_sock = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+		err(1, "socket");
+
+	bzero(&sun, sizeof(sun));
+	sun.sun_family = AF_UNIX;
+	strlcpy(sun.sun_path, OSPF6D_SOCKET, sizeof(sun.sun_path));
+	if (connect(ctl_sock, (struct sockaddr *)&sun, sizeof(sun)) == -1)
+		err(1, "connect: %s", OSPF6D_SOCKET);
+
+	if ((ibuf = malloc(sizeof(struct imsgbuf))) == NULL)
+		err(1, NULL);
+	imsg_init(ibuf, ctl_sock, NULL);
+	done = 0;
+
+	/* process user request */
+	switch (res->action) {
+	case NONE:
+		usage();
+		/* not reached */
+	case SHOW:
+	case SHOW_SUM:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_SUM, 0, 0, NULL, 0);
+		break;
+	case SHOW_IFACE:
+		printf("%-11s %-18s %-6s %-10s %-10s %-8s %3s %3s\n",
+		    "Interface", "Address", "State", "HelloTimer", "Linkstate",
+		    "Uptime", "nc", "ac");
+	case SHOW_IFACE_DTAIL:
+		if (*res->ifname) {
+			ifidx = if_nametoindex(res->ifname);
+			if (ifidx == 0)
+				errx(1, "no such interface %s", res->ifname);
+		}
+		imsg_compose(ibuf, IMSG_CTL_SHOW_INTERFACE, 0, 0,
+		    &ifidx, sizeof(ifidx));
+		break;
+	case SHOW_NBR:
+		printf("%-15s %-3s %-12s %-8s %-15s %-9s %s\n", "ID", "Pri",
+		    "State", "DeadTime", "Address", "Iface","Uptime");
+	case SHOW_NBR_DTAIL:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_NBR, 0, 0, NULL, 0);
+		break;
+	case SHOW_DB:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_DATABASE, 0, 0, NULL, 0);
+		break;
+	case SHOW_DBBYAREA:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_DATABASE, 0, 0,
+		    &res->addr, sizeof(res->addr));
+		break;
+	case SHOW_DBEXT:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_DB_EXT, 0, 0, NULL, 0);
+		break;
+	case SHOW_DBNET:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_DB_NET, 0, 0, NULL, 0);
+		break;
+	case SHOW_DBRTR:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_DB_RTR, 0, 0, NULL, 0);
+		break;
+	case SHOW_DBSELF:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_DB_SELF, 0, 0, NULL, 0);
+		break;
+	case SHOW_DBSUM:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_DB_SUM, 0, 0, NULL, 0);
+		break;
+	case SHOW_DBASBR:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_DB_ASBR, 0, 0, NULL, 0);
+		break;
+	case SHOW_RIB:
+		printf("%-20s %-17s %-12s %-9s %-7s %-8s\n", "Destination",
+		    "Nexthop", "Path Type", "Type", "Cost", "Uptime");
+	case SHOW_RIB_DTAIL:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_RIB, 0, 0, NULL, 0);
+		break;
+	case SHOW_FIB:
+		if (!res->addr.s_addr)
+			imsg_compose(ibuf, IMSG_CTL_KROUTE, 0, 0,
+			    &res->flags, sizeof(res->flags));
+		else
+			imsg_compose(ibuf, IMSG_CTL_KROUTE_ADDR, 0, 0,
+			    &res->addr, sizeof(res->addr));
+		show_fib_head();
+		break;
+	case SHOW_FIB_IFACE:
+		if (*res->ifname)
+			imsg_compose(ibuf, IMSG_CTL_IFINFO, 0, 0,
+			    res->ifname, sizeof(res->ifname));
+		else
+			imsg_compose(ibuf, IMSG_CTL_IFINFO, 0, 0, NULL, 0);
+		show_interface_head();
+		break;
+	case FIB:
+		errx(1, "fib couple|decouple");
+		break;
+	case FIB_COUPLE:
+		imsg_compose(ibuf, IMSG_CTL_FIB_COUPLE, 0, 0, NULL, 0);
+		printf("couple request sent.\n");
+		done = 1;
+		break;
+	case FIB_DECOUPLE:
+		imsg_compose(ibuf, IMSG_CTL_FIB_DECOUPLE, 0, 0, NULL, 0);
+		printf("decouple request sent.\n");
+		done = 1;
+		break;
+	case RELOAD:
+		imsg_compose(ibuf, IMSG_CTL_RELOAD, 0, 0, NULL, 0);
+		printf("reload request sent.\n");
+		done = 1;
+		break;
+	}
+
+	while (ibuf->w.queued)
+		if (msgbuf_write(&ibuf->w) < 0)
+			err(1, "write error");
+
+	while (!done) {
+		if ((n = imsg_read(ibuf)) == -1)
+			errx(1, "imsg_read error");
+		if (n == 0)
+			errx(1, "pipe closed");
+
+		while (!done) {
+			if ((n = imsg_get(ibuf, &imsg)) == -1)
+				errx(1, "imsg_get error");
+			if (n == 0)
+				break;
+			switch (res->action) {
+			case SHOW:
+			case SHOW_SUM:
+				done = show_summary_msg(&imsg);
+				break;
+			case SHOW_IFACE:
+				done = show_interface_msg(&imsg);
+				break;
+			case SHOW_IFACE_DTAIL:
+				done = show_interface_detail_msg(&imsg);
+				break;
+			case SHOW_NBR:
+				done = show_nbr_msg(&imsg);
+				break;
+			case SHOW_NBR_DTAIL:
+				done = show_nbr_detail_msg(&imsg);
+				break;
+			case SHOW_DB:
+			case SHOW_DBBYAREA:
+			case SHOW_DBSELF:
+				done = show_database_msg(&imsg);
+				break;
+			case SHOW_DBEXT:
+			case SHOW_DBNET:
+			case SHOW_DBRTR:
+			case SHOW_DBSUM:
+			case SHOW_DBASBR:
+				done = show_db_msg_detail(&imsg);
+				break;
+			case SHOW_RIB:
+				done = show_rib_msg(&imsg);
+				break;
+			case SHOW_RIB_DTAIL:
+				done = show_rib_detail_msg(&imsg);
+				break;
+			case SHOW_FIB:
+				done = show_fib_msg(&imsg);
+				break;
+			case SHOW_FIB_IFACE:
+				done = show_fib_interface_msg(&imsg);
+				break;
+			case NONE:
+			case FIB:
+			case FIB_COUPLE:
+			case FIB_DECOUPLE:
+			case RELOAD:
+				break;
+			}
+			imsg_free(&imsg);
+		}
+	}
+	close(ctl_sock);
+	free(ibuf);
+
+	return (0);
+}
+
+int
+show_summary_msg(struct imsg *imsg)
+{
+	struct ctl_sum		*sum;
+	struct ctl_sum_area	*sumarea;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_SUM:
+		sum = imsg->data;
+		printf("Router ID: %s\n", inet_ntoa(sum->rtr_id));
+		printf("Uptime: %s\n", fmt_timeframe_core(sum->uptime));
+
+		printf("SPF delay is %d sec(s), hold time between two SPFs "
+		    "is %d sec(s)\n", sum->spf_delay, sum->spf_hold_time);
+		printf("Number of external LSA(s) %d\n", sum->num_ext_lsa);
+		printf("Number of areas attached to this router: %d\n",
+		    sum->num_area);
+		break;
+	case IMSG_CTL_SHOW_SUM_AREA:
+		sumarea = imsg->data;
+		printf("\nArea ID: %s\n", inet_ntoa(sumarea->area));
+		printf("  Number of interfaces in this area: %d\n",
+		    sumarea->num_iface);
+		printf("  Number of fully adjacent neighbors in this "
+		    "area: %d\n", sumarea->num_adj_nbr);
+		printf("  SPF algorithm executed %d time(s)\n",
+		    sumarea->num_spf_calc);
+		printf("  Number LSA(s) %d\n", sumarea->num_lsa);
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+int
+get_ifms_type(int mediatype)
+{
+	switch (mediatype) {
+	case IFT_ETHER:
+		return (IFM_ETHER);
+	case IFT_FDDI:
+		return (IFM_FDDI);
+	case IFT_CARP:
+		return (IFM_CARP);
+	case IFT_PPP:
+		return (IFM_TDM);
+	default:
+		return (0);
+	}
+}
+
+int
+show_interface_msg(struct imsg *imsg)
+{
+	struct ctl_iface	*iface;
+	char			*netid;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_INTERFACE:
+		iface = imsg->data;
+
+		if (asprintf(&netid, "%s", log_in6addr(&iface->addr)) == -1)
+			err(1, NULL);
+		printf("%-11s %-18s %-6s %-10s %-10s %s %3d %3d\n",
+		    iface->name, netid, if_state_name(iface->state),
+		    fmt_timeframe_core(iface->hello_timer),
+		    get_linkstate(get_ifms_type(iface->mediatype),
+		    iface->linkstate), fmt_timeframe_core(iface->uptime),
+		    iface->nbr_cnt,
+		    iface->adj_cnt);
+		free(netid);
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+int
+show_interface_detail_msg(struct imsg *imsg)
+{
+	struct ctl_iface	*iface;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_INTERFACE:
+		iface = imsg->data;
+		printf("\n");
+		printf("Interface %s, line protocol is %s\n",
+		    iface->name, print_link(iface->flags));
+		printf("  Internet address %s/ ",
+		    log_in6addr(&iface->addr));
+		printf("Area %s\n", inet_ntoa(iface->area));
+		printf("  Linkstate %s\n",
+		    get_linkstate(get_ifms_type(iface->mediatype),
+		    iface->linkstate));
+		printf("  Router ID %s, network type %s, cost: %d\n",
+		    inet_ntoa(iface->rtr_id),
+		    if_type_name(iface->type), iface->metric);
+		printf("  Transmit delay is %d sec(s), state %s, priority %d\n",
+		    iface->transmit_delay, if_state_name(iface->state),
+		    iface->priority);
+		printf("  Designated Router (ID) %s, ",
+		    inet_ntoa(iface->dr_id));
+		printf("interface address %s\n", log_in6addr(&iface->dr_addr));
+		printf("  Backup Designated Router (ID) %s, ",
+		    inet_ntoa(iface->bdr_id));
+		printf("interface address %s\n", log_in6addr(&iface->bdr_addr));
+		printf("  Timer intervals configured, "
+		    "hello %d, dead %d, wait %d, retransmit %d\n",
+		     iface->hello_interval, iface->dead_interval,
+		     iface->dead_interval, iface->rxmt_interval);
+		if (iface->passive)
+			printf("    Passive interface (No Hellos)\n");
+		else if (iface->hello_timer < 0)
+			printf("    Hello timer not running\n");
+		else
+			printf("    Hello timer due in %s\n",
+			    fmt_timeframe_core(iface->hello_timer));
+		printf("    Uptime %s\n", fmt_timeframe_core(iface->uptime));
+		printf("  Neighbor count is %d, adjacent neighbor count is "
+		    "%d\n", iface->nbr_cnt, iface->adj_cnt);
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+const char *
+print_link(int state)
+{
+	if (state & IFF_UP)
+		return ("UP");
+	else
+		return ("DOWN");
+}
+
+#define TF_BUFS	8
+#define TF_LEN	9
+
+const char *
+fmt_timeframe(time_t t)
+{
+	if (t == 0)
+		return ("Never");
+	else
+		return (fmt_timeframe_core(time(NULL) - t));
+}
+
+const char *
+fmt_timeframe_core(time_t t)
+{
+	char		*buf;
+	static char	 tfbuf[TF_BUFS][TF_LEN];	/* ring buffer */
+	static int	 idx = 0;
+	unsigned	 sec, min, hrs, day, week;
+
+	if (t == 0)
+		return ("00:00:00");
+
+	buf = tfbuf[idx++];
+	if (idx == TF_BUFS)
+		idx = 0;
+
+	week = t;
+
+	sec = week % 60;
+	week /= 60;
+	min = week % 60;
+	week /= 60;
+	hrs = week % 24;
+	week /= 24;
+	day = week % 7;
+	week /= 7;
+
+	if (week > 0)
+		snprintf(buf, TF_LEN, "%02uw%01ud%02uh", week, day, hrs);
+	else if (day > 0)
+		snprintf(buf, TF_LEN, "%01ud%02uh%02um", day, hrs, min);
+	else
+		snprintf(buf, TF_LEN, "%02u:%02u:%02u", hrs, min, sec);
+
+	return (buf);
+}
+
+const char *
+log_id(u_int32_t id)
+{
+	static char	buf[48];
+	struct in_addr	addr;
+
+	addr.s_addr = id;
+
+	if (inet_ntop(AF_INET, &addr, buf, sizeof(buf)) == NULL)
+		return ("?");
+	else
+		return (buf);
+}
+
+const char *
+log_adv_rtr(u_int32_t adv_rtr)
+{
+	static char	buf[48];
+	struct in_addr	addr;
+
+	addr.s_addr = adv_rtr;
+
+	if (inet_ntop(AF_INET, &addr, buf, sizeof(buf)) == NULL)
+		return ("?");
+	else
+		return (buf);
+}
+
+/* prototype defined in ospfd.h and shared with the kroute.c version */
+u_int8_t
+mask2prefixlen(in_addr_t ina)
+{
+	if (ina == 0)
+		return (0);
+	else
+		return (33 - ffs(ntohl(ina)));
+}
+
+void
+show_database_head(struct in_addr aid, u_int8_t type)
+{
+	char	*header, *format;
+
+	switch (type) {
+	case LSA_TYPE_ROUTER:
+		format = "Router Link States";
+		break;
+	case LSA_TYPE_NETWORK:
+		format = "Net Link States";
+		break;
+	case LSA_TYPE_SUM_NETWORK:
+		format = "Summary Net Link States";
+		break;
+	case LSA_TYPE_SUM_ROUTER:
+		format = "Summary Router Link States";
+		break;
+	case LSA_TYPE_EXTERNAL:
+		format = NULL;
+		if ((header = strdup("Type-5 AS External Link States")) == NULL)
+			err(1, NULL);
+		break;
+	default:
+		errx(1, "unknown LSA type");
+	}
+	if (type != LSA_TYPE_EXTERNAL)
+		if (asprintf(&header, "%s (Area %s)", format,
+		    inet_ntoa(aid)) == -1)
+			err(1, NULL);
+
+	printf("\n%-15s %s\n\n", "", header);
+	free(header);
+}
+
+int
+show_database_msg(struct imsg *imsg)
+{
+	static struct in_addr	 area_id;
+	static u_int8_t		 lasttype;
+	struct area		*area;
+	struct lsa_hdr		*lsa;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_DATABASE:
+	case IMSG_CTL_SHOW_DB_SELF:
+		lsa = imsg->data;
+		if (lsa->type != lasttype) {
+			show_database_head(area_id, lsa->type);
+			printf("%-15s %-15s %-4s %-10s %-8s\n", "Link ID",
+			    "Adv Router", "Age", "Seq#", "Checksum");
+		}
+		printf("%-15s %-15s %-4d 0x%08x 0x%04x\n",
+		    log_id(lsa->ls_id), log_adv_rtr(lsa->adv_rtr),
+		    ntohs(lsa->age), ntohl(lsa->seq_num),
+		    ntohs(lsa->ls_chksum));
+		lasttype = lsa->type;
+		break;
+	case IMSG_CTL_AREA:
+		area = imsg->data;
+		area_id = area->id;
+		lasttype = 0;
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+char *
+print_ls_type(u_int8_t type)
+{
+	switch (type) {
+	case LSA_TYPE_ROUTER:
+		return ("Router");
+	case LSA_TYPE_NETWORK:
+		return ("Network");
+	case LSA_TYPE_SUM_NETWORK:
+		return ("Summary (Network)");
+	case LSA_TYPE_SUM_ROUTER:
+		return ("Summary (Router)");
+	case LSA_TYPE_EXTERNAL:
+		return ("AS External");
+	default:
+		return ("Unknown");
+	}
+}
+
+void
+show_db_hdr_msg_detail(struct lsa_hdr *lsa)
+{
+	printf("LS age: %d\n", ntohs(lsa->age));
+//XXX	printf("Options: %s\n", print_ospf_options(lsa->opts));
+	printf("LS Type: %s\n", print_ls_type(lsa->type));
+
+	switch (lsa->type) {
+	case LSA_TYPE_ROUTER:
+		printf("Link State ID: %s\n", log_id(lsa->ls_id));
+		break;
+	case LSA_TYPE_NETWORK:
+		printf("Link State ID: %s (address of Designated Router)\n",
+		    log_id(lsa->ls_id));
+		break;
+	case LSA_TYPE_SUM_NETWORK:
+		printf("Link State ID: %s (Network ID)\n", log_id(lsa->ls_id));
+		break;
+	case LSA_TYPE_SUM_ROUTER:
+		printf("Link State ID: %s (ASBR Router ID)\n",
+		    log_id(lsa->ls_id));
+		break;
+	case LSA_TYPE_EXTERNAL:
+		printf("Link State ID: %s (External Network Number)\n",
+		     log_id(lsa->ls_id));
+		break;
+	}
+
+	printf("Advertising Router: %s\n", log_adv_rtr(lsa->adv_rtr));
+	printf("LS Seq Number: 0x%08x\n", ntohl(lsa->seq_num));
+	printf("Checksum: 0x%04x\n", ntohs(lsa->ls_chksum));
+	printf("Length: %d\n", ntohs(lsa->len));
+}
+
+char *
+print_rtr_link_type(u_int8_t type)
+{
+	switch (type) {
+	case LINK_TYPE_POINTTOPOINT:
+		return ("Point-to-Point");
+	case LINK_TYPE_TRANSIT_NET:
+		return ("Transit Network");
+	case LINK_TYPE_STUB_NET:
+		return ("Stub Network");
+	case LINK_TYPE_VIRTUAL:
+		return ("Virtual Link");
+	default:
+		return ("Unknown");
+	}
+}
+
+const char *
+print_ospf_flags(u_int8_t opts)
+{
+	static char	optbuf[32];
+
+	snprintf(optbuf, sizeof(optbuf), "*|*|*|*|*|%s|%s|%s",
+	    opts & OSPF_RTR_V ? "V" : "-",
+	    opts & OSPF_RTR_E ? "E" : "-",
+	    opts & OSPF_RTR_B ? "B" : "-");
+	return (optbuf);
+}
+
+int
+show_db_msg_detail(struct imsg *imsg)
+{
+	static struct in_addr	 area_id;
+	static u_int8_t		 lasttype;
+	struct in_addr		 addr, data;
+	struct area		*area;
+	struct lsa		*lsa;
+	struct lsa_rtr_link	*rtr_link;
+	struct lsa_asext	*asext;
+	u_int16_t		 i, nlinks, off;
+
+	/* XXX sanity checks! */
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_DB_EXT:
+		lsa = imsg->data;
+		if (lsa->hdr.type != lasttype)
+			show_database_head(area_id, lsa->hdr.type);
+		show_db_hdr_msg_detail(&lsa->hdr);
+		addr.s_addr = lsa->data.asext.mask;
+		printf("Network Mask: %s\n", inet_ntoa(addr));
+
+		asext = (struct lsa_asext *)((char *)lsa + sizeof(lsa->hdr));
+
+		printf("    Metric type: ");
+		if (ntohl(lsa->data.asext.metric) & LSA_ASEXT_E_FLAG)
+			printf("2\n");
+		else
+			printf("1\n");
+		printf("    Metric: %d\n", ntohl(asext->metric)
+		    & LSA_METRIC_MASK);
+		addr.s_addr = asext->fw_addr;
+		printf("    Forwarding Address: %s\n", inet_ntoa(addr));
+		printf("    External Route Tag: %d\n\n", ntohl(asext->ext_tag));
+
+		lasttype = lsa->hdr.type;
+		break;
+	case IMSG_CTL_SHOW_DB_NET:
+		lsa = imsg->data;
+		if (lsa->hdr.type != lasttype)
+			show_database_head(area_id, 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));
+
+		nlinks = (ntohs(lsa->hdr.len) - sizeof(struct lsa_hdr)
+		    - sizeof(u_int32_t)) / sizeof(struct lsa_net_link);
+		off = sizeof(lsa->hdr) + sizeof(u_int32_t);
+
+		for (i = 0; i < nlinks; i++) {
+			addr.s_addr = lsa->data.net.att_rtr[i];
+			printf("    Attached Router: %s\n", inet_ntoa(addr));
+		}
+
+		printf("\n");
+		lasttype = lsa->hdr.type;
+		break;
+	case IMSG_CTL_SHOW_DB_RTR:
+		lsa = imsg->data;
+		if (lsa->hdr.type != lasttype)
+			show_database_head(area_id, lsa->hdr.type);
+		show_db_hdr_msg_detail(&lsa->hdr);
+		printf("Flags: %s\n", print_ospf_flags(lsa->data.rtr.flags));
+		nlinks = ntohs(lsa->data.rtr.nlinks);
+		printf("Number of Links: %d\n\n", nlinks);
+
+		off = sizeof(lsa->hdr) + sizeof(struct lsa_rtr);
+
+		for (i = 0; i < nlinks; i++) {
+			rtr_link = (struct lsa_rtr_link *)((char *)lsa + off);
+
+			printf("    Link connected to: %s\n",
+			    print_rtr_link_type(rtr_link->type));
+
+			addr.s_addr = rtr_link->id;
+			data.s_addr = rtr_link->data;
+
+			switch (rtr_link->type) {
+			case LINK_TYPE_POINTTOPOINT:
+			case LINK_TYPE_VIRTUAL:
+				printf("    Link ID (Neighbors Router ID):"
+				    " %s\n", inet_ntoa(addr));
+				printf("    Link Data (Router Interface "
+				    "address): %s\n", inet_ntoa(data));
+				break;
+			case LINK_TYPE_TRANSIT_NET:
+				printf("    Link ID (Designated Router "
+				    "address): %s\n", inet_ntoa(addr));
+				printf("    Link Data (Router Interface "
+				    "address): %s\n", inet_ntoa(data));
+				break;
+			case LINK_TYPE_STUB_NET:
+				printf("    Link ID (Network ID): %s\n",
+				    inet_ntoa(addr));
+				printf("    Link Data (Network Mask): %s\n",
+				    inet_ntoa(data));
+				break;
+			default:
+				printf("    Link ID (Unknown): %s\n",
+				    inet_ntoa(addr));
+				printf("    Link Data (Unknown): %s\n",
+				    inet_ntoa(data));
+				break;
+			}
+
+			printf("    Metric: %d\n\n", ntohs(rtr_link->metric));
+
+			off += sizeof(struct lsa_rtr_link) +
+			    rtr_link->num_tos * sizeof(u_int32_t);
+		}
+
+		lasttype = lsa->hdr.type;
+		break;
+	case IMSG_CTL_SHOW_DB_SUM:
+	case IMSG_CTL_SHOW_DB_ASBR:
+		lsa = imsg->data;
+		if (lsa->hdr.type != lasttype)
+			show_database_head(area_id, lsa->hdr.type);
+		show_db_hdr_msg_detail(&lsa->hdr);
+		addr.s_addr = lsa->data.sum.mask;
+		printf("Network Mask: %s\n", inet_ntoa(addr));
+		printf("Metric: %d\n\n", ntohl(lsa->data.sum.metric) &
+		    LSA_METRIC_MASK);
+		lasttype = lsa->hdr.type;
+		break;
+	case IMSG_CTL_AREA:
+		area = imsg->data;
+		area_id = area->id;
+		lasttype = 0;
+		break;
+	case IMSG_CTL_END:
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+int
+show_nbr_msg(struct imsg *imsg)
+{
+	struct ctl_nbr	*nbr;
+	char		*state;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_NBR:
+		nbr = imsg->data;
+		if (asprintf(&state, "%s/%s", nbr_state_name(nbr->nbr_state),
+		    if_state_name(nbr->iface_state)) == -1)
+			err(1, NULL);
+		printf("%-15s %-3d %-12s %-9s", inet_ntoa(nbr->id),
+		    nbr->priority, state, fmt_timeframe_core(nbr->dead_timer));
+		printf("%-15s %-9s %s\n", log_in6addr(&nbr->addr), nbr->name,
+		    nbr->uptime == 0 ? "-" : fmt_timeframe_core(nbr->uptime));
+		free(state);
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+const char *
+print_ospf_options(u_int8_t opts)
+{
+	static char	optbuf[32];
+
+	snprintf(optbuf, sizeof(optbuf), "*|*|%s|%s|%s|%s|%s|%s",
+	    opts & OSPF_OPTION_DC ? "DC" : "-",
+	    opts & OSPF_OPTION_R ? "R" : "-",
+	    opts & OSPF_OPTION_N ? "N" : "-",
+	    opts & OSPF_OPTION_MC ? "MC" : "-",
+	    opts & OSPF_OPTION_E ? "E" : "-",
+	    opts & OSPF_OPTION_V6 ? "V6" : "-");
+	return (optbuf);
+}
+
+int
+show_nbr_detail_msg(struct imsg *imsg)
+{
+	struct ctl_nbr	*nbr;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_NBR:
+		nbr = imsg->data;
+		printf("\nNeighbor %s, ", inet_ntoa(nbr->id));
+		printf("interface address %s\n", log_in6addr(&nbr->addr));
+		printf("  Area %s, interface %s\n", inet_ntoa(nbr->area),
+		    nbr->name);
+		printf("  Neighbor priority is %d, "
+		    "State is %s, %d state changes\n",
+		    nbr->priority, nbr_state_name(nbr->nbr_state),
+		    nbr->state_chng_cnt);
+		printf("  DR is %s, ", inet_ntoa(nbr->dr));
+		printf("BDR is %s\n", inet_ntoa(nbr->bdr));
+		printf("  Options %s\n", print_ospf_options(nbr->options));
+		printf("  Dead timer due in %s\n",
+		    fmt_timeframe_core(nbr->dead_timer));
+		printf("  Uptime %s\n", fmt_timeframe_core(nbr->uptime));
+		printf("  Database Summary List %d\n", nbr->db_sum_lst_cnt);
+		printf("  Link State Request List %d\n", nbr->ls_req_lst_cnt);
+		printf("  Link State Retransmission List %d\n",
+		    nbr->ls_retrans_lst_cnt);
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+int
+show_rib_msg(struct imsg *imsg)
+{
+	struct ctl_rt	*rt;
+	char		*dstnet;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_RIB:
+		rt = imsg->data;
+		switch (rt->d_type) {
+		case DT_NET:
+			if (asprintf(&dstnet, "%s/%d", inet_ntoa(rt->prefix),
+			    rt->prefixlen) == -1)
+				err(1, NULL);
+			break;
+		case DT_RTR:
+			if (asprintf(&dstnet, "%s",
+			    inet_ntoa(rt->prefix)) == -1)
+				err(1, NULL);
+			break;
+		default:
+			errx(1, "Invalid route type");
+		}
+
+		printf("%-20s %-17s %-12s %-9s %-7d %s\n", dstnet,
+		    inet_ntoa(rt->nexthop), path_type_name(rt->p_type),
+		    dst_type_name(rt->d_type), rt->cost,
+		    rt->uptime == 0 ? "-" : fmt_timeframe_core(rt->uptime));
+		free(dstnet);
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+void
+show_rib_head(struct in_addr aid, u_int8_t d_type, u_int8_t p_type)
+{
+	char	*header, *format, *format2;
+
+	switch (p_type) {
+	case PT_INTRA_AREA:
+	case PT_INTER_AREA:
+		switch (d_type) {
+		case DT_NET:
+			format = "Network Routing Table";
+			format2 = "";
+			break;
+		case DT_RTR:
+			format = "Router Routing Table";
+			format2 = "Type";
+			break;
+		default:
+			errx(1, "unknown route type");
+		}
+		break;
+	case PT_TYPE1_EXT:
+	case PT_TYPE2_EXT:
+		format = NULL;
+		format2 = "Cost 2";
+		if ((header = strdup("External Routing Table")) == NULL)
+			err(1, NULL);
+		break;
+	default:
+		errx(1, "unknown route type");
+	}
+
+	if (p_type != PT_TYPE1_EXT && p_type != PT_TYPE2_EXT)
+		if (asprintf(&header, "%s (Area %s)", format,
+		    inet_ntoa(aid)) == -1)
+			err(1, NULL);
+
+	printf("\n%-18s %s\n", "", header);
+	free(header);
+
+	printf("\n%-18s %-15s %-15s %-12s %-7s %-7s\n", "Destination",
+	    "Nexthop", "Adv Router", "Path type", "Cost", format2);
+}
+
+const char *
+print_ospf_rtr_flags(u_int8_t opts)
+{
+	static char	optbuf[32];
+
+	snprintf(optbuf, sizeof(optbuf), "%s%s%s",
+	    opts & OSPF_RTR_E ? "AS" : "",
+	    opts & OSPF_RTR_E && opts & OSPF_RTR_B ? "+" : "",
+	    opts & OSPF_RTR_B ? "ABR" : "");
+	return (optbuf);
+}
+
+int
+show_rib_detail_msg(struct imsg *imsg)
+{
+	static struct in_addr	 area_id;
+	struct ctl_rt		*rt;
+	struct area		*area;
+	char			*dstnet;
+	static u_int8_t		 lasttype;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_RIB:
+		rt = imsg->data;
+
+		switch (rt->p_type) {
+		case PT_INTRA_AREA:
+		case PT_INTER_AREA:
+			switch (rt->d_type) {
+			case DT_NET:
+				if (lasttype != RIB_NET)
+					show_rib_head(rt->area, rt->d_type,
+					     rt->p_type);
+				if (asprintf(&dstnet, "%s/%d",
+				    inet_ntoa(rt->prefix), rt->prefixlen) == -1)
+					err(1, NULL);
+				lasttype = RIB_NET;
+				break;
+			case DT_RTR:
+				if (lasttype != RIB_RTR)
+					show_rib_head(rt->area, rt->d_type,
+					     rt->p_type);
+				if (asprintf(&dstnet, "%s",
+				    inet_ntoa(rt->prefix)) == -1)
+					err(1, NULL);
+				lasttype = RIB_RTR;
+				break;
+			default:
+				errx(1, "unknown route type");
+			}
+			printf("%-18s %-15s ", dstnet, inet_ntoa(rt->nexthop));
+			printf("%-15s %-12s %-7d", inet_ntoa(rt->adv_rtr),
+			    path_type_name(rt->p_type), rt->cost);
+			free(dstnet);
+
+			if (rt->d_type == DT_RTR)
+				printf(" %-7s",
+				    print_ospf_rtr_flags(rt->flags));
+
+			printf("\n");
+			break;
+		case PT_TYPE1_EXT:
+		case PT_TYPE2_EXT:
+			if (lasttype != RIB_EXT)
+				show_rib_head(rt->area, rt->d_type, rt->p_type);
+
+			if (asprintf(&dstnet, "%s/%d",
+			    inet_ntoa(rt->prefix), rt->prefixlen) == -1)
+				err(1, NULL);
+
+			printf("%-18s %-15s ", dstnet, inet_ntoa(rt->nexthop));
+			printf("%-15s %-12s %-7d %-7d\n",
+			    inet_ntoa(rt->adv_rtr), path_type_name(rt->p_type),
+			    rt->cost, rt->cost2);
+
+			lasttype = RIB_EXT;
+			break;
+		default:
+			errx(1, "unknown route type");
+		}
+		break;
+	case IMSG_CTL_AREA:
+		area = imsg->data;
+		area_id = area->id;
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+void
+show_fib_head(void)
+{
+	printf("flags: * = valid, O = OSPF, C = Connected, S = Static\n");
+	printf("%-6s %-20s %-17s\n", "Flags", "Destination", "Nexthop");
+}
+
+int
+show_fib_msg(struct imsg *imsg)
+{
+	struct kroute		*k;
+	char			*p;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_KROUTE:
+		if (imsg->hdr.len < IMSG_HEADER_SIZE + sizeof(struct kroute))
+			errx(1, "wrong imsg len");
+		k = imsg->data;
+
+		if (k->flags & F_DOWN)
+			printf(" ");
+		else
+			printf("*");
+
+		if (!(k->flags & F_KERNEL))
+			printf("O");
+		else if (k->flags & F_CONNECTED)
+			printf("C");
+		else if (k->flags & F_STATIC)
+			printf("S");
+		else
+			printf(" ");
+
+		printf("     ");
+		if (asprintf(&p, "%s/%u", inet_ntoa(k->prefix), k->prefixlen) ==
+		    -1)
+			err(1, NULL);
+		printf("%-20s ", p);
+		free(p);
+
+		if (k->nexthop.s_addr)
+			printf("%s", inet_ntoa(k->nexthop));
+		else if (k->flags & F_CONNECTED)
+			printf("link#%u", k->ifindex);
+		printf("\n");
+
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+void
+show_interface_head(void)
+{
+	printf("%-15s%-15s%s\n", "Interface", "Flags",
+	    "Link state");
+}
+
+const int	ifm_status_valid_list[] = IFM_STATUS_VALID_LIST;
+const struct ifmedia_status_description
+		ifm_status_descriptions[] = IFM_STATUS_DESCRIPTIONS;
+const struct ifmedia_description
+		ifm_type_descriptions[] = IFM_TYPE_DESCRIPTIONS;
+
+const char *
+get_media_descr(int media_type)
+{
+	const struct ifmedia_description	*p;
+
+	for (p = ifm_type_descriptions; p->ifmt_string != NULL; p++)
+		if (media_type == p->ifmt_word)
+			return (p->ifmt_string);
+
+	return ("unknown");
+}
+
+const char *
+get_linkstate(int media_type, int link_state)
+{
+	const struct ifmedia_status_description	*p;
+	int					 i;
+
+	if (link_state == LINK_STATE_UNKNOWN)
+		return ("unknown");
+
+	for (i = 0; ifm_status_valid_list[i] != 0; i++)
+		for (p = ifm_status_descriptions; p->ifms_valid != 0; p++) {
+			if (p->ifms_type != media_type ||
+			    p->ifms_valid != ifm_status_valid_list[i])
+				continue;
+			if (LINK_STATE_IS_UP(link_state))
+				return (p->ifms_string[1]);
+			return (p->ifms_string[0]);
+		}
+
+	return ("unknown");
+}
+
+void
+print_baudrate(u_int64_t baudrate)
+{
+	if (baudrate > IF_Gbps(1))
+		printf("%llu GBit/s", baudrate / IF_Gbps(1));
+	else if (baudrate > IF_Mbps(1))
+		printf("%llu MBit/s", baudrate / IF_Mbps(1));
+	else if (baudrate > IF_Kbps(1))
+		printf("%llu KBit/s", baudrate / IF_Kbps(1));
+	else
+		printf("%llu Bit/s", baudrate);
+}
+
+int
+show_fib_interface_msg(struct imsg *imsg)
+{
+	struct kif	*k;
+	int		 ifms_type;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_IFINFO:
+		k = imsg->data;
+		printf("%-15s", k->ifname);
+		printf("%-15s", k->flags & IFF_UP ? "UP" : "");
+		switch (k->media_type) {
+		case IFT_ETHER:
+			ifms_type = IFM_ETHER;
+			break;
+		case IFT_FDDI:
+			ifms_type = IFM_FDDI;
+			break;
+		case IFT_CARP:
+			ifms_type = IFM_CARP;
+			break;
+		default:
+			ifms_type = 0;
+			break;
+		}
+
+		if (ifms_type)
+			printf("%s, %s", get_media_descr(ifms_type),
+			    get_linkstate(ifms_type, k->link_state));
+		else if (k->link_state == LINK_STATE_UNKNOWN)
+			printf("unknown");
+		else
+			printf("link state %u", k->link_state);
+
+		if (k->link_state != LINK_STATE_DOWN && k->baudrate > 0) {
+			printf(", ");
+			print_baudrate(k->baudrate);
+		}
+		printf("\n");
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
diff --git a/usr.sbin/ospf6ctl/ospf6ctl.cat8 b/usr.sbin/ospf6ctl/ospf6ctl.cat8
new file mode 100644
index 00000000000..50c652b93b5
--- /dev/null
+++ b/usr.sbin/ospf6ctl/ospf6ctl.cat8
@@ -0,0 +1,75 @@
+OSPF6CTL(8)             OpenBSD System Manager's Manual            OSPF6CTL(8)
+
+NNAAMMEE
+     oossppff66ccttll - control the Open Shortest Path First daemon
+
+SSYYNNOOPPSSIISS
+     oossppff66ccttll _c_o_m_m_a_n_d [_a_r_g_u_m_e_n_t_s _._._.]
+
+DDEESSCCRRIIPPTTIIOONN
+     The oossppff66ccttll program controls the ospf6d(8) daemon.
+
+     The following commands are available:
+
+     ffiibb ccoouuppllee
+             Insert the learned routes into the Forwarding Information Base
+             a.k.a. the kernel routing table.
+
+     ffiibb ddeeccoouuppllee
+             Remove the learned routes from the Forwarding Information Base
+             a.k.a. the kernel routing table.  Decoupling the FIB from an OSPF
+             router may create routing loops and could cause major routing is-
+             sues in the complete OSPF cloud.  Only routers with just one link
+             to the OSPF cloud can safely decouple the FIB.
+
+     rreellooaadd  Reload the configuration file.
+
+     sshhooww ddaattaabbaassee [_f_i_l_t_e_r]
+             Show the link state database.  _f_i_l_t_e_r can be any one of the fol-
+             lowing:
+
+             aarreeaa _I_D            Show only LSAs from the specified area _I_D.
+             aassbbrr               Show only ASBR LSAs.
+             eexxtteerrnnaall           Show only AS-External LSAs.
+             nneettwwoorrkk            Show only Network LSAs.
+             rroouutteerr             Show only Router LSAs.
+             sseellff--oorriiggiinnaatteedd    Show only self-originated LSAs.
+             ssuummmmaarryy            Show only Summary LSAs.
+
+     sshhooww ffiibb [_d_e_s_t_i_n_a_t_i_o_n | _f_i_l_t_e_r]
+             Show the Forwarding Information Base.  _d_e_s_t_i_n_a_t_i_o_n can be speci-
+             fied to show the route matching a destination IP address.  _f_i_l_t_e_r
+             can be any of the following:
+
+             ccoonnnneecctteedd               Show only connected routes.
+             iinntteerrffaaccee [_i_n_t_e_r_f_a_c_e]   Show only interfaces or the specified
+                                     _i_n_t_e_r_f_a_c_e.
+             oossppff                    Show only OSPF routes.
+             ssttaattiicc                  Show only static routes.
+
+             ccoonnnneecctteedd, oossppff and ssttaattiicc may be specified together.
+
+     sshhooww iinntteerrffaacceess [_i_n_t_e_r_f_a_c_e]
+             Show details for all interfaces or the specified _i_n_t_e_r_f_a_c_e.
+
+     sshhooww nneeiigghhbboorr [ddeettaaiill]
+             Show neighbors.  ddeettaaiill can be specified for additional detail.
+
+     sshhooww rriibb [ddeettaaiill]
+             Show the Routing Information Base.  ddeettaaiill can be specified for
+             additional detail.
+
+     sshhooww ssuummmmaarryy
+             Show summary information.
+
+FFIILLEESS
+     /var/run/ospf6d.sock    Unix-domain socket used for communication with
+                             ospf6d(8).
+
+SSEEEE AALLSSOO
+     ospf6d.conf(5), ospf6d(8)
+
+HHIISSTTOORRYY
+     The oossppff66ccttll program first appeared in OpenBSD 4.2.
+
+OpenBSD 4.2                     August 3, 2007                               2
diff --git a/usr.sbin/ospf6ctl/parser.c b/usr.sbin/ospf6ctl/parser.c
new file mode 100644
index 00000000000..0c75ef03739
--- /dev/null
+++ b/usr.sbin/ospf6ctl/parser.c
@@ -0,0 +1,328 @@
+/*	$OpenBSD: parser.c,v 1.1 2007/10/12 08:22:53 norby Exp $ */
+
+/*
+ * Copyright (c) 2004 Esben Norby <norby@openbsd.org>
+ * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <err.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "ospf6d.h"
+
+#include "parser.h"
+
+enum token_type {
+	NOTOKEN,
+	ENDTOKEN,
+	KEYWORD,
+	ADDRESS,
+	FLAG,
+	PREFIX,
+	IFNAME
+};
+
+struct token {
+	enum token_type		 type;
+	const char		*keyword;
+	int			 value;
+	const struct token	*next;
+};
+
+static const struct token t_main[];
+static const struct token t_fib[];
+static const struct token t_show[];
+static const struct token t_show_iface[];
+static const struct token t_show_db[];
+static const struct token t_show_area[];
+static const struct token t_show_nbr[];
+static const struct token t_show_rib[];
+static const struct token t_show_fib[];
+
+static const struct token t_main[] = {
+	{KEYWORD,	"reload",	RELOAD,		NULL},
+	{KEYWORD,	"fib",		FIB,		t_fib},
+	{KEYWORD,	"show",		SHOW,		t_show},
+	{ENDTOKEN,	"",		NONE,		NULL}
+};
+
+static const struct token t_fib[] = {
+	{ KEYWORD,	"couple",	FIB_COUPLE,	NULL},
+	{ KEYWORD,	"decouple",	FIB_DECOUPLE,	NULL},
+	{ ENDTOKEN,	"",		NONE,		NULL}
+};
+
+static const struct token t_show[] = {
+	{NOTOKEN,	"",		NONE,		NULL},
+	{KEYWORD,	"interfaces",	SHOW_IFACE,	t_show_iface},
+	{KEYWORD,	"database",	SHOW_DB,	t_show_db},
+	{KEYWORD,	"neighbor",	SHOW_NBR,	t_show_nbr},
+	{KEYWORD,	"rib",		SHOW_RIB,	t_show_rib},
+	{KEYWORD,	"fib",		SHOW_FIB,	t_show_fib},
+	{KEYWORD,	"summary",	SHOW_SUM,	NULL},
+	{ENDTOKEN,	"",		NONE,		NULL}
+};
+
+static const struct token t_show_iface[] = {
+	{NOTOKEN,	"",		NONE,			NULL},
+	{KEYWORD,	"detail",	SHOW_IFACE_DTAIL,	NULL},
+	{IFNAME,	"",		SHOW_IFACE_DTAIL,	NULL},
+	{ENDTOKEN,	"",		NONE,			NULL}
+};
+
+static const struct token t_show_db[] = {
+	{NOTOKEN,	"",			NONE,		NULL},
+	{KEYWORD,	"area",			SHOW_DBBYAREA,	t_show_area},
+	{KEYWORD,	"asbr",			SHOW_DBASBR,	NULL},
+	{KEYWORD,	"external",		SHOW_DBEXT,	NULL},
+	{KEYWORD,	"network",		SHOW_DBNET,	NULL},
+	{KEYWORD,	"router",		SHOW_DBRTR,	NULL},
+	{KEYWORD,	"self-originated",	SHOW_DBSELF,	NULL},
+	{KEYWORD,	"summary",		SHOW_DBSUM,	NULL},
+	{ENDTOKEN,	"",			NONE,		NULL}
+};
+
+static const struct token t_show_area[] = {
+	{ADDRESS,	"",		NONE,		NULL},
+	{ENDTOKEN,	"",		NONE,		NULL}
+};
+
+static const struct token t_show_nbr[] = {
+	{NOTOKEN,	"",		NONE,		NULL},
+	{KEYWORD,	"detail",	SHOW_NBR_DTAIL,	NULL},
+	{ENDTOKEN,	"",		NONE,		NULL}
+};
+
+static const struct token t_show_rib[] = {
+	{NOTOKEN,	"",		NONE,		NULL},
+	{KEYWORD,	"detail",	SHOW_RIB_DTAIL,	NULL},
+	{ENDTOKEN,	"",		NONE,		NULL}
+};
+
+static const struct token t_show_fib[] = {
+	{NOTOKEN,	"",		NONE,			NULL},
+	{KEYWORD,	"interface",	SHOW_FIB_IFACE,		t_show_iface},
+	{FLAG,		"connected",	F_CONNECTED,		t_show_fib},
+	{FLAG,		"static",	F_STATIC,		t_show_fib},
+	{FLAG,		"ospf",		F_OSPFD_INSERTED,	t_show_fib},
+	{ADDRESS,	"",		NONE,			NULL},
+	{ENDTOKEN,	"",		NONE,			NULL}
+};
+
+static struct parse_result	res;
+
+struct parse_result *
+parse(int argc, char *argv[])
+{
+	const struct token	*table = t_main;
+	const struct token	*match;
+
+	bzero(&res, sizeof(res));
+
+	while (argc >= 0) {
+		if ((match = match_token(argv[0], table)) == NULL) {
+			fprintf(stderr, "valid commands/args:\n");
+			show_valid_args(table);
+			return (NULL);
+		}
+
+		argc--;
+		argv++;
+
+		if (match->type == NOTOKEN || match->next == NULL)
+			break;
+
+		table = match->next;
+	}
+
+	if (argc > 0) {
+		fprintf(stderr, "superfluous argument: %s\n", argv[0]);
+		return (NULL);
+	}
+
+	return (&res);
+}
+
+const struct token *
+match_token(const char *word, const struct token table[])
+{
+	u_int			 i, match;
+	const struct token	*t = NULL;
+
+	match = 0;
+
+	for (i = 0; table[i].type != ENDTOKEN; i++) {
+		switch (table[i].type) {
+		case NOTOKEN:
+			if (word == NULL || strlen(word) == 0) {
+				match++;
+				t = &table[i];
+			}
+			break;
+		case KEYWORD:
+			if (word != NULL && strncmp(word, table[i].keyword,
+			    strlen(word)) == 0) {
+				match++;
+				t = &table[i];
+				if (t->value)
+					res.action = t->value;
+			}
+			break;
+		case FLAG:
+			if (word != NULL && strncmp(word, table[i].keyword,
+			    strlen(word)) == 0) {
+				match++;
+				t = &table[i];
+				res.flags |= t->value;
+			}
+			break;
+		case ADDRESS:
+			if (parse_addr(word, &res.addr)) {
+				match++;
+				t = &table[i];
+				if (t->value)
+					res.action = t->value;
+			}
+			break;
+		case PREFIX:
+			if (parse_prefix(word, &res.addr, &res.prefixlen)) {
+				match++;
+				t = &table[i];
+				if (t->value)
+					res.action = t->value;
+			}
+			break;
+		case IFNAME:
+			if (!match && word != NULL && strlen(word) > 0) {
+				if (strlcpy(res.ifname, word,
+				    sizeof(res.ifname)) >=
+				    sizeof(res.ifname))
+					err(1, "interface name too long");
+				match++;
+				t = &table[i];
+				if (t->value)
+					res.action = t->value;
+			}
+			break;
+
+		case ENDTOKEN:
+			break;
+		}
+	}
+
+	if (match != 1) {
+		if (word == NULL)
+			fprintf(stderr, "missing argument:\n");
+		else if (match > 1)
+			fprintf(stderr, "ambiguous argument: %s\n", word);
+		else if (match < 1)
+			fprintf(stderr, "unknown argument: %s\n", word);
+		return (NULL);
+	}
+
+	return (t);
+}
+
+void
+show_valid_args(const struct token table[])
+{
+	int	i;
+
+	for (i = 0; table[i].type != ENDTOKEN; i++) {
+		switch (table[i].type) {
+		case NOTOKEN:
+			fprintf(stderr, "  <cr>\n");
+			break;
+		case KEYWORD:
+		case FLAG:
+			fprintf(stderr, "  %s\n", table[i].keyword);
+			break;
+		case ADDRESS:
+			fprintf(stderr, "  <address>\n");
+			break;
+		case PREFIX:
+			fprintf(stderr, "  <address>[/<len>]\n");
+			break;
+		case IFNAME:
+			fprintf(stderr, "  <interface>\n");
+		case ENDTOKEN:
+			break;
+		}
+	}
+}
+
+int
+parse_addr(const char *word, struct in_addr *addr)
+{
+	struct in_addr	ina;
+
+	if (word == NULL)
+		return (0);
+
+	bzero(addr, sizeof(struct in_addr));
+	bzero(&ina, sizeof(ina));
+
+	if (inet_pton(AF_INET, word, &ina)) {
+		addr->s_addr = ina.s_addr;
+		return (1);
+	}
+
+	return (0);
+}
+
+int
+parse_prefix(const char *word, struct in_addr *addr, u_int8_t *prefixlen)
+{
+	struct in_addr	 ina;
+	int		 bits = 32;
+
+	if (word == NULL)
+		return (0);
+
+	bzero(addr, sizeof(struct in_addr));
+	bzero(&ina, sizeof(ina));
+
+	if (strrchr(word, '/') != NULL) {
+		if ((bits = inet_net_pton(AF_INET, word,
+		    &ina, sizeof(ina))) == -1)
+			return (0);
+		addr->s_addr = ina.s_addr & htonl(prefixlen2mask(bits));
+		*prefixlen = bits;
+		return (1);
+	} else {
+		*prefixlen = 32;
+		return (parse_addr(word, addr));
+	}
+
+	return (0);
+}
+
+/* XXX local copy from kroute.c, should go to shared file */
+in_addr_t
+prefixlen2mask(u_int8_t prefixlen)
+{
+	if (prefixlen == 0)
+		return (0);
+
+	return (0xffffffff << (32 - prefixlen));
+}
diff --git a/usr.sbin/ospf6ctl/parser.h b/usr.sbin/ospf6ctl/parser.h
new file mode 100644
index 00000000000..58820e269e9
--- /dev/null
+++ b/usr.sbin/ospf6ctl/parser.h
@@ -0,0 +1,68 @@
+/*	$OpenBSD: parser.h,v 1.1 2007/10/12 08:22:53 norby Exp $ */
+
+/*
+ * Copyright (c) 2004 Esben Norby <norby@openbsd.org>
+ * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _PARSER_H_
+#define _PARSER_H_
+
+#include <sys/types.h>
+#include <net/if.h>
+#include <netinet/in.h>
+
+enum actions {
+	NONE,
+	FIB,
+	FIB_COUPLE,
+	FIB_DECOUPLE,
+	SHOW,
+	SHOW_SUM,
+	SHOW_IFACE,
+	SHOW_IFACE_DTAIL,
+	SHOW_NBR,
+	SHOW_NBR_DTAIL,
+	SHOW_DB,
+	SHOW_DBBYAREA,
+	SHOW_DBEXT,
+	SHOW_DBNET,
+	SHOW_DBRTR,
+	SHOW_DBSELF,
+	SHOW_DBSUM,
+	SHOW_DBASBR,
+	SHOW_RIB,
+	SHOW_RIB_DTAIL,
+	SHOW_FIB,
+	SHOW_FIB_IFACE,
+	RELOAD
+};
+
+struct parse_result {
+	struct in_addr	addr;
+	char		ifname[IF_NAMESIZE];
+	int		flags;
+	enum actions	action;
+	u_int8_t	prefixlen;
+};
+
+struct parse_result	*parse(int, char *[]);
+const struct token	*match_token(const char *, const struct token []);
+void			 show_valid_args(const struct token []);
+int			 parse_addr(const char *, struct in_addr *);
+int			 parse_prefix(const char *, struct in_addr *,
+			     u_int8_t *);
+
+#endif	/* _PARSER_H_ */