]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #131 in SNORT/snort3 from ~JOCORNET/snort3:rearrange_time_dir...
authorRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 13 Nov 2015 18:25:26 +0000 (13:25 -0500)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 13 Nov 2015 18:25:26 +0000 (13:25 -0500)
commitbd51e8b4ca1d77be19817c5c5e45d534e8a73e6f
tree29832921bd257a30e215ccd63922f80b735ecea6
parent7f7b52354ddb4286e4e3f90abee09f96bb91ab5d
Merge pull request #131 in SNORT/snort3 from ~JOCORNET/snort3:rearrange_time_dir to master

Squashed commit of the following:

commit 9a2fb92580e29b331a85a1ad97a117f134b54c80
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 17:23:46 2015 -0500

    added include

commit b4e5a52f19c70958223919c6aa18e8d533b60305
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 17:05:20 2015 -0500

    further cleanup

commit 9069e256c3d50c4e3dfa95d288bc7a95d3dc333f
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 16:53:13 2015 -0500

    added forward declarations for profilestats

commit 86a6864733ff5fd1a40931b6a7ae92619b6f292d
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 16:38:14 2015 -0500

    moved profiler to its own directory

commit 3660246db180aa0048ac9a55fe43e05947857c9f
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 16:13:32 2015 -0500

    moved ppm to its own directory
148 files changed:
configure.ac
src/CMakeLists.txt
src/Makefile.am
src/actions/act_react.cc
src/actions/act_reject.cc
src/detection/detect.cc
src/detection/detect.h
src/detection/detection_options.cc
src/detection/fp_detect.cc
src/detection/fp_detect.h
src/framework/mpse.cc
src/framework/mpse.h
src/helpers/chunk.cc
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_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_data.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_http.cc
src/ips_options/ips_http_header.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_pkt_data.cc
src/ips_options/ips_raw_data.cc
src/ips_options/ips_regex.cc
src/ips_options/ips_replace.cc
src/ips_options/ips_rpc.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_luajit.cc
src/main.cc
src/main/modules.cc
src/main/snort.cc
src/main/snort_config.cc
src/managers/inspector_manager.cc
src/managers/module_manager.cc
src/network_inspectors/arp_spoof/arp_spoof.cc
src/network_inspectors/binder/binder.cc
src/network_inspectors/normalize/normalize.cc
src/network_inspectors/perf_monitor/perf_monitor.cc
src/network_inspectors/port_scan/port_scan.cc
src/parser/parse_rule.cc
src/parser/parser.cc
src/parser/vars.cc
src/ppm/CMakeLists.txt [new file with mode: 0644]
src/ppm/Makefile.am [new file with mode: 0644]
src/ppm/ppm.cc [moved from src/time/ppm.cc with 97% similarity]
src/ppm/ppm.h [moved from src/time/ppm.h with 98% similarity]
src/ppm/ppm_module.cc [moved from src/time/ppm_module.cc with 99% similarity]
src/ppm/ppm_module.h [moved from src/time/ppm_module.h with 92% similarity]
src/profiler/CMakeLists.txt [new file with mode: 0644]
src/profiler/Makefile.am [new file with mode: 0644]
src/profiler/profiler.cc [moved from src/time/profiler.cc with 100% similarity]
src/profiler/profiler.h [moved from src/time/profiler.h with 100% similarity]
src/protocols/packet_manager.cc
src/search_engines/ac_banded.cc
src/search_engines/ac_bnfa.cc
src/search_engines/ac_bnfa_q.cc
src/search_engines/ac_full.cc
src/search_engines/ac_full_q.cc
src/search_engines/ac_sparse.cc
src/search_engines/ac_sparse_bands.cc
src/search_engines/ac_std.cc
src/search_engines/intel_cpm.cc
src/service_inspectors/back_orifice/back_orifice.cc
src/service_inspectors/dns/dns.cc
src/service_inspectors/dns/dns.h
src/service_inspectors/ftp_telnet/ft_main.cc
src/service_inspectors/ftp_telnet/ft_main.h
src/service_inspectors/ftp_telnet/ftp.cc
src/service_inspectors/ftp_telnet/ftp_data.cc
src/service_inspectors/ftp_telnet/ftp_parse.cc
src/service_inspectors/ftp_telnet/ftp_print.cc
src/service_inspectors/ftp_telnet/telnet.cc
src/service_inspectors/gtp/gtp.cc
src/service_inspectors/gtp/gtp_inspect.cc
src/service_inspectors/gtp/gtp_module.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/hi_main.cc
src/service_inspectors/http_inspect/hi_main.h
src/service_inspectors/http_inspect/http_inspect.cc
src/service_inspectors/imap/imap.cc
src/service_inspectors/imap/imap.h
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/modbus/modbus.cc
src/service_inspectors/modbus/modbus_module.cc
src/service_inspectors/pop/pop.cc
src/service_inspectors/pop/pop.h
src/service_inspectors/rpc_decode/rpc_decode.cc
src/service_inspectors/sip/ips_sip.cc
src/service_inspectors/sip/ips_sip_method.cc
src/service_inspectors/sip/ips_sip_stat_code.cc
src/service_inspectors/sip/sip.cc
src/service_inspectors/sip/sip.h
src/service_inspectors/smtp/smtp.cc
src/service_inspectors/smtp/smtp.h
src/service_inspectors/ssh/ssh.cc
src/service_inspectors/ssh/ssh.h
src/service_inspectors/ssl/ips_ssl_state.cc
src/service_inspectors/ssl/ips_ssl_version.cc
src/service_inspectors/ssl/ssl_inspector.cc
src/service_inspectors/ssl/ssl_inspector.h
src/service_inspectors/wizard/wizard.cc
src/stream/base/stream_base.cc
src/stream/file/file_session.cc
src/stream/icmp/icmp_session.cc
src/stream/ip/ip_defrag.cc
src/stream/ip/ip_session.cc
src/stream/tcp/ips_stream_reassemble.cc
src/stream/tcp/ips_stream_size.cc
src/stream/tcp/tcp_module.cc
src/stream/tcp/tcp_module.h
src/stream/tcp/tcp_reassembler.cc
src/stream/tcp/tcp_session.cc
src/stream/udp/udp_session.cc
src/stream/user/user_session.cc
src/time/CMakeLists.txt
src/time/Makefile.am
src/utils/stats.cc
src/utils/util.cc