BSD 4_4_Lite2 release
[unix-history] / usr / src / usr.bin / netstat / route.c
index 9584f2c..ee98f07 100644 (file)
@@ -1,28 +1,65 @@
 /*
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * 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. 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.2 85/06/15";
-#endif
+static char sccsid[] = "@(#)route.c    8.6 (Berkeley) 4/28/95";
+#endif /* not lint */
 
 
-#include <sys/types.h>
+#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>
 #include <net/route.h>
+#undef KERNEL
 #include <netinet/in.h>
 
 #include <netns/ns.h>
 
 #include <netinet/in.h>
 
 #include <netns/ns.h>
 
+#include <sys/sysctl.h>
+
 #include <netdb.h>
 #include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "netstat.h"
 
 
-extern int kmem;
-extern int nflag;
-extern char *routename(), *netname(), *ns_print();
+#define kget(p, d) (kread((u_long)(p), (char *)&(d), sizeof (d)))
 
 /*
  * Definitions for showing gateway flags.
 
 /*
  * Definitions for showing gateway flags.
@@ -34,189 +71,574 @@ 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_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_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)
-       off_t hostaddr, netaddr, hashsizeaddr;
+void
+routepr(rtree)
+       u_long rtree;
 {
 {
-       struct mbuf mb;
-       register struct rtentry *rt;
-       register struct mbuf *m;
-       register struct bits *p;
-       char name[16], *flags;
-       struct mbuf **routehash;
-       struct ifnet ifnet;
-       int hashsize;
-       int i, doinghost = 1;
-
-       if (hostaddr == 0) {
-               printf("rthost: symbol not in namelist\n");
-               return;
-       }
-       if (netaddr == 0) {
-               printf("rtnet: symbol not in namelist\n");
-               return;
+       struct radix_node_head *rnh, head;
+       int i;
+
+       printf("Routing tables\n");
+
+       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 (hashsizeaddr == 0) {
-               printf("rthashsize: symbol not in namelist\n");
-               return;
+}
+
+/*
+ * Print address family header before a section of the routing table.
+ */
+void
+pr_family(af)
+       int af;
+{
+       char *afname;
+
+       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;
        }
        }
