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

Fixes for non-OSX.

Browse source
This commit is contained in:
Robin Sommer 2013-03-26 13:08:03 -07:00
parent af1809aaa3
commit eef4858692
10 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aux/bro-aux

@ -1 +1 @@
Subproject commit ae14da422bfb252c8a53bd00d3e5fd7da8bc112e Subproject commit 70681007546aad6e5648494e882b71adb9165105

2
aux/broctl

@ -1 +1 @@
Subproject commit 3e3ada3c2efebeda1278b8897859dd7c7d61e671 Subproject commit 2b35d0331366865fbf0119919cc9692d55c4538c

2
src/CMakeLists.txt
View file

@ -451,7 +451,7 @@ set(bro_SRCS
plugin/Plugin.cc plugin/Plugin.cc
analyzer/Analyzer.cc analyzer/Analyzer.cc
analyzer/BuiltinAnalyzers.cc analyzer/BuiltInAnalyzers.cc
analyzer/Manager.cc analyzer/Manager.cc
analyzer/PluginComponent.cc analyzer/PluginComponent.cc
analyzer/Tag.cc analyzer/Tag.cc

2
src/RuleAction.h
View file

@ -5,7 +5,7 @@
#include "List.h" #include "List.h"
#include "util.h" #include "util.h"
#include "analyzer/tag.h" #include "analyzer/Tag.h"
class Rule; class Rule;
class RuleEndpointState; class RuleEndpointState;

4
src/analyzer/Analyzer.h
View file

@ -258,10 +258,10 @@ public:
void Weird(const char* name, const char* addl = ""); void Weird(const char* name, const char* addl = "");
protected: protected:
friend class Connection;
friend class AnalyzerTimer; friend class AnalyzerTimer;
friend class TCP_ApplicationAnalyzer;
friend class Manager; friend class Manager;
friend class ::Connection;
friend class ::TCP_ApplicationAnalyzer;
// Associates a connection with this analyzer. Must be called if // Associates a connection with this analyzer. Must be called if
// we're using the default ctor. // we're using the default ctor.

0
src/analyzer/BuiltinAnalyzers.cc → src/analyzer/BuiltInAnalyzers.cc
View file

0
src/analyzer/BuiltinAnalyzers.h → src/analyzer/BuiltInAnalyzers.h
View file

8
src/analyzer/Manager.h
View file

@ -5,10 +5,10 @@
#include <queue> #include <queue>
#include "Tag.h"
#include "PluginComponent.h"
#include "Analyzer.h" #include "Analyzer.h"
#include "PluginComponent.h"
#include "Tag.h"
#include "../Dict.h" #include "../Dict.h"
#include "../net_util.h" #include "../net_util.h"
#include "../IP.h" #include "../IP.h"
@ -112,7 +112,7 @@ public:
// as a wildcard for orig. (Cookie is currently unused. Eventually, // as a wildcard for orig. (Cookie is currently unused. Eventually,
// we may pass it on to the analyzer). // we may pass it on to the analyzer).
void ExpectConnection(const IPAddr& orig, const IPAddr& resp, uint16 resp_p, void ExpectConnection(const IPAddr& orig, const IPAddr& resp, uint16 resp_p,
TransportProto proto, Tag::Tag analyzer, TransportProto proto, Tag analyzer,
double timeout, void* cookie); double timeout, void* cookie);
void ExpectConnection(const IPAddr& orig, const IPAddr& resp, uint16 resp_p, void ExpectConnection(const IPAddr& orig, const IPAddr& resp, uint16 resp_p,

3
src/main.cc
View file

@ -56,8 +56,9 @@ extern "C" void OPENSSL_add_all_algorithms_conf(void);
#include "input/Manager.h" #include "input/Manager.h"
#include "logging/Manager.h" #include "logging/Manager.h"
#include "logging/writers/Ascii.h" #include "logging/writers/Ascii.h"
#include "analyzer/BuiltinAnalyzers.h" #include "analyzer/BuiltInAnalyzers.h"
#include "analyzer/Manager.h" #include "analyzer/Manager.h"
#include "analyzer/Tag.h"
#include "plugin/Manager.h" #include "plugin/Manager.h"
#include "binpac_bro.h" #include "binpac_bro.h"

2
src/scan.l
View file

@ -26,7 +26,7 @@
#include "RE.h" #include "RE.h"
#include "Net.h" #include "Net.h"
#include "analyzer/analyzer.h" #include "analyzer/Analyzer.h"
extern YYLTYPE yylloc; // holds start line and column of token extern YYLTYPE yylloc; // holds start line and column of token
extern int print_loaded_scripts; extern int print_loaded_scripts;