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

Applied patch from Mats Erik Andersson <mats.andersson@gisladisker.se>

Browse Source 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=427852#30

Adds support for IPv6

Also fixes:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477928 (minor typo)

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=595169 (performance problem
with address hashing)

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598367 (failing link address
detection for GNU/kfreebsd)
This commit is contained in:
pdw
2010-11-27 11:06:12 +00:00
parent 6d594acbd6
commit 6197223f52
13 changed files with 491 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
addrs_ioctl.c
View File

@@ -18,12 +18,17 @@
#include <net/if.h>
#include <netinet/in.h>
#if defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
#if defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ \
|| ( defined __GNUC__ && ! defined __linux__ )
#include <sys/param.h>
#include <sys/sysctl.h>
#include <net/if_dl.h>
#endif
#ifdef USE_GETIFADDRS
#include <ifaddrs.h>
#endif
#include "iftop.h"
/*
@@ -40,16 +45,20 @@
*/
int
get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr)
get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr, struct in6_addr *if_ip6_addr)
{
int s;
struct ifreq ifr = {};
int got_hw_addr = 0;
int got_ip_addr = 0;
int got_ip6_addr = 0;
#ifdef USE_GETIFADDRS
struct ifaddrs *ifa, *ifas;
#endif
/* -- */
s = socket(PF_INET, SOCK_DGRAM, 0); /* any sort of IP socket will do */
s = socket(AF_INET, SOCK_DGRAM, 0); /* any sort of IP socket will do */
if (s == -1) {
perror("socket");
@@ -71,7 +80,8 @@ get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr)
got_hw_addr = 1;
}
#else
#if defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
#if defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ \
|| ( defined __GNUC__ && ! defined __linux__ )
{
int sysctlparam[6] = {CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0};
size_t needed = 0;
@@ -109,7 +119,45 @@ get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr)
#endif
/* Get the IP address of the interface */
#ifdef SIOCGIFADDR
#ifdef USE_GETIFADDRS
if (getifaddrs(&ifas) == -1) {
fprintf(stderr, "Unable to get IP address for interface: %s\n", interface);
perror("getifaddrs()");
}
else {
for (ifa = ifas; ifa != NULL; ifa = ifa->ifa_next) {
if (got_ip_addr && got_ip6_addr)
break; /* Search is already complete. */
if (strcmp(ifa->ifa_name, interface))
continue; /* Not our interface. */
if ( (ifa->ifa_addr->sa_family != AF_INET)
&& (ifa->ifa_addr->sa_family != AF_INET6) )
continue; /* AF_PACKET is beyond our scope. */
if ( (ifa->ifa_addr->sa_family == AF_INET)
&& !got_ip_addr ) {
got_ip_addr = 2;
memcpy(if_ip_addr,
&(((struct sockaddr_in *) ifa->ifa_addr)->sin_addr),
sizeof(*if_ip_addr));
continue;
}
/* Must be a IPv6 address at this point. */
struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *) ifa->ifa_addr;
if ( IN6_IS_ADDR_LINKLOCAL(&(sa6->sin6_addr))
|| IN6_IS_ADDR_SITELOCAL(&(sa6->sin6_addr)) )
continue;
/* A useful IPv6 address. */
memcpy(if_ip6_addr, &(sa6->sin6_addr), sizeof(*if_ip6_addr));
got_ip6_addr = 4;
}
freeifaddrs(ifas);
} /* getifaddrs() */
#elif defined(SIOCGIFADDR)
(*(struct sockaddr_in *) &ifr.ifr_addr).sin_family = AF_INET;
if (ioctl(s, SIOCGIFADDR, &ifr) < 0) {
fprintf(stderr, "Unable to get IP address for interface: %s\n", interface);
@@ -125,5 +173,5 @@ get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr)
close(s);
return got_hw_addr + got_ip_addr;
return got_hw_addr + got_ip_addr + got_ip6_addr;
}