-       klseek(kmem, hashsizeaddr, 0);
-       read(kmem, &hashsize, sizeof (hashsize));
-       routehash = (struct mbuf **)malloc( hashsize*sizeof (struct mbuf *) );
-       klseek(kmem, hostaddr, 0);
-       read(kmem, routehash, hashsize*sizeof (struct mbuf *));
-       printf("Routing tables\n");
-       printf("%-15.15s %-15.15s %-8.8s %-6.6s %-10.10s %s\n",
-               "Destination", "Gateway",
-               "Flags", "Refcnt", "Use", "Interface");
+       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");
+}
+
+static struct sockaddr *
+kgetsa(dst)
+       register struct sockaddr *dst;
+{
+
+       kget(dst, pt_u.u_sa);
+       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);
+}
+
+static void
+p_tree(rn)
+       struct radix_node *rn;
+{
+
 again:
 again:
-       for (i = 0; i < hashsize; i++) {
-               if (routehash[i] == 0)
-                       continue;
-               m = routehash[i];
-               while (m) {
-                       struct sockaddr_in *sin;
-                       struct sockaddr_ns *sns;
-                       long *l = (long *)&rt->rt_dst;
-
-                       klseek(kmem, m, 0);
-                       read(kmem, &mb, sizeof (mb));
-                       rt = mtod(&mb, struct rtentry *);
-                       switch(rt->rt_dst.sa_family) {
-               case AF_INET:
-                       sin = (struct sockaddr_in *)&rt->rt_dst;
-                       printf("%-15.15s ",
-                           (sin->sin_addr.s_addr == 0) ? "default" :
-                           (rt->rt_flags & RTF_HOST) ?
-                           routename(sin->sin_addr) : netname(sin->sin_addr, 0));
-                       sin = (struct sockaddr_in *)&rt->rt_gateway;
-                       printf("%-15.15s ", routename(sin->sin_addr));
-                       break;
-               case AF_NS:
-                       printf("%-15s ",
-                           ns_print((struct sockaddr_ns *)&rt->rt_dst));
-                       printf("%-15s ",
-                           ns_print((struct sockaddr_ns *)&rt->rt_gateway));
+       kget(rn, rnode);
+       if (rnode.rn_b < 0) {
+               if (Aflag)
+                       printf("%-8.8x ", rn);
+               if (rnode.rn_flags & RNF_ROOT) {
+                       if (Aflag)
+                               printf("(root node)%s",
+                                   rnode.rn_dupedkey ? " =>\n" : "\n");
+               } else if (do_rtent) {
+                       kget(rn, rtentry);
+                       p_rtentry(&rtentry);
+                       if (Aflag)
+                               p_rtnode();
+               } else {
+                       p_sockaddr(kgetsa((struct sockaddr *)rnode.rn_key),
+                                  NULL, 0, 44);
+                       putchar('\n');
+               }
+               if (rn = rnode.rn_dupedkey)
+                       goto again;
+       } else {
+               if (Aflag && do_rtent) {
+                       printf("%-8.8x ", rn);
+                       p_rtnode();
+               }
+               rn = rnode.rn_r;
+               p_tree(rnode.rn_l);
+               p_tree(rn);
+       }
+}
+
+char   nbuf[20];
+
+static void
+p_rtnode()
+{
+       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),
+                                  NULL, 0, -1);
+               } else if (rm == 0)
+                       return;
+       } else {
+               sprintf(nbuf, "(%d)", rnode.rn_b);
+               printf("%6.6s %8.8x : %8.8x", nbuf, rnode.rn_l, rnode.rn_r);
+       }
+       while (rm) {
+               kget(rm, rmask);
+               sprintf(nbuf, " %d refs, ", rmask.rm_refs);
+               printf(" mk = %8.8x {(%d),%s",
+                       rm, -1 - rmask.rm_b, rmask.rm_refs ? nbuf : " ");
+               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('\n');
+}
+
+static void
+ntreestuff()
+{
+       size_t needed;
+       int mib[6];
+       char *buf, *next, *lim;
+       register struct rt_msghdr *rtm;
+
+        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 (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;
+               np_rtentry(rtm);
+       }
+}
+
+static void
+np_rtentry(rtm)
+       register struct rt_msghdr *rtm;
+{
+       register 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;
+
+#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 (af != old_af) {
+               pr_family(af);
+               old_af = af;
+       }
+       if (rtm->rtm_addrs == RTA_DST)
+               p_sockaddr(sa, NULL, 0, 36);
+       else {
+               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);
+               p_sockaddr(sa, NULL, 0, 18);
+       }
+       p_flags(rtm->rtm_flags & interesting, "%-6.6s ");
+       putchar('\n');
+}
+
+static void
+p_sockaddr(sa, mask, flags, width)
+       struct sockaddr *sa, *mask;
+       int flags, width;
+{
+       char workbuf[128], *cplim;
+       register char *cp = workbuf;
+
+       switch(sa->sa_family) {
+       case AF_INET:
+           {
+               register struct sockaddr_in *sin = (struct sockaddr_in *)sa;
+
+               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;
+           }
+
+       case AF_NS:
+               cp = ns_print(sa);
+               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;
                        break;
+                   }
                default:
                default:
-                       printf("%8.8x %8.8x %8.8x %8.8x",*l, l[1], l[2], l[3]);
-                       l = (long *)&rt->rt_gateway;
-                       printf("%8.8x %8.8x %8.8x %8.8x",*l, l[1], l[2], l[3]);
-                       }
-                       for (flags = name, p = bits; p->b_mask; p++)
-                               if (p->b_mask & rt->rt_flags)
-                                       *flags++ = p->b_val;
-                       *flags = '\0';
-                       printf("%-8.8s %-6d %-10d ", name,
-                               rt->rt_refcnt, rt->rt_use);
-                       if (rt->rt_ifp == 0) {
-                               putchar('\n');
-                               m = mb.m_next;
-                               continue;
-                       }
-                       klseek(kmem, rt->rt_ifp, 0);
-                       read(kmem, &ifnet, sizeof (ifnet));
-                       klseek(kmem, (int)ifnet.if_name, 0);
-                       read(kmem, name, 16);
-                       printf("%s%d\n", name, ifnet.if_unit);
-                       m = mb.m_next;
+                       cp = link_ntoa(sdl);
+                       break;
                }
                }
