BSD 4_4_Lite2 release

[unix-history] / usr / src / usr.bin / netstat / route.c

diff --git a/usr/src/usr.bin/netstat/route.c b/usr/src/usr.bin/netstat/route.c
index 77437cf..ee98f07 100644 (file)
--- a/usr/src/usr.bin/netstat/route.c
+++ b/usr/src/usr.bin/netstat/route.c
@@ -1,19 +1,48 @@
 /*
 /*

- * Copyright (c) 1983, 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. 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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)route.c    5.20 (Berkeley) %G%";
+static char sccsid[] = "@(#)route.c    8.6 (Berkeley) 4/28/95";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>

+#include <sys/protosw.h>

 #include <sys/socket.h>
 #include <sys/mbuf.h>
 
 #include <net/if.h>
 #include <sys/socket.h>
 #include <sys/mbuf.h>
 
 #include <net/if.h>

+#include <net/if_dl.h>
+#include <net/if_types.h>

 #define  KERNEL
 #include <net/route.h>
 #undef KERNEL
 #define  KERNEL
 #include <net/route.h>
 #undef KERNEL


@@ -21,18 +50,16 @@ static char sccsid[] = "@(#)route.c 5.20 (Berkeley) %G%";
 
 #include <netns/ns.h>
 
 
 #include <netns/ns.h>
 

-#include <netdb.h>
-#include <sys/kinfo.h>
+#include <sys/sysctl.h>

 
 

+#include <netdb.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>

 #include <string.h>
 #include <string.h>

+#include <unistd.h>
+#include "netstat.h"

 
 

-extern int nflag, aflag, Aflag, af;
-int do_rtent;
-extern char *routename(), *netname(), *ns_print(), *plural();
-extern char *malloc();
-#define kget(p, d) \
-       (kvm_read((off_t)(p), (char *)&(d), sizeof (d)))
+#define kget(p, d) (kread((u_long)(p), (char *)&(d), sizeof (d)))

 
 /*
  * Definitions for showing gateway flags.
 
 /*
  * Definitions for showing gateway flags.


@@ -44,121 +71,146 @@ struct bits {
        { RTF_UP,       'U' },
        { RTF_GATEWAY,  'G' },
        { RTF_HOST,     'H' },
        { RTF_UP,       'U' },
        { RTF_GATEWAY,  'G' },
        { RTF_HOST,     'H' },

+       { RTF_REJECT,   'R' },

        { RTF_DYNAMIC,  'D' },
        { RTF_MODIFIED, 'M' },
        { 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_CLONING,  'C' },
        { RTF_XRESOLVE, 'X' },
        { RTF_LLINFO,   'L' },

-       { RTF_REJECT,   'R' },
+       { RTF_STATIC,   'S' },
+       { RTF_PROTO1,   '1' },
+       { RTF_PROTO2,   '2' },

        { 0 }
 };
 
        { 0 }
 };
 

+static union {
+       struct  sockaddr u_sa;
+       u_short u_data[128];
+} pt_u;
+
+int    do_rtent = 0;
+struct rtentry rtentry;
+struct radix_node rnode;
+struct radix_mask rmask;
+
+int    NewTree = 0;
+
+static struct sockaddr *kgetsa __P((struct sockaddr *));
+static void p_tree __P((struct radix_node *));
+static void p_rtnode __P(());
+static void ntreestuff __P(());
+static void np_rtentry __P((struct rt_msghdr *));
+static void p_sockaddr __P((struct sockaddr *, struct sockaddr *, int, int));
+static void p_flags __P((int, char *));
+static void p_rtentry __P((struct rtentry *));
+

 /*
  * Print routing tables.
  */
 /*
  * Print routing tables.
  */

