Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 15:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/robin/log-threads' into topic/bernhard/input-threads

Browse source 
(and move a little bit of functionality from ascii reader to backend)

Conflicts:
	src/threading/Manager.cc
This commit is contained in:
Bernhard Amann 2012-03-07 13:42:49 -08:00
commit 7076c64a5e
54 changed files with 594 additions and 1693 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/NetVar.h
View file

@ -216,11 +216,6 @@ extern int sig_max_group_size;
extern int enable_syslog;
extern int use_connection_compressor;
extern int cc_handle_resets;
extern int cc_handle_only_syns;
extern int cc_instantiate_on_data;
extern TableType* irc_join_list;
extern RecordType* irc_join_info;
extern TableVal* irc_servers;