Merge branch 'topic/tunnels' of ssh://git.bro-ids.org/bro into topic/tunnels

This commit is contained in:
Seth Hall 2012-04-24 17:30:57 -04:00
commit ad55331258
4 changed files with 2 additions and 14 deletions

View file

@ -2629,10 +2629,8 @@ const ignore_keep_alive_rexmit = F &redef;
module Tunnel;
export {
## Whether to decapsulate IP tunnels (IPinIP, 6in4, 6to4)
const decapsulate_ip = T &redef;
## The maximum depth of a tunnel to decapsulate until giving up.
## Setting this to zero will disable tunnel decapsulation.
const max_depth: count = 2 &redef;
} # end export
module GLOBAL;