-routepr(hostaddr, netaddr, hashsizeaddr, treeaddr)
-       off_t hostaddr, netaddr, hashsizeaddr, treeaddr;
+void
+routepr(rtree)
+       u_long rtree;

 {
 {

-       struct mbuf mb;
-       register struct ortentry *rt;
-       register struct mbuf *m;
-       char name[16], *flags;
-       struct mbuf **routehash;
-       int hashsize;
-       int i, doinghost = 1;
+       struct radix_node_head *rnh, head;
+       int i;

 
        printf("Routing tables\n");
 
        printf("Routing tables\n");

-       if (Aflag)
-               printf("%-8.8s ","Address");
-       printf("%-16.16s %-18.18s %-6.6s  %6.6s%8.8s  %s\n",
-               "Destination", "Gateway",
-               "Flags", "Refs", "Use", "Interface");
-       if (treeaddr)
-               return treestuff(treeaddr);
-       if (hostaddr == 0) {
-               printf("rthost: symbol not in namelist\n");
-               return;
-       }
-       if (netaddr == 0) {
-               printf("rtnet: symbol not in namelist\n");
-               return;
-       }
-       if (hashsizeaddr == 0) {
-               printf("rthashsize: symbol not in namelist\n");
-               return;
-       }
-       kget(hashsizeaddr, hashsize);
-       routehash = (struct mbuf **)malloc( hashsize*sizeof (struct mbuf *) );
-       kvm_read(hostaddr, (char *)routehash, hashsize*sizeof (struct mbuf *));
-again:
-       for (i = 0; i < hashsize; i++) {
-               if (routehash[i] == 0)
-                       continue;
-               m = routehash[i];
-               while (m) {
-                       kget(m, mb);
-                       if (Aflag)
-                               printf("%8.8x ", m);
-                       p_ortentry((struct ortentry *)(mb.m_dat));
-                       m = mb.m_next;
+
+       if (Aflag == 0 && NewTree)
+               ntreestuff();
+       else {
+               if (rtree == 0) {
+                       printf("rt_tables: symbol not in namelist\n");
+                       return;
+               }
+
+               kget(rtree, rt_tables);
+               for (i = 0; i <= AF_MAX; i++) {
+                       if ((rnh = rt_tables[i]) == 0)
+                               continue;
+                       kget(rnh, head);
+                       if (i == AF_UNSPEC) {
+                               if (Aflag && af == 0) {
+                                       printf("Netmasks:\n");
+                                       p_tree(head.rnh_treetop);
+                               }
+                       } else if (af == AF_UNSPEC || af == i) {
+                               pr_family(i);
+                               do_rtent = 1;
+                               pr_rthdr();
+                               p_tree(head.rnh_treetop);
+                       }

                }
        }
                }
        }

-       if (doinghost) {
-               kvm_read(netaddr, (char *)routehash,
-                       hashsize*sizeof (struct mbuf *));
-               doinghost = 0;
-               goto again;
-       }
-       free((char *)routehash);
-       return;

 }
 
 }
 

-static union {
-       struct  sockaddr u_sa;
-       u_short u_data[128];
-} pt_u;
-int do_rtent = 0;
-struct rtentry rtentry;
-struct radix_node rnode;
-struct radix_mask rmask;
-
-int NewTree = 0;
-treestuff(rtree)
-off_t rtree;
+/*
+ * Print address family header before a section of the routing table.
+ */
+void
+pr_family(af)
+       int af;

 {
 {

-       struct radix_node_head *rnh, head;
+       char *afname;

 
 

-       if (Aflag == 0 && NewTree)
-               return(ntreestuff());
-       for (kget(rtree, rnh); rnh; rnh = head.rnh_next) {
-               kget(rnh, head);
-               if (head.rnh_af == 0) {
-                       if (Aflag || af == AF_UNSPEC) { 
-                               printf("Netmasks:\n");
-                               p_tree(head.rnh_treetop);
-                       }
-               } else if (af == AF_UNSPEC || af == head.rnh_af) {
-                       printf("\nRoute Tree for Protocol Family %d:\n",
-                                                               head.rnh_af);
-                       do_rtent = 1;
-                       p_tree(head.rnh_treetop);
-               }
+       switch (af) {
+       case AF_INET:
+               afname = "Internet";
+               break;
+       case AF_NS:
+               afname = "XNS";
+               break;
+       case AF_ISO:
+               afname = "ISO";
+               break;
+       case AF_CCITT:
+               afname = "X.25";
+               break;
+       default:
+               afname = NULL;
+               break;

        }
        }

+       if (afname)
+               printf("\n%s:\n", afname);
+       else
+               printf("\nProtocol Family %d:\n", af);
+}
+
+/* column widths; each followed by one space */
+#define        WID_DST         16      /* width of destination column */
+#define        WID_GW          18      /* width of gateway column */
+
+/*
+ * Print header for routing table columns.
+ */
+void
+pr_rthdr()
+{
+
+       if (Aflag)
+               printf("%-8.8s ","Address");
+       printf("%-*.*s %-*.*s %-6.6s  %6.6s%8.8s  %s\n",
+               WID_DST, WID_DST, "Destination",
+               WID_GW, WID_GW, "Gateway",
+               "Flags", "Refs", "Use", "Interface");

 }
 
 }
 

