diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-03-24 20:22:00 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-03-25 03:22:33 +0000 |
| commit | 083f6b6e6dcd97aaf0553d0cfdd0b8a5fd2e6339 (patch) | |
| tree | 50bf2bb41032be6ac8f73f6c6d02a66408027f51 /epan | |
| parent | 493ddd5963b2a4f95897f8fa5100277a0973834d (diff) | |
| download | wireshark-083f6b6e6dcd97aaf0553d0cfdd0b8a5fd2e6339.tar.gz | |
Have a #define for whether the capture buffer size can be set.
It can be set if either 1) this is Windows (where we're assumed to be
using WinPcap, which includes calls to set the buffer size) or 2) we
have pcap_create() (in which case we also have pcap_set_buffer_size(),
at least in a normal libpcap release).
Use that rather than testing "defined(_WIN32) ||
defined(HAVE_PCAP_CREATE)"; that makes it a bit more obvious what's
being tested.
Change-Id: Id9f8455019d19206b04dd6820a748cb97ae5ad12
Reviewed-on: https://code.wireshark.org/review/7816
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/prefs.c | 4 | ||||
| -rw-r--r-- | epan/prefs.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index 00890d9c66..e37cc8110b 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -167,7 +167,7 @@ static const gchar *capture_cols[7] = { }; #define CAPTURE_COL_TYPE_DESCRIPTION \ "Possible values: INTERFACE, LINK, PMODE, SNAPLEN, MONITOR, BUFFER, FILTER\n" -#elif defined(_WIN32) && !defined (HAVE_PCAP_CREATE) +#elif defined(CAN_SET_CAPTURE_BUFFER_SIZE) /* Can set buffer size but not monitor mode. */ static gint num_capture_cols = 6; static const gchar *capture_cols[6] = { @@ -2389,7 +2389,7 @@ prefs_register_modules(void) "By default, capture in monitor mode on interface? (Ex: eth0,eth3,...)", (const char **)&prefs.capture_devices_monitor_mode); -#if defined(_WIN32) || defined(HAVE_PCAP_CREATE) +#ifdef CAN_SET_CAPTURE_BUFFER_SIZE prefs_register_string_preference(capture_module, "devices_buffersize", "Interface buffer size", "Interface buffer size (Ex: en0(1),en1(143),...)", ((const char **)&prefs.capture_devices_buffersize)); diff --git a/epan/prefs.h b/epan/prefs.h index d84de317cf..cd6398560e 100644 --- a/epan/prefs.h +++ b/epan/prefs.h @@ -188,7 +188,7 @@ typedef struct _e_prefs { gchar *capture_devices_descr; gchar *capture_devices_hide; gchar *capture_devices_monitor_mode; -#if defined(_WIN32) || defined(HAVE_PCAP_CREATE) +#ifdef CAN_SET_CAPTURE_BUFFER_SIZE gchar *capture_devices_buffersize; #endif gchar *capture_devices_snaplen; |