not every value return in an nlist structure was being

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

diff --git a/usr/src/usr.bin/netstat/mroute.c b/usr/src/usr.bin/netstat/mroute.c
index c9bd018..adbe335 100644 (file)
--- a/usr/src/usr.bin/netstat/mroute.c
+++ b/usr/src/usr.bin/netstat/mroute.c
@@ -8,7 +8,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)mroute.c    7.1 (Berkeley) %G%
+ *     @(#)mroute.c    7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -34,7 +34,7 @@
 
 void
 mroutepr(mrpaddr, mrtaddr, vifaddr)
 
 void
 mroutepr(mrpaddr, mrtaddr, vifaddr)

-       off_t mrpaddr, mrtaddr, vifaddr;
+       u_long mrpaddr, mrtaddr, vifaddr;

 {
        u_int mrtproto;
        struct mrt *mrttable[MRTHASHSIZ];
 {
        u_int mrtproto;
        struct mrt *mrttable[MRTHASHSIZ];


@@ -53,7 +53,7 @@ mroutepr(mrpaddr, mrtaddr, vifaddr)
                return;
        }
 
                return;
        }
 

-       kread((off_t)mrpaddr, (char *)&mrtproto, sizeof(mrtproto));
+       kread(mrpaddr, (char *)&mrtproto, sizeof(mrtproto));

        switch (mrtproto) {
 
        case 0:
        switch (mrtproto) {
 
        case 0:


@@ -80,7 +80,7 @@ mroutepr(mrpaddr, mrtaddr, vifaddr)
        saved_nflag = nflag;
        nflag = 1;
 
        saved_nflag = nflag;
        nflag = 1;
 

-       kread((off_t)vifaddr, (char *)&viftable, sizeof(viftable));
+       kread(vifaddr, (char *)&viftable, sizeof(viftable));

        banner_printed = 0;
        for (vifi = 0, v = viftable; vifi < MAXVIFS; ++vifi, ++v) {
                if (v->v_lcl_addr.s_addr == 0)
        banner_printed = 0;
        for (vifi = 0, v = viftable; vifi < MAXVIFS; ++vifi, ++v) {
                if (v->v_lcl_addr.s_addr == 0)


@@ -104,7 +104,7 @@ mroutepr(mrpaddr, mrtaddr, vifaddr)
                        printf("v_lcl_grps_n: malloc failed\n");
                        return;
                }
                        printf("v_lcl_grps_n: malloc failed\n");
                        return;
                }

-               kread((off_t)v->v_lcl_grps, (caddr_t)grp, n * sizeof(*grp));
+               kread((u_long)v->v_lcl_grps, (caddr_t)grp, n * sizeof(*grp));

                for (i = 0; i < n; ++i)
                        printf("%51s %-15.15s\n",
                            "", routename((grp++)->s_addr));
                for (i = 0; i < n; ++i)
                        printf("%51s %-15.15s\n",
                            "", routename((grp++)->s_addr));


@@ -113,7 +113,7 @@ mroutepr(mrpaddr, mrtaddr, vifaddr)
        if (!banner_printed)
                printf("\nVirtual Interface Table is empty\n");
 
        if (!banner_printed)
                printf("\nVirtual Interface Table is empty\n");
 

-       kread((off_t)mrtaddr, (char *)&mrttable, sizeof(mrttable));
+       kread(mrtaddr, (char *)&mrttable, sizeof(mrttable));

        banner_printed = 0;
        for (i = 0; i < MRTHASHSIZ; ++i) {
                for (mrt = mrttable[i]; mrt != NULL; mrt = mrt->mrt_next) {
        banner_printed = 0;
        for (i = 0; i < MRTHASHSIZ; ++i) {
                for (mrt = mrttable[i]; mrt != NULL; mrt = mrt->mrt_next) {


@@ -123,7 +123,7 @@ mroutepr(mrpaddr, mrtaddr, vifaddr)
                                banner_printed = 1;
                        }
 
                                banner_printed = 1;
                        }
 

-                       kread((off_t)mrt, (char *)&smrt, sizeof(*mrt));
+                       kread((u_long)mrt, (char *)&smrt, sizeof(*mrt));

                        mrt = &smrt;
                        printf(" %3u   %-15.15s  %2u   ",
                            i, netname(mrt->mrt_origin.s_addr,
                        mrt = &smrt;
                        printf(" %3u   %-15.15s  %2u   ",
                            i, netname(mrt->mrt_origin.s_addr,


@@ -148,7 +148,7 @@ mroutepr(mrpaddr, mrtaddr, vifaddr)
 
 void
 mrt_stats(mrpaddr, mstaddr)
 
 void
 mrt_stats(mrpaddr, mstaddr)

-       off_t mrpaddr, mstaddr;
+       u_long mrpaddr, mstaddr;

 {
        u_int mrtproto;
        struct mrtstat mrtstat;
 {
        u_int mrtproto;
        struct mrtstat mrtstat;


@@ -158,7 +158,7 @@ mrt_stats(mrpaddr, mstaddr)
                return;
        }
 
                return;
        }
 

-       kread((off_t)mrpaddr, (char *)&mrtproto, sizeof(mrtproto));
+       kread(mrpaddr, (char *)&mrtproto, sizeof(mrtproto));

        switch (mrtproto) {
            case 0:
                printf("no multicast routing compiled into this system\n");
        switch (mrtproto) {
            case 0:
                printf("no multicast routing compiled into this system\n");


@@ -177,7 +177,7 @@ mrt_stats(mrpaddr, mstaddr)
                return;
        }
 
                return;
        }
 

-       kread((off_t)mstaddr, (char *)&mrtstat, sizeof(mrtstat));
+       kread(mstaddr, (char *)&mrtstat, sizeof(mrtstat));

        printf("multicast routing:\n");
        printf(" %10u multicast route lookup%s\n",
          mrtstat.mrts_mrt_lookups, plural(mrtstat.mrts_mrt_lookups));
        printf("multicast routing:\n");
        printf(" %10u multicast route lookup%s\n",
          mrtstat.mrts_mrt_lookups, plural(mrtstat.mrts_mrt_lookups));