git.ipfire.org Git - thirdparty/snort3.git/commit

author	Steve Chew (stechew) <stechew@cisco.com>
	Mon, 20 Sep 2021 20:30:30 +0000 (20:30 +0000)
committer	Steve Chew (stechew) <stechew@cisco.com>
	Mon, 20 Sep 2021 20:30:30 +0000 (20:30 +0000)
commit	91cf494d30c770262367eb22c221cb76e18525b2
tree	baef336237bfe0f5a9e76e6d8d63171ee0ac0c50	tree
parent	e4b42c44a423afdabc5d9fb511921f94337a4eea	commit \| diff

Merge pull request #3067 in SNORT/snort3 from ~DERAMADA/snort3:netflow_unique_templates to master

Squashed commit of the following:

commit d936e929feacc641f05d7da7965a460c75a55e58
Author: Deepak Ramadass <deramada@cisco.com>
Date:   Fri Sep 17 10:45:56 2021 -0400

    fix cppucheck

commit 2d612e6f89852f66e6ccdfba40c79105364f2b41
Author: Deepak Ramadass <deramada@cisco.com>
Date:   Fri Sep 17 10:02:41 2021 -0400

    netflow: use device ip and template id to ensure that the template cache keys are unique

src/service_inspectors/netflow/netflow.cc		diff \| blob \| blame \| history
src/service_inspectors/netflow/netflow_module.h		diff \| blob \| blame \| history