]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1189 in SNORT/snort3 from more_perf to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 17 Apr 2018 15:06:22 +0000 (11:06 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 17 Apr 2018 15:06:22 +0000 (11:06 -0400)
commit0d09ae22636e02b4adfdd3252dbb1f8979c614e1
tree6a9774c891027ae63b988bebc44bbcf4648243a6
parent3e9b41f960b29f821cdb2be227b786d9e6ffe42d
Merge pull request #1189 in SNORT/snort3 from more_perf to master

Squashed commit of the following:

commit ec308cd55b2e2e32ae4db3eb969b5fd38e7bb63f
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Mon Apr 16 16:49:26 2018 -0400

    stream_tcp: switch to splitter max

commit 783c405bb721e48352db0a9e00946722c037231a
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Sat Apr 14 07:46:20 2018 -0400

    spell check: fix memeory and indicies typos

commit 9aa84591ec853873196ca1bb5dc85fddd043081a
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Fri Apr 13 21:41:02 2018 -0400

    build: fix various warnings:

    file_decomp_pdf.cc: unreachable code return
    decompress/file_decomp_pdf.cc: implicit fallthrough
    stream.cc: warning: potential memory leaks
    memory_manager.cc: dangling references

commit f07b179baae636ec9be6307fe3bbb0295aeba387
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Thu Apr 12 09:27:50 2018 -0400

    stream: be selective about flow creation for scans

commit cdf528691f7aaeebb40a0b686ae46b7ff4651579
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Wed Apr 11 21:25:31 2018 -0400

    http_inspect: patch around regression failures until a permanent solution is implemented

commit 7f57541f3e4d1c1aaf44807c358b858f9ede043c
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Fri Apr 6 17:17:56 2018 -0400

    stream_tcp: tweak seglist cursor handling

commit 417992054439d839d3651fc5adf1b08d836cd1d4
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Wed Apr 11 07:41:35 2018 -0400

    port_scan: include open ports with alerts instead of separate

commit cf2e7d2ac36b3cf70ee8c7a55f932029755ddccb
Author: Russ Combs <rucombs@cisco.com>
Date:   Sat Mar 31 12:41:53 2018 -0400

    stream: remove usused ignore_any_rules from tcp and udp

commit f5843c4d2ad6a439003afde1830c41900bc492bf
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Thu Apr 5 17:00:27 2018 -0400

    stream: respect tcp require_3whs

commit c9bb1eb11d3060515bc26e8a393a1c963f47ae9c
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Thu Apr 5 11:44:15 2018 -0400

    stream: refactor flow control for new PktTypes

commit c9c5d239de87e9aa45925fde906d842f3ad2c33d
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Tue Apr 10 11:12:06 2018 -0400

    search_engine: revert default detect_raw_tcp to false

commit f0556f01cf98bfd8fef7494177ae6b33fde52b38
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Thu Apr 5 09:57:27 2018 -0400

    framework: remove bogus PktType for ARP and just use proto bits instead

commit f84ee2cb693c94e243180b2f3a715cc564d2d329
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Thu Apr 5 09:31:53 2018 -0400

    framework: align PktType and proto bits

commit f1f54c0fd3188460b1cb2e203cfb3c4789ed8e8a
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Mon Apr 2 06:14:05 2018 -0400

    memory: disable with -DNO_MEM_MGR

commit 6d070a4e8f17ae96f519cb833e356aaa7c3e6145
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Mon Apr 2 06:13:42 2018 -0400

    profile: disable with -DNO_PROFILER

commit a7ddf1395e9c9e69eb2b5d72077c40cb5e7aac19
Author: Russ Combs <rucombs@cisco.com>
Date:   Sat Mar 31 13:04:24 2018 -0400

    zhash: cleanup cruftiness
89 files changed:
extra/src/inspectors/data_log/data_log.cc
extra/src/inspectors/dpx/dpx.cc
extra/src/inspectors/reg_test/reg_test.cc
extra/src/ips_options/ips_pkt_num/ips_pkt_num.cc
src/codecs/ip/cd_tcp.cc
src/codecs/link/cd_arp.cc
src/decompress/file_decomp_pdf.cc
src/detection/detection_engine.cc
src/file_api/file_flows.cc
src/file_api/file_log.cc
src/flow/flow.cc
src/flow/flow.h
src/flow/flow_control.cc
src/flow/flow_control.h
src/flow/session.h
src/framework/codec.h
src/framework/decode_data.h
src/framework/inspector.cc
src/framework/inspector.h
src/hash/zhash.cc
src/hash/zhash.h
src/ips_options/ips_flowbits.cc
src/main/modules.cc
src/main/snort_config.h
src/managers/inspector_manager.cc
src/memory/memory_manager.cc
src/network_inspectors/appid/appid_inspector.cc
src/network_inspectors/appid/ips_appid_option.cc
src/network_inspectors/appid/thirdparty_appid_utils.cc
src/network_inspectors/arp_spoof/arp_spoof.cc
src/network_inspectors/binder/bind_module.cc
src/network_inspectors/binder/binder.cc
src/network_inspectors/normalize/normalize.cc
src/network_inspectors/packet_capture/packet_capture.cc
src/network_inspectors/perf_monitor/perf_module.h
src/network_inspectors/perf_monitor/perf_monitor.cc
src/network_inspectors/port_scan/port_scan.cc
src/network_inspectors/port_scan/ps_detect.cc
src/network_inspectors/port_scan/ps_detect.h
src/network_inspectors/reputation/reputation_inspect.cc
src/profiler/profiler_defs.h
src/protocols/packet.cc
src/protocols/packet.h
src/protocols/tcp.h
src/service_inspectors/back_orifice/back_orifice.cc
src/service_inspectors/dce_rpc/dce_http_proxy.cc
src/service_inspectors/dce_rpc/dce_http_server.cc
src/service_inspectors/dce_rpc/dce_smb.cc
src/service_inspectors/dce_rpc/dce_tcp.cc
src/service_inspectors/dce_rpc/dce_udp.cc
src/service_inspectors/dnp3/dnp3.cc
src/service_inspectors/dnp3/dnp3_reassembly.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/telnet.cc
src/service_inspectors/gtp/gtp_inspect.cc
src/service_inspectors/http2_inspect/http2_api.cc
src/service_inspectors/http_inspect/http_api.cc
src/service_inspectors/http_inspect/http_stream_splitter_reassemble.cc
src/service_inspectors/imap/imap.cc
src/service_inspectors/modbus/modbus.cc
src/service_inspectors/pop/pop.cc
src/service_inspectors/rpc_decode/rpc_decode.cc
src/service_inspectors/sip/sip.cc
src/service_inspectors/smtp/smtp.cc
src/service_inspectors/ssh/ssh.cc
src/service_inspectors/ssl/ssl_inspector.cc
src/service_inspectors/wizard/wizard.cc
src/stream/base/stream_base.cc
src/stream/base/stream_module.h
src/stream/file/stream_file.cc
src/stream/icmp/stream_icmp.cc
src/stream/ip/stream_ip.cc
src/stream/libtcp/tcp_segment_descriptor.cc
src/stream/tcp/stream_tcp.cc
src/stream/tcp/tcp_module.cc
src/stream/tcp/tcp_reassembler.cc
src/stream/tcp/tcp_reassembler.h
src/stream/tcp/tcp_session.cc
src/stream/tcp/tcp_stream_config.cc
src/stream/tcp/tcp_stream_config.h
src/stream/udp/stream_udp.cc
src/stream/udp/stream_udp.h
src/stream/udp/udp_module.cc
src/stream/user/stream_user.cc
tools/snort2lua/config_states/config_no_option.cc
tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc
tools/snort2lua/preprocessor_states/pps_stream5_udp.cc