Move file_analysis code to zeek namespaces

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

View file

@ -9,21 +9,22 @@
#include "Analyzer.h"
#include "unified2_pac.h"
namespace file_analysis {
namespace zeek::file_analysis::detail {
/**
* An analyzer to extract content of files from local disk.
*/
class Unified2 : public file_analysis::Analyzer {
class Unified2 : public zeek::file_analysis::Analyzer {
public:
~Unified2() override;
bool DeliverStream(const u_char* data, uint64_t len) override;
static file_analysis::Analyzer* Instantiate(zeek::RecordValPtr args, File* file);
static zeek::file_analysis::Analyzer* Instantiate(zeek::RecordValPtr args,
zeek::file_analysis::File* file);
protected:
Unified2(zeek::RecordValPtr args, File* file);
Unified2(zeek::RecordValPtr args, zeek::file_analysis::File* file);
private:
binpac::Unified2::Unified2_Analyzer* interp;
@ -31,4 +32,10 @@ private:
string filename;
};
} // namespace zeek::file_analysis::detail
namespace file_analysis {
using Unified2 [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::Unified2.")]] = zeek::file_analysis::detail::Unified2;
} // namespace file_analysis