]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
source-pcap-file: honor bpf filter on command line
authorEric Leblond <eric@regit.org>
Tue, 19 Nov 2019 16:21:10 +0000 (17:21 +0100)
committerVictor Julien <victor@inliniac.net>
Mon, 25 Nov 2019 18:49:19 +0000 (19:49 +0100)
When a BPF filter is given on the command line when reading a
pcap file, the BPF filter is not honored.

The regression has been introduced in:

commit 3ab9120821e2b5cbc5925470bcfa5bcfb53f246b
Author: Dana Helwig <dana.helwig@protectwise.com>
Date:   Thu Apr 27 11:17:16 2017 -0600

    source-pcap-file: Pcap Directory Mode (Feature #2222)

Reported-By: Tim Colin <tcolin@et.esiea.fr>
src/source-pcap-file.c

index 61811aa861c1e171175c5a5f8f0b4ec1c30d5dc4..035c63e11a26cf11d0d3df57b4f586ecb3f0a2b0 100644 (file)
@@ -263,10 +263,9 @@ TmEcode ReceivePcapFileThreadInit(ThreadVars *tv, const void *initdata, void **d
             SCReturnInt(TM_ECODE_OK);
         }
 
+        pv->shared = &ptv->shared;
         status = InitPcapFile(pv);
         if(status == TM_ECODE_OK) {
-            pv->shared = &ptv->shared;
-
             ptv->is_directory = 0;
             ptv->behavior.file = pv;
         } else {