+               break;
+           }
+
+       default:
+           {
+               register u_char *s = (u_char *)sa->sa_data, *slim;
+
+               slim =  sa->sa_len + (u_char *) sa;
+               cplim = cp + sizeof(workbuf) - 6;
+               cp += sprintf(cp, "(%d)", sa->sa_family);
+               while (s < slim && cp < cplim) {
+                       cp += sprintf(cp, " %02x", *s++);
+                       if (s < slim)
+                           cp += sprintf(cp, "%02x", *s++);
+               }
+               cp = workbuf;
+           }
+       }
+       if (width < 0 )
+               printf("%s ", cp);
+       else {
+               if (nflag)
+                       printf("%-*s ", width, cp);
+               else
+                       printf("%-*.*s ", width, width, cp);
        }
        }
-       if (doinghost) {
-               klseek(kmem, netaddr, 0);
-               read(kmem, routehash, hashsize*sizeof (struct mbuf *));
-               doinghost = 0;
-               goto again;
+}
+
+static void
+p_flags(f, format)
+       register int f;
+       char *format;
+{
+       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;
+       *flags = '\0';
+       printf(format, name);
+}
+
+static void
+p_rtentry(rt)
+       register struct rtentry *rt;
+{
+       static struct ifnet ifnet, *lastif;
+       static char name[16];
+       register struct sockaddr *sa;
+       struct sockaddr addr, mask;
+
+       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);
+       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 ? " =>" : "");
        }
        }
-       free(routehash);
+       putchar('\n');
 }
 
 char *
 routename(in)
 }
 
 char *
 routename(in)