-struct sockaddr *
+static struct sockaddr *

 kgetsa(dst)
 kgetsa(dst)

-register struct sockaddr *dst;
+       register struct sockaddr *dst;

 {
 {

+

        kget(dst, pt_u.u_sa);
        kget(dst, pt_u.u_sa);

-       if (pt_u.u_sa.sa_len > sizeof (pt_u.u_sa)) {
-               kvm_read((off_t)dst, pt_u.u_data, pt_u.u_sa.sa_len);
-       }
+       if (pt_u.u_sa.sa_len > sizeof (pt_u.u_sa))
+               kread((u_long)dst, (char *)pt_u.u_data, pt_u.u_sa.sa_len);

        return (&pt_u.u_sa);
 }
 
        return (&pt_u.u_sa);
 }
 

+static void

 p_tree(rn)
 p_tree(rn)

-struct radix_node *rn;
+       struct radix_node *rn;

 {
 
 again:
 {
 
 again:


@@ -166,17 +218,18 @@ again:
        if (rnode.rn_b < 0) {
                if (Aflag)
                        printf("%-8.8x ", rn);
        if (rnode.rn_b < 0) {
                if (Aflag)
                        printf("%-8.8x ", rn);

-               if (rnode.rn_flags & RNF_ROOT)
-                       printf("(root node)%s",
+               if (rnode.rn_flags & RNF_ROOT) {
+                       if (Aflag)
+                               printf("(root node)%s",

                                    rnode.rn_dupedkey ? " =>\n" : "\n");
                                    rnode.rn_dupedkey ? " =>\n" : "\n");

-               else if (do_rtent) {
+               } else if (do_rtent) {

                        kget(rn, rtentry);
                        p_rtentry(&rtentry);
                        if (Aflag)
                                p_rtnode();
                } else {
                        p_sockaddr(kgetsa((struct sockaddr *)rnode.rn_key),
                        kget(rn, rtentry);
                        p_rtentry(&rtentry);
                        if (Aflag)
                                p_rtnode();
                } else {
                        p_sockaddr(kgetsa((struct sockaddr *)rnode.rn_key),

-                                   0, 44);
+                                  NULL, 0, 44);

                        putchar('\n');
                }
                if (rn = rnode.rn_dupedkey)
                        putchar('\n');
                }
                if (rn = rnode.rn_dupedkey)


@@ -191,17 +244,19 @@ again:
                p_tree(rn);
        }
 }
                p_tree(rn);
        }
 }

-char nbuf[20];

 
 

