]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1057 in SNORT/snort3 from rename_hashs to master
authorHui Cao (huica) <huica@cisco.com>
Fri, 3 Nov 2017 15:06:28 +0000 (11:06 -0400)
committerHui Cao (huica) <huica@cisco.com>
Fri, 3 Nov 2017 15:06:28 +0000 (11:06 -0400)
commitca385596be4931e8314508752b64f3f53eaf31ee
tree43a04178e96eb3b6e26409f0565d84a9134ed837
parent2da66818836bbe504b68da1800545fc7ce1fbba0
Merge pull request #1057 in SNORT/snort3 from rename_hashs to master

Squashed commit of the following:

commit 7554b9b3f0a0894cb525548436916385b7a95f56
Author: Victor Roemer <viroemer@cisco.com>
Date:   Fri Nov 3 08:14:06 2017 -0400

    fix build

commit 22610f0d5112c6d2d7996712c0f24dff4a8ca87d
Author: Victor Roemer <viroemer@cisco.com>
Date:   Thu Nov 2 12:41:23 2017 -0400

    detection: rename ServiceInfo to SignatureServiceInfo

commit 1b0538ac5321fb801e6710041b8073a830433106
Author: Victor Roemer <viroemer@cisco.com>
Date:   Tue Oct 31 17:10:37 2017 -0400

    hash: Rename SFGHASH, SFXHASH, SFHASHFCN to something resonable
128 files changed:
extra/src/ips_options/ips_mss/ips_mss.cc
extra/src/ips_options/ips_pkt_num/ips_pkt_num.cc
extra/src/ips_options/ips_urg/ips_urg.cc
extra/src/ips_options/ips_wscale/ips_wscale.cc
src/detection/detection_options.cc
src/detection/detection_options.h
src/detection/fp_create.cc
src/detection/service_map.cc
src/detection/service_map.h
src/detection/signature.cc
src/detection/signature.h
src/detection/tag.cc
src/file_api/file_cache.cc
src/file_api/file_cache.h
src/file_api/file_enforcer.cc
src/file_api/file_enforcer.h
src/file_api/file_identifier.cc
src/file_api/file_identifier.h
src/filters/detection_filter.cc
src/filters/rate_filter.cc
src/filters/sfrf.cc
src/filters/sfrf.h
src/filters/sfthd.cc
src/filters/sfthd.h
src/filters/sfthd_test.cc
src/filters/sfthreshold.cc
src/flow/flow_key.cc
src/flow/flow_key.h
src/framework/ips_option.cc
src/hash/CMakeLists.txt
src/hash/Makefile.am
src/hash/ghash.cc [moved from src/hash/sfghash.cc with 80% similarity]
src/hash/ghash.h [moved from src/hash/sfghash.h with 61% similarity]
src/hash/hashfcn.cc [moved from src/hash/sfhashfcn.cc with 82% similarity]
src/hash/hashfcn.h [moved from src/hash/sfhashfcn.h with 85% similarity]
src/hash/primetable.cc [moved from src/hash/sfprimetable.cc with 99% similarity]
src/hash/primetable.h [moved from src/hash/sfprimetable.h with 93% similarity]
src/hash/test/CMakeLists.txt
src/hash/test/Makefile.am
src/hash/test/ghash_test.cc [moved from src/hash/test/sfghash_test.cc with 73% similarity]
src/hash/xhash.cc [moved from src/hash/sfxhash.cc with 77% similarity]
src/hash/xhash.h [moved from src/hash/sfxhash.h with 56% similarity]
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_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_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/loggers/alert_sf_socket.cc
src/main/policy.h
src/main/snort_config.cc
src/main/snort_config.h
src/network_inspectors/appid/app_forecast.cc
src/network_inspectors/appid/appid_utils/network_set.cc
src/network_inspectors/appid/appid_utils/network_set.h
src/network_inspectors/appid/ips_appid_option.cc
src/network_inspectors/appid/length_app_cache.cc
src/network_inspectors/appid/lua_detector_api.cc
src/network_inspectors/appid/service_state.cc
src/network_inspectors/perf_monitor/flow_ip_tracker.cc
src/network_inspectors/perf_monitor/flow_ip_tracker.h
src/network_inspectors/port_scan/ps_detect.cc
src/parser/parse_conf.cc
src/parser/parse_rule.cc
src/parser/parser.cc
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/profiler/rule_profiler.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/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_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/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/stream/udp/udp_session.cc