]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #2009 in SNORT/snort3 from ~DAVMCPHE/snort3:lru_cache_for_hash...
authorRuss Combs (rucombs) <rucombs@cisco.com>
Wed, 26 Feb 2020 20:54:36 +0000 (20:54 +0000)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Wed, 26 Feb 2020 20:54:36 +0000 (20:54 +0000)
commitbb26ceaaed7ca78c25ff5b8aa6f0b338fb9ecc1a
tree8b9f4e7cc98828c3292513285b62350a5e3d22f3
parentf9473953f9e42d6d6a010fb8473d451e5dfb04fd
Merge pull request #2009 in SNORT/snort3 from ~DAVMCPHE/snort3:lru_cache_for_hash to master

Squashed commit of the following:

commit 6f962204d41c0b1007992483f739db508e5d9c0d
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Fri Jan 24 09:11:21 2020 -0500

    xhash/zhash: refactor duplicated code into a common base class, xhash/zhash will subclass this new base class

    utils: create memory allocation class based on sfmemcap functionality

    xhash: refactor XHash and HashFnc to eliminate c-style callbacks and simplify ctor options

    xhash: rename hashfcn.[cc|h] to hash_keys.[cc|h]

    zhash: refactor to use hash_lru_cache and hash_key_operations classes

    zhash: make zhash a subclass of xhash...eliminate duplicate code

    utils: add unit tests for MemCapAllocator class

    hash: add unit tests for new HashLruCache class - (PR review comments
134 files changed:
src/detection/detection_options.cc
src/detection/detection_options.h
src/detection/fp_create.cc
src/detection/signature.cc
src/detection/tag.cc
src/file_api/file_cache.cc
src/file_api/file_cache.h
src/file_api/file_identifier.cc
src/file_api/file_identifier.h
src/filters/sfrf.cc
src/filters/sfthd.cc
src/flow/expect_cache.cc
src/flow/flow_cache.cc
src/flow/flow_key.cc
src/flow/flow_key.h
src/flow/test/CMakeLists.txt
src/framework/ips_option.cc
src/hash/CMakeLists.txt
src/hash/ghash.cc
src/hash/ghash.h
src/hash/hash_defs.h
src/hash/hash_key_operations.cc [moved from src/hash/hashfcn.cc with 65% similarity]
src/hash/hash_key_operations.h [moved from src/hash/hashfcn.h with 83% similarity]
src/hash/hash_lru_cache.cc [new file with mode: 0644]
src/hash/hash_lru_cache.h [new file with mode: 0644]
src/hash/test/CMakeLists.txt
src/hash/test/ghash_test.cc
src/hash/test/hash_lru_cache_test.cc [new file with mode: 0644]
src/hash/test/xhash_test.cc
src/hash/test/zhash_test.cc [new file with mode: 0644]
src/hash/xhash.cc
src/hash/xhash.h
src/hash/zhash.cc
src/hash/zhash.h
src/ips_options/ips_ack.cc
src/ips_options/ips_asn1.cc
src/ips_options/ips_base64.cc
src/ips_options/ips_ber_data.cc
src/ips_options/ips_ber_skip.cc
src/ips_options/ips_bufferlen.cc
src/ips_options/ips_byte_extract.cc
src/ips_options/ips_byte_jump.cc
src/ips_options/ips_byte_math.cc
src/ips_options/ips_byte_test.cc
src/ips_options/ips_content.cc
src/ips_options/ips_cvs.cc
src/ips_options/ips_dsize.cc
src/ips_options/ips_file_type.cc
src/ips_options/ips_flags.cc
src/ips_options/ips_flow.cc
src/ips_options/ips_flowbits.cc
src/ips_options/ips_fragbits.cc
src/ips_options/ips_fragoffset.cc
src/ips_options/ips_hash.cc
src/ips_options/ips_icmp_id.cc
src/ips_options/ips_icmp_seq.cc
src/ips_options/ips_icode.cc
src/ips_options/ips_id.cc
src/ips_options/ips_ip_proto.cc
src/ips_options/ips_ipopts.cc
src/ips_options/ips_isdataat.cc
src/ips_options/ips_itype.cc
src/ips_options/ips_luajit.cc
src/ips_options/ips_pcre.cc
src/ips_options/ips_regex.cc
src/ips_options/ips_replace.cc
src/ips_options/ips_rpc.cc
src/ips_options/ips_sd_pattern.cc
src/ips_options/ips_seq.cc
src/ips_options/ips_session.cc
src/ips_options/ips_so.cc
src/ips_options/ips_tos.cc
src/ips_options/ips_ttl.cc
src/ips_options/ips_window.cc
src/main/snort_config.h
src/mime/file_mime_process.cc
src/network_inspectors/appid/ips_appid_option.cc
src/network_inspectors/perf_monitor/flow_ip_tracker.cc
src/network_inspectors/perf_monitor/perf_monitor.cc
src/network_inspectors/perf_monitor/perf_pegs.h
src/network_inspectors/port_scan/ps_detect.cc
src/parser/parser.cc
src/ports/port_object.cc
src/ports/port_object.h
src/ports/port_object2.cc
src/ports/port_object2.h
src/ports/port_table.cc
src/ports/port_table.h
src/ports/port_var_table.cc
src/ports/port_var_table.h
src/service_inspectors/cip/ips_cip_attribute.cc
src/service_inspectors/cip/ips_cip_class.cc
src/service_inspectors/cip/ips_cip_connpathclass.cc
src/service_inspectors/cip/ips_cip_enipcommand.cc
src/service_inspectors/cip/ips_cip_enipreq.cc
src/service_inspectors/cip/ips_cip_eniprsp.cc
src/service_inspectors/cip/ips_cip_instance.cc
src/service_inspectors/cip/ips_cip_req.cc
src/service_inspectors/cip/ips_cip_rsp.cc
src/service_inspectors/cip/ips_cip_service.cc
src/service_inspectors/cip/ips_cip_status.cc
src/service_inspectors/dce_rpc/ips_dce_iface.cc
src/service_inspectors/dce_rpc/ips_dce_opnum.cc
src/service_inspectors/dce_rpc/ips_dce_stub_data.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/ftp_telnet/pp_ftp.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_buffer_info.cc
src/service_inspectors/http_inspect/http_transaction.cc
src/service_inspectors/http_inspect/http_uri.cc
src/service_inspectors/http_inspect/ips_http.cc
src/service_inspectors/modbus/ips_modbus_data.cc
src/service_inspectors/modbus/ips_modbus_func.cc
src/service_inspectors/modbus/ips_modbus_unit.cc
src/service_inspectors/s7commplus/ips_s7comm_content.cc
src/service_inspectors/s7commplus/ips_s7comm_func.cc
src/service_inspectors/s7commplus/ips_s7comm_opcode.cc
src/service_inspectors/sip/ips_sip_method.cc
src/service_inspectors/sip/ips_sip_stat_code.cc
src/service_inspectors/sip/sip_utils.cc
src/service_inspectors/ssl/ips_ssl_state.cc
src/service_inspectors/ssl/ips_ssl_version.cc
src/stream/tcp/ips_stream_reassemble.cc
src/stream/tcp/ips_stream_size.cc
src/utils/CMakeLists.txt
src/utils/memcap_allocator.h [new file with mode: 0644]
src/utils/sfmemcap.cc
src/utils/test/CMakeLists.txt
src/utils/test/memcap_allocator_test.cc [new file with mode: 0644]