diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-04-15 03:37:16 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-04-15 03:37:16 +0000 |
| commit | f8c976489400ad3d77bd0d254fc6e7e227e203dd (patch) | |
| tree | e1224e2ca540486e5a5bf0f927ab339ff37df77c /ipproto.c | |
| parent | 38b8932fd03d0e27596eee9470a7524b9a1b2e28 (diff) | |
| download | wireshark-f8c976489400ad3d77bd0d254fc6e7e227e203dd.tar.gz wireshark-f8c976489400ad3d77bd0d254fc6e7e227e203dd.tar.bz2 wireshark-f8c976489400ad3d77bd0d254fc6e7e227e203dd.zip | |
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.
svn path=/trunk/; revision=3300
Diffstat (limited to 'ipproto.c')
| -rw-r--r-- | ipproto.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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; |