-       struct in_addr in;
+       u_long in;
 {
 {
-       char *cp = 0;
-       static char line[50];
+       register char *cp;
+       static char line[MAXHOSTNAMELEN + 1];
        struct hostent *hp;
        struct hostent *hp;
+       static char domain[MAXHOSTNAMELEN + 1];
+       static int first = 1;
 
 
+       if (first) {
+               first = 0;
+               if (gethostname(domain, MAXHOSTNAMELEN) == 0 &&
+                   (cp = index(domain, '.')))
+                       (void) strcpy(domain, cp + 1);
+               else
+                       domain[0] = 0;
+       }
+       cp = 0;
        if (!nflag) {
        if (!nflag) {
-               hp = gethostbyaddr(&in, sizeof (struct in_addr),
+               hp = gethostbyaddr((char *)&in, sizeof (struct in_addr),
                        AF_INET);
                        AF_INET);
-               if (hp)
+               if (hp) {
+                       if ((cp = index(hp->h_name, '.')) &&
+                           !strcmp(cp + 1, domain))
+                               *cp = 0;
                        cp = hp->h_name;
                        cp = hp->h_name;
+               }
        }
        if (cp)
        }
        if (cp)
-               strcpy(line, cp);
+               strncpy(line, cp, sizeof(line) - 1);
        else {
 #define C(x)   ((x) & 0xff)
        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;
 {
        char *cp = 0;
-       static char line[50];
+       static char line[MAXHOSTNAMELEN + 1];
        struct netent *np = 0;
        struct netent *np = 0;
-       u_long net;
-       register i;
-
-       in.s_addr = ntohl(in.s_addr);
-       if (!nflag && in.s_addr) {
-               if (mask) {
-                       net = in.s_addr & mask;
-                       while ((mask & 1) == 0)
-                               mask >>= 1, net >>= 1;
-                       np = getnetbyaddr(net, AF_INET);
-               }
-               if (np == 0) {
+       u_long net, omask;
+       register u_long i;
+       int subnetshift;
+
+       i = ntohl(in);
+       omask = mask;
+       if (!nflag && i) {
+               if (mask == 0) {
+                       switch (mask = forgemask(i)) {
+                       case IN_CLASSA_NET:
+                               subnetshift = 8;
+                               break;
+                       case IN_CLASSB_NET:
+                               subnetshift = 8;
+                               break;
+                       case IN_CLASSC_NET:
+                               subnetshift = 4;
+                               break;
+                       default:
+                               abort();
+                       }
                        /*
                        /*
-                        * Try for subnet addresses.
+                        * If there are more bits than the standard mask
+                        * would suggest, subnets must be in use.
+                        * Guess at the subnet mask, assuming reasonable
+                        * width subnet fields.
                         */
                         */
-                       for (i = 0; ((0xf<<i) & in.s_addr) == 0; i += 4)
-                               ;
-                       for ( ; i; i -= 4)
-                           if (np = getnetbyaddr((unsigned)in.s_addr >> i,
-                                   AF_INET))
-                                       break;
+                       while (i &~ mask)
+                               mask = (long)mask >> subnetshift;
                }
                }
+               net = i & mask;
+               while ((mask & 1) == 0)
+                       mask >>= 1, net >>= 1;
+               np = getnetbyaddr(net, AF_INET);
                if (np)
                        cp = np->n_name;
        }
        if (cp)
                if (np)
                        cp = np->n_name;
        }
        if (cp)
-               strcpy(line, cp);
-       else if ((in.s_addr & 0xffffff) == 0)
-               sprintf(line, "%u", C(in.s_addr >> 24));
-       else if ((in.s_addr & 0xffff) == 0)
-               sprintf(line, "%u.%u", C(in.s_addr >> 24) , C(in.s_addr >> 16));
-       else if ((in.s_addr & 0xff) == 0)
-               sprintf(line, "%u.%u.%u", C(in.s_addr >> 24),
-                       C(in.s_addr >> 16), C(in.s_addr >> 8));
+               strncpy(line, cp, sizeof(line) - 1);
+       else if ((i & 0xffffff) == 0)
+               sprintf(line, "%u", C(i >> 24));
+       else if ((i & 0xffff) == 0)
+               sprintf(line, "%u.%u", C(i >> 24) , C(i >> 16));
+       else if ((i & 0xff) == 0)
+               sprintf(line, "%u.%u.%u", C(i >> 24), C(i >> 16), C(i >> 8));
        else
        else
-               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));
+               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);
 }
        return (line);
 }
+
 /*
  * Print routing statistics
  */
 /*
  * Print routing statistics
  */
+void
 rt_stats(off)
 rt_stats(off)
-       off_t off;
+       u_long off;
 {
        struct rtstat rtstat;
 
 {
        struct rtstat rtstat;
 
@@ -224,62 +646,95 @@ rt_stats(off)
                printf("rtstat: symbol not in namelist\n");
                return;
        }
                printf("rtstat: symbol not in namelist\n");
                return;
        }
-       klseek(kmem, off, 0);
-       read(kmem, (char *)&rtstat, sizeof (rtstat));
+       kread(off, (char *)&rtstat, sizeof (rtstat));
        printf("routing:\n");
        printf("routing:\n");
-       printf("\t%d bad routing redirect%s\n",
+       printf("\t%u bad routing redirect%s\n",
                rtstat.rts_badredirect, plural(rtstat.rts_badredirect));
                rtstat.rts_badredirect, plural(rtstat.rts_badredirect));
-       printf("\t%d dynamically created route%s\n",
+       printf("\t%u dynamically created route%s\n",
                rtstat.rts_dynamic, plural(rtstat.rts_dynamic));
                rtstat.rts_dynamic, plural(rtstat.rts_dynamic));
