zeek/scripts/base/protocols
Robin Sommer eb637f9f3e Merge remote-tracking branch 'origin/master' into topic/robin/plugins
Thanks to git this merge was less troublesome that I was afraid it
would be. Not all tests pass yet though (and file hashes have changed
unfortunately).

Conflicts:
	cmake
	doc/scripts/DocSourcesList.cmake
	scripts/base/init-bare.bro
	scripts/base/protocols/ftp/main.bro
	scripts/base/protocols/irc/dcc-send.bro
	scripts/test-all-policy.bro
	src/AnalyzerTags.h
	src/CMakeLists.txt
	src/analyzer/Analyzer.cc
	src/analyzer/protocol/file/File.cc
	src/analyzer/protocol/file/File.h
	src/analyzer/protocol/http/HTTP.cc
	src/analyzer/protocol/http/HTTP.h
	src/analyzer/protocol/mime/MIME.cc
	src/event.bif
	src/main.cc
	src/util-config.h.in
	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/istate.events-ssl/receiver.http.log
	testing/btest/Baseline/istate.events-ssl/sender.http.log
	testing/btest/Baseline/istate.events/receiver.http.log
	testing/btest/Baseline/istate.events/sender.http.log
2013-05-16 17:58:48 -07:00
..
conn First prototype of new analyzer framework. 2013-03-26 11:05:38 -07:00
dns Removing legacy binpac analyzer for DNS and HTTP. 2013-04-03 13:40:45 -07:00
ftp Merge remote-tracking branch 'origin/master' into topic/robin/plugins 2013-05-16 17:58:48 -07:00
http Merge remote-tracking branch 'origin/master' into topic/robin/plugins 2013-05-16 17:58:48 -07:00
irc Merge remote-tracking branch 'origin/master' into topic/robin/plugins 2013-05-16 17:58:48 -07:00
modbus First prototype of new analyzer framework. 2013-03-26 11:05:38 -07:00
smtp Merge remote-tracking branch 'origin/master' into topic/robin/plugins 2013-05-16 17:58:48 -07:00
socks First prototype of new analyzer framework. 2013-03-26 11:05:38 -07:00
ssh Merge remote-tracking branch 'origin/master' into topic/robin/plugins 2013-05-16 17:58:48 -07:00
ssl First prototype of new analyzer framework. 2013-03-26 11:05:38 -07:00
syslog Porting syslog analyzer as another example. 2013-04-05 13:13:30 -07:00