diff --git a/sbin/route/route.c b/sbin/route/route.c index 752d85b27933..61210ae04698 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -1,4 +1,4 @@ -/* $NetBSD: route.c,v 1.92 2005/08/30 19:01:25 ginsbach Exp $ */ +/* $NetBSD: route.c,v 1.93 2005/08/31 02:58:30 ginsbach Exp $ */ /* * Copyright (c) 1983, 1989, 1991, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1991, 1993\n\ #if 0 static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: route.c,v 1.92 2005/08/30 19:01:25 ginsbach Exp $"); +__RCSID("$NetBSD: route.c,v 1.93 2005/08/31 02:58:30 ginsbach Exp $"); #endif #endif /* not lint */ @@ -87,8 +87,8 @@ static int inet6_makenetandmask(struct sockaddr_in6 *); #endif static int getaddr(int, char *, struct hostent **); static int flushroutes(int, char *[], int); -#ifndef SMALL static int prefixlen(const char *); +#ifndef SMALL static int x25_makemask(void); static void interfaces(void); static void monitor(void); @@ -548,7 +548,6 @@ routename(struct sockaddr *sa, struct sockaddr *nm, int flags) case AF_LINK: return (link_ntoa((struct sockaddr_dl *)sa)); -#ifndef SMALL #ifdef INET6 case AF_INET6: { @@ -596,6 +595,7 @@ routename(struct sockaddr *sa, struct sockaddr *nm, int flags) } #endif +#ifndef SMALL case AF_NS: return (ns_print((struct sockaddr_ns *)sa)); @@ -709,7 +709,6 @@ netname(struct sockaddr *sa, struct sockaddr *nm) case AF_LINK: return (link_ntoa((struct sockaddr_dl *)sa)); -#ifndef SMALL #ifdef INET6 case AF_INET6: { @@ -749,6 +748,7 @@ netname(struct sockaddr *sa, struct sockaddr *nm) } #endif +#ifndef SMALL case AF_NS: return (ns_print((struct sockaddr_ns *)sa)); @@ -1201,7 +1201,6 @@ getaddr(int which, char *s, struct hostent **hpp) return (0); } switch (afamily) { -#ifndef SMALL #ifdef INET6 case AF_INET6: { @@ -1251,6 +1250,7 @@ getaddr(int which, char *s, struct hostent **hpp) } #endif +#ifndef SMALL case AF_NS: if (which == RTA_DST) { struct sockaddr_ns *sms = &(so_mask.sns); @@ -2073,7 +2073,6 @@ sodump(sup su, const char *which) (void)printf("%s: link %s; ", which, link_ntoa(&su->sdl)); break; -#ifndef SMALL #ifdef INET6 case AF_INET6: (void)printf("%s: inet6 %s; ", @@ -2081,6 +2080,7 @@ sodump(sup su, const char *which) ntop_buf, sizeof(ntop_buf))); break; #endif +#ifndef SMALL case AF_ISO: (void)printf("%s: iso %s; ", which, iso_ntoa(&su->siso.siso_addr)); diff --git a/sbin/route/show.c b/sbin/route/show.c index f3ea538aeeb7..f62b96370970 100644 --- a/sbin/route/show.c +++ b/sbin/route/show.c @@ -1,4 +1,4 @@ -/* $NetBSD: show.c,v 1.27 2005/08/30 19:01:25 ginsbach Exp $ */ +/* $NetBSD: show.c,v 1.28 2005/08/31 02:58:30 ginsbach Exp $ */ /* * Copyright (c) 1983, 1988, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "from: @(#)route.c 8.3 (Berkeley) 3/9/94"; #else -__RCSID("$NetBSD: show.c,v 1.27 2005/08/30 19:01:25 ginsbach Exp $"); +__RCSID("$NetBSD: show.c,v 1.28 2005/08/31 02:58:30 ginsbach Exp $"); #endif #endif /* not lint */ @@ -282,12 +282,12 @@ pr_family(int af) case AF_INET: afname = "Internet"; break; -#ifndef SMALL #ifdef INET6 case AF_INET6: afname = "Internet6"; break; #endif /* INET6 */ +#ifndef SMALL case AF_NS: afname = "XNS"; break; @@ -331,7 +331,6 @@ p_sockaddr(struct sockaddr *sa, struct sockaddr *nm, int flags, int width) cp = routename(sa, nm, flags); break; -#ifndef SMALL #ifdef INET6 case AF_INET6: cp = routename(sa, nm, flags); @@ -341,6 +340,7 @@ p_sockaddr(struct sockaddr *sa, struct sockaddr *nm, int flags, int width) break; #endif /* INET6 */ +#ifndef SMALL case AF_NS: cp = ns_print((struct sockaddr_ns *)sa); break;