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

Remove value serialization.

Browse source 
Note - this compiles, but you cannot run Bro anymore - it crashes
immediately with a 0-pointer access. The reason behind it is that the
required clone functionality does not work anymore.
This commit is contained in:
Johanna Amann 2019-05-09 11:52:51 -07:00
parent 9b49c7cbc6
commit 474efe9e69
78 changed files with 58 additions and 9185 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/main.cc
View file

@ -38,7 +38,6 @@ extern "C" {
#include "DFA.h"
#include "RuleMatcher.h"
#include "Anon.h"
#include "Serializer.h"
#include "EventRegistry.h"
#include "Stats.h"
#include "Brofiler.h"
@ -99,9 +98,9 @@ name_list prefixes;
Stmt* stmts;
EventHandlerPtr net_done = 0;
RuleMatcher* rule_matcher = 0;
FileSerializer* event_serializer = 0;
FileSerializer* state_serializer = 0;
EventPlayer* event_player = 0;
// Fixme: Johanna
// FileSerializer* event_serializer = 0;
// EventPlayer* event_player = 0;
EventRegistry* event_registry = 0;
ProfileLogger* profiling_logger = 0;
ProfileLogger* segment_logger = 0;
@ -171,7 +170,6 @@ void usage(int code = 1)
fprintf(stderr, " -t|--tracefile <tracefile> | activate execution tracing\n");
fprintf(stderr, " -v|--version | print version and exit\n");
fprintf(stderr, " -w|--writefile <writefile> | write to given tcpdump file\n");
fprintf(stderr, " -x|--print-state <file.bst> | print contents of state file\n");
#ifdef DEBUG
fprintf(stderr, " -B|--debug <dbgstreams> | Enable debugging output for selected streams ('-B help' for help)\n");
#endif
@ -353,8 +351,8 @@ void terminate_bro()
delete zeekygen_mgr;
delete timer_mgr;
delete event_serializer;
delete state_serializer;
// Fixme: johanna
// delete event_serializer;
delete event_registry;
delete analyzer_mgr;
delete file_mgr;
@ -424,7 +422,6 @@ int main(int argc, char** argv)
name_list interfaces;
name_list read_files;
name_list rule_files;
char* bst_file = 0;
char* id_name = 0;
char* events_file = 0;
char* seed_load_file = getenv("BRO_SEED_FILE");
@ -455,7 +452,6 @@ int main(int argc, char** argv)
{"tracefile", required_argument, 0, 't'},
{"writefile", required_argument, 0, 'w'},
{"version", no_argument, 0, 'v'},
{"print-state", required_argument, 0, 'x'},
{"no-checksums", no_argument, 0, 'C'},
{"force-dns", no_argument, 0, 'F'},
{"load-seeds", required_argument, 0, 'G'},
@ -578,10 +574,6 @@ int main(int argc, char** argv)
writefile = optarg;
break;
case 'x':
bst_file = optarg;
break;
case 'B':
debug_streams = optarg;
break;
@ -744,7 +736,7 @@ int main(int argc, char** argv)
if ( optind == argc &&
read_files.length() == 0 &&
interfaces.length() == 0 &&
! (id_name || bst_file) && ! command_line_policy && ! print_plugins )
! id_name && ! command_line_policy && ! print_plugins )
add_input_file("-");
// Process remaining arguments. X=Y arguments indicate script
@ -796,8 +788,9 @@ int main(int argc, char** argv)
plugin_mgr->ActivateDynamicPlugins(! bare_mode);
if ( events_file )
event_player = new EventPlayer(events_file);
// Fixme: Johanna
// if ( events_file )
// event_player = new EventPlayer(events_file);
init_event_handlers();
@ -972,19 +965,6 @@ int main(int argc, char** argv)
exit(0);
}
// Just read state file from disk.
if ( bst_file )
{
FileSerializer s;
UnserialInfo info(&s);
info.print = stdout;
info.install_uniques = true;
if ( ! s.Read(&info, bst_file) )
reporter->Error("Failed to read events from %s\n", bst_file);
exit(0);
}
// Print the ID.
if ( id_name )
{