There's no "enable name resolution in captures" preference in Ethereal,

and never was - there's only an Ethereal-wide "enable name resolution"
preference.  Name it just "name_resolve".

Replace all tests of "g_resolving_actif" with tests of
"prefs.name_resolv", and replace all code that sets "g_resolving_actif"
with code that sets "prefs.name_resolv", so that the setting of
"prefs.name_resolv" actually affects whether names are resolved or not.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3300 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 3 insertions, 2 deletions

diff --git a/ipproto.c b/ipproto.c
index 2f8a1cea21..862fc6ea49 100644
--- a/ipproto.c
+++ b/ipproto.c
@@ -1,7 +1,7 @@
 /* ipproto.c
  * Routines for converting IPv4 protocol/v6 nxthdr field into string
  *
- * $Id: ipproto.c,v 1.11 2001/04/13 18:51:32 guy Exp $
+ * $Id: ipproto.c,v 1.12 2001/04/15 03:37:13 guy Exp $
  *
  * Gilbert Ramirez <gram@xiexie.org>
  *
@@ -45,6 +45,7 @@
 
 #include "globals.h"
 #include "packet.h"
+#include "prefs.h"
 #include "resolv.h"
 #include "packet-ip.h"
 #include "packet-ipv6.h"
@@ -105,7 +106,7 @@ const char *ipprotostr(int proto) {
 	goto ok;
 
 #ifdef HAVE_GETPROTOBYNUMBER
-    if (g_resolving_actif) {
+    if (prefs.name_resolve) {
 	pe = getprotobynumber(proto);
 	if (pe) {
 	    s = pe->p_name;