+char   nbuf[20];
+
+static void

 p_rtnode()
 {
 p_rtnode()
 {

-

        struct radix_mask *rm = rnode.rn_mklist;
        struct radix_mask *rm = rnode.rn_mklist;

+

        if (rnode.rn_b < 0) {
                if (rnode.rn_mask) {
                        printf("\t  mask ");
                        p_sockaddr(kgetsa((struct sockaddr *)rnode.rn_mask),
        if (rnode.rn_b < 0) {
                if (rnode.rn_mask) {
                        printf("\t  mask ");
                        p_sockaddr(kgetsa((struct sockaddr *)rnode.rn_mask),

-                                   0, -1);
+                                  NULL, 0, -1);

                } else if (rm == 0)
                        return;
        } else {
                } else if (rm == 0)
                        return;
        } else {


@@ -213,7 +268,15 @@ p_rtnode()
                sprintf(nbuf, " %d refs, ", rmask.rm_refs);
                printf(" mk = %8.8x {(%d),%s",
                        rm, -1 - rmask.rm_b, rmask.rm_refs ? nbuf : " ");
                sprintf(nbuf, " %d refs, ", rmask.rm_refs);
                printf(" mk = %8.8x {(%d),%s",
                        rm, -1 - rmask.rm_b, rmask.rm_refs ? nbuf : " ");

-               p_sockaddr(kgetsa((struct sockaddr *)rmask.rm_mask), 0, -1);
+               if (rmask.rm_flags & RNF_NORMAL) {
+                       struct radix_node rnode_aux;
+                       printf(" <normal>, ");
+                       kget(rmask.rm_leaf, rnode_aux);
+                       p_sockaddr(kgetsa((struct sockaddr *)rnode_aux.rn_mask),
+                                   NULL, 0, -1);
+               } else
+                   p_sockaddr(kgetsa((struct sockaddr *)rmask.rm_mask),
+                               NULL, 0, -1);

                putchar('}');
                if (rm = rmask.rm_mklist)
                        printf(" ->");
                putchar('}');
                if (rm = rmask.rm_mklist)
                        printf(" ->");


@@ -221,18 +284,26 @@ p_rtnode()
        putchar('\n');
 }
 
        putchar('\n');
 }
 

+static void

 ntreestuff()
 {
 ntreestuff()
 {

-       int needed;
+       size_t needed;
+       int mib[6];

        char *buf, *next, *lim;
        register struct rt_msghdr *rtm;
 
        char *buf, *next, *lim;
        register struct rt_msghdr *rtm;
 

-       if ((needed = getkerninfo(KINFO_RT_DUMP, 0, 0, 0)) < 0)
-               { perror("route-getkerninfo-estimate"); exit(1);}
+        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)
+               { perror("route-sysctl-estimate"); exit(1);}

        if ((buf = malloc(needed)) == 0)
                { printf("out of space\n"); exit(1);}
        if ((buf = malloc(needed)) == 0)
                { printf("out of space\n"); exit(1);}

-       if (getkerninfo(KINFO_RT_DUMP, buf, &needed, 0) < 0)
-               { perror("actual retrieval of routing table"); exit(1);}
+        if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
+               { perror("sysctl of routing table"); exit(1);}

        lim  = buf + needed;
        for (next = buf; next < lim; next += rtm->rtm_msglen) {
                rtm = (struct rt_msghdr *)next;
        lim  = buf + needed;
        for (next = buf; next < lim; next += rtm->rtm_msglen) {
                rtm = (struct rt_msghdr *)next;


@@ -240,11 +311,15 @@ ntreestuff()
        }
 }
 
        }
 }
 

+static void

 np_rtentry(rtm)
 np_rtentry(rtm)

-register struct rt_msghdr *rtm;
+       register struct rt_msghdr *rtm;

 {
        register struct sockaddr *sa = (struct sockaddr *)(rtm + 1);
 {
        register struct sockaddr *sa = (struct sockaddr *)(rtm + 1);

-       static int masks_done, old_af, banner_printed;
+#ifdef notdef
+       static int masks_done, banner_printed;
+#endif
+       static int old_af;

        int af = 0, interesting = RTF_UP | RTF_GATEWAY | RTF_HOST;
 
 #ifdef notdef
        int af = 0, interesting = RTF_UP | RTF_GATEWAY | RTF_HOST;
 
 #ifdef notdef


@@ -262,55 +337,93 @@ register struct rt_msghdr *rtm;
 #endif
                af = sa->sa_family;
        if (af != old_af) {
 #endif
                af = sa->sa_family;
        if (af != old_af) {

-               printf("\nRoute Tree for Protocol Family %d:\n", af);
+               pr_family(af);

                old_af = af;
        }
        if (rtm->rtm_addrs == RTA_DST)
                old_af = af;
        }
        if (rtm->rtm_addrs == RTA_DST)

-               p_sockaddr(sa, 0, 36);
+               p_sockaddr(sa, NULL, 0, 36);

        else {
        else {

-               p_sockaddr(sa, rtm->rtm_flags, 16);
+               p_sockaddr(sa, NULL, rtm->rtm_flags, 16);

                if (sa->sa_len == 0)
                        sa->sa_len = sizeof(long);
                sa = (struct sockaddr *)(sa->sa_len + (char *)sa);
                if (sa->sa_len == 0)
                        sa->sa_len = sizeof(long);
                sa = (struct sockaddr *)(sa->sa_len + (char *)sa);

-               p_sockaddr(sa, 0, 18);
+               p_sockaddr(sa, NULL, 0, 18);

        }
        p_flags(rtm->rtm_flags & interesting, "%-6.6s ");
        putchar('\n');
 }
 
        }
        p_flags(rtm->rtm_flags & interesting, "%-6.6s ");
        putchar('\n');
 }
 

-p_sockaddr(sa, flags, width)
-struct sockaddr *sa;
-int flags, width;
+static void
+p_sockaddr(sa, mask, flags, width)
+       struct sockaddr *sa, *mask;
+       int flags, width;

 {
 {

-       char format[20], workbuf[128], *cp, *cplim;
-       register char *cpout;
+       char workbuf[128], *cplim;
+       register char *cp = workbuf;

 
        switch(sa->sa_family) {
        case AF_INET:
            {
                register struct sockaddr_in *sin = (struct sockaddr_in *)sa;
 
 
        switch(sa->sa_family) {
        case AF_INET:
            {
                register struct sockaddr_in *sin = (struct sockaddr_in *)sa;
 

-               cp = (sin->sin_addr.s_addr == 0) ? "default" :
-                     ((flags & RTF_HOST) ?
-                       routename(sin->sin_addr) : netname(sin->sin_addr, 0L));
-           }
+               if (sin->sin_addr.s_addr == INADDR_ANY)
+                       cp = "default";
+               else if (flags & RTF_HOST)
+                       cp = routename(sin->sin_addr.s_addr);
+               else if (mask)
+                       cp = netname(sin->sin_addr.s_addr,
+                                    ntohl(((struct sockaddr_in *)mask)
+                                          ->sin_addr.s_addr));
+               else
+                       cp = netname(sin->sin_addr.s_addr, 0L);

                break;
                break;

+           }

 
        case AF_NS:
 
        case AF_NS:

-               cp = ns_print((struct sockaddr_ns *)sa);
+               cp = ns_print(sa);

                break;
 
                break;
 

+       case AF_LINK:
+           {
+               register struct sockaddr_dl *sdl = (struct sockaddr_dl *)sa;
+
+               if (sdl->sdl_nlen == 0 && sdl->sdl_alen == 0 &&
+                   sdl->sdl_slen == 0)
+                       (void) sprintf(workbuf, "link#%d", sdl->sdl_index);
+               else switch (sdl->sdl_type) {
+               case IFT_ETHER:
+                   {
+                       register int i;
+                       register u_char *lla = (u_char *)sdl->sdl_data +
+                           sdl->sdl_nlen;
+
+                       cplim = "";
+                       for (i = 0; i < sdl->sdl_alen; i++, lla++) {
+                               cp += sprintf(cp, "%s%x", cplim, *lla);
+                               cplim = ":";
+                       }
+                       cp = workbuf;
+                       break;
+                   }
+               default:
+                       cp = link_ntoa(sdl);
+                       break;
+               }
+               break;
+           }
+

        default:
            {
        default:
            {

-               register u_short *s = ((u_short *)sa->sa_data), *slim;
+               register u_char *s = (u_char *)sa->sa_data, *slim;

 
 

-               slim = (u_short *) sa + ((sa->sa_len + sizeof(u_short) - 1) /
-                   sizeof(u_short));
-               cp = workbuf;
+               slim =  sa->sa_len + (u_char *) sa;

                cplim = cp + sizeof(workbuf) - 6;
                cp += sprintf(cp, "(%d)", sa->sa_family);
                cplim = cp + sizeof(workbuf) - 6;
                cp += sprintf(cp, "(%d)", sa->sa_family);

-               while (s < slim && cp < cplim)
-                       cp += sprintf(cp, " %x", *s++);
+               while (s < slim && cp < cplim) {
+                       cp += sprintf(cp, " %02x", *s++);
+                       if (s < slim)
+                           cp += sprintf(cp, "%02x", *s++);
+               }

                cp = workbuf;
            }
        }
                cp = workbuf;
            }
        }


@@ -324,12 +437,14 @@ int flags, width;
        }
 }
 
        }
 }
 

