]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1851 in SNORT/snort3 from ~BBANTWAL/snort3:vxlan_new to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Wed, 18 Mar 2020 14:21:42 +0000 (14:21 +0000)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Wed, 18 Mar 2020 14:21:42 +0000 (14:21 +0000)
commite711d21fa30ecb1431222e565ecb335f9697a76d
tree035c340e501412cf620c62175b29688cfd4f3d64
parenteaf3d1c296c893c590f5709b36d78292ea83d3bb
Merge pull request #1851 in SNORT/snort3 from ~BBANTWAL/snort3:vxlan_new to master

Squashed commit of the following:

commit 5c8104ebe65146c9315ae4a5a52e8fa3843b19c8
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Tue Mar 17 15:19:57 2020 -0400

    main: check if flow state is blocked while applying verdicts

commit c7f9f5def1d0a42695a0a1e6f9229a443f329b4b
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Tue Dec 10 15:14:37 2019 -0500

    codecs: add new proto bit for udp tunneled traffic

commit 82313413cf6f4152915ffce33fc2f41118bbbd1c
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Thu Aug 30 13:41:51 2018 -0400

    codecs: add vxlan codec

    move gtp_ports and deep_teredo_inspection from
    snort config to UdpCodecConfig
20 files changed:
src/codecs/codec_api.cc
src/codecs/ip/cd_udp.cc
src/codecs/misc/CMakeLists.txt
src/codecs/misc/cd_vxlan.cc [new file with mode: 0644]
src/detection/detection_options.cc
src/detection/fp_detect.cc
src/framework/decode_data.h
src/main/analyzer.cc
src/main/modules.cc
src/main/snort_config.cc
src/main/snort_config.h
src/packet_io/sfdaq.cc
src/packet_io/sfdaq.h
src/packet_io/sfdaq_instance.cc
src/packet_io/sfdaq_instance.h
src/protocols/packet.h
src/protocols/protocol_ids.h
tools/snort2lua/config_states/config_api.cc
tools/snort2lua/config_states/config_deleted.cc
tools/snort2lua/config_states/config_no_option.cc