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

Merge branch 'master' into topic/tunnels

Browse source 
Conflicts:
	scripts/base/init-bare.bro
This commit is contained in:
Jon Siwek 2012-06-06 14:53:57 -05:00
commit 9ddb70b109
154 changed files with 1900 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/base/frameworks/dpd/main.bro
View file

@ -3,8 +3,7 @@
module DPD;
## Add the DPD signatures to the signature framework.
redef signature_files += "base/frameworks/dpd/dpd.sig";
@load-sigs ./dpd.sig
export {
## Add the DPD logging stream identifier.