diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/main.c | 5 | ||||
| -rw-r--r-- | ui/gtk/main_menubar.c | 4 | ||||
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 4 |
3 files changed, 6 insertions, 7 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); } diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index bcd9024806..751b7db862 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -4703,7 +4703,7 @@ set_menus_for_selected_packet(capture_file *cf) frame_selected); set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/ResolveName", frame_selected && (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)); set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/AnalyzeMenu/FollowTCPStream", is_tcp); set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/AnalyzeMenu/FollowUDPStream", @@ -4716,7 +4716,7 @@ set_menus_for_selected_packet(capture_file *cf) frame_selected && decode_as_ok()); set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/ViewMenu/NameResolution/ResolveName", frame_selected && (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)); set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/ToolsMenu/FirewallACLRules", frame_selected); set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/StatisticsMenu/TCPStreamGraphMenu", diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index f543890d04..33ffcd4169 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -1169,7 +1169,7 @@ void MainWindow::setMenusForSelectedPacket() // set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/ViewMenu/NameResolution/ResolveName", // frame_selected && (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)); // set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/ToolsMenu/FirewallACLRules", // frame_selected); main_ui_->menuTcpStreamGraphs->setEnabled(is_tcp); @@ -1266,7 +1266,7 @@ void MainWindow::setMenusForSelectedTreeRow(field_info *fi) { // set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/ResolveName", // frame_selected && (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)); main_ui_->actionAnalyzeAAFSelected->setEnabled(can_match_selected); main_ui_->actionAnalyzeAAFNotSelected->setEnabled(can_match_selected); |