From 96a691484e6e3c6fa415b46e466c85323d017baa Mon Sep 17 00:00:00 2001 From: Paul Warren Date: Wed, 4 Jan 2017 22:55:26 +0000 Subject: Fix mac address display iftop would display portions of mac address with large ffffff prefixes. Make if_hw_addr type consistent. Kevin Darbyshire-Bryant --- ChangeLog | 3 +++ addrs_dlpi.c | 2 +- addrs_ioctl.c | 2 +- addrs_ioctl.h | 2 +- iftop.c | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47de20f..a69e22a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ Unattributed items are by Paul Warren and Chris Lightfoot. 1.0 +* Fix MAC address display + Kevin Darbyshire-Bryant + * Clean up libpcap on exit Brian Russell diff --git a/addrs_dlpi.c b/addrs_dlpi.c index 188fef8..6c04ea1 100644 --- a/addrs_dlpi.c +++ b/addrs_dlpi.c @@ -50,7 +50,7 @@ extern char *strncat2(char *dest, char *src, int n); */ int -get_addrs_dlpi(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr) +get_addrs_dlpi(char *interface, u_int8_t if_hw_addr[], struct in_addr *if_ip_addr) { int got_hw_addr = 0; int got_ip_addr = 0; diff --git a/addrs_ioctl.c b/addrs_ioctl.c index 870c83b..7d01fb2 100644 --- a/addrs_ioctl.c +++ b/addrs_ioctl.c @@ -45,7 +45,7 @@ */ int -get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr, struct in6_addr *if_ip6_addr) +get_addrs_ioctl(char *interface, u_int8_t if_hw_addr[], struct in_addr *if_ip_addr, struct in6_addr *if_ip6_addr) { int s; struct ifreq ifr = {}; diff --git a/addrs_ioctl.h b/addrs_ioctl.h index f93a0b4..739de61 100644 --- a/addrs_ioctl.h +++ b/addrs_ioctl.h @@ -7,6 +7,6 @@ #define __ADDRS_IOCTL_H_ int -get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr, struct in6_addr *if_ip6_addr); +get_addrs_ioctl(char *interface, u_int8_t if_hw_addr[], struct in_addr *if_ip_addr, struct in6_addr *if_ip6_addr); #endif /* __ADDRS_IOCTL_H_ */ diff --git a/iftop.c b/iftop.c index f9875c9..032df61 100644 --- a/iftop.c +++ b/iftop.c @@ -55,7 +55,7 @@ /* ethernet address of interface. */ int have_hw_addr = 0; -char if_hw_addr[6]; +u_int8_t if_hw_addr[6]; /* IP address of interface */ int have_ip_addr = 0; -- cgit v1.2.3