From e005bc819c201c49cf330a2607ad0770f145904e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Sat, 26 Mar 2016 03:16:17 +0000 Subject: Remove synchronous DNS name resolution MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie5e670b769eb0674950f3679ef511047641c2873 Reviewed-on: https://code.wireshark.org/review/14751 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman --- tshark.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tshark.c') diff --git a/tshark.c b/tshark.c index 7407e82ea8..3a2949390d 100644 --- a/tshark.c +++ b/tshark.c @@ -1531,8 +1531,7 @@ main(int argc, char *argv[]) if (badopt != '\0') { cmdarg_err("-N specifies unknown resolving option '%c'; valid options are:", badopt); - cmdarg_err_cont("\t'C' to enable concurrent (asynchronous) DNS lookups\n" - "\t'd' to enable address resolution from captured DNS packets\n" + cmdarg_err_cont("\t'd' to enable address resolution from captured DNS packets\n" "\t'm' to enable MAC address resolution\n" "\t'n' to enable network address resolution\n" "\t'N' to enable using external resolvers (e.g., DNS)\n" @@ -2984,7 +2983,7 @@ process_packet_first_pass(capture_file *cf, epan_dissect_t *edt, do a dissection and do so. */ if (edt) { if (gbl_resolv_flags.mac_name || gbl_resolv_flags.network_name || - gbl_resolv_flags.transport_name || gbl_resolv_flags.concurrent_dns) + gbl_resolv_flags.transport_name) /* Grab any resolved addresses */ host_name_lookup_process(); @@ -3057,7 +3056,7 @@ process_packet_second_pass(capture_file *cf, epan_dissect_t *edt, frame_data *fd do a dissection and do so. */ if (edt) { if (gbl_resolv_flags.mac_name || gbl_resolv_flags.network_name || - gbl_resolv_flags.transport_name || gbl_resolv_flags.concurrent_dns) + gbl_resolv_flags.transport_name) /* Grab any resolved addresses */ host_name_lookup_process(); @@ -3696,7 +3695,7 @@ process_packet(capture_file *cf, epan_dissect_t *edt, gint64 offset, struct wtap do a dissection and do so. */ if (edt) { if (print_packet_info && (gbl_resolv_flags.mac_name || gbl_resolv_flags.network_name || - gbl_resolv_flags.transport_name || gbl_resolv_flags.concurrent_dns)) + gbl_resolv_flags.transport_name)) /* Grab any resolved addresses */ host_name_lookup_process(); -- cgit v1.2.3