]> git.ipfire.org Git - thirdparty/snort3.git/commit
projects / thirdparty / snort3.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e2995df) | patch
Merge pull request #1036 in SNORT/snort3 from tunnel_225582 to master
authorTom Peters (thopeter) <thopeter@cisco.com>
Mon, 9 Oct 2017 15:13:21 +0000 (11:13 -0400)
committerTom Peters (thopeter) <thopeter@cisco.com>
Mon, 9 Oct 2017 15:13:21 +0000 (11:13 -0400)
commit8c374c9f3dc290d82dd68eeb330275edd778743e
tree9f340ecf63c424f6b8d0329859298e0bfaebaaf1tree | snapshot
parente2995df4a13642188a4dc5fb6dbeffa122cb098acommit | diff
Merge pull request #1036 in SNORT/snort3 from tunnel_225582 to master

Squashed commit of the following:

commit e9cc0d0af2059cb6aa589d8818bf4cac54738620
Author: Steven Baigal <sbaigal@cisco.com>
Date:   Tue Oct 3 14:59:25 2017 -0400

    updated DAQ stats to include retry verdict  peg count

commit 37cf28a584f43f093fbeec23baa9429257427304
Author: Steven Baigal <sbaigal@cisco.com>
Date:   Mon Sep 25 15:14:23 2017 -0400

    added tunnel bypass for IP 4IN4, IP 6IN6, GRE and MPLS
src/codecs/ip/cd_gre.cc diff | blob | blame | history
src/codecs/ip/cd_ipv4.cc diff | blob | blame | history
src/codecs/ip/cd_ipv6.cc diff | blob | blame | history
src/codecs/link/cd_mpls.cc diff | blob | blame | history
src/main/modules.cc diff | blob | blame | history
src/main/snort_config.cc diff | blob | blame | history
src/main/snort_config.h diff | blob | blame | history
src/utils/stats.cc diff | blob | blame | history
src/utils/stats.h diff | blob | blame | history
Mirror of https://github.com/snort3/snort3.git