mark/iftop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switched back to SIOCGIFHWADDR for getting hardware address. Other platforms will need some more work...

Browse Source
This commit is contained in:
pdw
2003-05-19 20:22:20 +00:00
parent 55aa26756b
commit 678f924d77
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
iftop.c
View File

@@ -415,15 +415,21 @@ void packet_init() {
perror("socket"); perror("socket");
exit(1); exit(1);
} }
fprintf(stderr,"if: %s\n", options.interface);
#ifdef SIOCGIFHWADDR
strncpy(ifr.ifr_name, options.interface, IFNAMSIZ); strncpy(ifr.ifr_name, options.interface, IFNAMSIZ);
ifr.ifr_hwaddr.sa_family = AF_UNSPEC; if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0) {
if (ioctl(s, SIOCGIFADDR, &ifr) == -1) {
fprintf(stderr, "Error getting hardware address for interface: %s\n", options.interface); fprintf(stderr, "Error getting hardware address for interface: %s\n", options.interface);
perror("ioctl(SIOCGIFHWADDR)"); perror("ioctl(SIOCGIFHWADDR)");
exit(1); exit(1);
} }
close(s);
memcpy(if_hw_addr, ifr.ifr_hwaddr.sa_data, 6); memcpy(if_hw_addr, ifr.ifr_hwaddr.sa_data, 6);
#else
fprintf(stderr, "Cannot obtain hardware address on this platform\n");
memset(if_hw_addr, 0, 6);
#endif
close(s);
fprintf(stderr, "MAC address is:"); fprintf(stderr, "MAC address is:");
for (s = 0; s < 6; ++s) for (s = 0; s < 6; ++s)
fprintf(stderr, "%c%02x", s ? ':' : ' ', (unsigned int)if_hw_addr[s]); fprintf(stderr, "%c%02x", s ? ':' : ' ', (unsigned int)if_hw_addr[s]);

9
iftop.h
View File

@@ -36,13 +36,4 @@ void ui_init(void);
void options_read(int argc, char **argv); void options_read(int argc, char **argv);
/* Make use of SIOCGIFHWADDR work on FreeBSD and Solaris. */
#ifndef SIOCGIFHWADDR
# ifdef HAVE_SYS_SOCKIO_H
# include <sys/sockio.h> /* Solaris and others?? */
# endif
# define SIOCGIFHWADDR SIOCGIFADDR
# define ifr_hwaddr ifr_addr
#endif
#endif /* __IFTOP_H_ */ #endif /* __IFTOP_H_ */