]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #994 in SNORT/snort3 from elk to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 18 Aug 2017 14:53:04 +0000 (10:53 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 18 Aug 2017 14:53:04 +0000 (10:53 -0400)
commitd4a237e3777d2dbaf2da01d780e9ca85ce2ccc37
tree7be4bfe39f4b8eba1e87901f985674dbec3cfb6f
parentb4ec5e9e2660a2b5db91ae5299fc7bde7c4292ab
Merge pull request #994 in SNORT/snort3 from elk to master

Squashed commit of the following:

commit 573659a4166f5e1c9583383d7bf0bddbee4472a5
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Aug 17 15:22:54 2017 -0400

    csv: updates

commit d566f6bb98497dd76baea1b88f451509a7291b96
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Aug 17 15:11:50 2017 -0400

    b64: updates

commit c25181487233e22511dcd7d5c2f06ba2ad6cf5a2
Author: Russ Combs <rucombs@cisco.com>
Date:   Wed Aug 16 13:45:31 2017 -0400

    appid: convert appid_stats.log from u2 to csv

commit c882db6d3c1901bb3f42e38f733cb70632f3139e
Author: Russ Combs <rucombs@cisco.com>
Date:   Wed Aug 16 11:48:23 2017 -0400

    configure: add --disable-stdlog for cases where logging alerts to file descriptor 3 is unhelpful

commit 6d3c8c3d4c365e8d99866ada71ecc1b039e2c00b
Author: Russ Combs <rucombs@cisco.com>
Date:   Wed Aug 16 11:22:48 2017 -0400

    cleanup: remove rogue HAVE_CONFIG_H from includes

commit d302999d9e784d6a6e2fe8e18514be33b2a3d470
Author: Russ Combs <rucombs@cisco.com>
Date:   Wed Aug 16 11:17:54 2017 -0400

    appid: tweak help for instance_id

commit 2b135326f84f4047aaef5336c7bc31948607d1d5
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Aug 14 12:56:28 2017 -0400

    stream_tcp: ensure max pdu is flushed by default splitter

commit 7f5eb5649c0f7012c518b5197c77c4b320407841
Author: Russ Combs <rucombs@cisco.com>
Date:   Sun Aug 13 20:39:22 2017 -0400

    unified2: log buffers as cooked packets with legacy events

commit 946b93bdb7aa35d23b259cb769e2eac940254ad7
Author: Russ Combs <rucombs@cisco.com>
Date:   Sun Aug 13 07:32:07 2017 -0400

    build: fix unused parameter warning

commit 4c7e0c61a43102c803c34ca22fe919e2998a941b
Author: Russ Combs <rucombs@cisco.com>
Date:   Sat Aug 12 16:05:10 2017 -0400

    conf: fix default classification capitalization

commit a9ccc441b02898f6c9e6471404ced30a1f17f312
Author: Russ Combs <rucombs@cisco.com>
Date:   Sun Aug 13 07:28:57 2017 -0400

    alert_csv: add vlan and mpls options

commit 666b46fd3a976da03840aedf93f5522a639e0de9
Author: Russ Combs <rucombs@cisco.com>
Date:   Sat Aug 12 10:25:32 2017 -0400

    alert_csv: add b64_data, rename dgm_len to pkt_len

commit 64889ec87c4a8c953742a7a828d968334439ef48
Author: Russ Combs <rucombs@cisco.com>
Date:   Sat Aug 12 10:24:04 2017 -0400

    loggers: add base64 encoder based on libb64 from devolve

commit dfb8e204bcc8d6232b51fdd47ef91ac5d4609f8d
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Aug 11 22:32:17 2017 -0400

    alert_csv: add class, priority, and service options

commit c39d12177bf9a4f304a2801dca1c4edb9b3b8f18
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Aug 11 22:32:01 2017 -0400

    loggers: use standard year/mon/day format
30 files changed:
cmake/configure_options.cmake
cmake/create_options.cmake
config.cmake.h.in
configure.ac
configure_cmake.sh
lua/snort_defaults.lua
src/detection/detect_trace.cc
src/detection/detect_trace.h
src/helpers/CMakeLists.txt
src/helpers/Makefile.am
src/helpers/base64_encoder.cc [new file with mode: 0644]
src/helpers/base64_encoder.h [new file with mode: 0644]
src/log/text_log.cc
src/log/unified2.h
src/loggers/CMakeLists.txt
src/loggers/Makefile.am
src/loggers/alert_csv.cc
src/loggers/u2_packet.cc [new file with mode: 0644]
src/loggers/u2_packet.h [new file with mode: 0644]
src/loggers/unified2.cc
src/main/snort.cc
src/network_inspectors/appid/appid_module.cc
src/network_inspectors/appid/appid_stats.cc
src/network_inspectors/appid/appid_stats.h
src/network_inspectors/binder/binder.cc
src/protocols/packet.h
src/stream/libtcp/tcp_stream_session.h
src/stream/tcp/tcp_reassembler.cc
src/utils/util.cc
tools/snort2lua/output_states/out_csv.cc