aboutsummaryrefslogtreecommitdiffstats
path: root/dumpcap.c
diff options
context:
space:
mode:
authorMichael Tüxen <tuexen@fh-muenster.de>2011-05-21 18:51:25 +0000
committerMichael Tüxen <tuexen@fh-muenster.de>2011-05-21 18:51:25 +0000
commit17dd51831fbcace47b04d53919c2eda98a07d7f7 (patch)
treec2deb099ba3cce4d1b9a64b1ea4840659dea0427 /dumpcap.c
parentc6c2577bbc97388be260fb677db3f730e1b372c3 (diff)
As suggested on the dev list: Use pcapng and threads
when capturing on multiple interfaces even if not specified on the command line. svn path=/trunk/; revision=37343
Diffstat (limited to 'dumpcap.c')
-rw-r--r--dumpcap.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/dumpcap.c b/dumpcap.c
index 6eb12d717d..56529dc79d 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -4102,8 +4102,13 @@ main(int argc, char *argv[])
exit_main(1);
}
} else {
- /* We're supposed to capture traffic; was the ring buffer option
- specified and, if so, does it make sense? */
+ /* We're supposed to capture traffic; */
+ /* Are we capturing on multiple interface? If so, use threads and pcapng. */
+ if (global_capture_opts.ifaces->len > 1) {
+ use_threads = TRUE;
+ global_capture_opts.use_pcapng = TRUE;
+ }
+ /* Was the ring buffer option specified and, if so, does it make sense? */
if (global_capture_opts.multi_files_on) {
/* Ring buffer works only under certain conditions:
a) ring buffer does not work with temporary files;