]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1745 in SNORT/snort3 from ~BBANTWAL/snort3:expect_cache_fix to...
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Mon, 23 Sep 2019 19:02:10 +0000 (15:02 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Mon, 23 Sep 2019 19:02:10 +0000 (15:02 -0400)
commit30894e7cb9f45640ebaadbd61df5ac17eac5669c
tree944be5e3a41d6f47d9cf9bf9084f63c2ded7c9be
parent430c6b2c8ea8f8e10af9445c10d9027104081df7
Merge pull request #1745 in SNORT/snort3 from ~BBANTWAL/snort3:expect_cache_fix to master

Squashed commit of the following:

commit d7228380a4b95305ea45e59b14087af1b9b95a6e
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Thu Sep 12 14:16:13 2019 -0400

    flow: check if control packet has a valid daq instance before setting up daq expected flow and add pegcounts for expected flows
12 files changed:
src/flow/expect_cache.cc
src/flow/flow_control.h
src/main/analyzer.cc
src/packet_io/active.cc
src/packet_io/sfdaq_instance.cc
src/packet_io/sfdaq_instance.h
src/packet_io/sfdaq_module.cc
src/packet_io/sfdaq_module.h
src/stream/base/stream_base.cc
src/stream/base/stream_module.h
src/utils/stats.cc
src/utils/stats.h