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 /ui/gtk/main.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 'ui/gtk/main.c')
| -rw-r--r-- | ui/gtk/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index efd56f7748..15f713ccb1 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -929,7 +929,6 @@ void resolve_name_cb(GtkWidget *widget _U_, gpointer data _U_) TRUE, /* mac_name */ TRUE, /* network_name */ TRUE, /* transport_name */ - TRUE, /* concurrent_dns */ TRUE, /* dns_pkt_addr_resolution */ TRUE, /* use_external_net_name_resolver */ FALSE, /* load_hosts_file_from_profile_only */ @@ -1213,7 +1212,7 @@ print_usage(gboolean for_help_option) { fprintf(output, "Processing:\n"); fprintf(output, " -R <read filter> packet filter in Wireshark display filter syntax\n"); fprintf(output, " -n disable all name resolutions (def: all enabled)\n"); - fprintf(output, " -N <name resolve flags> enable specific name resolution(s): \"mnNtCd\"\n"); + fprintf(output, " -N <name resolve flags> enable specific name resolution(s): \"mnNtd\"\n"); fprintf(output, " --disable-protocol <proto_name>\n"); fprintf(output, " disable dissection of proto_name\n"); fprintf(output, " --enable-heuristic <short_name>\n"); @@ -2712,7 +2711,7 @@ main(int argc, char *argv[]) case 'N': /* Select what types of addresses/port #s to resolve */ badopt = string_to_name_resolve(optarg, &gbl_resolv_flags); if (badopt != '\0') { - cmdarg_err("-N specifies unknown resolving option '%c'; valid options are 'C', 'd', m', 'n', 'N', and 't'", + cmdarg_err("-N specifies unknown resolving option '%c'; valid options are 'd', m', 'n', 'N', and 't'", badopt); exit(1); } |