]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #3064 in SNORT/snort3 from ~SHRARANG/snort3:vdb_ci to master
authorShravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Fri, 17 Sep 2021 21:45:21 +0000 (21:45 +0000)
committerShravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Fri, 17 Sep 2021 21:45:21 +0000 (21:45 +0000)
commita1673ac4fb14aefd5c48bbc8d61e5d3c3bd7c346
treebbbfb65debe53786cae04161ae48dc38aff76eae
parent2625830ba510ec2430941dc960d964a9bcbd441e
Merge pull request #3064 in SNORT/snort3 from ~SHRARANG/snort3:vdb_ci to master

Squashed commit of the following:

commit 5f9d8a09fb045bdff70841ce5aa6b4caeb8b80ab
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Wed Sep 1 21:43:33 2021 -0400

    appid: prioritize appid's client detection over third-party
src/network_inspectors/appid/appid_session.h
src/network_inspectors/appid/client_plugins/client_discovery.cc