summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpdw <>2011-10-03 20:24:23 +0000
committerpdw <>2011-10-03 20:24:23 +0000
commitf6f4b68a07a953f321af869de8a4012f1b14e42e (patch)
tree46f694f361a58df1b0a26b757060a67ecf4a0886
parentfc511cfea99e21c5359259728b360670abcd8068 (diff)
downloadiftop-f6f4b68a07a953f321af869de8a4012f1b14e42e.zip
Removed all references to s6_addr32, fixed compilation error.
-rw-r--r--configure.in8
-rw-r--r--options.c4
2 files changed, 2 insertions, 10 deletions
diff --git a/configure.in b/configure.in
index 4cbd612..2aee6e3 100644
--- a/configure.in
+++ b/configure.in
@@ -81,14 +81,6 @@ AC_C_CONST
AC_TYPE_SIZE_T
AC_HEADER_TIME
-dnl At least FeeBSD doesn't define s6_addr32 in user-land code, with a
-dnl note saying this is not standard
-AC_CHECK_DECL([s6_addr32],
- [],
- [AC_DEFINE([s6_addr32], [__u6_addr.__u6_addr32],
- [Define to a way to access the inner bytes of an ip6 address.])],
- [#include <netinet/in.h>])
-
dnl
dnl Are we on a system that uses the STREAMS low-level DLPI interface?
dnl
diff --git a/options.c b/options.c
index 1f61cbb..db3b827 100644
--- a/options.c
+++ b/options.c
@@ -561,8 +561,8 @@ int options_config_get_net_filter6() {
}
}
/* Prepare any comparison by masking the provided filtered net. */
- for (j=0; j < 4; ++j)
- options.netfilter6net.s6_addr32[j] &= options.netfilter6mask.s6_addr32[j];
+ for (j=0; j < 16; ++j)
+ options.netfilter6net.s6_addr[j] &= options.netfilter6mask.s6_addr[j];
return 1;
}