aboutsummaryrefslogtreecommitdiffstats
path: root/epan/prefs.c
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-03-26 03:16:17 +0000
committerAnders Broman <a.broman58@gmail.com>2016-04-04 06:49:55 +0000
commite005bc819c201c49cf330a2607ad0770f145904e (patch)
treeaaff654c2682c3bde08440b5d9526deee1e033c5 /epan/prefs.c
parent1cf7834b2d16f549c6145e5d36b8b7dd7a384223 (diff)
Remove synchronous DNS name resolution
Change-Id: Ie5e670b769eb0674950f3679ef511047641c2873 Reviewed-on: https://code.wireshark.org/review/14751 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/prefs.c')
-rw-r--r--epan/prefs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/prefs.c b/epan/prefs.c
index fb99675ba0..c7d7a2b906 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -3909,7 +3909,8 @@ string_to_name_resolve(const char *string, e_addr_resolve *name_resolve)
name_resolve->transport_name = TRUE;
break;
case 'C':
- name_resolve->concurrent_dns = TRUE;
+ /* DEPRECATED */
+ /* name_resolve->concurrent_dns */
break;
case 'd':
name_resolve->dns_pkt_addr_resolution = TRUE;
@@ -4067,7 +4068,6 @@ set_pref(gchar *pref_name, const gchar *value, void *private_data _U_,
gbl_resolv_flags.mac_name = TRUE;
gbl_resolv_flags.network_name = TRUE;
gbl_resolv_flags.transport_name = TRUE;
- gbl_resolv_flags.concurrent_dns = TRUE;
}
else if (g_ascii_strcasecmp(value, "false") == 0) {
disable_name_resolution();