diff options
| author | Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2008-06-04 15:16:03 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-06-04 15:16:03 +0200 |
| commit | 5a2208c3e62a150e6f6297abbfa63056ab4a8066 (patch) | |
| tree | 24af03cb6ee30252de74b2e5e2ee7c8096d153d3 | |
| parent | c634cb9cb13d6e1b6fd661b426363431f7ef321a (diff) | |
Use s6_addr32 to access bits in int6_addr instead of incompatible name
Spotted by Khem Raj <raj.khem@gmail.com>
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
| -rw-r--r-- | libiptc/libip6tc.c | 2 | ||||
| -rw-r--r-- | xtables.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c index effbd448..71e262e8 100644 --- a/libiptc/libip6tc.c +++ b/libiptc/libip6tc.c @@ -113,7 +113,7 @@ typedef unsigned int socklen_t; #include "libiptc.c" #define BIT6(a, l) \ - ((ntohl(a->in6_u.u6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1) + ((ntohl(a->s6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1) int ipv6_prefix_length(const struct in6_addr *a) @@ -1178,7 +1178,7 @@ void ip6parse_hostnetworkmask(const char *name, struct in6_addr **addrpp, n = *naddrs; for (i = 0, j = 0; i < n; ++i) { for (k = 0; k < 4; ++k) - addrp[j].in6_u.u6_addr32[k] &= maskp->in6_u.u6_addr32[k]; + addrp[j].s6_addr32[k] &= maskp->s6_addr32[k]; ++j; for (k = 0; k < j - 1; ++k) if (IN6_ARE_ADDR_EQUAL(&addrp[k], &addrp[j - 1])) { |