]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #628 in SNORT/snort3 from misc_perf to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 20 Sep 2016 20:46:36 +0000 (16:46 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 20 Sep 2016 20:46:36 +0000 (16:46 -0400)
commitd2907c0b3b411bafb5575e879b20c7b6f4899d4a
tree6243ddc091c56b51b096cda850405b1053bc99bf
parent685c0137fe449dfd65bc71d3bd17245a141b42cc
Merge pull request #628 in SNORT/snort3 from misc_perf to master

Squashed commit of the following:

commit 7b11ea83413f1af8f0f5a847a0177637deca1d45
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Sep 16 17:32:17 2016 -0400

    Refactored BitOp related.  Only instantiate on demand.  Move accessor out of stream_api
    for better encapsulation in ips_flowbits.  Eliminate useless methods.

    Added stream.ip_frags_only so we can avoid processing non-ICMP-TCP-UDP-frags where not
    needed.  This avoids creating flows etc.  Beware - appID wants flows for everything
    at the moment.

    Fixed double counting of ip session timeouts and prunes as well as
    double counting of udp session timeouts.

    Changed stale pruning to prune 1 at a time to resolve excessive latency caused
    by pruning.  Timeouts are pruned one at a time too, although it remains to be
    seen if this is adequate for idle timeouts where connection events are concerned.

    Changed default cache sizes to match 2.X.

    FlowControl::max_flows() and FlowControl::prune_flows() no longer used; deleted.

    Shutdown purging was being counted as prunes in stream_tcp.  This is fixed but
    still need to fix stream.user prunes which includes shutdown stuff.

    Added a crude total and max to packet latency stats to calculate average packet time
    a la 2.X.  Still only totals about half of runtime so needs to be revisited.  It is not
    supposed to include stuff like decode so it may be ok.

    Fixed stream_tcp to close a scan session immediately (was timing out).  So a SYN
    that gets a RST results in closed and getting cleared.

    Fixed some annoying legacy naming issues.  So inspector data on a flow is now
    flow_data instead of application_data.  Also C-style functions like
    get_x_from_y() are now simply C++-style get_x().

    Cleanup default conf.
72 files changed:
extra/src/inspectors/http_server/hi_main.cc
lua/snort.lua
src/codecs/ip/cd_tcp.cc
src/detection/detect.cc
src/file_api/file_flows.cc
src/flow/expect_cache.cc
src/flow/flow.cc
src/flow/flow.h
src/flow/flow_cache.cc
src/flow/flow_cache.h
src/flow/flow_config.h
src/flow/flow_control.cc
src/flow/flow_control.h
src/ips_options/ips_flowbits.cc
src/ips_options/ips_flowbits.h
src/latency/latency_module.cc
src/latency/latency_stats.h
src/latency/packet_latency.cc
src/main/snort.cc
src/network_inspectors/appid/appid_api.cc
src/network_inspectors/appid/appid_session.cc
src/network_inspectors/appid/test/external_apis.cc
src/network_inspectors/appid/test/external_apis.h
src/network_inspectors/appid/test/mpse.cc
src/network_inspectors/binder/binder.cc
src/network_inspectors/binder/test/binder_test.cc
src/network_inspectors/reputation/reputation_inspect.cc
src/packet_io/active.cc
src/service_inspectors/dce_rpc/dce_smb.cc
src/service_inspectors/dce_rpc/dce_tcp.cc
src/service_inspectors/dnp3/dnp3.cc
src/service_inspectors/dnp3/ips_dnp3_data.cc
src/service_inspectors/dnp3/ips_dnp3_func.cc
src/service_inspectors/dnp3/ips_dnp3_ind.cc
src/service_inspectors/dnp3/ips_dnp3_obj.cc
src/service_inspectors/dns/dns.cc
src/service_inspectors/ftp_telnet/ftp.cc
src/service_inspectors/ftp_telnet/ftp_data.cc
src/service_inspectors/ftp_telnet/ftpp_si.cc
src/service_inspectors/ftp_telnet/telnet.cc
src/service_inspectors/gtp/gtp.cc
src/service_inspectors/gtp/ips_gtp_info.cc
src/service_inspectors/gtp/ips_gtp_type.cc
src/service_inspectors/gtp/ips_gtp_version.cc
src/service_inspectors/http_inspect/http_inspect.cc
src/service_inspectors/http_inspect/http_stream_splitter_reassemble.cc
src/service_inspectors/http_inspect/http_stream_splitter_scan.cc
src/service_inspectors/imap/imap.cc
src/service_inspectors/modbus/ips_modbus_func.cc
src/service_inspectors/modbus/ips_modbus_unit.cc
src/service_inspectors/modbus/modbus.cc
src/service_inspectors/modbus/modbus_decode.cc
src/service_inspectors/pop/pop.cc
src/service_inspectors/rpc_decode/rpc_decode.cc
src/service_inspectors/sip/sip.cc
src/service_inspectors/sip/sip_dialog.cc
src/service_inspectors/smtp/smtp.cc
src/service_inspectors/ssh/ssh.cc
src/service_inspectors/ssl/ssl_inspector.cc
src/stream/base/stream_base.cc
src/stream/base/stream_module.cc
src/stream/base/stream_module.h
src/stream/icmp/icmp_session.cc
src/stream/ip/ip_session.cc
src/stream/libtcp/tcp_stream_session.h
src/stream/stream_api.cc
src/stream/stream_api.h
src/stream/tcp/tcp_session.cc
src/stream/tcp/tcp_state_syn_sent.cc
src/stream/udp/udp_session.cc
src/utils/bitop.h
src/utils/bitop_test.cc