]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1043 in SNORT/snort3 from daq_tunnel to master
authorTom Peters (thopeter) <thopeter@cisco.com>
Tue, 17 Oct 2017 19:02:03 +0000 (15:02 -0400)
committerTom Peters (thopeter) <thopeter@cisco.com>
Tue, 17 Oct 2017 19:02:03 +0000 (15:02 -0400)
commit6164f58df4a894c5a193b2ffa32a8dc84fd70ddc
treed8525692dd6cc2d606b65315951b62739ad2a511
parentc9715cfc08ee9914cda331dfc0d9ac559d805117
Merge pull request #1043 in SNORT/snort3 from daq_tunnel to master

Squashed commit of the following:

commit 940e83dcc968adf1ea4cd29c745a4dbff35b1993
Author: Steven Baigal <sbaigal@cisco.com>
Date:   Wed Oct 11 15:36:37 2017 -0400

    US131276 allow DAQ to set the tunnel bypass flags
extra/src/daqs/daq_regtest/daq_regtest.c
src/codecs/ip/cd_ipv4.cc
src/codecs/ip/cd_ipv6.cc
src/codecs/misc/cd_gtp.cc
src/main/snort_config.cc
src/main/snort_config.h
src/packet_io/sfdaq.cc
src/packet_io/sfdaq.h