Fix fo bug 5616:
authorjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 25 Jan 2011 22:11:59 +0000 (22:11 +0000)
committerjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 25 Jan 2011 22:11:59 +0000 (22:11 +0000)
Remove the filters on IPv6 Link Local and Multicast addresses, since
these _can_ be resolved through the hosts file and manual entry.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35651 f5534014-38df-0310-8fa8-9805f1628bb7

epan/addr_resolv.c

index 99ccfe6..5e05d68 100644 (file)
@@ -2628,8 +2628,9 @@ get_hostname6(const struct e_in6_addr *addr)
   gboolean resolve = gbl_resolv_flags & RESOLV_NETWORK;
   hashipv6_t *tp = host_lookup6(addr, resolve, &found);
 
-  if (!resolve || E_IN6_IS_ADDR_LINKLOCAL(addr) || E_IN6_IS_ADDR_MULTICAST(addr))
+  if (!resolve)
     return tp->ip6;
+
   return tp->name;
 }