optimization for normal masks requires keeping ptr to associated leaf,

[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 0559603..13aec77 100644 (file)
--- a/usr/src/usr.bin/netstat/route.c
+++ b/usr/src/usr.bin/netstat/route.c
@@ -1,12 +1,12 @@
 /*
 /*

- * 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%
  */
 
 #ifndef lint
  *
  * %sccs.include.redist.c%
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)route.c    5.26 (Berkeley) %G%";
+static char sccsid[] = "@(#)route.c    8.4 (Berkeley) %G%";

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


@@ -374,14 +374,16 @@ p_sockaddr(sa, flags, width)
 
        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));
+               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;
            }
        }


@@ -418,7 +420,7 @@ p_rtentry(rt)
        static char name[16];
 
        p_sockaddr(kgetsa(rt_key(rt)), rt->rt_flags, WID_DST);
        static char name[16];
 
        p_sockaddr(kgetsa(rt_key(rt)), rt->rt_flags, WID_DST);

-       p_sockaddr(kgetsa(rt->rt_gateway), 0, WID_GW);
+       p_sockaddr(kgetsa(rt->rt_gateway), RTF_HOST, WID_GW);

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