Patch from Scott Bertilson <ssb@umn.edu> to remove dependence on s6_addr32.

This commit is contained in:
pdw
2011-10-03 20:21:55 +00:00
parent cd57e76727
commit fc511cfea9
4 changed files with 18 additions and 17 deletions

10
iftop.c
View File

@@ -328,11 +328,11 @@ static void handle_ip_packet(struct ip* iptr, int hw_dir)
/* First reduce the participating addresses using the netfilter prefix.
* We need scratch pads to do this.
*/
for (j=0; j < 4; ++j) {
scribdst.s6_addr32[j] = ip6tr->ip6_dst.s6_addr32[j]
& options.netfilter6mask.s6_addr32[j];
scribsrc.s6_addr32[j] = ip6tr->ip6_src.s6_addr32[j]
& options.netfilter6mask.s6_addr32[j];
for (j=0; j < 16; ++j) {
scribdst.s6_addr[j] = ip6tr->ip6_dst.s6_addr[j]
& options.netfilter6mask.s6_addr[j];
scribsrc.s6_addr[j] = ip6tr->ip6_src.s6_addr[j]
& options.netfilter6mask.s6_addr[j];
}
/* Now look for any hits. */