As noted by Pavel Kankovsky, the "Resolve Name" menu items should be

available if *any* forms of name resolution aren't enabled.  (Well,
actually, it should probably affect only the item the mouse was over
when you selected it, and should be available if name resolution for
that type of name isn't enabled, but....)

svn path=/trunk/; revision=10056
This commit is contained in:
Guy Harris 2004-02-13 01:09:52 +00:00
parent a1667bf2c0
commit 75acdcbba0
2 changed files with 5 additions and 3 deletions

View File

@ -1,7 +1,7 @@
/* resolv.h
* Definitions for network object lookup
*
* $Id: resolv.h,v 1.15 2004/01/10 17:31:40 obiot Exp $
* $Id: resolv.h,v 1.16 2004/02/13 01:09:51 guy Exp $
*
* Laurent Deniel <laurent.deniel@free.fr>
*
@ -44,6 +44,8 @@ extern guint32 g_resolv_flags;
#define RESOLV_NETWORK 0x2
#define RESOLV_TRANSPORT 0x4
#define RESOLV_CONCURRENT 0x8
#define RESOLV_ALL_ADDRS (RESOLV_MAC|RESOLV_NETWORK|RESOLV_TRANSPORT)
#define RESOLV_ALL 0xFFFFFFFF
/* global variables */

View File

@ -1,7 +1,7 @@
/* menu.c
* Menu routines
*
* $Id: menu.c,v 1.163 2004/02/12 22:24:28 guy Exp $
* $Id: menu.c,v 1.164 2004/02/13 01:09:52 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -1507,7 +1507,7 @@ set_menus_for_selected_packet(capture_file *cf)
set_menu_sensitivity(NULL, "/Decode As...",
cf->current_frame != NULL && decode_as_ok());
set_menu_sensitivity(tree_view_menu_factory, "/Resolve Name",
cf->current_frame != NULL && g_resolv_flags == 0);
cf->current_frame != NULL && (g_resolv_flags & RESOLV_ALL_ADDRS) != RESOLV_ALL_ADDRS);
set_menu_sensitivity(main_menu_factory, "/Analyze/TCP Stream Analysis",
cf->current_frame != NULL ? (cf->edt->pi.ipproto == IP_PROTO_TCP) : FALSE);
set_menu_sensitivity(packet_list_menu_factory, "/Match",