 @@ -1,408 +1,408 @@
-/*	$NetBSD: show.c,v 1.38 2008/09/10 01:06:58 dyoung Exp $	*/
+/*	$NetBSD: show.c,v 1.39 2009/03/17 00:53:42 lukem Exp $	*/
 /*
  * Copyright (c) 1983, 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "from: @(#)route.c	8.3 (Berkeley) 3/9/94";
 #else
-__RCSID("$NetBSD: show.c,v 1.38 2008/09/10 01:06:58 dyoung Exp $");
+__RCSID("$NetBSD: show.c,v 1.39 2009/03/17 00:53:42 lukem Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/mbuf.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/route.h>
 #include <netinet/in.h>
 #include <sys/sysctl.h>
 #include <netdb.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <err.h>
 #include "keywords.h"
 #include "extern.h"
 #define ROUNDUP(a) \
 	((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
 #define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
 /*
  * Definitions for showing gateway flags.
  */
 struct bits {
 	short	b_mask;
 	char	b_val;
 };
 static const struct bits bits[] = {
 	{ RTF_UP,	'U' },
 	{ RTF_GATEWAY,	'G' },
 	{ RTF_HOST,	'H' },
 	{ RTF_REJECT,	'R' },
 	{ RTF_DYNAMIC,	'D' },
 	{ RTF_MODIFIED,	'M' },
 	{ RTF_DONE,	'd' }, /* Completed -- for routing messages only */
 	{ RTF_MASK,	'm' }, /* Mask Present -- for routing messages only */
 	{ RTF_CLONING,	'C' },
 	{ RTF_XRESOLVE,	'X' },
 	{ RTF_LLINFO,	'L' },
 	{ RTF_STATIC,	'S' },
 	{ RTF_BLACKHOLE, 'B' },
 	{ RTF_CLONED,	'c' },
 	{ RTF_PROTO1,	'1' },
 	{ RTF_PROTO2,	'2' },
 	{ 0, '\0' }
 };
 static void pr_rthdr(int);
 static void p_rtentry(struct rt_msghdr *);
 static void pr_family(int);
 static void p_sockaddr(struct sockaddr *, struct sockaddr *, int, int );
 static void p_flags(int);
 void
 parse_show_opts(int argc, char * const *argv, int *afp, int *flagsp,
     const char **afnamep, bool nolink)
+{
 	const char *afname = "unspec";
 	int af, flags;
 	flags = 0;
 	af = AF_UNSPEC;
 	for (; argc >= 2; argc--) {
 		if (*argv[argc - 1] != '-')
 			goto bad;
 		switch (keyword(argv[argc - 1] + 1)) {
 		case K_HOST:
 			flags |= RTF_HOST;
 			break;
 		case K_LLINFO:
 			flags |= RTF_LLINFO;
 			break;
 		case K_INET:
 			af = AF_INET;
 			afname = argv[argc - 1] + 1;
 			break;
 #ifdef INET6
 		case K_INET6:
 			af = AF_INET6;
 			afname = argv[argc - 1] + 1;
 			break;
 #endif
 #ifndef SMALL
 		case K_ATALK:
 			af = AF_APPLETALK;
 			afname = argv[argc - 1] + 1;
 			break;
 		case K_ISO:
 		case K_OSI:
 			af = AF_ISO;
 			afname = argv[argc - 1] + 1;
 			break;
 #endif /* SMALL */
 		case K_LINK:
 			if (nolink)
 				goto bad;
 			af = AF_LINK;
 			afname = argv[argc - 1] + 1;
 			break;
 		default:
 			goto bad;
+		}
+	}
 	switch (argc) {
 	case 1:
 	case 0:
 		break;
 	default:
 	bad:
 		usage(argv[argc - 1]);
+	}
 	if (afnamep != NULL)
 		*afnamep = afname;
 	*afp = af;
 	*flagsp = flags;
+}
 /*
  * Print routing tables.
  */
 void
 show(int argc, char *const *argv)
