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

Merge remote-tracking branch 'origin/fastpath'

Browse source 
* origin/fastpath:
  Fix some warnings from sphinx when building docs.
This commit is contained in:
Robin Sommer 2012-11-23 18:21:32 -08:00
commit 0096ebdd6b
5 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.1-169 | 2012-11-23 18:21:32 -0800
* Fix some warnings from sphinx when building docs. (Jon Siwek)
2.1-167 | 2012-11-14 13:19:17 -0800 2.1-167 | 2012-11-14 13:19:17 -0800
* Add a new BIF "bytestring_to_double" for converting from a binary * Add a new BIF "bytestring_to_double" for converting from a binary

2
VERSION
View file

@ -1 +1 @@
2.1-167 2.1-169

4
scripts/base/frameworks/intel/main.bro
View file

@ -59,7 +59,7 @@ export {
}; };
## Enum to represent where data came from when it was discovered. ## Enum to represent where data came from when it was discovered.
## The convenction is to prefix the name with "IN_". ## The convention is to prefix the name with ``IN_``.
type Where: enum { type Where: enum {
## A catchall value to represent data of unknown provenance. ## A catchall value to represent data of unknown provenance.
IN_ANYWHERE, IN_ANYWHERE,
@ -342,4 +342,4 @@ function insert(item: Item)
else else
event Intel::new_item(item); event Intel::new_item(item);
} }

10
scripts/policy/integration/collective-intel/README
View file

@ -1,6 +1,4 @@
Collective Intelligence Framework Integration The scripts in this module are for deeper integration with the
============================================= Collective Intelligence Framework (CIF) since Bro's Intel framework
doesn't natively behave the same as CIF nor does it store and maintain
The scripts in this module are for deeper integration with the Collective Intelligence the same data in all cases.
Framework (CIF) since Bro's Intel framework doesn't natively behave the same as CIF nor
does it store and maintain the same data in all cases.

3
scripts/policy/protocols/modbus/track-memmap.bro
View file

@ -2,11 +2,12 @@
##! changes as they are discovered. ##! changes as they are discovered.
##! ##!
##! .. todo: Not all register reads and write functions are being supported yet. ##! .. todo: Not all register reads and write functions are being supported yet.
module Modbus;
@load base/protocols/modbus @load base/protocols/modbus
@load base/utils/directions-and-hosts @load base/utils/directions-and-hosts
module Modbus;
export { export {
redef enum Log::ID += { Modbus::REGISTER_CHANGE_LOG }; redef enum Log::ID += { Modbus::REGISTER_CHANGE_LOG };