diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-09-12 06:21:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-09-12 06:21:35 +0000 |
| commit | 39fd819fb4f986330167e4f1d51ecb00f07cf775 (patch) | |
| tree | 221a7573bb57f01d4f28be59a4a1e5d7f9b9c909 /epan/addr_resolv.c | |
| parent | f9b16868836047da2a15384419d576f08eea8e29 (diff) | |
Don't collide with the "regular" IPv6 defintions in at least some
platforms in ipv6-utils.h.
svn path=/trunk/; revision=15764
Diffstat (limited to 'epan/addr_resolv.c')
| -rw-r--r-- | epan/addr_resolv.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index cb130081c8..154da5c12d 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -146,7 +146,7 @@ typedef struct hashipv4 { /* hash table used for IPv6 lookup */ #define HASH_IPV6_ADDRESS(addr) \ - ((((addr).s6_addr8[14] << 8)|((addr).s6_addr8[15])) & (HASHHOSTSIZE - 1)) + ((((addr).bytes[14] << 8)|((addr).bytes[15])) & (HASHHOSTSIZE - 1)) typedef struct hashipv6 { struct e_in6_addr addr; @@ -540,7 +540,7 @@ static const gchar *solve_address_to_name(address *addr) return get_hostname(ipv4_addr); case AT_IPv6: - memcpy(&ipv6_addr.s6_addr, addr->data, sizeof ipv6_addr.s6_addr); + memcpy(&ipv6_addr.bytes, addr->data, sizeof ipv6_addr.bytes); return get_hostname6(&ipv6_addr); case AT_STRINGZ: @@ -1775,17 +1775,10 @@ extern const gchar *get_hostname6(struct e_in6_addr *addr) { gboolean found; -#ifdef INET6 if (!(g_resolv_flags & RESOLV_NETWORK)) return ip6_to_str(addr); -#ifdef SOLARIS8_INET6 - if (IN6_IS_ADDR_LINKLOCAL((struct in6_addr*)addr) || IN6_IS_ADDR_MULTICAST((struct in6_addr*)addr)) -#else - if (IN6_IS_ADDR_LINKLOCAL(addr) || IN6_IS_ADDR_MULTICAST(addr)) -#endif + if (E_IN6_IS_ADDR_LINKLOCAL(addr) || E_IN6_IS_ADDR_MULTICAST(addr)) return ip6_to_str(addr); -#endif - return host_name_lookup6(addr, &found); } |