+{
 	size_t needed;
 	int af, flags, mib[6];
 	char *buf, *next, *lim;
 	struct rt_msghdr *rtm;
 	struct sockaddr *sa;
 	parse_show_opts(argc, argv, &af, &flags, NULL, true);
 	mib[0] = CTL_NET;
 	mib[1] = PF_ROUTE;
 	mib[2] = 0;
 	mib[3] = 0;
 	mib[4] = NET_RT_DUMP;
 	mib[5] = 0;
 	if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
 		err(EXIT_FAILURE, "route-sysctl-estimate");
 	buf = lim = NULL;
 	if (needed) {
 		if ((buf = malloc(needed)) == 0)
 			err(EXIT_FAILURE, "malloc");
 		if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
 			err(EXIT_FAILURE, "sysctl of routing table");
 		lim  = buf + needed;
+	}
 	printf("Routing table%s\n", (af == AF_UNSPEC)? "s" : "");
 	if (needed) {
 		for (next = buf; next < lim; next += rtm->rtm_msglen) {
 			rtm = (struct rt_msghdr *)next;
 			sa = (struct sockaddr *)(rtm + 1);
 			if ((rtm->rtm_flags & flags) != flags)
 				continue;
 			if (af == AF_UNSPEC || af == sa->sa_family)
 				p_rtentry(rtm);
+		}
 		free(buf);
+	}
+}
 /* column widths; each followed by one space */
 #ifndef INET6
 #define	WID_DST(af)	18	/* width of destination column */
 #define	WID_GW(af)	18	/* width of gateway column */
 #else
 /* width of destination/gateway column */
 #if 1
 /* strlen("fe80::aaaa:bbbb:cccc:dddd@gif0") == 30, strlen("/128") == 4 */
 #define	WID_DST(af)	((af) == AF_INET6 ? (nflag ? 34 : 18) : 18)
 #define	WID_GW(af)	((af) == AF_INET6 ? (nflag ? 30 : 18) : 18)
 #else
 /* strlen("fe80::aaaa:bbbb:cccc:dddd") == 25, strlen("/128") == 4 */
 #define	WID_DST(af)	((af) == AF_INET6 ? (nflag ? 29 : 18) : 18)
 #define	WID_GW(af)	((af) == AF_INET6 ? (nflag ? 25 : 18) : 18)
 #endif
 #endif /* INET6 */
 /*
  * Print header for routing table columns.
  */
 static void
 pr_rthdr(int af)
+{
 	printf("%-*.*s %-*.*s %-6.6s\n",
 		WID_DST(af), WID_DST(af), "Destination",
 		WID_GW(af), WID_GW(af), "Gateway",
 		"Flags");
+}
 /*
  * Print a routing table entry.
  */
 static void
 p_rtentry(struct rt_msghdr *rtm)
+{
 	struct sockaddr *sa = (struct sockaddr *)(rtm + 1);
 #ifdef notdef
 	static int masks_done, banner_printed;
 #endif
 	static int old_af;
 	int af = 0, interesting = RTF_UP | RTF_GATEWAY | RTF_HOST |
 	    RTF_REJECT | RTF_LLINFO;
 #ifdef notdef
 	/* for the moment, netmasks are skipped over */
 	if (!banner_printed) {
 		printf("Netmasks:\n");
 		banner_printed = 1;
+	}
 	if (masks_done == 0) {
 		if (rtm->rtm_addrs != RTA_DST ) {
 			masks_done = 1;
 			af = sa->sa_family;
+		}
 	} else
 #endif
 		af = sa->sa_family;
 	if (old_af != af) {
 		old_af = af;
 		pr_family(af);
 		pr_rthdr(af);
+	}
 	if (rtm->rtm_addrs == RTA_DST)
 		p_sockaddr(sa, NULL, 0, WID_DST(af) + 1 + WID_GW(af) + 1);
 	else {
 		struct sockaddr *nm;
 		if ((rtm->rtm_addrs & RTA_NETMASK) == 0)
 			nm = NULL;
 		else {
 			/* skip to gateway */
 			nm = (struct sockaddr *)
 			    (ROUNDUP(sa->sa_len) + (char *)sa);
 			/* skip over gateway to netmask */
 			nm = (struct sockaddr *)
 			    (ROUNDUP(nm->sa_len) + (char *)nm);
+		}
 		p_sockaddr(sa, nm, rtm->rtm_flags, WID_DST(af));
 		sa = (struct sockaddr *)(ROUNDUP(sa->sa_len) + (char *)sa);
 		p_sockaddr(sa, NULL, 0, WID_GW(af));
+	}
 	p_flags(rtm->rtm_flags & interesting);
 	putchar('\n');
+}
 /*
  * Print address family header before a section of the routing table.
  */
 static void
 pr_family(int af)
