It is not an error (anymore) to specify multiple capture filters.
authorMichael Tüxen <tuexen@fh-muenster.de>
Thu, 19 May 2011 11:58:18 +0000 (11:58 -0000)
committerMichael Tüxen <tuexen@fh-muenster.de>
Thu, 19 May 2011 11:58:18 +0000 (11:58 -0000)
This was
wireshark -i lo0 -f sctp -i en0 -f udp -k
will work.

svn path=/trunk/; revision=37287

capture_opts.c

index b29e782f58be0e87a830d1f77f4dd0910b6a6335..5770211544f201fbd1e2a41105450b0372d537b2 100644 (file)
@@ -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);