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

file_analysis/Manager: Remove RunState.h include

Browse source 
The file_analysis/Manager.h header only needs run_state::terminating, so
declare just that similar to what Val.h does. This breaks ZBody compilation
due to OP_READING_LIVE_TRAFFIC_V and OP_READING_TRACES_V accessing
run-state::reading_live and run_state::reading_traces. Add the include to
ZBody.cc as a fix.

This may break external plugins, too, but then they didn't have the
right includes setup to begin with.
This commit is contained in:
Arne Welzel 2023-04-19 15:47:29 +02:00
parent 89c828ac14
commit ed169b537c
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/file_analysis/Manager.h
View file

@ -7,7 +7,6 @@
#include <string> #include <string>
#include "zeek/RuleMatcher.h" #include "zeek/RuleMatcher.h"
#include "zeek/RunState.h"
#include "zeek/Tag.h" #include "zeek/Tag.h"
#include "zeek/file_analysis/Component.h" #include "zeek/file_analysis/Component.h"
#include "zeek/file_analysis/FileTimer.h" #include "zeek/file_analysis/FileTimer.h"
@ -19,6 +18,13 @@ namespace zeek
class TableVal; class TableVal;
class VectorVal; class VectorVal;
namespace run_state
{
extern bool terminating;
} // namespace run_state
namespace analyzer namespace analyzer
{ {

3
src/script_opt/ZAM/ZBody.cc
View file

@ -23,6 +23,9 @@
#include "zeek/logging/Manager.h" #include "zeek/logging/Manager.h"
#include "zeek/packet_analysis/Manager.h" #include "zeek/packet_analysis/Manager.h"
// For reading_live and reading_traces
#include "zeek/RunState.h"
namespace zeek::detail namespace zeek::detail
{ {