+{
 	const char *afname;
 	switch (af) {
 	case AF_INET:
 		afname = "Internet";
 		break;
 #ifdef INET6
 	case AF_INET6:
 		afname = "Internet6";
 		break;
 #endif /* INET6 */
 #ifndef SMALL
 	case AF_ISO:
 		afname = "ISO";
 		break;
 #endif /* SMALL */
 	case AF_APPLETALK:
 		afname = "AppleTalk";
 		break;
 	default:
 		afname = NULL;
 		break;
+	}
 	if (afname)
 		printf("\n%s:\n", afname);
 	else
 		printf("\nProtocol Family %d:\n", af);
+}
 static void
 p_sockaddr(struct sockaddr *sa, struct sockaddr *nm, int flags, int width)
+{
 	char workbuf[128];
 	const char *cp;
 	switch(sa->sa_family) {
 	case AF_LINK:
 		if (getnameinfo(sa, sa->sa_len, workbuf, sizeof(workbuf),
 		    NULL, 0, NI_NUMERICHOST) != 0)
 			strlcpy(workbuf, "invalid", sizeof(workbuf));
 		cp = workbuf;
 		break;
 	case AF_INET:
 		cp = routename(sa, nm, flags);
 		break;
 #ifdef INET6
 	case AF_INET6:
 		cp = routename(sa, nm, flags);
 		/* make sure numeric address is not truncated */
-		if (strchr(cp, ':') != NULL && strlen(cp) > width)
+		if (strchr(cp, ':') != NULL && (int)strlen(cp) > width)
 			width = strlen(cp);
 		break;
 #endif /* INET6 */
 #ifndef SMALL
 #endif /* SMALL */
 	default:
+	    {
 		u_char *s = (u_char *)sa->sa_data, *slim;
 		char *wp = workbuf, *wplim;
 		slim = sa->sa_len + (u_char *)sa;
 		wplim = wp + sizeof(workbuf) - 6;
 		wp += snprintf(wp, wplim - wp, "(%d)", sa->sa_family);
 		while (s < slim && wp < wplim) {
 			wp += snprintf(wp, wplim - wp, " %02x", *s++);
 			if (s < slim)
 			    wp += snprintf(wp, wplim - wp, "%02x", *s++);
+		}
 		cp = workbuf;
+	    }
+	}
 	if (width < 0 )
 		printf("%s ", cp);
 	else {
 		if (nflag)
 			printf("%-*s ", width, cp);
 		else
 			printf("%-*.*s ", width, width, cp);
+	}
+}
 static void
 p_flags(int f)
+{
 	char name[33], *flags;
 	const struct bits *p = bits;
 	for (flags = name; p->b_mask; p++)
 		if (p->b_mask & f)
 			*flags++ = p->b_val;
 		else if (Sflag)
 			*flags++ = ' ';
 	*flags = '\0';
 	printf("%-6.6s ", name);
+}