Robin Sommer e050648621 Merge branch 'topic/robin/file-analysis-merge' ... Closes #982. * topic/robin/file-analysis-merge: (64 commits) A few more small tweaks. Various smalle tweaks in preparation for merging. FileAnalysis: load custom mime magic database just once. Improve a libmagic-related error message. FileAnalysis: add is_orig field to fa_file & Info. FileAnalysis: inlined doc fixes. FileAnalysis: optimizate connection set updating. FileAnalysis: optimize file handle construction. FileAnalysis: workarounds for older libmagics. FileAnalysis: add custom libmagic database. FileAnalysis: change terminology s/action/analyzer FileAnalysis: libmagic tweaks. FileAnalysis: add bif for setting timeout interval FileAnalysis: add more params to some events. FileAnalysis: insert explicit event queue flush points. FileAnalysis: remove some file events. FileAnalysis: finish switching hooks to events. FileAnalysis: checkpoint in middle of big reorganization. FileAnalysis: fix file type canonification for file_analysis.log Revert "FileAnalysis: optimize get_file_handle event queueing." ... Conflicts: NEWS		2013-05-15 15:14:21 -07:00
..
cluster	s/bro-ids.org/bro.org/g	2013-03-07 19:33:04 -08:00
communication	Merge remote-tracking branch 'vlad/info_record_fixes'	2012-07-13 16:20:49 -07:00
control	Enable Bro to communicate with peers over non-global IPv6 addresses.	2012-05-17 12:59:20 -05:00
dpd	Fixed some problems with the SOCKS analyzer and tests.	2012-06-20 22:57:46 -04:00
file-analysis	FileAnalysis: add is_orig field to fa_file & Info.	2013-04-23 10:50:43 -05:00
input	FileAnalysis: add binary input reader and BIFs for sending in data.	2013-03-06 12:59:54 -06:00
intel	Fix some warnings from sphinx when building docs.	2012-11-15 16:40:18 -06:00
logging	Merge remote-tracking branch 'origin/master' into topic/bernhard/input-logging-commmon-functions	2012-12-13 11:22:58 -08:00
notice	Merge remote-tracking branch 'origin/topic/seth/notice-framework-updates'	2013-03-06 16:45:30 -08:00
packet-filter	Checkpoint after pass.	2012-02-15 13:07:08 -08:00
reporter	Change reporter messages to more reliably print to stderr.	2013-01-18 12:46:00 -06:00
signatures	remove the byte_len and length bifs	2013-03-06 13:45:42 -08:00
software	Update software version parsing and comparison to account for a third numeric subversion.	2013-02-06 13:59:05 -05:00
sumstats	prevent merge-hook of sumstats unique plugin from damaging source data.	2013-05-07 11:16:59 -07:00
tunnels	Add parsing for GTPv1 extension headers and control messages.	2013-02-07 14:59:02 -06:00