Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-13 03:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into topic/tunnels

Browse source 
Conflicts:
	scripts/base/init-bare.bro
	src/Conn.cc
	src/Conn.h
	src/Sessions.cc
	src/Sessions.h
	src/const.bif
	src/types.bif
This commit is contained in:
Jon Siwek 2012-05-31 16:13:14 -05:00
commit 9fb0065696
147 changed files with 10008 additions and 405 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/types.bif
View file

@ -169,7 +169,6 @@ enum ID %{
Unknown,
%}
module Tunnel;
enum Type %{
NONE,
@ -181,4 +180,25 @@ enum Type %{
type EncapsulatingConn: record;
module Input;
enum Reader %{
READER_DEFAULT,
READER_ASCII,
READER_RAW,
READER_BENCHMARK,
%}
enum Event %{
EVENT_NEW,
EVENT_CHANGED,
EVENT_REMOVED,
%}
enum Mode %{
MANUAL = 0,
REREAD = 1,
STREAM = 2,
%}
module GLOBAL;