diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-07-10 14:33:19 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-07-10 14:33:19 +0000 |
| commit | 7a8a40946a71335eb504be4ec9fac13a4906d6fb (patch) | |
| tree | fd359a7b80a7ded26799d55186ddd5e7757a9177 /epan/addr_resolv.c | |
| parent | c59ae18df7a4e204f89c5a5db522330814f22063 (diff) | |
host_lookup() and host_lookup6() are both called even when network-name
resolution is NOT enabled (it's always been like this and I'm not sure why
and I was hesitant to change that). So: don't use the external name resolver
unless both network-name resolution AND use-external-resolvers are enabled.
svn path=/trunk/; revision=43645
Diffstat (limited to 'epan/addr_resolv.c')
| -rw-r--r-- | epan/addr_resolv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 7a06e3aab0..cf8c13c110 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -800,7 +800,7 @@ host_lookup(const guint addr, gboolean *found) } } - if (gbl_resolv_flags.use_external_net_name_resolver) { + if (gbl_resolv_flags.network_name && gbl_resolv_flags.use_external_net_name_resolver) { tp->resolve = TRUE; #ifdef ASYNC_DNS if (gbl_resolv_flags.concurrent_dns && @@ -898,7 +898,7 @@ host_lookup6(const struct e_in6_addr *addr, gboolean *found) } } - if (gbl_resolv_flags.use_external_net_name_resolver) { + if (gbl_resolv_flags.network_name && gbl_resolv_flags.use_external_net_name_resolver) { tp->resolve = TRUE; #ifdef INET6 @@ -2362,7 +2362,7 @@ subnet_name_lookup_init(void) * External Functions */ -void +void addr_resolve_pref_init(module_t *nameres) { prefs_register_bool_preference(nameres, "mac_name", @@ -2406,7 +2406,7 @@ addr_resolve_pref_init(module_t *nameres) &name_resolve_concurrency); #else prefs_register_static_text_preference(nameres, "concurrent_dns", - "Enable concurrent DNS name resolution: N/A", + "Enable concurrent DNS name resolution: N/A", "Support for concurrent DNS name resolution was not" " compiled into this version of Wireshark"); #endif |