summaryrefslogtreecommitdiff
path: root/capture_opts.c
diff options
context:
space:
mode:
authorMichael Tüxen <tuexen@fh-muenster.de>2011-05-19 11:58:18 +0000
committerMichael Tüxen <tuexen@fh-muenster.de>2011-05-19 11:58:18 +0000
commitd37d757dbc5c3a2c57794c6d0ccb5d172c5b509e (patch)
treee31a684d521dd63c765c068d626e6d9d25bdd447 /capture_opts.c
parent0f41b64142436ab5da197cbf5ed64f530918924f (diff)
downloadwireshark-d37d757dbc5c3a2c57794c6d0ccb5d172c5b509e.tar.gz
It is not an error (anymore) to specify multiple capture filters.
This was wireshark -i lo0 -f sctp -i en0 -f udp -k will work. svn path=/trunk/; revision=37287
Diffstat (limited to 'capture_opts.c')
-rw-r--r--capture_opts.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/capture_opts.c b/capture_opts.c
index b29e782f58..5770211544 100644
--- a/capture_opts.c
+++ b/capture_opts.c
@@ -658,10 +658,6 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
capture_opts->autostop_packets = get_positive_int(optarg_str_p, "packet count");
break;
case 'f': /* capture filter */
- if ((!capture_opts->use_pcapng) && (capture_opts->has_cfilter)) {
- cmdarg_err("More than one -f argument specified");
- return 1;
- }
capture_opts->has_cfilter = TRUE;
g_free(capture_opts->cfilter);
capture_opts->cfilter = g_strdup(optarg_str_p);