-       printf("\t%d new gateway%s due to redirects\n",
+       printf("\t%u new gateway%s due to redirects\n",
                rtstat.rts_newgateway, plural(rtstat.rts_newgateway));
                rtstat.rts_newgateway, plural(rtstat.rts_newgateway));
-       printf("\t%d destination%s found unreachable\n",
+       printf("\t%u destination%s found unreachable\n",
                rtstat.rts_unreach, plural(rtstat.rts_unreach));
                rtstat.rts_unreach, plural(rtstat.rts_unreach));
-       printf("\t%d use%s of a wildcard route\n",
+       printf("\t%u use%s of a wildcard route\n",
                rtstat.rts_wildcard, plural(rtstat.rts_wildcard));
 }
                rtstat.rts_wildcard, plural(rtstat.rts_wildcard));
 }
+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 ns_addr *dna = &sns->sns_addr;
-       long net = ntohl(ns_netof(*dna));
-       static char mybuf[50];
-       register char *p = mybuf;
-       short port = dna->x_port;
-
-       sprintf(p,"%ld:", net);
+       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;
+       static char mybuf[50], cport[10], chost[25];
+       char *host = "";
+       register char *p; register u_char *q;
 
 
-       while(*p)p++; /* find end of string */
+       work = sns->sns_addr;
+       port = ntohs(work.x_port);
+       work.x_port = 0;
+       net.net_e  = work.x_net;
+       if (ns_nullhost(work) && net.long_e == 0) {
+               if (port ) {
+                       sprintf(mybuf, "*.%xH", port);
+                       upHex(mybuf);
+               } else
+                       sprintf(mybuf, "*.*");
+               return (mybuf);
+       }
 
 
-       if (strncmp(ns_bh,dna->x_host.c_host,6)==0)
-               sprintf(p,"any");
-       else
-               sprintf(p,"%x.%x.%x.%x.%x.%x",
-                           dna->x_host.c_host[0], dna->x_host.c_host[1],
-                           dna->x_host.c_host[2], dna->x_host.c_host[3],
-                           dna->x_host.c_host[4], dna->x_host.c_host[5]);
-       if (port) {
-       while(*p)p++; /* find end of string */
-               printf(":%d",port);
+       if (bcmp(ns_bh, work.x_host.c_host, 6) == 0) {
+               host = "any";
+       } else if (bcmp(ns_nullh, work.x_host.c_host, 6) == 0) {
+               host = "*";
+       } else {
+               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++)
+                       continue;
+               host = p;
        }
        }
+       if (port)
+               sprintf(cport, ".%xH", htons(port));
+       else
+               *cport = 0;
+
+       sprintf(mybuf,"%xH.%s%s", ntohl(net.long_e), host, cport);
+       upHex(mybuf);
        return(mybuf);
 }
        return(mybuf);
 }
+
 char *
 char *
-ns_phost(sns)
-struct sockaddr_ns *sns;
+ns_phost(sa)
+       struct sockaddr *sa;
 {
 {
-       register struct ns_addr *dna = &sns->sns_addr;
-       long net = ntohl(ns_netof(*dna));
-       static char mybuf[50];
-       register char *p = mybuf;
-       if (strncmp(ns_bh,dna->x_host.c_host,6)==0)
-               sprintf(p,"any");
-       else
-               sprintf(p,"%x,%x,%x",
-                          dna->x_host.s_host[0], dna->x_host.s_host[1],
-                           dna->x_host.s_host[2]);
-       return(mybuf);
+       register struct sockaddr_ns *sns = (struct sockaddr_ns *)sa;
+       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;
+
+       p = ns_print((struct sockaddr *)&work);
+       if (strncmp("0H.", p, 3) == 0) p += 3;
+       return(p);
+}
+
+void
+upHex(p0)
+       char *p0;
+{
+       register char *p = p0;
+       for (; *p; p++) switch (*p) {
+
+       case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+               *p += ('A' - 'a');
+       }
 }
 }