osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Try to fix the buildbots. 

The patch for capture_dlg.c is from Anders...

svn path=/trunk/; revision=48164
This commit is contained in:
Michael Tüxen 2013-03-07 12:06:55 +00:00
parent cb42bc9fec
commit 15501fad2a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/prefs.c
View File

@ -2180,9 +2180,11 @@ 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)
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));
#endif
prefs_register_string_preference(capture_module, "devices_snaplen", "Interface snap length",
"Interface snap length (Ex: en0(65535),en1(1430),...)",

4
ui/gtk/capture_dlg.c
View File

@ -1248,14 +1248,14 @@ insert_new_rows(GList *list)
device.display_name = g_strdup(if_string);
}
#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
if ((device.buffer = capture_dev_user_buffersize_find(if_string->name)) == -1) {
if ((device.buffer = capture_dev_user_buffersize_find(if_string)) == -1) {
device.buffer = global_capture_opts.default_options.buffer_size;
}
#endif
device.pmode = global_capture_opts.default_options.promisc_mode;
device.has_snaplen = global_capture_opts.default_options.has_snaplen;
device.snap_pref = TRUE;
if ((device.snaplen = capture_dev_user_buffersize_find(if_string->name)) == -1) {
if ((device.snaplen = capture_dev_user_buffersize_find(if_string)) == -1) {
device.snaplen = global_capture_opts.default_options.snaplen;
}
device.cfilter = g_strdup(global_capture_opts.default_options.cfilter);