diff --git a/doc/scripts/DocSourcesList.cmake b/doc/scripts/DocSourcesList.cmake index b127e1526d..01eeda5188 100644 --- a/doc/scripts/DocSourcesList.cmake +++ b/doc/scripts/DocSourcesList.cmake @@ -62,6 +62,7 @@ rest_target(${psd} base/frameworks/reporter/main.bro) rest_target(${psd} base/frameworks/signatures/main.bro) rest_target(${psd} base/frameworks/software/main.bro) rest_target(${psd} base/frameworks/tunnels/main.bro) +rest_target(${psd} base/misc/find-checksum-offloading.bro) rest_target(${psd} base/protocols/conn/contents.bro) rest_target(${psd} base/protocols/conn/inactivity.bro) rest_target(${psd} base/protocols/conn/main.bro) @@ -79,6 +80,8 @@ rest_target(${psd} base/protocols/http/main.bro) rest_target(${psd} base/protocols/http/utils.bro) rest_target(${psd} base/protocols/irc/dcc-send.bro) rest_target(${psd} base/protocols/irc/main.bro) +rest_target(${psd} base/protocols/modbus/consts.bro) +rest_target(${psd} base/protocols/modbus/main.bro) rest_target(${psd} base/protocols/smtp/entities-excerpt.bro) rest_target(${psd} base/protocols/smtp/entities.bro) rest_target(${psd} base/protocols/smtp/main.bro) @@ -134,6 +137,8 @@ rest_target(${psd} policy/protocols/http/software-browser-plugins.bro) rest_target(${psd} policy/protocols/http/software.bro) rest_target(${psd} policy/protocols/http/var-extraction-cookies.bro) rest_target(${psd} policy/protocols/http/var-extraction-uri.bro) +rest_target(${psd} policy/protocols/modbus/known-masters-slaves.bro) +rest_target(${psd} policy/protocols/modbus/track-memmap.bro) rest_target(${psd} policy/protocols/smtp/blocklists.bro) rest_target(${psd} policy/protocols/smtp/detect-suspicious-orig.bro) rest_target(${psd} policy/protocols/smtp/software.bro) diff --git a/scripts/base/protocols/modbus/main.bro b/scripts/base/protocols/modbus/main.bro index 291a20cdc3..aa11c5ce07 100644 --- a/scripts/base/protocols/modbus/main.bro +++ b/scripts/base/protocols/modbus/main.bro @@ -2,6 +2,8 @@ module Modbus; +@load ./consts + export { redef enum Log::ID += { LOG }; diff --git a/scripts/base/utils/patterns.bro b/scripts/base/utils/patterns.bro index 107eebce5b..f2a242b271 100644 --- a/scripts/base/utils/patterns.bro +++ b/scripts/base/utils/patterns.bro @@ -1,5 +1,7 @@ ##! Functions for creating and working with patterns. +module GLOBAL; + ## Given a pattern as a string with two tildes (~~) contained in it, it will ## return a pattern with string set's elements OR'd together where the ## double-tilde was given (this function only works at or before init time). diff --git a/scripts/policy/protocols/modbus/known-masters-slaves.bro b/scripts/policy/protocols/modbus/known-masters-slaves.bro index 07b689c340..b1544a48dd 100644 --- a/scripts/policy/protocols/modbus/known-masters-slaves.bro +++ b/scripts/policy/protocols/modbus/known-masters-slaves.bro @@ -4,6 +4,8 @@ ##! master/slave relationships based on commands sent and successful (non-exception) ##! responses. +@load base/protocols/modbus + module Known; export { diff --git a/scripts/policy/protocols/modbus/track-memmap.bro b/scripts/policy/protocols/modbus/track-memmap.bro index 7976537d8e..fc02d9b274 100644 --- a/scripts/policy/protocols/modbus/track-memmap.bro +++ b/scripts/policy/protocols/modbus/track-memmap.bro @@ -4,6 +4,9 @@ ##! .. todo: Not all register reads and write functions are being supported yet. module Modbus; +@load base/protocols/modbus +@load base/utils/directions-and-hosts + export { redef enum Log::ID += { Modbus::REGISTER_CHANGE_LOG }; diff --git a/scripts/test-all-policy.bro b/scripts/test-all-policy.bro index a7c43b14b3..94c9c04a69 100644 --- a/scripts/test-all-policy.bro +++ b/scripts/test-all-policy.bro @@ -44,6 +44,8 @@ @load protocols/http/software.bro @load protocols/http/var-extraction-cookies.bro @load protocols/http/var-extraction-uri.bro +@load protocols/modbus/known-masters-slaves.bro +@load protocols/modbus/track-memmap.bro @load protocols/smtp/blocklists.bro @load protocols/smtp/detect-suspicious-orig.bro @load protocols/smtp/software.bro diff --git a/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log b/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log index c3ee64cffe..939d85fdbe 100644 --- a/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log +++ b/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log @@ -3,7 +3,7 @@ #empty_field (empty) #unset_field - #path loaded_scripts -#open 2012-07-20-14-34-40 +#open 2012-11-05-23-29-45 #fields name #types string scripts/base/init-bare.bro @@ -99,6 +99,9 @@ scripts/base/init-default.bro scripts/base/protocols/irc/__load__.bro scripts/base/protocols/irc/./main.bro scripts/base/protocols/irc/./dcc-send.bro + scripts/base/protocols/modbus/__load__.bro + scripts/base/protocols/modbus/./consts.bro + scripts/base/protocols/modbus/./main.bro scripts/base/protocols/smtp/__load__.bro scripts/base/protocols/smtp/./main.bro scripts/base/protocols/smtp/./entities.bro @@ -111,5 +114,6 @@ scripts/base/init-default.bro scripts/base/protocols/syslog/__load__.bro scripts/base/protocols/syslog/./consts.bro scripts/base/protocols/syslog/./main.bro + scripts/base/misc/find-checksum-offloading.bro scripts/policy/misc/loaded-scripts.bro -#close 2012-07-20-14-34-40 +#close 2012-11-05-23-29-45