+static void

 p_flags(f, format)
 p_flags(f, format)

-register int f;
-char *format;
+       register int f;
+       char *format;

 {
        char name[33], *flags;
        register struct bits *p = bits;
 {
        char name[33], *flags;
        register struct bits *p = bits;

+

        for (flags = name; p->b_mask; p++)
                if (p->b_mask & f)
                        *flags++ = p->b_val;
        for (flags = name; p->b_mask; p++)
                if (p->b_mask & f)
                        *flags++ = p->b_val;


@@ -337,58 +452,48 @@ char *format;
        printf(format, name);
 }
 
        printf(format, name);
 }
 

+static void

 p_rtentry(rt)
 p_rtentry(rt)

-register struct rtentry *rt;
+       register struct rtentry *rt;

 {
 {

-       char name[16];
+       static struct ifnet ifnet, *lastif;
+       static char name[16];

        register struct sockaddr *sa;
        register struct sockaddr *sa;

-       struct ifnet ifnet;
+       struct sockaddr addr, mask;

 
 

-       p_sockaddr(kgetsa(rt_key(rt)), rt->rt_flags, 16);
-       p_sockaddr(kgetsa(rt->rt_gateway), 0, 18);
-       p_flags(rt->rt_flags, "%-6.6s ");
-       printf("%6d %8d ", rt->rt_refcnt, rt->rt_use);
-       if (rt->rt_ifp == 0) {
-               putchar('\n');
-               return;
-       }
-       kget(rt->rt_ifp, ifnet);
-       kvm_read((off_t)ifnet.if_name, name, 16);
-       printf(" %.15s%d%s", name, ifnet.if_unit,
-               rt->rt_nodes[0].rn_dupedkey ? " =>\n" : "\n");
-}
-
-p_ortentry(rt)
-register struct ortentry *rt;
-{
-       char name[16], *flags;
-       register struct bits *p;
-       register struct sockaddr_in *sin;
-       struct ifnet ifnet;
-
-       p_sockaddr(&rt->rt_dst, rt->rt_flags, 16);
-       p_sockaddr(&rt->rt_gateway, 0, 18);
+       if (!(sa = kgetsa(rt_key(rt))))
+               bzero(&addr, sizeof addr);
+       else
+               addr = *sa;
+       if (!rt_mask(rt) || !(sa = kgetsa(rt_mask(rt))))
+               bzero(&mask, sizeof mask);
+       else
+               mask = *sa;
+       p_sockaddr(&addr, &mask, rt->rt_flags, WID_DST);
+       p_sockaddr(kgetsa(rt->rt_gateway), NULL, RTF_HOST, WID_GW);

        p_flags(rt->rt_flags, "%-6.6s ");
        printf("%6d %8d ", rt->rt_refcnt, rt->rt_use);
        p_flags(rt->rt_flags, "%-6.6s ");
        printf("%6d %8d ", rt->rt_refcnt, rt->rt_use);

-       if (rt->rt_ifp == 0) {
-               putchar('\n');
-               return;
+       if (rt->rt_ifp) {
+               if (rt->rt_ifp != lastif) {
+                       kget(rt->rt_ifp, ifnet);
+                       kread((u_long)ifnet.if_name, name, 16);
+                       lastif = rt->rt_ifp;
+               }
+               printf(" %.15s%d%s", name, ifnet.if_unit,
+                       rt->rt_nodes[0].rn_dupedkey ? " =>" : "");

        }
        }

-       kget(rt->rt_ifp, ifnet);
-       kvm_read((off_t)ifnet.if_name, name, 16);
-       printf(" %.15s%d\n", name, ifnet.if_unit);
+       putchar('\n');

 }
 
 char *
 routename(in)
 }
 
 char *
 routename(in)

