]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #665 in SNORT/snort3 from version to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Fri, 7 Oct 2016 18:33:18 +0000 (14:33 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Fri, 7 Oct 2016 18:33:18 +0000 (14:33 -0400)
commit82439d48922124a2f1b8808ce91045409844fd2f
tree8eb2699b9064b37ff112254c21700cd483f6fa3b
parent68fb1c767f7119772018b8c8f054a3cf0eda616b
Merge pull request #665 in SNORT/snort3 from version to master

Squashed commit of the following:

commit 21e605f778e6716318853656f4d60ca2a45d2e7e
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Oct 4 19:39:32 2016 -0400

    utils: Add LibDAQ version to snort -V output

commit c5f46884c20d855c7d045a3d1025dc59124facc1
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed Oct 5 15:50:35 2016 -0400

    appid: (Re-)Fix printf format specifier warnings for peg counts

commit 17e27d89cdb4da7b88f176c1d7f3aee7430fb4b2
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Oct 4 19:22:49 2016 -0400

    utils: Minimize utils.h includes and handle the fallout
104 files changed:
extra/src/inspectors/http_server/hi_main.cc
extra/src/inspectors/http_server/http_inspect.cc
extra/src/loggers/alert_unixsock/alert_unixsock.cc
src/actions/act_react.cc
src/codecs/ip/cd_dst_opts.cc
src/codecs/ip/cd_ipv4.cc
src/detection/detection_options.cc
src/detection/fp_create.cc
src/detection/fp_detect.cc
src/detection/pcrm.cc
src/detection/service_map.cc
src/detection/signature.cc
src/detection/tag.cc
src/events/event_queue.cc
src/file_api/file_cache.cc
src/file_api/file_capture.cc
src/file_api/file_enforcer.cc
src/file_api/file_identifier.cc
src/file_api/file_mempool.cc
src/filters/detection_filter.cc
src/helpers/process.cc
src/ips_options/ips_base64.cc
src/ips_options/ips_byte_extract.cc
src/ips_options/ips_byte_jump.cc
src/ips_options/ips_byte_test.cc
src/ips_options/ips_content.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_hash.cc
src/ips_options/ips_ip_proto.cc
src/ips_options/ips_isdataat.cc
src/ips_options/ips_metadata.cc
src/ips_options/ips_pcre.cc
src/ips_options/ips_regex.cc
src/ips_options/ips_replace.cc
src/ips_options/ips_sd_pattern.cc
src/ips_options/ips_session.cc
src/latency/packet_latency.cc
src/log/log.cc
src/log/log_text.cc
src/loggers/alert_sf_socket.cc
src/loggers/alert_syslog.cc
src/loggers/log_pcap.cc
src/loggers/unified2.cc
src/main.cc
src/main/modules.cc
src/main/snort.cc
src/main/snort_config.cc
src/main/snort_debug.cc
src/main/snort_module.cc
src/main/thread_config.cc
src/managers/connector_manager.cc
src/managers/module_manager.cc
src/mime/file_mime_process.cc
src/network_inspectors/appid/appid_inspector.cc
src/network_inspectors/arp_spoof/arp_spoof.cc
src/network_inspectors/binder/bind_module.cc
src/network_inspectors/normalize/normalize.cc
src/network_inspectors/perf_monitor/flow_ip_tracker.cc
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/reputation/reputation_inspect.cc
src/network_inspectors/reputation/reputation_module.cc
src/network_inspectors/reputation/reputation_parse.cc
src/packet_io/active.cc
src/packet_io/intf.cc
src/packet_io/sfdaq.cc
src/packet_io/sfdaq_module.cc
src/packet_io/trough.cc
src/parser/cmd_line.cc
src/parser/config_file.cc
src/parser/parse_conf.cc
src/parser/parse_ip.cc
src/parser/parse_rule.cc
src/parser/parse_utils.cc
src/parser/parser.cc
src/parser/vars.cc
src/ports/port_object.cc
src/ports/port_object2.cc
src/ports/port_table.cc
src/ports/rule_port_tables.cc
src/search_engines/acsmx2.cc
src/search_engines/bnfa_search.cc
src/service_inspectors/back_orifice/back_orifice.cc
src/service_inspectors/dce_rpc/dce_smb_module.cc
src/service_inspectors/dnp3/dnp3_module.cc
src/service_inspectors/ftp_telnet/ftp_parse.cc
src/service_inspectors/imap/imap_module.cc
src/service_inspectors/pop/pop_module.cc
src/service_inspectors/rpc_decode/rpc_decode.cc
src/service_inspectors/sip/sip.cc
src/service_inspectors/sip/sip_config.cc
src/service_inspectors/smtp/smtp.cc
src/service_inspectors/smtp/smtp_module.cc
src/stream/ip/ip_defrag.cc
src/stream/tcp/tcp_stream_config.cc
src/target_based/sftarget_reader.cc
src/target_based/snort_protocols.cc
src/utils/stats.cc
src/utils/util.cc
src/utils/util.h