39c39
< "$FreeBSD: head/usr.bin/netstat/if.c 53068 1999-11-09 22:22:36Z dfr $";
---
> "$FreeBSD: head/usr.bin/netstat/if.c 54263 1999-12-07 17:39:16Z shin $";
80a81,86
> #ifdef INET6
> char *netname6 __P((struct sockaddr_in6 *, struct in6_addr *));
> static char ntop_buf[INET6_ADDRSTRLEN]; /* for inet_ntop() */
> static int bdg_done;
> #endif
>
96a103,108
> #ifdef INET6
> if (bdg_done != 0)
> return;
> else
> bdg_done = 1;
> #endif
119c131
< intpr(interval, ifnetaddr)
---
> intpr(interval, ifnetaddr, pfunc)
121a134
> void (*pfunc)(char *);
127a141,143
> #ifdef INET6
> struct in6_ifaddr in6;
> #endif
156,168c172,186
< printf("%-5.5s %-5.5s %-13.13s %-15.15s %8.8s %5.5s",
< "Name", "Mtu", "Network", "Address", "Ipkts", "Ierrs");
< if (bflag)
< printf(" %10.10s","Ibytes");
< printf(" %8.8s %5.5s", "Opkts", "Oerrs");
< if (bflag)
< printf(" %10.10s","Obytes");
< printf(" %5s", "Coll");
< if (tflag)
< printf(" %s", "Time");
< if (dflag)
< printf(" %s", "Drop");
< putchar('\n');
---
> if (!sflag && !pflag) {
> printf("%-5.5s %-5.5s %-13.13s %-15.15s %8.8s %5.5s",
> "Name", "Mtu", "Network", "Address", "Ipkts", "Ierrs");
> if (bflag)
> printf(" %10.10s","Ibytes");
> printf(" %8.8s %5.5s", "Opkts", "Oerrs");
> if (bflag)
> printf(" %10.10s","Obytes");
> printf(" %5s", "Coll");
> if (tflag)
> printf(" %s", "Time");
> if (dflag)
> printf(" %s", "Drop");
> putchar('\n');
> }
171a190,192
> #ifdef INET6
> struct sockaddr_in6 *sin6;
> #endif
185a207,212
>
> if (pfunc) {
> (*pfunc)(name);
> continue;
> }
>
227a255,266
> #ifdef INET6
> case AF_INET6:
> sin6 = (struct sockaddr_in6 *)sa;
> printf("%-11.11s ",
> netname6(&ifaddr.in6.ia_addr,
> &ifaddr.in6.ia_prefixmask.sin6_addr));
> printf("%-17.17s ",
> (char *)inet_ntop(AF_INET6,
> &sin6->sin6_addr,
> ntop_buf, sizeof(ntop_buf)));
> break;
> #endif /*INET6*/
269,270c308,312
< cp = (char *)LLADDR(sdl);
< n = sdl->sdl_alen;
---
> char linknum[10];
> cp = (char *)LLADDR(sdl);
> n = sdl->sdl_alen;
> sprintf(linknum, "<Link#%d>", sdl->sdl_index);
> m = printf("%-11.11s ", linknum);
272d313
< m = printf("%-11.11s ", "<Link>");
313a355,357
> #ifdef INET6
> struct sockaddr_in6 in6;
> #endif /* INET6 */
335c379,387
<
---
> #ifdef INET6
> case AF_INET6:
> printf("%23s %-19.19s(refs: %d)\n", "",
> inet_ntop(AF_INET6,
> &msa.in6.sin6_addr,
> ntop_buf,
> sizeof(ntop_buf)),
> ifma.ifma_refcount);
> #endif /* INET6 */