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

Merge branch 'master' into topic/robin/log-threads

Browse source 
Conflicts:
	cmake
This commit is contained in:
Jon Siwek 2012-03-30 12:02:32 -05:00
commit 256c0af98e
77 changed files with 1987 additions and 729 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Net.cc
View file

@ -42,7 +42,6 @@ extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
PList(PktSrc) pkt_srcs;
// FIXME: We should really merge PktDumper and PacketDumper.
// It's on my to-do [Robin].
PktDumper* pkt_dumper = 0;
int reading_live = 0;