Merge remote-tracking branch 'origin/topic/jsiwek/reorg-followup'

2025-10-11 19:18:19 +00:00 · 2011-08-25 16:44:31 -04:00 · 2011-08-25 16:44:31 -04:00 · fc5f22cb5d
commit fc5f22cb5d
parent 562abfb0d1 e37430ef66
234 changed files with 295 additions and 104 deletions
--- a/scripts/base/protocols/mime/load.bro
+++ b/scripts/base/protocols/mime/load.bro
@ -1,4 +1,4 @@
-@load protocols/mime/base
-@load protocols/mime/file-ident
-@load protocols/mime/file-extract
-@load protocols/mime/file-hash
+@load ./main
+@load ./file-ident
+@load ./file-extract
+@load ./file-hash
--- a/scripts/base/protocols/mime/file-hash.bro
+++ b/scripts/base/protocols/mime/file-hash.bro
@ -1,4 +1,5 @@
@load ./file-ident
+@load base/frameworks/notice

 module MIME;

--- a/scripts/base/protocols/mime/file-ident.bro
+++ b/scripts/base/protocols/mime/file-ident.bro
@ -1,4 +1,4 @@
-@load ./base
+@load ./main

 module MIME;

--- a/scripts/base/protocols/mime/main.bro
+++ b/scripts/base/protocols/mime/main.bro