-       struct in_addr in;
+       u_long in;

 {
        register char *cp;
        static char line[MAXHOSTNAMELEN + 1];
        struct hostent *hp;
        static char domain[MAXHOSTNAMELEN + 1];
        static int first = 1;
 {
        register char *cp;
        static char line[MAXHOSTNAMELEN + 1];
        struct hostent *hp;
        static char domain[MAXHOSTNAMELEN + 1];
        static int first = 1;

-       char *index();

 
        if (first) {
                first = 0;
 
        if (first) {
                first = 0;


@@ -413,41 +518,89 @@ routename(in)
                strncpy(line, cp, sizeof(line) - 1);
        else {
 #define C(x)   ((x) & 0xff)
                strncpy(line, cp, sizeof(line) - 1);
        else {
 #define C(x)   ((x) & 0xff)

-               in.s_addr = ntohl(in.s_addr);
-               sprintf(line, "%u.%u.%u.%u", C(in.s_addr >> 24),
-                       C(in.s_addr >> 16), C(in.s_addr >> 8), C(in.s_addr));
+               in = ntohl(in);
+               sprintf(line, "%u.%u.%u.%u",
+                   C(in >> 24), C(in >> 16), C(in >> 8), C(in));

        }
        return (line);
 }
 
        }
        return (line);
 }
 

+static u_long
+forgemask(a)
+       u_long a;
+{
+       u_long m;
+
+       if (IN_CLASSA(a))
+               m = IN_CLASSA_NET;
+       else if (IN_CLASSB(a))
+               m = IN_CLASSB_NET;
+       else
+               m = IN_CLASSC_NET;
+       return (m);
+}
+
+static void
+domask(dst, addr, mask)
+       char *dst;
+       u_long addr, mask;
+{
+       register int b, i;
+
+       if (!mask || (forgemask(addr) == mask)) {
+               *dst = '\0';
+               return;
+       }
+       i = 0;
+       for (b = 0; b < 32; b++)
+               if (mask & (1 << b)) {
+                       register int bb;
+
+                       i = b;
+                       for (bb = b+1; bb < 32; bb++)
+                               if (!(mask & (1 << bb))) {
+                                       i = -1; /* noncontig */
+                                       break;
+                               }
+                       break;
+               }
+       if (i == -1)
+               sprintf(dst, "&0x%lx", mask);
+       else
+               sprintf(dst, "/%d", 32-i);
+}
+

 /*
  * Return the name of the network whose address is given.
  * The address is assumed to be that of a net or subnet, not a host.
  */
 char *
 netname(in, mask)
 /*
  * Return the name of the network whose address is given.
  * The address is assumed to be that of a net or subnet, not a host.
  */
 char *
 netname(in, mask)

-       struct in_addr in;
-       u_long mask;
+       u_long in, mask;

 {
        char *cp = 0;
        static char line[MAXHOSTNAMELEN + 1];
        struct netent *np = 0;
 {
        char *cp = 0;
        static char line[MAXHOSTNAMELEN + 1];
        struct netent *np = 0;

-       u_long net;
-       register i;
+       u_long net, omask;
+       register u_long i;

        int subnetshift;
 
        int subnetshift;
 

-       i = ntohl(in.s_addr);
+       i = ntohl(in);
+       omask = mask;

        if (!nflag && i) {
                if (mask == 0) {
        if (!nflag && i) {
                if (mask == 0) {

-                       if (IN_CLASSA(i)) {
-                               mask = IN_CLASSA_NET;
+                       switch (mask = forgemask(i)) {
+                       case IN_CLASSA_NET:

                                subnetshift = 8;
                                subnetshift = 8;

-                       } else if (IN_CLASSB(i)) {
-                               mask = IN_CLASSB_NET;
+                               break;
+                       case IN_CLASSB_NET:

                                subnetshift = 8;
                                subnetshift = 8;

-                       } else {
-                               mask = IN_CLASSC_NET;
+                               break;
+                       case IN_CLASSC_NET:

                                subnetshift = 4;
                                subnetshift = 4;

+                               break;
+                       default:
+                               abort();

                        }
                        /*
                         * If there are more bits than the standard mask
                        }
                        /*
                         * If there are more bits than the standard mask


@@ -464,7 +617,7 @@ netname(in, mask)
                np = getnetbyaddr(net, AF_INET);
                if (np)
                        cp = np->n_name;
                np = getnetbyaddr(net, AF_INET);
                if (np)
                        cp = np->n_name;

-       }       
+       }

        if (cp)
                strncpy(line, cp, sizeof(line) - 1);
        else if ((i & 0xffffff) == 0)
        if (cp)
                strncpy(line, cp, sizeof(line) - 1);
        else if ((i & 0xffffff) == 0)


@@ -476,14 +629,16 @@ netname(in, mask)
        else
                sprintf(line, "%u.%u.%u.%u", C(i >> 24),
                        C(i >> 16), C(i >> 8), C(i));
        else
                sprintf(line, "%u.%u.%u.%u", C(i >> 24),
                        C(i >> 16), C(i >> 8), C(i));

+       domask(line+strlen(line), i, omask);

        return (line);
 }
 
 /*
  * Print routing statistics
  */
        return (line);
 }
 
 /*
  * Print routing statistics
  */

+void

 rt_stats(off)
 rt_stats(off)

-       off_t off;
+       u_long off;

 {
        struct rtstat rtstat;
 
 {
        struct rtstat rtstat;
 


@@ -491,7 +646,7 @@ rt_stats(off)
                printf("rtstat: symbol not in namelist\n");
                return;
        }
                printf("rtstat: symbol not in namelist\n");
                return;
        }

-       kvm_read(off, (char *)&rtstat, sizeof (rtstat));
+       kread(off, (char *)&rtstat, sizeof (rtstat));

        printf("routing:\n");
        printf("\t%u bad routing redirect%s\n",
                rtstat.rts_badredirect, plural(rtstat.rts_badredirect));
        printf("routing:\n");
        printf("\t%u bad routing redirect%s\n",
                rtstat.rts_badredirect, plural(rtstat.rts_badredirect));


@@ -508,9 +663,10 @@ short ns_nullh[] = {0,0,0};
 short ns_bh[] = {-1,-1,-1};
 
 char *
 short ns_bh[] = {-1,-1,-1};
 
 char *

-ns_print(sns)
-struct sockaddr_ns *sns;
+ns_print(sa)
+       register struct sockaddr *sa;

 {
 {

+       register struct sockaddr_ns *sns = (struct sockaddr_ns*)sa;

        struct ns_addr work;
        union { union ns_net net_e; u_long long_e; } net;
        u_short port;
        struct ns_addr work;
        union { union ns_net net_e; u_long long_e; } net;
        u_short port;


@@ -539,7 +695,8 @@ struct sockaddr_ns *sns;
                q = work.x_host.c_host;
                sprintf(chost, "%02x%02x%02x%02x%02x%02xH",
                        q[0], q[1], q[2], q[3], q[4], q[5]);
                q = work.x_host.c_host;
                sprintf(chost, "%02x%02x%02x%02x%02x%02xH",
                        q[0], q[1], q[2], q[3], q[4], q[5]);

-               for (p = chost; *p == '0' && p < chost + 12; p++);
+               for (p = chost; *p == '0' && p < chost + 12; p++)
+                       continue;

                host = p;
        }
        if (port)
                host = p;
        }
        if (port)


@@ -553,23 +710,26 @@ struct sockaddr_ns *sns;
 }
 
 char *
 }
 
 char *

-ns_phost(sns)
-struct sockaddr_ns *sns;
+ns_phost(sa)
+       struct sockaddr *sa;

 {
 {

+       register struct sockaddr_ns *sns = (struct sockaddr_ns *)sa;

        struct sockaddr_ns work;
        static union ns_net ns_zeronet;
        char *p;
        struct sockaddr_ns work;
        static union ns_net ns_zeronet;
        char *p;

-       
+

        work = *sns;
        work.sns_addr.x_port = 0;
        work.sns_addr.x_net = ns_zeronet;
 
        work = *sns;
        work.sns_addr.x_port = 0;
        work.sns_addr.x_net = ns_zeronet;
 

-       p = ns_print(&work);
+       p = ns_print((struct sockaddr *)&work);

        if (strncmp("0H.", p, 3) == 0) p += 3;
        return(p);
 }
        if (strncmp("0H.", p, 3) == 0) p += 3;
        return(p);
 }

+
+void

 upHex(p0)
 upHex(p0)

-char *p0;
+       char *p0;

 {
        register char *p = p0;
        for (; *p; p++) switch (*p) {
 {
        register char *p = p0;
        for (; *p; p++) switch (*p) {