]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #2050 in SNORT/snort3 from ~RUCOMBS/snort3:long_road to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Mon, 9 Mar 2020 23:59:23 +0000 (23:59 +0000)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Mon, 9 Mar 2020 23:59:23 +0000 (23:59 +0000)
commit19edc10e8f113247f6105ad7cba3d55c6bfa4988
treebfb08fefcbcb6fd3d658875b044e4d59704fe03d
parent34556a8c72e68b7f17b536da8e84ac94a91f9c31
Merge pull request #2050 in SNORT/snort3 from ~RUCOMBS/snort3:long_road to master

Squashed commit of the following:

commit 7fac732d47e375c11ccaaa09c460ce097698c052
Author: russ <rucombs@cisco.com>
Date:   Sat Mar 7 16:55:46 2020 -0500

    build: use const and auto references where possible

commit ab2497818f6dbcfb448deee8b29ba60ba69dcda6
Author: russ <rucombs@cisco.com>
Date:   Fri Mar 6 17:56:59 2020 -0500

    style: remove tabs and too long lines

commit ef713d0a2672db3c3e99fec22085a871c9554493
Author: russ <rucombs@cisco.com>
Date:   Sun Mar 1 23:56:53 2020 -0500

    parser: remove legacy parsing code

commit 8cb33a613e08adc45eacc3ec7ec1f0fef4e6aba6
Author: russ <rucombs@cisco.com>
Date:   Sun Mar 1 13:09:13 2020 -0500

    service: update implementation to vector

commit f1abe6fd867f95825860489b075f77c392fa2efc
Author: russ <rucombs@cisco.com>
Date:   Sun Mar 1 12:37:42 2020 -0500

    rules: add constructors for references and classifications

commit a8bd8c55d6a1f639a5107a86d34d1126d1759cf4
Author: russ <rucombs@cisco.com>
Date:   Sun Mar 1 11:21:10 2020 -0500

    classifications: use consistent variable names

commit b7c8f3bcc6ea05b65c607cb3955860c4cc4539dd
Author: russ <rucombs@cisco.com>
Date:   Sun Mar 1 11:01:39 2020 -0500

    reference: update implementation to vector

commit 7d0e021b805a82aeabe2af0fa09259d5afc3a2e7
Author: russ <rucombs@cisco.com>
Date:   Sun Mar 1 10:23:08 2020 -0500

    references: update implementation with unordered map

commit f85ef33a59b2bc3d6a81fbcc0ed97ac433fd8f4d
Author: russ <rucombs@cisco.com>
Date:   Sun Mar 1 09:38:47 2020 -0500

    classifications: update implementation with unordered map

commit 7046a630d3e94901b0c0bb0c61404666ba547e8d
Author: russ <rucombs@cisco.com>
Date:   Sun Mar 1 08:45:28 2020 -0500

    build: tweak includes

commit 43db2d95c454236cf638c280736fa6ac506e9eaa
Author: russ <rucombs@cisco.com>
Date:   Sat Feb 29 17:12:58 2020 -0500

    stats: update shutdown timing stats

    Fix pkts/sec to use analyzed packet count.  Also remove packets which is
    already provided under daq stats.  Add Mbits/sec.

commit 3a331613022272a845ca4e3ee30e2e6d486abe1f
Author: russ <rucombs@cisco.com>
Date:   Thu Feb 27 09:32:55 2020 -0500

    # This is a combination of 2 commits.
    # This is the 1st commit message:

    rules: simplify implementation of services, classifications, and references by using std::string

    # The commit message #2 will be skipped:

    # fixup std::string

commit ee176681f558429e98e1a2dcca9bc318b2051f56
Author: russ <rucombs@cisco.com>
Date:   Wed Feb 26 23:16:21 2020 -0500

    rules: update --gen-msg-map to include all configured rules with references

commit 431dddb0a50b2dd1766cc12f8d5454d43367aaa1
Author: russ <rucombs@cisco.com>
Date:   Sun Feb 23 08:15:54 2020 -0500

    rules: remove cruft

commit 51816c1d9776221651bc639bd9870df4d6285212
Author: russ <rucombs@cisco.com>
Date:   Sun Feb 23 08:15:07 2020 -0500

    rules: fix warnings and startup counts for duplicates

commit 1c9f4b1ca655c9e8ed3bab2814caaa21616891b5
Author: russ <rucombs@cisco.com>
Date:   Sun Feb 23 08:12:19 2020 -0500

    stream_tcp: no_ack applies only to ips mode
56 files changed:
src/codecs/link/test/cisco_meta_data_test.cc
src/detection/detect.cc
src/detection/detection_options.cc
src/detection/fp_utils.cc
src/detection/service_map.cc
src/detection/signature.cc
src/detection/signature.h
src/detection/treenodes.h
src/framework/mpse.h
src/framework/mpse_batch.h
src/hash/test/ghash_test.cc
src/ips_options/ips_classtype.cc
src/ips_options/ips_flowbits.cc
src/ips_options/ips_isdataat.cc
src/ips_options/ips_msg.cc
src/ips_options/ips_reference.cc
src/log/log_text.cc
src/loggers/alert_csv.cc
src/loggers/alert_json.cc
src/loggers/alert_luajit.cc
src/loggers/alert_syslog.cc
src/main.cc
src/main/help.cc
src/main/help.h
src/main/modules.cc
src/main/snort_config.cc
src/main/snort_config.h
src/main/snort_module.cc
src/managers/module_manager.cc
src/managers/module_manager.h
src/packet_io/sfdaq_config.h
src/parser/CMakeLists.txt
src/parser/config_file.cc
src/parser/mstring.cc [deleted file]
src/parser/mstring.h [deleted file]
src/parser/parse_conf.cc
src/parser/parse_rule.cc
src/parser/parse_stream.cc
src/parser/parser.cc
src/piglet_plugins/pp_event_iface.cc
src/pub_sub/assistant_gadget_event.h
src/service_inspectors/back_orifice/back_orifice.cc
src/service_inspectors/http2_inspect/http2_data_cutter.h
src/service_inspectors/http2_inspect/http2_data_frame.h
src/service_inspectors/http2_inspect/http2_dummy_packet.h
src/service_inspectors/http2_inspect/http2_frame.cc
src/service_inspectors/http2_inspect/http2_headers_frame.h
src/service_inspectors/http2_inspect/http2_stream.h
src/service_inspectors/http2_inspect/http2_stream_splitter.cc
src/service_inspectors/http2_inspect/http2_stream_splitter_impl.cc
src/service_inspectors/http_inspect/http_flow_data.h
src/service_inspectors/http_inspect/http_uri.cc
src/stream/tcp/tcp_session.cc
src/stream/tcp/tcp_stream_session.cc
src/stream/tcp/tcp_stream_session.h
src/utils/stats.cc