diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-26 03:16:17 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-04-04 06:49:55 +0000 |
| commit | e005bc819c201c49cf330a2607ad0770f145904e (patch) | |
| tree | aaff654c2682c3bde08440b5d9526deee1e033c5 /tshark.c | |
| parent | 1cf7834b2d16f549c6145e5d36b8b7dd7a384223 (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 'tshark.c')
| -rw-r--r-- | tshark.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -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(); |