Controller for dvmrpd.

Almost all available information in dvmrpd can be read.
Not connected to builds yet.

ok claudio@

5 files changed, 1116 insertions, 0 deletions

diff --git a/usr.sbin/dvmrpctl/Makefile b/usr.sbin/dvmrpctl/Makefile
new file mode 100644
index 00000000000..63f027133a8
--- /dev/null
+++ b/usr.sbin/dvmrpctl/Makefile
@@ -0,0 +1,17 @@
+#	$OpenBSD: Makefile,v 1.1 2006/06/01 14:21:28 norby Exp $
+
+.PATH:		${.CURDIR}/../dvmrpd
+
+PROG=	dvmrpctl
+SRCS=	buffer.c imsg.c log.c dvmrpctl.c parser.c
+
+CFLAGS+= -Wall
+CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
+CLFAGS+= -Wmissing-declarations -Wredundant-decls
+CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
+CFLAGS+= -Wsign-compare
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../dvmrpd
+
+MAN=	dvmrpctl.8
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/dvmrpctl/dvmrpctl.8 b/usr.sbin/dvmrpctl/dvmrpctl.8
new file mode 100644
index 00000000000..3e3709a923e
--- /dev/null
+++ b/usr.sbin/dvmrpctl/dvmrpctl.8
@@ -0,0 +1,69 @@
+.\"	$OpenBSD: dvmrpctl.8,v 1.1 2006/06/01 14:21:28 norby Exp $
+.\"
+.\" Copyright (c) 2004, 2005, 2006 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 March 21, 2006
+.Dt DVMRPCTL 8
+.Os
+.Sh NAME
+.Nm dvmrpctl
+.Nd control the Distance Vector Mutlicast Routing Protocol daemon
+.Sh SYNOPSIS
+.Nm
+.Ar command
+.Op Ar arguments ...
+.Sh DESCRIPTION
+The
+.Nm
+program controls the
+.Xr dvmrpd 8
+daemon.
+.Pp
+The following commands are available:
+.Bl -tag -width Ds
+.It Cm show igmp
+Show IGMP status for all interfaces.
+.It Cm show interfaces Op Ar interface
+Show details for all interfaces or the specified
+.Ar interface .
+.It Cm show mfc Op Cm detail
+Show the Multicast Forwarding Cache.
+.Cm detail
+can be specified for additional detail.
+.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/dvmrpd.sockXX" -compact
+.It /var/run/dvmrpd.sock
+Unix-domain socket used for communication with
+.Xr dvmrpd 8 .
+.El
+.Sh SEE ALSO
+.Xr dvmrpd.conf 5 ,
+.Xr dvmrpd 8
+.Sh HISTORY
+The
+.Nm
+program first appeared in
+.Ox 4.0 .
diff --git a/usr.sbin/dvmrpctl/dvmrpctl.c b/usr.sbin/dvmrpctl/dvmrpctl.c
new file mode 100644
index 00000000000..6d75de6f2fa
--- /dev/null
+++ b/usr.sbin/dvmrpctl/dvmrpctl.c
@@ -0,0 +1,687 @@
+/*	$OpenBSD: dvmrpctl.c,v 1.1 2006/06/01 14:21:28 norby Exp $ */
+
+/*
+ * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
+ * Copyright (c) 2004, 2005, 2006 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 <netinet/ip_mroute.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 "igmp.h"
+#include "dvmrp.h"
+#include "dvmrpd.h"
+#include "dvmrpe.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 *);
+int		 show_igmp_msg(struct imsg *);
+const char	*print_if_type(enum iface_type type);
+const char	*print_nbr_state(int);
+const char	*print_link(int);
+const char	*fmt_timeframe(time_t t);
+const char	*fmt_timeframe_core(time_t t);
+int		 show_nbr_msg(struct imsg *);
+const char	*print_dvmrp_options(u_int8_t);
+int		 show_nbr_detail_msg(struct imsg *);
+int		 show_rib_msg(struct imsg *);
+int		 show_rib_detail_msg(struct imsg *);
+int		 show_mfc_msg(struct imsg *);
+int		 show_mfc_detail_msg(struct imsg *);
+const char *	 get_linkstate(int, int);
+
+struct imsgbuf	*ibuf;
+
+__dead void
+usage(void)
+{
+	extern char *__progname;
+
+	fprintf(stderr, "usage: %s <command> [arg [...]]\n", __progname);
+	exit(1);
+}
+
+void
+imsg_event_add(struct imsgbuf *i)
+{
+}
+
+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 dvmrpd 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, DVMRPD_SOCKET, sizeof(sun.sun_path));
+	if (connect(ctl_sock, (struct sockaddr *)&sun, sizeof(sun)) == -1)
+		err(1, "connect: %s", DVMRPD_SOCKET);
+
+	if ((ibuf = malloc(sizeof(struct imsgbuf))) == NULL)
+		fatal(NULL);
+	imsg_init(ibuf, ctl_sock, NULL);
+	done = 0;
+
+	/* process user request */
+	switch (res->action) {
+	case NONE:
+		usage();
+		/* NOTREACHED */
+	case SHOW:
+	case SHOW_SUM:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_SUM, 0, 0, NULL, 0);
+		break;
+	case SHOW_IFACE:
+		printf("%-11s %-18s %-10s %-10s %-10s %-8s %s\n",
+		    "Interface", "Address", "State", "ProbeTimer", "Linkstate",
+		    "Uptime", "Groups");
+		/* FALLTHROUGH */
+	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_IFACE, 0, 0, &ifidx,
+		    sizeof(ifidx));
+		break;
+	case SHOW_IGMP:
+		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_IGMP, 0, 0, &ifidx,
+		    sizeof(ifidx));
+		break;
+	case SHOW_NBR:
+		printf("%-15s %-10s %-9s %-15s %-11s %-8s\n", "ID", "State",
+		    "DeadTime", "Address", "Interface", "Uptime");
+		/* FALLTHROUGH */
+	case SHOW_NBR_DTAIL:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_NBR, 0, 0, NULL, 0);
+		break;
+	case SHOW_RIB:
+		printf("%-20s %-17s %-7s %-10s %-s\n", "Destination", "Nexthop",
+		    "Cost", "Uptime", "Expire");
+		/* FALLTHROUGH */
+	case SHOW_RIB_DTAIL:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_RIB, 0, 0, NULL, 0);
+		break;
+	case SHOW_MFC:
+		printf("%-16s %-16s %-9s %-9s %-4s %-10s %-10s\n", "Group",
+		    "Origin", "Incoming", "Outgoing", "TTL", "Uptime",
+		    "Expire");
+		/* FALLTHROUGH */
+	case SHOW_MFC_DTAIL:
+		imsg_compose(ibuf, IMSG_CTL_SHOW_MFC, 0, 0, NULL, 0);
+		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_IGMP:
+				done = show_igmp_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_RIB:
+				done = show_rib_msg(&imsg);
+				break;
+			case SHOW_RIB_DTAIL:
+				done = show_rib_detail_msg(&imsg);
+				break;
+			case SHOW_MFC:
+				done = show_mfc_msg(&imsg);
+				break;
+			case SHOW_MFC_DTAIL:
+				done = show_mfc_detail_msg(&imsg);
+				break;
+			case NONE:
+			case RELOAD:
+				break;
+			}
+			imsg_free(&imsg);
+		}
+	}
+	close(ctl_sock);
+	free(ibuf);
+
+	return (0);
+}
+
+int
+show_summary_msg(struct imsg *imsg)
+{
+	struct ctl_sum		*sum;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_SUM:
+		sum = imsg->data;
+		printf("Router ID: %s\n", inet_ntoa(sum->rtr_id));
+		printf("Hold time is %d sec(s)\n", sum->hold_time);
+		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);
+		break;
+	case IFT_FDDI:
+		return (IFM_FDDI);
+		break;
+	case IFT_ISO88025:
+		return (IFM_TOKEN);
+		break;
+	case IFT_CARP:
+		return (IFM_CARP);
+		break;
+	default:
+		return (0);
+		break;
+	}
+}
+
+int
+show_interface_msg(struct imsg *imsg)
+{
+	struct ctl_iface	*iface;
+	char			*netid;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_IFACE:
+		iface = imsg->data;
+
+		if (asprintf(&netid, "%s/%d", inet_ntoa(iface->addr),
+		    mask2prefixlen(iface->mask.s_addr)) == -1)
+			err(1, NULL);
+		printf("%-11s %-18s %-10s %-10s %-10s %-8s %5d\n",
+		    iface->name, netid, if_state_name(iface->state),
+		    iface->probe_timer == 0 ? "00:00:00" :
+		    fmt_timeframe_core(iface->probe_timer),
+		    get_linkstate(get_ifms_type(iface->mediatype),
+		    iface->linkstate), iface->uptime == 0 ? "00:00:00" :
+		    fmt_timeframe_core(iface->uptime), iface->group_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_IFACE:
+		iface = imsg->data;
+
+		printf("\n");
+		printf("Interface %s, line protocol is %s\n",
+		    iface->name, print_link(iface->flags));
+		printf("  Internet address %s/%d\n",
+		    inet_ntoa(iface->addr),
+		    mask2prefixlen(iface->mask.s_addr));
+		printf("  Linkstate %s\n",
+		    get_linkstate(get_ifms_type(iface->mediatype),
+		    iface->linkstate));
+		printf("  Network type %s, cost: %d\n",
+		    if_type_name(iface->type), iface->metric);
+		printf("  State %s, querier ", if_state_name(iface->state));
+		if (iface->state == IF_STA_QUERIER)
+			printf("%s\n", inet_ntoa(iface->addr));
+		else
+			printf("%s\n", inet_ntoa(iface->querier));
+		printf("  Generation ID %d\n", iface->gen_id);
+		printf("  Timer intervals configured, "
+		    "probe %d, dead %d\n", iface->probe_interval,
+		    iface->dead_interval);
+		if (iface->passive)
+			printf("    Passive interface (No Hellos)\n");
+		else if (iface->probe_timer < 0)
+			printf("    Hello timer not running\n");
+		else
+			printf("    Hello timer due in %s\n",
+			    fmt_timeframe_core(iface->probe_timer));
+		printf("    Uptime %s\n", iface->uptime == 0 ?
+		    "00:00:00" : 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);
+}
+
+int
+show_igmp_msg(struct imsg *imsg)
+{
+	struct ctl_iface	*iface;
+	struct ctl_group	*group;
+	char			*netid;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_IFACE:
+		iface = imsg->data;
+		if (asprintf(&netid, "%s/%d", inet_ntoa(iface->addr),
+		    mask2prefixlen(iface->mask.s_addr)) == -1)
+			err(1, NULL);
+		printf("\nInterface %s, address %s, state %s, groups %d\n",
+		    iface->name, netid, if_state_name(iface->state),
+		    iface->group_cnt);
+		free(netid);
+		printf("  %-16s %-10s %-10s %-10s\n", "Group", "State",
+		    "DeadTimer", "Uptime");
+		break;
+	case IMSG_CTL_SHOW_IGMP:
+		group = imsg->data;
+		printf("  %-16s %-10s %-10s %-10s\n", inet_ntoa(group->addr),
+		    group_state_name(group->state),
+		    group->dead_timer == 0 ? "00:00:00" :
+		    fmt_timeframe_core(group->dead_timer),
+		    group->uptime == 0 ? "00:00:00" :
+		    fmt_timeframe_core(group->uptime));
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+const char *
+print_if_type(enum iface_type type)
+{
+	switch (type) {
+	case IF_TYPE_POINTOPOINT:
+		return ("POINTOPOINT");
+	case IF_TYPE_BROADCAST:
+		return ("BROADCAST");
+	default:
+		return ("UNKNOWN");
+	}
+}
+
+const char *
+print_nbr_state(int state)
+{
+	switch (state) {
+	case NBR_STA_DOWN:
+		return ("DOWN");
+	case NBR_STA_1_WAY:
+		return ("1-WAY");
+	case NBR_STA_2_WAY:
+		return ("2-WAY");
+	default:
+		return ("UNKNOWN");
+	}
+}
+
+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 ("Stopped");
+
+	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);
+}
+
+/* prototype defined in dvmrpd.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)));
+}
+
+int
+show_nbr_msg(struct imsg *imsg)
+{
+	struct ctl_nbr	*nbr;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_NBR:
+		nbr = imsg->data;
+		printf("%-15s %-10s %-10s", inet_ntoa(nbr->id),
+		    print_nbr_state(nbr->state),
+		    fmt_timeframe_core(nbr->dead_timer));
+		printf("%-15s %-11s %s\n", inet_ntoa(nbr->addr),
+		    nbr->name, fmt_timeframe_core(nbr->uptime));
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+const char *
+print_dvmrp_options(u_int8_t opts)
+{
+	static char	optbuf[32];
+
+	snprintf(optbuf, sizeof(optbuf), "*|*|%s|%s|%s|%s|%s|%s",
+	    opts & DVMRP_CAP_NETMASK ? "N" : "-",
+	    opts & DVMRP_CAP_SNMP ? "S" : "-",
+	    opts & DVMRP_CAP_MTRACE ? "M" : "-",
+	    opts & DVMRP_CAP_GENID ? "G" : "-",
+	    opts & DVMRP_CAP_PRUNE ? "P" : "-",
+	    opts & DVMRP_CAP_LEAF ? "L" : "-");
+	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;
+		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;
+		if (asprintf(&dstnet, "%s/%d", inet_ntoa(rt->prefix),
+		    rt->prefixlen) == -1)
+			err(1, NULL);
+
+		printf("%-20s %-17s %-7d %-9s %9s\n", dstnet,
+		    inet_ntoa(rt->nexthop),
+		    rt->cost, rt->uptime == 0 ? "-" :
+		    fmt_timeframe_core(rt->uptime),
+		    rt->expire == 0 ? "00:00:00" :
+		    fmt_timeframe_core(rt->expire));
+		free(dstnet);
+
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+int
+show_rib_detail_msg(struct imsg *imsg)
+{
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_RIB:
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+int
+show_mfc_msg(struct imsg *imsg)
+{
+	char		 iname[IF_NAMESIZE];
+	char		 oname[IF_NAMESIZE] = "-";
+	struct ctl_mfc	*mfc;
+	int		 i;
+
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_MFC:
+		mfc = imsg->data;
+		if_indextoname(mfc->ifindex, iname);
+
+		/* search for first entry with ttl > 0 */
+		for (i = 0; i < MAXVIFS; i++) {
+			if (mfc->ttls[i] > 0) {
+				if_indextoname(i, oname);
+				i++;
+				break;
+			}
+		}
+
+		/* display first entry with uptime */
+		printf("%-16s ", inet_ntoa(mfc->group));
+		printf("%-16s %-9s %-9s %-4d %-10s %-10s\n",
+		    inet_ntoa(mfc->origin), iname, oname, mfc->ttls[i - 1],
+		    mfc->uptime == 0 ? "-" : fmt_timeframe_core(mfc->uptime),
+		    mfc->expire == 0 ? "-" : fmt_timeframe_core(mfc->expire));
+
+		/* display remaining entries with ttl > 0 */
+		for (; i < MAXVIFS; i++) {
+			if (mfc->ttls[i] > 0) {
+				if_indextoname(i, oname);
+				printf("%43s %-9s %-4d\n", " ", oname,
+				    mfc->ttls[i]);
+			}
+		}
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+int
+show_mfc_detail_msg(struct imsg *imsg)
+{
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_MFC:
+		break;
+	case IMSG_CTL_END:
+		printf("\n");
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+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_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;
+			return (p->ifms_string[link_state == LINK_STATE_UP]);
+		}
+
+	return ("unknown link state");
+}
diff --git a/usr.sbin/dvmrpctl/parser.c b/usr.sbin/dvmrpctl/parser.c
new file mode 100644
index 00000000000..50724f0a45f
--- /dev/null
+++ b/usr.sbin/dvmrpctl/parser.c
@@ -0,0 +1,285 @@
+/*	$OpenBSD: parser.c,v 1.1 2006/06/01 14:21:28 norby Exp $ */
+
+/*
+ * Copyright (c) 2004, 2005, 2006 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 "dvmrpd.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_show[];
+static const struct token t_show_iface[];
+static const struct token t_show_nbr[];
+static const struct token t_show_mfc[];
+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,	"show",		SHOW,		t_show},
+	{ENDTOKEN,	"",		NONE,		NULL}
+};
+
+static const struct token t_show[] = {
+	{NOTOKEN,	"",		NONE,		NULL},
+	{KEYWORD,	"igmp",		SHOW_IGMP,	NULL},
+	{KEYWORD,	"interfaces",	SHOW_IFACE,	t_show_iface},
+	{KEYWORD,	"mfc",		SHOW_MFC,	t_show_mfc},
+	{KEYWORD,	"neighbor",	SHOW_NBR,	t_show_nbr},
+	{KEYWORD,	"rib",		SHOW_RIB,	t_show_rib},
+	{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_mfc[] = {
+	{NOTOKEN,	"",		NONE,		NULL},
+	{KEYWORD,	"detail",	SHOW_MFC_DTAIL,	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 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 (match > 1)
+			fprintf(stderr, "ambiguous argument: %s\n", word);
+		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(0xffffffff << (32 - bits));
+		*prefixlen = bits;
+		return (1);
+	} else {
+		*prefixlen = 32;
+		return (parse_addr(word, addr));
+	}
+
+	return (0);
+}
diff --git a/usr.sbin/dvmrpctl/parser.h b/usr.sbin/dvmrpctl/parser.h
new file mode 100644
index 00000000000..8bc19b7c7f9
--- /dev/null
+++ b/usr.sbin/dvmrpctl/parser.h
@@ -0,0 +1,58 @@
+/*	$OpenBSD: parser.h,v 1.1 2006/06/01 14:21:28 norby Exp $ */
+
+/*
+ * Copyright (c) 2004, 2005, 2006 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,
+	SHOW,
+	SHOW_SUM,
+	SHOW_IFACE,
+	SHOW_IFACE_DTAIL,
+	SHOW_IGMP,
+	SHOW_NBR,
+	SHOW_NBR_DTAIL,
+	SHOW_RIB,
+	SHOW_RIB_DTAIL,
+	SHOW_MFC,
+	SHOW_MFC_DTAIL,
+	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_ */