]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1557 in SNORT/snort3 from ~RUCOMBS/snort3:various to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Mon, 25 Mar 2019 16:55:42 +0000 (12:55 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Mon, 25 Mar 2019 16:55:42 +0000 (12:55 -0400)
commit9e685aeb006dba466d9e985d0a43772c387495a3
tree6f3f2c7fac77ffa22893115bc068eec7b55eba3f
parentd50d810784815e296790355677666f7f08a2a1b4
Merge pull request #1557 in SNORT/snort3 from ~RUCOMBS/snort3:various to master

Squashed commit of the following:

commit b953cc05bab4496ade6f9db8a31cc9e25c965740
Author: russ <rucombs@cisco.com>
Date:   Sun Mar 24 12:09:49 2019 -0400

    stream_tcp: fix up stream order flags

    -- use trivial fsm for proper flagging
    -- remove useless checks from smtp
    -- reorder tracker data members to save 48 bytes / flow

commit 2a04335c17f174bb575e9179a91cb9dc81c20f4e
Author: russ <rucombs@cisco.com>
Date:   Sat Mar 23 00:35:36 2019 -0400

    stream_tcp: add track_only to disable reassembly

commit bdfb917a0a350477b7d02a0acf073931e1926f81
Author: russ <rucombs@cisco.com>
Date:   Fri Mar 22 14:39:32 2019 -0400

    conf: remove obscure and slow automatic iface var assignments; use Lua instead

commit 9173b5a8862e22b2a8d2d3b86f09045d0d5a26de
Author: russ <rucombs@cisco.com>
Date:   Thu Mar 21 20:23:06 2019 -0400

    profiler: add quick exit if not configured to minimize overhead (rule times)

commit 97804d99baafb7b60785f198758ba7e9d1c472cd
Author: russ <rucombs@cisco.com>
Date:   Thu Mar 21 17:46:56 2019 -0400

    appid: fixup profiling

    -- use generic DeepProfile instead of APPID_DEEP_PERF_PROFILING
    -- change tp_library to deep profile consistent with subprofiles
18 files changed:
src/flow/flow.cc
src/main/modules.cc
src/network_inspectors/appid/appid_http_session.cc
src/network_inspectors/appid/client_plugins/client_discovery.cc
src/network_inspectors/appid/ips_appid_option.cc
src/network_inspectors/appid/lua_detector_api.cc
src/network_inspectors/appid/service_plugins/service_discovery.cc
src/network_inspectors/appid/tp_appid_utils.cc
src/parser/parser.cc
src/profiler/rule_profiler.cc
src/profiler/rule_profiler_defs.h
src/service_inspectors/smtp/smtp.cc
src/stream/libtcp/tcp_stream_tracker.cc
src/stream/libtcp/tcp_stream_tracker.h
src/stream/tcp/tcp_module.cc
src/stream/tcp/tcp_session.cc
src/stream/tcp/tcp_session.h
src/stream/tcp/tcp_stream_config.h