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

Move file_analysis code to zeek namespaces

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-08-01 10:47:36 -07:00
parent 8411adf9e1
commit 14408235b8
66 changed files with 554 additions and 410 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/file_analysis/Component.h
View file

@ -13,11 +13,11 @@ namespace zeek {
using RecordValPtr = zeek::IntrusivePtr<RecordVal>;
}
namespace file_analysis {
ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis);
ZEEK_FORWARD_DECLARE_NAMESPACED(Analyzer, zeek, file_analysis);
ZEEK_FORWARD_DECLARE_NAMESPACED(Manager, zeek, file_analysis);
class File;
class Analyzer;
class Manager;
namespace zeek::file_analysis {
/**
* Component description for plugins providing file analyzers.
@ -26,7 +26,7 @@ class Manager;
* analyzer component, describing the analyzer.
*/
class Component : public zeek::plugin::Component,
public plugin::TaggedComponent<file_analysis::Tag> {
public zeek::plugin::TaggedComponent<file_analysis::Tag> {
public:
typedef Analyzer* (*factory_callback)(zeek::RecordVal* args, File* file);
using factory_function = Analyzer* (*)(zeek::RecordValPtr args, File* file);
@ -83,10 +83,14 @@ protected:
void DoDescribe(zeek::ODesc* d) const override;
private:
friend class file_analysis::Manager;
friend class zeek::file_analysis::Manager;
factory_callback factory; // The analyzer's factory callback (deprecated).
factory_function factory_func; // The analyzer's factory callback.
};
}
} // namespace zeek::file_analysis
namespace file_analysis {
using Component [[deprecated("Remove in v4.1. Use zeek::file_analysis::Component.")]] = zeek::file_analysis::Component;
} // namespace file_analysis