diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-07-06 04:48:36 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-07-06 04:48:36 +0000 |
| commit | c19583b72cba8c2f3fb19a075cf5a1a14b770135 (patch) | |
| tree | 9f74d2432949fd24349d487d6d2d003c9b3fefe0 /rawshark.c | |
| parent | 4c647041d442350fa96d204b4ab0a62bda39d446 (diff) | |
| download | wireshark-c19583b72cba8c2f3fb19a075cf5a1a14b770135.tar.gz | |
From Michael Mann:
Generic preferences implementation - Printing and Name Resolution.
svn path=/trunk/; revision=43579
Diffstat (limited to 'rawshark.c')
| -rw-r--r-- | rawshark.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/rawshark.c b/rawshark.c index 2e68a970da..b68fecab9c 100644 --- a/rawshark.c +++ b/rawshark.c @@ -542,9 +542,6 @@ main(int argc, char *argv[]) pf_path = NULL; } - /* Set the name resolution code's flags from the preferences. */ - gbl_resolv_flags = prefs_p->name_resolve; - /* Read the disabled protocols file. */ read_disabled_protos_list(&gdp_path, &gdp_open_errno, &gdp_read_errno, &dp_path, &dp_open_errno, &dp_read_errno); @@ -619,11 +616,12 @@ main(int argc, char *argv[]) line_buffered = TRUE; break; case 'n': /* No name resolution */ - gbl_resolv_flags = RESOLV_NONE; + gbl_resolv_flags.mac_name = FALSE; + gbl_resolv_flags.network_name = FALSE; + gbl_resolv_flags.transport_name = FALSE; + gbl_resolv_flags.concurrent_dns = FALSE; break; case 'N': /* Select what types of addresses/port #s to resolve */ - if (gbl_resolv_flags == RESOLV_ALL) - gbl_resolv_flags = RESOLV_NONE; badopt = string_to_name_resolve(optarg, &gbl_resolv_flags); if (badopt != '\0') { cmdarg_err("-N specifies unknown resolving option '%c'; valid options are 'm', 'n', and 't'", |