diff options
author | tuexen <tuexen@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-05-16 14:12:35 +0000 |
---|---|---|
committer | tuexen <tuexen@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-05-16 14:12:35 +0000 |
commit | 10ed59226c20f7563d1ad17eb33adfa50c4d9c6b (patch) | |
tree | f986087dc05ce2788a7ec94da26fc77cec6dfcff /capture_opts.h | |
parent | 581c4fa21e6cb4675c278cf1cf46cd06ff6766f3 (diff) |
Make pcap samping a per interface setting.
Use consistent naming of variables on capture_options.
Make pcap sampling independent of remote capturing, since
it seems to work local pcap devices using winpcap (at
least that is what the documentation says).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37176 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'capture_opts.h')
-rw-r--r-- | capture_opts.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/capture_opts.h b/capture_opts.h index 81e7cadfdf..f67632169d 100644 --- a/capture_opts.h +++ b/capture_opts.h @@ -84,6 +84,10 @@ typedef struct interface_options_tag { int buffer_size; #endif gboolean monitor_mode; +#ifdef HAVE_PCAP_SETSAMPLING + capture_sampling sampling_method; + int sampling_param; +#endif } interface_options; /** Capture options coming from user interface */ @@ -126,10 +130,12 @@ typedef struct capture_options_tag { gboolean nocap_local; /**< TODO: Whether to capture local traffic */ #endif #ifdef HAVE_PCAP_SETSAMPLING - /**< XXX: Should this whole block moved to - *< interface_options ?*/ - capture_sampling sampling_method; /**< PCAP packet sampling method */ - int sampling_param; /**< PCAP packet sampling parameter */ + capture_sampling sampling_method; /**< PCAP packet sampling method + *< XXX: Can finally be be removed. + *< Replaced by interface_options.sampling_method */ + int sampling_param; /**< PCAP packet sampling parameter + *< XXX: Can finally be be removed. + *< Replaced by interface_options.sampling_param */ #endif #if defined(_WIN32) || defined(HAVE_PCAP_CREATE) int buffer_size; /**< the capture buffer size (MB) |