diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-16 12:42:30 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-16 12:42:30 +0000 |
| commit | e584a3a59f1177f3e6cb4b0828aa51cf24835271 (patch) | |
| tree | a1e0168626f52bdf10414c91435c809114a27f34 /usr.bin/netstat | |
| parent | 85b6fdf96bd97d751cdefe70916d4bf99e8d0300 (diff) | |
print ether/fddi addresses seperated by : not .; netbsd pr#2473; from jhawk@mit.edu
Diffstat (limited to 'usr.bin/netstat')
| -rw-r--r-- | usr.bin/netstat/if.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index 879a7e9055b..8d36d2847ea 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -47,6 +47,7 @@ static char *rcsid = "$NetBSD: if.c,v 1.16.4.1 1996/06/04 20:27:06 cgd Exp $"; #include <net/if.h> #include <net/if_dl.h> +#include <net/if_types.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netns/ns.h> @@ -194,7 +195,7 @@ intpr(interval, ifnetaddr) char netnum[8]; *(union ns_net *) &net = sns->sns_addr.x_net; - sprintf(netnum, "%lxH", ntohl(net)); + sprintf(netnum, "%lxH", ntohl(net)); upHex(netnum); printf("ns:%-8s ", netnum); printf("%-17s ", @@ -205,11 +206,18 @@ intpr(interval, ifnetaddr) { struct sockaddr_dl *sdl = (struct sockaddr_dl *)sa; - cp = (char *)LLADDR(sdl); - n = sdl->sdl_alen; - } m = printf("%-11.11s ", "<Link>"); - goto hexprint; + if (sdl->sdl_type == IFT_ETHER || + sdl->sdl_type == IFT_FDDI) + printf("%-17.17s ", + ether_ntoa(LLADDR(sdl))); + else { + cp = (char *)LLADDR(sdl); + n = sdl->sdl_alen; + goto hexprint; + } + } + break; default: m = printf("(%d)", sa->sa_family); for (cp = sa->sa_len + (char *)sa; |