]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1673 in SNORT/snort3 from ~DERAMADA/snort3:revert_stash_changes...
authorDavis McPherson (davmcphe) <davmcphe@cisco.com>
Mon, 15 Jul 2019 18:06:50 +0000 (14:06 -0400)
committerDavis McPherson (davmcphe) <davmcphe@cisco.com>
Mon, 15 Jul 2019 18:06:50 +0000 (14:06 -0400)
commit2a91aa4899d1e2a3fe4c9b62ed94f2999091dbdf
treeb0c921235d854ef6e694b27beb1510512a077342
parent6905cc51c8f3c823d6775daca4365353fbe1e667
Merge pull request #1673 in SNORT/snort3 from ~DERAMADA/snort3:revert_stash_changes to master

Squashed commit of the following:

commit 0cacc8ab500b966c9d23ec819255f4bb77f94b7c
Author: deramada <deramada@cisco.com>
Date:   Fri Jul 12 11:23:12 2019 -0400

    Revert "Merge pull request #1593 in SNORT/snort3 from ~DERAMADA/snort3:appid_stash_store to master"

    This reverts commit 1880af5f2b31ed968fc4a790384720d560acec1c.
19 files changed:
src/flow/CMakeLists.txt
src/flow/flow.cc
src/flow/flow.h
src/flow/flow_stash.cc
src/flow/flow_stash.h
src/flow/flow_stash_keys.h [deleted file]
src/flow/stash_item.h
src/flow/test/flow_stash_test.cc
src/network_inspectors/appid/appid_discovery.cc
src/network_inspectors/appid/appid_http_event_handler.cc
src/network_inspectors/appid/appid_http_session.cc
src/network_inspectors/appid/appid_http_session.h
src/network_inspectors/appid/appid_session.cc
src/network_inspectors/appid/appid_session.h
src/network_inspectors/appid/ips_appid_option.cc
src/network_inspectors/appid/test/appid_discovery_test.cc
src/network_inspectors/appid/test/appid_http_event_test.cc
src/network_inspectors/appid/test/appid_mock_flow.h
src/network_inspectors/appid/test/appid_mock_session.h