diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2011-03-01 17:29:09 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2011-03-01 17:29:09 +0000 |
| commit | 5da016099ad3475ad6773b726f321118ab449892 (patch) | |
| tree | d5bc954bcf1ceca920cd835b1d688ef706af1381 /capture_opts.h | |
| parent | 3fac9089cb0659f92e24624d96402f41b8ebda87 (diff) | |
| download | wireshark-5da016099ad3475ad6773b726f321118ab449892.tar.gz | |
Make HAVE_PCAP_REMOTE and HAVE_PCAP_SETSAMPLING independent
as in other places of the code. Such that this is consistently
used. While there, clean up some whitespaces.
This fix was provided by Irene Ruengeler which testing
remote capturing (with multiple interfaces).
svn path=/trunk/; revision=36112
Diffstat (limited to 'capture_opts.h')
| -rw-r--r-- | capture_opts.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/capture_opts.h b/capture_opts.h index 478d41be54..9cd688c32e 100644 --- a/capture_opts.h +++ b/capture_opts.h @@ -57,7 +57,7 @@ typedef enum { CAPTURE_AUTH_NULL, /**< No authentication */ CAPTURE_AUTH_PWD /**< User/password authentication */ } capture_auth; - +#endif #ifdef HAVE_PCAP_SETSAMPLING /** * Method of packet sampling (dropping some captured packets), @@ -72,7 +72,6 @@ typedef enum { in N milliseconds */ } capture_sampling; #endif -#endif /** Capture options coming from user interface */ typedef struct capture_options_tag { @@ -81,17 +80,17 @@ typedef struct capture_options_tag { gboolean has_cfilter; /**< TRUE if capture filter specified on command line */ gchar *cfilter; /**< Capture filter string */ gchar *iface; /**< the network interface to capture from */ - gchar *iface_descr; /**< A human readable description of iface. - *< NOTE: capture_opts.c is not able to - *< set this field because doing so - *< requires too many dependencies. - *< Readers of this field should use - *< get_iface_description() from - *< "capture_ui_utils.h" to access it. */ + gchar *iface_descr; /**< A human readable description of iface. + *< NOTE: capture_opts.c is not able to + *< set this field because doing so + *< requires too many dependencies. + *< Readers of this field should use + *< get_iface_description() from + *< "capture_ui_utils.h" to access it. */ #ifdef HAVE_PCAP_REMOTE capture_source src_type; /**< Capturing on remote interface */ gchar *remote_host; /**< Host name or network address - *< for remote capturing */ + *< for remote capturing */ gchar *remote_port; /**< TCP port of remote RPCAP server */ capture_auth auth_type; @@ -101,11 +100,11 @@ typedef struct capture_options_tag { gboolean datatx_udp; /**< Whether to use UDP for data transfer */ gboolean nocap_rpcap; /**< Whether to capture RPCAP own traffic */ gboolean nocap_local; /**< TODO: Whether to capture local traffic */ +#endif #ifdef HAVE_PCAP_SETSAMPLING capture_sampling sampling_method; /**< PCAP packet sampling method */ int sampling_param; /**< PCAP packet sampling parameter */ #endif -#endif #if defined(_WIN32) || defined(HAVE_PCAP_CREATE) int buffer_size; /**< the capture buffer size (MB) */ #endif |