From ad3253f2ff71ed8d06cbe96c039163e99f2fffe8 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Sat, 6 Apr 2002 10:02:20 +0000 Subject: [PATCH] Print IFT_ETHER addresses with ether_ntoa(3) (with leading zeros). --- usr.bin/netstat/route.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index 71759777475..878223838e9 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -44,6 +44,7 @@ static const char rcsid[] = #include #include +#include #include #include #include @@ -513,20 +514,12 @@ p_sockaddr(struct sockaddr *sa, struct sockaddr *mask, int flags, int width) 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 = ":"; + if (sdl->sdl_alen == ETHER_ADDR_LEN) { + cp = ether_ntoa((struct ether_addr *) + sdl->sdl_data + sdl->sdl_nlen); + break; } - cp = workbuf; - break; - } - + /* FALLTHROUGH */ default: cp = link_ntoa(sdl); break;