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

Merge remote-tracking branch 'origin/topic/timw/1079-zeek-includes'

Browse source 
* origin/topic/timw/1079-zeek-includes:
  Move 'using namespace' declaration after other includes
  Use binpac.h as if it was an external dependency
  Fix includes of bif.h and _pac.h files to use full paths inside build directory
  Remove unnecessary include of NetVar.h from packet analysis plugins
  GH-1079: Use full paths starting with zeek/ when including files
This commit is contained in:
Tim Wojtulewicz 2020-11-12 12:16:00 -07:00
commit c10bcc7116
662 changed files with 2910 additions and 2878 deletions
Download patch file Download diff file Expand all files Collapse all files

35
CHANGES
View file

@ -1,3 +1,38 @@
3.3.0-dev.524 | 2020-11-12 12:16:00 -0700
* Move 'using namespace' declaration after other includes (Tim Wojtulewicz, Corelight)
* Use binpac.h as if it was an external dependency (Tim Wojtulewicz, Corelight)
* Fix includes of bif.h and _pac.h files to use full paths inside build directory (Tim Wojtulewicz, Corelight)
* Remove unnecessary include of NetVar.h from packet analysis plugins (Tim Wojtulewicz, Corelight)
* GH-1079: Use full paths starting with zeek/ when including files (Tim Wojtulewicz, Corelight)
* Fix type clash fatal error with log filters that use $ext_func and $include/$exclude
The logging manager's Manager::TraverseRecord(), called when adding a
log filter to a stream, skipped any fields intoduced by a filter's
$ext_func when such fields weren't mentioned in a $include restriction
or mentioned in an $exclude restriction. This was inconsistent with
Manager::RecordToFilterVals, used when actually writing log entries,
which does include those values.
The result was that the record indices descent in Manager::RecordToFilterVals
expects to find only record values, when in fact only the record
provided by ext_func is present. This leads to type mismatches and
hard Zeek exits like this one:
1300475173.475401 fatal error in zeek/share/zeek//base/init-bare.zeek, line 4810: Val::CONVERTER (string/record) (zeek)
The fix makes ext_func's field additions decisive, meaning the
filter's include/exclude lists don't apply to it. If a user really
wants to override this, they can reset the filter's ext_func back to
our no-op default.
The included btest produces the above error when the fix is not present. (Christian Kreibich, Corelight)
3.3.0-dev.516 | 2020-11-11 12:53:02 -0700 3.3.0-dev.516 | 2020-11-11 12:53:02 -0700
* Support for additional DNS RR Type: LOC[29], SSHFP[44], NSEC3PARAM[51], custom BIND9 signaling[65534] (Fatema BW) * Support for additional DNS RR Type: LOC[29], SSHFP[44], NSEC3PARAM[51], custom BIND9 signaling[65534] (Fatema BW)

2
VERSION
View file

@ -1 +1 @@
3.3.0-dev.516 3.3.0-dev.524

20
src/Anon.cc
View file

@ -1,19 +1,19 @@
#include "Anon.h" #include "zeek/Anon.h"
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <assert.h> #include <assert.h>
#include <sys/time.h> #include <sys/time.h>
#include "util.h" #include "zeek/util.h"
#include "net_util.h" #include "zeek/net_util.h"
#include "Val.h" #include "zeek/Val.h"
#include "NetVar.h" #include "zeek/NetVar.h"
#include "Reporter.h" #include "zeek/Reporter.h"
#include "Scope.h" #include "zeek/Scope.h"
#include "ID.h" #include "zeek/ID.h"
#include "IPAddr.h" #include "zeek/IPAddr.h"
#include "Event.h" #include "zeek/Event.h"
namespace zeek::detail { namespace zeek::detail {

14
src/Attr.cc
View file

@ -2,13 +2,13 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "Attr.h" #include "zeek/Attr.h"
#include "Expr.h" #include "zeek/Expr.h"
#include "Desc.h" #include "zeek/Desc.h"
#include "Val.h" #include "zeek/Val.h"
#include "IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
#include "input/Manager.h" #include "zeek/input/Manager.h"
#include "threading/SerialTypes.h" #include "zeek/threading/SerialTypes.h"
namespace zeek::detail { namespace zeek::detail {

6
src/Attr.h
View file

@ -5,9 +5,9 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "Obj.h" #include "zeek/Obj.h"
#include "ZeekList.h" #include "zeek/ZeekList.h"
#include "IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail);

9
src/Base64.cc
View file

@ -1,11 +1,12 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "Base64.h"
#include "ZeekString.h"
#include "Reporter.h"
#include "Conn.h"
#include <math.h> #include <math.h>
#include "zeek/Base64.h"
#include "zeek/ZeekString.h"
#include "zeek/Reporter.h"
#include "zeek/Conn.h"
namespace zeek::detail { namespace zeek::detail {
int Base64Converter::default_base64_table[256]; int Base64Converter::default_base64_table[256];

4
src/BifReturnVal.cc
View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "BifReturnVal.h" #include "zeek/BifReturnVal.h"
#include "Val.h" #include "zeek/Val.h"
namespace zeek::detail { namespace zeek::detail {

2
src/BifReturnVal.h
View file

@ -3,7 +3,7 @@
#pragma once #pragma once
#include "zeek-config.h" #include "zeek-config.h"
#include "IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek);
namespace zeek { namespace zeek {

2
src/BroList.h
View file

@ -1,2 +1,2 @@
#warning "BroList.h is deprecated and will be removed in v4.1. Use ZeekList.h instead." #warning "BroList.h is deprecated and will be removed in v4.1. Use ZeekList.h instead."
#include "ZeekList.h" #include "zeek/ZeekList.h"

2
src/BroString.h
View file

@ -1,2 +1,2 @@
#warning "BroString.h is deprecated and will be removed in v4.1. Use ZeekString.h instead." #warning "BroString.h is deprecated and will be removed in v4.1. Use ZeekString.h instead."
#include "ZeekString.h" #include "zeek/ZeekString.h"

6
src/CCL.cc
View file

@ -1,12 +1,12 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "zeek/CCL.h"
#include <algorithm> #include <algorithm>
#include "CCL.h" #include "zeek/RE.h"
#include "RE.h" #include "zeek/DFA.h"
#include "DFA.h"
namespace zeek::detail { namespace zeek::detail {

16
src/CompHash.cc
View file

@ -1,19 +1,19 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "zeek/CompHash.h"
#include <cstring> #include <cstring>
#include <vector> #include <vector>
#include <map> #include <map>
#include "CompHash.h" #include "zeek/ZeekString.h"
#include "ZeekString.h" #include "zeek/Dict.h"
#include "Dict.h" #include "zeek/Val.h"
#include "Val.h" #include "zeek/RE.h"
#include "RE.h" #include "zeek/Reporter.h"
#include "Reporter.h" #include "zeek/Func.h"
#include "Func.h" #include "zeek/IPAddr.h"
#include "IPAddr.h"
namespace zeek::detail { namespace zeek::detail {

4
src/CompHash.h
View file

@ -4,8 +4,8 @@
#include <memory> #include <memory>
#include "Type.h" #include "zeek/Type.h"
#include "IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(ListVal, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(ListVal, zeek);
ZEEK_FORWARD_DECLARE_NAMESPACED(HashKey, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(HashKey, zeek::detail);

31
src/Conn.cc
View file

@ -1,25 +1,24 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "zeek/Conn.h"
#include "Conn.h"
#include <ctype.h> #include <ctype.h>
#include <binpac.h>
#include "Desc.h" #include "zeek/Desc.h"
#include "RunState.h" #include "zeek/RunState.h"
#include "NetVar.h" #include "zeek/NetVar.h"
#include "Event.h" #include "zeek/Event.h"
#include "Sessions.h" #include "zeek/Sessions.h"
#include "Reporter.h" #include "zeek/Reporter.h"
#include "Timer.h" #include "zeek/Timer.h"
#include "iosource/IOSource.h" #include "zeek/iosource/IOSource.h"
#include "analyzer/protocol/pia/PIA.h" #include "zeek/analyzer/protocol/pia/PIA.h"
#include "binpac.h" #include "zeek/TunnelEncapsulation.h"
#include "TunnelEncapsulation.h" #include "zeek/analyzer/Analyzer.h"
#include "analyzer/Analyzer.h" #include "zeek/analyzer/Manager.h"
#include "analyzer/Manager.h" #include "zeek/iosource/IOSource.h"
#include "iosource/IOSource.h"
namespace zeek { namespace zeek {
namespace detail { namespace detail {

22
src/Conn.h
View file

@ -8,18 +8,18 @@
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>
#include "Dict.h" #include "zeek/Dict.h"
#include "Timer.h" #include "zeek/Timer.h"
#include "Rule.h" #include "zeek/Rule.h"
#include "IPAddr.h" #include "zeek/IPAddr.h"
#include "UID.h" #include "zeek/UID.h"
#include "WeirdState.h" #include "zeek/WeirdState.h"
#include "ZeekArgs.h" #include "zeek/ZeekArgs.h"
#include "IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
#include "iosource/Packet.h" #include "zeek/iosource/Packet.h"
#include "analyzer/Tag.h" #include "zeek/analyzer/Tag.h"
#include "analyzer/Analyzer.h" #include "zeek/analyzer/Analyzer.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Connection, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(Connection, zeek);
ZEEK_FORWARD_DECLARE_NAMESPACED(ConnectionTimer, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(ConnectionTimer, zeek::detail);

2
src/Continuation.h
View file

@ -8,7 +8,7 @@
#pragma once #pragma once
#include "List.h" #include "zeek/List.h"
class Continuation { class Continuation {
public: public:

30
src/ConvertUTF.c
View file

@ -55,9 +55,9 @@
*===------------------------------------------------------------------------=*/ *===------------------------------------------------------------------------=*/
/* /*
* Copyright 2001-2004 Unicode, Inc. * Copyright 2001-2004 Unicode, Inc.
* *
* Disclaimer * Disclaimer
* *
* This source code is provided as is by Unicode, Inc. No claims are * This source code is provided as is by Unicode, Inc. No claims are
* made as to fitness for any particular purpose. No warranties of any * made as to fitness for any particular purpose. No warranties of any
* kind are expressed or implied. The recipient agrees to determine * kind are expressed or implied. The recipient agrees to determine
@ -65,9 +65,9 @@
* purchased on magnetic or optical media from Unicode, Inc., the * purchased on magnetic or optical media from Unicode, Inc., the
* sole remedy for any claim will be exchange of defective media * sole remedy for any claim will be exchange of defective media
* within 90 days of receipt. * within 90 days of receipt.
* *
* Limitations on Rights to Redistribute This Code * Limitations on Rights to Redistribute This Code
* *
* Unicode, Inc. hereby grants the right to freely use the information * Unicode, Inc. hereby grants the right to freely use the information
* supplied in this file in the creation of products supporting the * supplied in this file in the creation of products supporting the
* Unicode Standard, and to make copies of this file in any form * Unicode Standard, and to make copies of this file in any form
@ -94,7 +94,7 @@
------------------------------------------------------------------------ */ ------------------------------------------------------------------------ */
#include "ConvertUTF.h" #include "zeek/ConvertUTF.h"
#ifdef CVTUTF_DEBUG #ifdef CVTUTF_DEBUG
#include <stdio.h> #include <stdio.h>
#endif #endif
@ -137,7 +137,7 @@ static const char trailingBytesForUTF8[256] = {
* This table contains as many values as there might be trailing bytes * This table contains as many values as there might be trailing bytes
* in a UTF-8 sequence. * in a UTF-8 sequence.
*/ */
static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL, static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
0x03C82080UL, 0xFA082080UL, 0x82082080UL }; 0x03C82080UL, 0xFA082080UL, 0x82082080UL };
/* /*
@ -163,7 +163,7 @@ static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
ConversionResult ConvertUTF32toUTF16 ( ConversionResult ConvertUTF32toUTF16 (
const UTF32** sourceStart, const UTF32* sourceEnd, const UTF32** sourceStart, const UTF32* sourceEnd,
UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) { UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
ConversionResult result = conversionOK; ConversionResult result = conversionOK;
const UTF32* source = *sourceStart; const UTF32* source = *sourceStart;
@ -212,7 +212,7 @@ ConversionResult ConvertUTF32toUTF16 (
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
ConversionResult ConvertUTF16toUTF32 ( ConversionResult ConvertUTF16toUTF32 (
const UTF16** sourceStart, const UTF16* sourceEnd, const UTF16** sourceStart, const UTF16* sourceEnd,
UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) { UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
ConversionResult result = conversionOK; ConversionResult result = conversionOK;
const UTF16* source = *sourceStart; const UTF16* source = *sourceStart;
@ -266,7 +266,7 @@ if (result == sourceIllegal) {
return result; return result;
} }
ConversionResult ConvertUTF16toUTF8 ( ConversionResult ConvertUTF16toUTF8 (
const UTF16** sourceStart, const UTF16* sourceEnd, const UTF16** sourceStart, const UTF16* sourceEnd,
UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) { UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
ConversionResult result = conversionOK; ConversionResult result = conversionOK;
const UTF16* source = *sourceStart; const UTF16* source = *sourceStart;
@ -275,7 +275,7 @@ ConversionResult ConvertUTF16toUTF8 (
UTF32 ch; UTF32 ch;
unsigned short bytesToWrite = 0; unsigned short bytesToWrite = 0;
const UTF32 byteMask = 0xBF; const UTF32 byteMask = 0xBF;
const UTF32 byteMark = 0x80; const UTF32 byteMark = 0x80;
const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */ const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
ch = *source++; ch = *source++;
/* If we have a surrogate pair, convert to UTF32 first. */ /* If we have a surrogate pair, convert to UTF32 first. */
@ -336,7 +336,7 @@ ConversionResult ConvertUTF16toUTF8 (
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
ConversionResult ConvertUTF32toUTF8 ( ConversionResult ConvertUTF32toUTF8 (
const UTF32** sourceStart, const UTF32* sourceEnd, const UTF32** sourceStart, const UTF32* sourceEnd,
UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) { UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
ConversionResult result = conversionOK; ConversionResult result = conversionOK;
const UTF32* source = *sourceStart; const UTF32* source = *sourceStart;
@ -345,7 +345,7 @@ ConversionResult ConvertUTF32toUTF8 (
UTF32 ch; UTF32 ch;
unsigned short bytesToWrite = 0; unsigned short bytesToWrite = 0;
const UTF32 byteMask = 0xBF; const UTF32 byteMask = 0xBF;
const UTF32 byteMark = 0x80; const UTF32 byteMark = 0x80;
ch = *source++; ch = *source++;
if (flags == strictConversion ) { if (flags == strictConversion ) {
/* UTF-16 surrogate values are illegal in UTF-32 */ /* UTF-16 surrogate values are illegal in UTF-32 */
@ -367,7 +367,7 @@ ConversionResult ConvertUTF32toUTF8 (
ch = UNI_REPLACEMENT_CHAR; ch = UNI_REPLACEMENT_CHAR;
result = sourceIllegal; result = sourceIllegal;
} }
target += bytesToWrite; target += bytesToWrite;
if (target > targetEnd) { if (target > targetEnd) {
--source; /* Back up source pointer! */ --source; /* Back up source pointer! */
@ -560,7 +560,7 @@ Boolean isLegalUTF8String(const UTF8 **source, const UTF8 *sourceEnd) {
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
ConversionResult ConvertUTF8toUTF16 ( ConversionResult ConvertUTF8toUTF16 (
const UTF8** sourceStart, const UTF8* sourceEnd, const UTF8** sourceStart, const UTF8* sourceEnd,
UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) { UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
ConversionResult result = conversionOK; ConversionResult result = conversionOK;
const UTF8* source = *sourceStart; const UTF8* source = *sourceStart;
@ -633,7 +633,7 @@ ConversionResult ConvertUTF8toUTF16 (
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
static ConversionResult ConvertUTF8toUTF32Impl( static ConversionResult ConvertUTF8toUTF32Impl(
const UTF8** sourceStart, const UTF8* sourceEnd, const UTF8** sourceStart, const UTF8* sourceEnd,
UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags, UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags,
Boolean InputIsPartial) { Boolean InputIsPartial) {
ConversionResult result = conversionOK; ConversionResult result = conversionOK;

8
src/DFA.cc
View file

@ -2,10 +2,10 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "DFA.h" #include "zeek/DFA.h"
#include "EquivClass.h" #include "zeek/EquivClass.h"
#include "Desc.h" #include "zeek/Desc.h"
#include "Hash.h" #include "zeek/Hash.h"
namespace zeek::detail { namespace zeek::detail {

11
src/DFA.h
View file

@ -3,15 +3,14 @@
#pragma once #pragma once
#include <assert.h>
#include <sys/types.h> // for u_char
#include <map> #include <map>
#include <string> #include <string>
#include <assert.h> #include "zeek/NFA.h"
#include <sys/types.h> // for u_char #include "zeek/RE.h" // for typedef AcceptingSet
#include "zeek/Obj.h"
#include "NFA.h"
#include "RE.h" // for typedef AcceptingSet
#include "Obj.h"
namespace zeek::detail { namespace zeek::detail {

28
src/DNS_Mgr.cc
View file

@ -1,8 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "zeek/DNS_Mgr.h"
#include "DNS_Mgr.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -31,24 +30,23 @@
#include <algorithm> #include <algorithm>
#include "ZeekString.h" #include "zeek/ZeekString.h"
#include "Expr.h" #include "zeek/Expr.h"
#include "Event.h" #include "zeek/Event.h"
#include "RunState.h" #include "zeek/RunState.h"
#include "Val.h" #include "zeek/Val.h"
#include "NetVar.h" #include "zeek/NetVar.h"
#include "ID.h" #include "zeek/ID.h"
#include "Reporter.h" #include "zeek/Reporter.h"
#include "IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
#include "iosource/Manager.h" #include "zeek/iosource/Manager.h"
#include "Hash.h" #include "zeek/Hash.h"
extern "C" { extern "C" {
extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *); extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
#include <netdb.h> #include <netdb.h>
#include "zeek/nb_dns.h"
#include "nb_dns.h"
} }
using namespace std; using namespace std;

10
src/DNS_Mgr.h
View file

@ -7,11 +7,11 @@
#include <queue> #include <queue>
#include <utility> #include <utility>
#include "List.h" #include "zeek/List.h"
#include "EventHandler.h" #include "zeek/EventHandler.h"
#include "iosource/IOSource.h" #include "zeek/iosource/IOSource.h"
#include "IPAddr.h" #include "zeek/IPAddr.h"
#include "util.h" #include "zeek/util.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(EventHandler, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(EventHandler, zeek);
ZEEK_FORWARD_DECLARE_NAMESPACED(DNS_Mgr_Request, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(DNS_Mgr_Request, zeek::detail);

26
src/DbgBreakpoint.cc
View file

@ -2,22 +2,22 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "DbgBreakpoint.h" #include "zeek/DbgBreakpoint.h"
#include <assert.h> #include <assert.h>
#include "Desc.h" #include "zeek/Desc.h"
#include "ID.h" #include "zeek/ID.h"
#include "Queue.h" #include "zeek/Queue.h"
#include "Debug.h" #include "zeek/Debug.h"
#include "Scope.h" #include "zeek/Scope.h"
#include "Frame.h" #include "zeek/Frame.h"
#include "Func.h" #include "zeek/Func.h"
#include "Val.h" #include "zeek/Val.h"
#include "Stmt.h" #include "zeek/Stmt.h"
#include "Timer.h" #include "zeek/Timer.h"
#include "Reporter.h" #include "zeek/Reporter.h"
#include "module_util.h" #include "zeek/module_util.h"
namespace zeek::detail { namespace zeek::detail {

2
src/DbgBreakpoint.h
View file

@ -3,7 +3,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include "util.h" #include "zeek/util.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Stmt, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Stmt, zeek::detail);
ZEEK_FORWARD_DECLARE_NAMESPACED(ParseLocationRec, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(ParseLocationRec, zeek::detail);

2
src/DbgHelp.cc
View file

@ -2,4 +2,4 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "Debug.h" #include "zeek/Debug.h"

6
src/DbgWatch.cc
View file

@ -1,10 +1,10 @@
// Implementation of watches // Implementation of watches
#include "zeek-config.h" #include "zeek-config.h"
#include "zeek/DbgWatch.h"
#include "Debug.h" #include "zeek/Debug.h"
#include "DbgWatch.h" #include "zeek/Reporter.h"
#include "Reporter.h"
namespace zeek::detail { namespace zeek::detail {

2
src/DbgWatch.h
View file

@ -2,7 +2,7 @@
#pragma once #pragma once
#include "util.h" #include "zeek/util.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail);
namespace zeek { class Obj; } namespace zeek { class Obj; }

41
src/Debug.cc
View file

@ -2,7 +2,7 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "Debug.h" #include "zeek/Debug.h"
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
@ -10,31 +10,32 @@
#include <ctype.h> #include <ctype.h>
#include <string> #include <string>
using namespace std;
#include "util.h"
#include "DebugCmds.h"
#include "DbgBreakpoint.h"
#include "ID.h"
#include "IntrusivePtr.h"
#include "Expr.h"
#include "Stmt.h"
#include "Frame.h"
#include "Func.h"
#include "IntrusivePtr.h"
#include "Scope.h"
#include "PolicyFile.h"
#include "Desc.h"
#include "Reporter.h"
#include "Val.h"
#include "module_util.h"
#include "input.h"
#ifdef HAVE_READLINE #ifdef HAVE_READLINE
#include <readline/readline.h> #include <readline/readline.h>
#include <readline/history.h> #include <readline/history.h>
#endif #endif
#include "zeek/util.h"
#include "zeek/DebugCmds.h"
#include "zeek/DbgBreakpoint.h"
#include "zeek/ID.h"
#include "zeek/IntrusivePtr.h"
#include "zeek/Expr.h"
#include "zeek/Stmt.h"
#include "zeek/Frame.h"
#include "zeek/Func.h"
#include "zeek/IntrusivePtr.h"
#include "zeek/Scope.h"
#include "zeek/PolicyFile.h"
#include "zeek/Desc.h"
#include "zeek/Reporter.h"
#include "zeek/Val.h"
#include "zeek/module_util.h"
#include "zeek/input.h"
using namespace std;
bool zeek::detail::g_policy_debug = false; bool zeek::detail::g_policy_debug = false;
bool& g_policy_debug = zeek::detail::g_policy_debug; bool& g_policy_debug = zeek::detail::g_policy_debug;

10
src/Debug.h
View file

@ -2,15 +2,15 @@
#pragma once #pragma once
#include "Obj.h"
#include "Queue.h"
#include "StmtEnums.h"
#include "util.h"
#include <vector> #include <vector>
#include <map> #include <map>
#include <string> #include <string>
#include "zeek/Obj.h"
#include "zeek/Queue.h"
#include "zeek/StmtEnums.h"
#include "zeek/util.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Frame, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Frame, zeek::detail);
ZEEK_FORWARD_DECLARE_NAMESPACED(Stmt, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Stmt, zeek::detail);
ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek);

4
src/DebugCmdInfoConstants.cc
View file

@ -4,7 +4,7 @@
// DO NOT EDIT. // DO NOT EDIT.
// //
#include "util.h" #include "zeek/util.h"
namespace zeek::detail { namespace zeek::detail {
void init_global_dbg_constants () { void init_global_dbg_constants () {
@ -280,7 +280,7 @@ void init_global_dbg_constants () {
false); false);
g_DebugCmdInfos.push_back(info); g_DebugCmdInfos.push_back(info);
} }
} }
} // namespace zeek::detail } // namespace zeek::detail

28
src/DebugCmds.cc
View file

@ -2,7 +2,7 @@
// implementation of most commands. // implementation of most commands.
#include "zeek-config.h" #include "zeek-config.h"
#include "DebugCmds.h" #include "zeek/DebugCmds.h"
#include <sys/types.h> #include <sys/types.h>
@ -10,19 +10,19 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include "DebugCmdInfoConstants.cc" #include "zeek/DebugCmdInfoConstants.cc"
#include "Debug.h" #include "zeek/Debug.h"
#include "Desc.h" #include "zeek/Desc.h"
#include "DbgBreakpoint.h" #include "zeek/DbgBreakpoint.h"
#include "ID.h" #include "zeek/ID.h"
#include "Frame.h" #include "zeek/Frame.h"
#include "Func.h" #include "zeek/Func.h"
#include "Stmt.h" #include "zeek/Stmt.h"
#include "Scope.h" #include "zeek/Scope.h"
#include "Reporter.h" #include "zeek/Reporter.h"
#include "PolicyFile.h" #include "zeek/PolicyFile.h"
#include "Val.h" #include "zeek/Val.h"
#include "util.h" #include "zeek/util.h"
using namespace std; using namespace std;

4
src/DebugCmds.h
View file

@ -7,7 +7,9 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "Queue.h" #include "zeek/Queue.h"
// This file is generated during the build.
#include "DebugCmdConstants.h" #include "DebugCmdConstants.h"
namespace zeek::detail { namespace zeek::detail {

7
src/DebugLogger.cc
View file

@ -1,11 +1,12 @@
#ifdef DEBUG #ifdef DEBUG
#include "zeek/DebugLogger.h"
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include "DebugLogger.h" #include "zeek/RunState.h"
#include "RunState.h" #include "zeek/plugin/Plugin.h"
#include "plugin/Plugin.h"
zeek::detail::DebugLogger zeek::detail::debug_logger; zeek::detail::DebugLogger zeek::detail::debug_logger;
zeek::detail::DebugLogger& debug_logger = zeek::detail::debug_logger; zeek::detail::DebugLogger& debug_logger = zeek::detail::debug_logger;

10
src/Desc.cc
View file

@ -1,17 +1,17 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "Desc.h" #include "zeek/Desc.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <math.h> #include <math.h>
#include "File.h" #include "zeek/File.h"
#include "Reporter.h" #include "zeek/Reporter.h"
#include "ConvertUTF.h" #include "zeek/ConvertUTF.h"
#include "IPAddr.h" #include "zeek/IPAddr.h"
#define DEFAULT_SIZE 128 #define DEFAULT_SIZE 128
#define SLOP 10 #define SLOP 10

6
src/Desc.h
View file

@ -2,14 +2,14 @@
#pragma once #pragma once
#include "ZeekString.h" // for byte_vec #include <sys/types.h> // for u_char
#include "util.h" // for bro_int_t
#include <set> #include <set>
#include <utility> #include <utility>
#include <string> #include <string>
#include <sys/types.h> // for u_char #include "zeek/ZeekString.h" // for byte_vec
#include "zeek/util.h" // for bro_int_t
ZEEK_FORWARD_DECLARE_NAMESPACED(IPAddr, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(IPAddr, zeek);
ZEEK_FORWARD_DECLARE_NAMESPACED(IPPrefix, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(IPPrefix, zeek);

9
src/Dict.cc
View file

@ -1,8 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "Dict.h"
#include "zeek-config.h" #include "zeek-config.h"
#include "zeek/Dict.h"
#ifdef HAVE_MEMORY_H #ifdef HAVE_MEMORY_H
#include <memory.h> #include <memory.h>
@ -12,10 +11,10 @@
#include <climits> #include <climits>
#include <fstream> #include <fstream>
#include "Reporter.h" #include "zeek/3rdparty/doctest.h"
#include "util.h"
#include "3rdparty/doctest.h" #include "zeek/Reporter.h"
#include "zeek/util.h"
#if defined(DEBUG) && defined(ZEEK_DICT_DEBUG) #if defined(DEBUG) && defined(ZEEK_DICT_DEBUG)
#define ASSERT_VALID(o) o->AssertValid() #define ASSERT_VALID(o) o->AssertValid()

2
src/Dict.h
View file

@ -5,7 +5,7 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
#include "Hash.h" #include "zeek/Hash.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(IterCookie, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(IterCookie, zeek);
ZEEK_FORWARD_DECLARE_NAMESPACED(DictEntry, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(DictEntry, zeek::detail);

16
src/Discard.cc
View file

@ -2,17 +2,17 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "Discard.h" #include "zeek/Discard.h"
#include <algorithm> #include <algorithm>
#include "ZeekString.h" #include "zeek/ZeekString.h"
#include "RunState.h" #include "zeek/RunState.h"
#include "Func.h" #include "zeek/Func.h"
#include "Var.h" #include "zeek/Var.h"
#include "Val.h" #include "zeek/Val.h"
#include "IP.h" #include "zeek/IP.h"
#include "Reporter.h" // for InterpreterException #include "zeek/Reporter.h" // for InterpreterException
namespace zeek::detail { namespace zeek::detail {

2
src/Discard.h
View file

@ -5,7 +5,7 @@
#include <sys/types.h> // for u_char #include <sys/types.h> // for u_char
#include <memory> #include <memory>
#include "IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(IP_Hdr, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(IP_Hdr, zeek);
ZEEK_FORWARD_DECLARE_NAMESPACED(Func, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(Func, zeek);

6
src/EquivClass.cc
View file

@ -2,9 +2,9 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "EquivClass.h" #include "zeek/EquivClass.h"
#include "CCL.h" #include "zeek/CCL.h"
#include "util.h" #include "zeek/util.h"
namespace zeek::detail { namespace zeek::detail {

20
src/Event.cc
View file

@ -2,16 +2,16 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "Event.h" #include "zeek/Event.h"
#include "Desc.h" #include "zeek/Desc.h"
#include "Func.h" #include "zeek/Func.h"
#include "NetVar.h" #include "zeek/NetVar.h"
#include "Trigger.h" #include "zeek/Trigger.h"
#include "Val.h" #include "zeek/Val.h"
#include "plugin/Manager.h" #include "zeek/plugin/Manager.h"
#include "iosource/Manager.h" #include "zeek/iosource/Manager.h"
#include "iosource/PktSrc.h" #include "zeek/iosource/PktSrc.h"
#include "RunState.h" #include "zeek/RunState.h"
zeek::EventMgr zeek::event_mgr; zeek::EventMgr zeek::event_mgr;
zeek::EventMgr& mgr = zeek::event_mgr; zeek::EventMgr& mgr = zeek::event_mgr;

14
src/Event.h
View file

@ -2,16 +2,16 @@
#pragma once #pragma once
#include "ZeekList.h"
#include "analyzer/Analyzer.h"
#include "iosource/IOSource.h"
#include "Flare.h"
#include "ZeekArgs.h"
#include "IntrusivePtr.h"
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>
#include "zeek/ZeekList.h"
#include "zeek/analyzer/Analyzer.h"
#include "zeek/iosource/IOSource.h"
#include "zeek/Flare.h"
#include "zeek/ZeekArgs.h"
#include "zeek/IntrusivePtr.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(EventMgr, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(EventMgr, zeek);
namespace zeek { namespace zeek {

21
src/EventHandler.cc
View file

@ -1,14 +1,15 @@
#include "EventHandler.h" #include "zeek/EventHandler.h"
#include "Event.h"
#include "Desc.h"
#include "Func.h"
#include "Scope.h"
#include "NetVar.h"
#include "ID.h"
#include "Var.h"
#include "broker/Manager.h" #include "zeek/Event.h"
#include "broker/Data.h" #include "zeek/Desc.h"
#include "zeek/Func.h"
#include "zeek/Scope.h"
#include "zeek/NetVar.h"
#include "zeek/ID.h"
#include "zeek/Var.h"
#include "zeek/broker/Manager.h"
#include "zeek/broker/Data.h"
namespace zeek { namespace zeek {

8
src/EventHandler.h
View file

@ -2,13 +2,13 @@
#pragma once #pragma once
#include "ZeekList.h"
#include "ZeekArgs.h"
#include "Type.h"
#include <unordered_set> #include <unordered_set>
#include <string> #include <string>
#include "zeek/ZeekList.h"
#include "zeek/ZeekArgs.h"
#include "zeek/Type.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Func, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(Func, zeek);
namespace zeek { namespace zeek {

14
src/EventLauncher.cc
View file

@ -1,9 +1,9 @@
#include "Val.h" #include "zeek/Val.h"
#include "analyzer/Analyzer.h" #include "zeek/analyzer/Analyzer.h"
#include "EventLauncher.h" #include "zeek/EventLauncher.h"
#include "Event.h" #include "zeek/Event.h"
#include "NetVar.h" #include "zeek/NetVar.h"
#include "Conn.h" #include "zeek/Conn.h"
#include "File.h" #include "zeek/File.h"
#include "event.bif.func_def" #include "event.bif.func_def"

10
src/EventRegistry.cc
View file

@ -1,8 +1,8 @@
#include "EventRegistry.h" #include "zeek/EventRegistry.h"
#include "EventHandler.h" #include "zeek/EventHandler.h"
#include "Func.h" #include "zeek/Func.h"
#include "RE.h" #include "zeek/RE.h"
#include "Reporter.h" #include "zeek/Reporter.h"
namespace zeek { namespace zeek {

36
src/Expr.cc
View file

@ -2,25 +2,25 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "Expr.h" #include "zeek/Expr.h"
#include "Event.h" #include "zeek/Event.h"
#include "Desc.h" #include "zeek/Desc.h"
#include "Frame.h" #include "zeek/Frame.h"
#include "Func.h" #include "zeek/Func.h"
#include "RE.h" #include "zeek/RE.h"
#include "Scope.h" #include "zeek/Scope.h"
#include "Stmt.h" #include "zeek/Stmt.h"
#include "EventRegistry.h" #include "zeek/EventRegistry.h"
#include "RunState.h" #include "zeek/RunState.h"
#include "Traverse.h" #include "zeek/Traverse.h"
#include "Trigger.h" #include "zeek/Trigger.h"
#include "IPAddr.h" #include "zeek/IPAddr.h"
#include "digest.h" #include "zeek/digest.h"
#include "module_util.h" #include "zeek/module_util.h"
#include "DebugLogger.h" #include "zeek/DebugLogger.h"
#include "Hash.h" #include "zeek/Hash.h"
#include "broker/Data.h" #include "zeek/broker/Data.h"
namespace zeek::detail { namespace zeek::detail {

16
src/Expr.h
View file

@ -8,14 +8,14 @@
#include <utility> #include <utility>
#include <optional> #include <optional>
#include "ZeekList.h" #include "zeek/ZeekList.h"
#include "IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
#include "Timer.h" #include "zeek/Timer.h"
#include "Type.h" #include "zeek/Type.h"
#include "EventHandler.h" #include "zeek/EventHandler.h"
#include "TraverseTypes.h" #include "zeek/TraverseTypes.h"
#include "Val.h" #include "zeek/Val.h"
#include "ZeekArgs.h" #include "zeek/ZeekArgs.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Frame, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Frame, zeek::detail);
ZEEK_FORWARD_DECLARE_NAMESPACED(Scope, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Scope, zeek::detail);

20
src/File.cc
View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "File.h" #include "zeek/File.h"
#include <sys/types.h> #include <sys/types.h>
#ifdef TIME_WITH_SYS_TIME #ifdef TIME_WITH_SYS_TIME
@ -21,15 +21,15 @@
#include <algorithm> #include <algorithm>
#include "Attr.h" #include "zeek/Attr.h"
#include "Type.h" #include "zeek/Type.h"
#include "Expr.h" #include "zeek/Expr.h"
#include "NetVar.h" #include "zeek/NetVar.h"
#include "RunState.h" #include "zeek/RunState.h"
#include "Event.h" #include "zeek/Event.h"
#include "Reporter.h" #include "zeek/Reporter.h"
#include "Desc.h" #include "zeek/Desc.h"
#include "Var.h" #include "zeek/Var.h"
namespace zeek { namespace zeek {

10
src/File.h
View file

@ -2,19 +2,19 @@
#pragma once #pragma once
#include <fcntl.h>
#include <list> #include <list>
#include <string> #include <string>
#include <utility> #include <utility>
#include <fcntl.h>
#ifdef NEED_KRB5_H #ifdef NEED_KRB5_H
#include <krb5.h> #include <krb5.h>
#endif // NEED_KRB5_H #endif // NEED_KRB5_H
#include "Obj.h" #include "zeek/Obj.h"
#include "IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
#include "util.h" #include "zeek/util.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(PrintStmt, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(PrintStmt, zeek::detail);
ZEEK_FORWARD_DECLARE_NAMESPACED(Attributes, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Attributes, zeek::detail);

6
src/Flare.cc
View file

@ -1,11 +1,13 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "Flare.h" #include "zeek/Flare.h"
#include "Reporter.h"
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include "zeek/Reporter.h"
namespace zeek::detail { namespace zeek::detail {
Flare::Flare() Flare::Flare()

2
src/Flare.h
View file

@ -2,7 +2,7 @@
#pragma once #pragma once
#include "Pipe.h" #include "zeek/Pipe.h"
namespace zeek::detail { namespace zeek::detail {

14
src/Frag.cc
View file

@ -2,13 +2,13 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "Frag.h" #include "zeek/Frag.h"
#include "Hash.h" #include "zeek/Hash.h"
#include "IP.h" #include "zeek/IP.h"
#include "NetVar.h" #include "zeek/NetVar.h"
#include "Sessions.h" #include "zeek/Sessions.h"
#include "Reporter.h" #include "zeek/Reporter.h"
#include "RunState.h" #include "zeek/RunState.h"
constexpr uint32_t MIN_ACCEPTABLE_FRAG_SIZE = 64; constexpr uint32_t MIN_ACCEPTABLE_FRAG_SIZE = 64;
constexpr uint32_t MAX_ACCEPTABLE_FRAG_SIZE = 64000; constexpr uint32_t MAX_ACCEPTABLE_FRAG_SIZE = 64000;

11
src/Frag.h
View file

@ -2,14 +2,13 @@
#pragma once #pragma once
#include "util.h" // for bro_uint_t #include <sys/types.h> // for u_char
#include "IPAddr.h"
#include "Reassem.h"
#include "Timer.h"
#include <tuple> #include <tuple>
#include <sys/types.h> // for u_char #include "zeek/util.h" // for bro_uint_t
#include "zeek/IPAddr.h"
#include "zeek/Reassem.h"
#include "zeek/Timer.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(NetSessions, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(NetSessions, zeek);
ZEEK_FORWARD_DECLARE_NAMESPACED(IP_Hdr, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(IP_Hdr, zeek);

14
src/Frame.cc
View file

@ -1,15 +1,15 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "Frame.h" #include "zeek/Frame.h"
#include <broker/error.hh> #include <broker/error.hh>
#include "broker/Data.h"
#include "Func.h" #include "zeek/broker/Data.h"
#include "Desc.h" #include "zeek/Func.h"
#include "Trigger.h" #include "zeek/Desc.h"
#include "Val.h" #include "zeek/Trigger.h"
#include "ID.h" #include "zeek/Val.h"
#include "zeek/ID.h"
std::vector<zeek::detail::Frame*> g_frame_stack; std::vector<zeek::detail::Frame*> g_frame_stack;

10
src/Frame.h
View file

@ -2,11 +2,6 @@
#pragma once #pragma once
#include "ZeekList.h" // for typedef val_list
#include "Obj.h"
#include "IntrusivePtr.h"
#include "ZeekArgs.h"
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
#include <utility> #include <utility>
@ -16,6 +11,11 @@
#include <broker/data.hh> #include <broker/data.hh>
#include <broker/expected.hh> #include <broker/expected.hh>
#include "zeek/ZeekList.h" // for typedef val_list
#include "zeek/Obj.h"
#include "zeek/IntrusivePtr.h"
#include "zeek/ZeekArgs.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(CallExpr, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(CallExpr, zeek::detail);
ZEEK_FORWARD_DECLARE_NAMESPACED(Trigger, zeek::detail::trigger); ZEEK_FORWARD_DECLARE_NAMESPACED(Trigger, zeek::detail::trigger);

44
src/Func.cc
View file

@ -2,7 +2,7 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "Func.h" #include "zeek/Func.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -33,27 +33,27 @@
#include <broker/error.hh> #include <broker/error.hh>
#include "Base64.h" #include "zeek/Base64.h"
#include "Debug.h" #include "zeek/Debug.h"
#include "Desc.h" #include "zeek/Desc.h"
#include "Expr.h" #include "zeek/Expr.h"
#include "Stmt.h" #include "zeek/Stmt.h"
#include "Scope.h" #include "zeek/Scope.h"
#include "RunState.h" #include "zeek/RunState.h"
#include "NetVar.h" #include "zeek/NetVar.h"
#include "File.h" #include "zeek/File.h"
#include "Frame.h" #include "zeek/Frame.h"
#include "Var.h" #include "zeek/Var.h"
#include "analyzer/protocol/login/Login.h" #include "zeek/analyzer/protocol/login/Login.h"
#include "Sessions.h" #include "zeek/Sessions.h"
#include "RE.h" #include "zeek/RE.h"
#include "Event.h" #include "zeek/Event.h"
#include "Traverse.h" #include "zeek/Traverse.h"
#include "Reporter.h" #include "zeek/Reporter.h"
#include "plugin/Manager.h" #include "zeek/plugin/Manager.h"
#include "module_util.h" #include "zeek/module_util.h"
#include "iosource/PktSrc.h" #include "zeek/iosource/PktSrc.h"
#include "iosource/PktDumper.h" #include "zeek/iosource/PktDumper.h"
#include "zeek.bif.func_h" #include "zeek.bif.func_h"
#include "stats.bif.func_h" #include "stats.bif.func_h"

14
src/Func.h
View file

@ -9,13 +9,13 @@
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>
#include "ZeekList.h" #include "zeek/ZeekList.h"
#include "Obj.h" #include "zeek/Obj.h"
#include "IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
#include "Type.h" /* for function_flavor */ #include "zeek/Type.h" /* for function_flavor */
#include "TraverseTypes.h" #include "zeek/TraverseTypes.h"
#include "ZeekArgs.h" #include "zeek/ZeekArgs.h"
#include "BifReturnVal.h" #include "zeek/BifReturnVal.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Scope, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Scope, zeek::detail);
ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek);

19
src/Hash.cc
View file

@ -1,18 +1,19 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "zeek/Hash.h"
#include <highwayhash/sip_hash.h>
#include <highwayhash/highwayhash_target.h>
#include <highwayhash/instruction_sets.h>
#include "zeek/digest.h"
#include "zeek/Reporter.h"
#include "zeek/ZeekString.h"
#include "zeek/Val.h" // needed for const.bif
#include "Hash.h"
#include "digest.h"
#include "Reporter.h"
#include "ZeekString.h"
#include "Val.h" // needed for const.bif
#include "const.bif.netvar_h" #include "const.bif.netvar_h"
#include "highwayhash/sip_hash.h"
#include "highwayhash/highwayhash_target.h"
#include "highwayhash/instruction_sets.h"
namespace zeek::detail { namespace zeek::detail {
alignas(32) uint64_t KeyedHash::shared_highwayhash_key[4]; alignas(32) uint64_t KeyedHash::shared_highwayhash_key[4];

6
src/Hash.h
View file

@ -19,12 +19,12 @@
#pragma once #pragma once
#include "util.h" // for bro_int_t
#include <stdlib.h> #include <stdlib.h>
#include "zeek/util.h" // for bro_int_t
// to allow bro_md5_hmac access to the hmac seed // to allow bro_md5_hmac access to the hmac seed
#include "ZeekArgs.h" #include "zeek/ZeekArgs.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Frame, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Frame, zeek::detail);
ZEEK_FORWARD_DECLARE_NAMESPACED(BifReturnVal, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(BifReturnVal, zeek::detail);

32
src/ID.cc
View file

@ -2,23 +2,23 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "zeek/ID.h"
#include "ID.h" #include "zeek/Attr.h"
#include "Attr.h" #include "zeek/Desc.h"
#include "Desc.h" #include "zeek/Expr.h"
#include "Expr.h" #include "zeek/Dict.h"
#include "Dict.h" #include "zeek/EventRegistry.h"
#include "EventRegistry.h" #include "zeek/Func.h"
#include "Func.h" #include "zeek/Scope.h"
#include "Scope.h" #include "zeek/Type.h"
#include "Type.h" #include "zeek/File.h"
#include "File.h" #include "zeek/Traverse.h"
#include "Traverse.h" #include "zeek/Val.h"
#include "Val.h" #include "zeek/zeekygen/Manager.h"
#include "zeekygen/Manager.h" #include "zeek/zeekygen/IdentifierInfo.h"
#include "zeekygen/IdentifierInfo.h" #include "zeek/zeekygen/ScriptInfo.h"
#include "zeekygen/ScriptInfo.h" #include "zeek/module_util.h"
#include "module_util.h"
namespace zeek { namespace zeek {

12
src/ID.h
View file

@ -2,17 +2,17 @@
#pragma once #pragma once
#include "IntrusivePtr.h"
#include "Obj.h"
#include "Attr.h"
#include "Notifier.h"
#include "TraverseTypes.h"
#include <map> #include <map>
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <vector> #include <vector>
#include "zeek/IntrusivePtr.h"
#include "zeek/Obj.h"
#include "zeek/Attr.h"
#include "zeek/Notifier.h"
#include "zeek/TraverseTypes.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Func, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(Func, zeek);
ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek);
ZEEK_FORWARD_DECLARE_NAMESPACED(RecordType, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(RecordType, zeek);

14
src/IP.cc
View file

@ -1,17 +1,17 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "IP.h" #include "zeek/IP.h"
#include <sys/types.h> #include <sys/types.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/icmp6.h> #include <netinet/icmp6.h>
#include "IPAddr.h" #include "zeek/IPAddr.h"
#include "Type.h" #include "zeek/Type.h"
#include "Val.h" #include "zeek/Val.h"
#include "Var.h" #include "zeek/Var.h"
#include "ZeekString.h" #include "zeek/ZeekString.h"
#include "Reporter.h" #include "zeek/Reporter.h"
namespace zeek { namespace zeek {

2
src/IP.h
View file

@ -14,7 +14,7 @@
#include <vector> #include <vector>
#include "IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(IPAddr, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(IPAddr, zeek);
ZEEK_FORWARD_DECLARE_NAMESPACED(RecordVal, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(RecordVal, zeek);

14
src/IPAddr.cc
View file

@ -3,14 +3,14 @@
#include <cstdlib> #include <cstdlib>
#include <string> #include <string>
#include <vector> #include <vector>
#include "IPAddr.h"
#include "Reporter.h"
#include "ZeekString.h"
#include "Conn.h"
#include "Hash.h"
#include "bro_inet_ntop.h"
#include "analyzer/Manager.h" #include "zeek/IPAddr.h"
#include "zeek/Reporter.h"
#include "zeek/ZeekString.h"
#include "zeek/Conn.h"
#include "zeek/Hash.h"
#include "zeek/bro_inet_ntop.h"
#include "zeek/analyzer/Manager.h"
namespace zeek { namespace zeek {

2
src/IPAddr.h
View file

@ -8,7 +8,7 @@
#include <string> #include <string>
#include <memory> #include <memory>
#include "threading/SerialTypes.h" #include "zeek/threading/SerialTypes.h"
namespace zeek { class String; } namespace zeek { class String; }
using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String; using BroString [[deprecated("Remove in v4.1. Use zeek::String instead.")]] = zeek::String;

3
src/IntSet.cc
View file

@ -1,12 +1,11 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "zeek/IntSet.h"
#ifdef HAVE_MEMORY_H #ifdef HAVE_MEMORY_H
#include <memory.h> #include <memory.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>
#include "IntSet.h"
namespace zeek::detail { namespace zeek::detail {
void IntSet::Expand(unsigned int i) void IntSet::Expand(unsigned int i)

4
src/List.cc
View file

@ -1,5 +1,5 @@
#include <List.h> #include "zeek/List.h"
#include <3rdparty/doctest.h> #include "zeek/3rdparty/doctest.h"
TEST_CASE("list construction") TEST_CASE("list construction")
{ {

2
src/List.h
View file

@ -24,7 +24,7 @@
#include <iterator> #include <iterator>
#include <utility> #include <utility>
#include <cassert> #include <cassert>
#include "util.h" #include "zeek/util.h"
namespace zeek { namespace zeek {

10
src/NFA.cc
View file

@ -1,14 +1,14 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "zeek/NFA.h"
#include "NFA.h"
#include "Desc.h"
#include "EquivClass.h"
#include "IntSet.h"
#include <algorithm> #include <algorithm>
#include "zeek/Desc.h"
#include "zeek/EquivClass.h"
#include "zeek/IntSet.h"
namespace zeek::detail { namespace zeek::detail {
static int nfa_state_id = 0; static int nfa_state_id = 0;

4
src/NFA.h
View file

@ -2,8 +2,8 @@
#pragma once #pragma once
#include "Obj.h" #include "zeek/Obj.h"
#include "List.h" #include "zeek/List.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(CCL, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(CCL, zeek::detail);
ZEEK_FORWARD_DECLARE_NAMESPACED(EquivClass, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(EquivClass, zeek::detail);

4
src/Net.h
View file

@ -1,4 +1,4 @@
#warning "Net.h is deprecated and will be removed in v4.1. Use RunState.h and/or ScannedFile.h instead." #warning "Net.h is deprecated and will be removed in v4.1. Use RunState.h and/or ScannedFile.h instead."
#include "RunState.h" #include "zeek/RunState.h"
#include "ScannedFile.h" #include "zeek/ScannedFile.h"

10
src/NetVar.cc
View file

@ -2,11 +2,11 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "NetVar.h" #include "zeek/NetVar.h"
#include "Var.h" #include "zeek/Var.h"
#include "EventHandler.h" #include "zeek/EventHandler.h"
#include "Val.h" #include "zeek/Val.h"
#include "ID.h" #include "zeek/ID.h"
zeek::RecordType* conn_id; zeek::RecordType* conn_id;
zeek::RecordType* endpoint; zeek::RecordType* endpoint;

6
src/NetVar.h
View file

@ -2,9 +2,9 @@
#pragma once #pragma once
#include "Val.h" #include "zeek/Val.h"
#include "EventRegistry.h" #include "zeek/EventRegistry.h"
#include "Stats.h" #include "zeek/Stats.h"
namespace zeek::detail { namespace zeek::detail {

6
src/Notifier.cc
View file

@ -1,10 +1,10 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "Notifier.h"
#include "DebugLogger.h"
#include <set> #include <set>
#include "zeek/Notifier.h"
#include "zeek/DebugLogger.h"
zeek::notifier::detail::Registry zeek::notifier::detail::registry; zeek::notifier::detail::Registry zeek::notifier::detail::registry;
zeek::notifier::detail::Registry& notifier::registry = zeek::notifier::detail::registry; zeek::notifier::detail::Registry& notifier::registry = zeek::notifier::detail::registry;

10
src/Obj.cc
View file

@ -1,14 +1,14 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "Obj.h" #include "zeek/Obj.h"
#include <stdlib.h> #include <stdlib.h>
#include "Desc.h" #include "zeek/Desc.h"
#include "Func.h" #include "zeek/Func.h"
#include "File.h" #include "zeek/File.h"
#include "plugin/Manager.h" #include "zeek/plugin/Manager.h"
namespace zeek { namespace zeek {
namespace detail { namespace detail {

21
src/OpaqueVal.cc
View file

@ -1,20 +1,21 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek/OpaqueVal.h"
#include <memory> #include <memory>
#include "OpaqueVal.h"
#include "CompHash.h"
#include "NetVar.h"
#include "Reporter.h"
#include "Scope.h"
#include "Desc.h"
#include "Var.h"
#include "probabilistic/BloomFilter.h"
#include "probabilistic/CardinalityCounter.h"
#include <broker/data.hh> #include <broker/data.hh>
#include <broker/error.hh> #include <broker/error.hh>
#include "zeek/CompHash.h"
#include "zeek/NetVar.h"
#include "zeek/Reporter.h"
#include "zeek/Scope.h"
#include "zeek/Desc.h"
#include "zeek/Var.h"
#include "zeek/probabilistic/BloomFilter.h"
#include "zeek/probabilistic/CardinalityCounter.h"
namespace zeek { namespace zeek {
// Helper to retrieve a broker value out of a broker::vector at a specified // Helper to retrieve a broker value out of a broker::vector at a specified

15
src/OpaqueVal.h
View file

@ -2,15 +2,14 @@
#pragma once #pragma once
#include "IntrusivePtr.h"
#include "RandTest.h"
#include "Val.h"
#include "digest.h"
#include "paraglob/paraglob.h"
#include <broker/expected.hh>
#include <sys/types.h> // for u_char #include <sys/types.h> // for u_char
#include <broker/expected.hh>
#include <paraglob/paraglob.h>
#include "zeek/IntrusivePtr.h"
#include "zeek/RandTest.h"
#include "zeek/Val.h"
#include "zeek/digest.h"
namespace broker { class data; } namespace broker { class data; }

14
src/Options.cc
View file

@ -2,10 +2,7 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "Options.h" #include "zeek/Options.h"
#include <algorithm>
#include <sstream>
#include <unistd.h> #include <unistd.h>
@ -13,8 +10,11 @@
#include <getopt.h> #include <getopt.h>
#endif #endif
#include "bsd-getopt-long.h" #include <algorithm>
#include "logging/writers/ascii/Ascii.h" #include <sstream>
#include "zeek/bsd-getopt-long.h"
#include "zeek/logging/writers/ascii/Ascii.h"
namespace zeek { namespace zeek {
@ -203,7 +203,7 @@ Options parse_cmdline(int argc, char** argv)
if ( i < argc ) if ( i < argc )
{ {
// If a script is invoked with Zeek as the interpreter, the arguments provided // If a script is invoked with Zeek as the interpreter, the arguments provided
// directly in the interpreter line of the script won't be broken apart in the // directly in the interpreter line of the script won't be broken apart in the
// argv on Linux so we split it up here. // argv on Linux so we split it up here.
if ( endsWith(argv[i], "--") && zeek_args.size() == 1 ) if ( endsWith(argv[i], "--") && zeek_args.size() == 1 )
{ {

2
src/Options.h
View file

@ -6,7 +6,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "DNS_Mgr.h" #include "zeek/DNS_Mgr.h"
namespace zeek { namespace zeek {

9
src/PacketDumper.cc
View file

@ -1,10 +1,11 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "PacketDumper.h" #include "zeek/PacketDumper.h"
#include "Reporter.h"
#include "util.h" #include "zeek/Reporter.h"
#include "iosource/PktDumper.h" #include "zeek/util.h"
#include "zeek/iosource/PktDumper.h"
namespace zeek::detail { namespace zeek::detail {

3
src/PacketDumper.h
View file

@ -4,9 +4,8 @@
#pragma once #pragma once
#include <pcap.h>
#include <sys/types.h> // for u_char #include <sys/types.h> // for u_char
#include <pcap.h>
namespace zeek::detail { namespace zeek::detail {

4
src/PacketFilter.cc
View file

@ -1,5 +1,5 @@
#include "PacketFilter.h" #include "zeek/PacketFilter.h"
#include "IP.h" #include "zeek/IP.h"
namespace zeek::detail { namespace zeek::detail {

5
src/PacketFilter.h
View file

@ -3,8 +3,9 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include "IPAddr.h"
#include "PrefixTable.h" #include "zeek/IPAddr.h"
#include "zeek/PrefixTable.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(IP_Hdr, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(IP_Hdr, zeek);
ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek);

6
src/Pipe.cc
View file

@ -1,12 +1,14 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "Pipe.h" #include "zeek/Pipe.h"
#include "Reporter.h"
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <cstdio> #include <cstdio>
#include "zeek/Reporter.h"
namespace zeek::detail { namespace zeek::detail {
static void pipe_fail(int eno) static void pipe_fail(int eno)

12
src/PolicyFile.cc
View file

@ -1,19 +1,19 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "zeek/PolicyFile.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <assert.h> #include <assert.h>
#include <map>
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <string> #include <string>
#include <vector> #include <vector>
#include <map>
#include "Debug.h" #include "zeek/Debug.h"
#include "util.h" #include "zeek/util.h"
#include "PolicyFile.h" #include "zeek/Reporter.h"
#include "Reporter.h"
using namespace std; using namespace std;

6
src/PrefixTable.cc
View file

@ -1,6 +1,6 @@
#include "PrefixTable.h" #include "zeek/PrefixTable.h"
#include "Reporter.h" #include "zeek/Reporter.h"
#include "Val.h" #include "zeek/Val.h"
namespace zeek::detail { namespace zeek::detail {

4
src/PrefixTable.h
View file

@ -1,12 +1,12 @@
#pragma once #pragma once
extern "C" { extern "C" {
#include "patricia.h" #include "zeek/patricia.h"
} }
#include <list> #include <list>
#include "IPAddr.h" #include "zeek/IPAddr.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek);
ZEEK_FORWARD_DECLARE_NAMESPACED(SubNetVal, zeek); ZEEK_FORWARD_DECLARE_NAMESPACED(SubNetVal, zeek);

6
src/PriorityQueue.cc
View file

@ -1,13 +1,13 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "zeek/PriorityQueue.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "PriorityQueue.h" #include "zeek/Reporter.h"
#include "Reporter.h" #include "zeek/util.h"
#include "util.h"
namespace zeek::detail { namespace zeek::detail {

12
src/RE.cc
View file

@ -1,16 +1,16 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "RE.h" #include "zeek/RE.h"
#include <stdlib.h> #include <stdlib.h>
#include <utility> #include <utility>
#include "DFA.h" #include "zeek/DFA.h"
#include "CCL.h" #include "zeek/CCL.h"
#include "EquivClass.h" #include "zeek/EquivClass.h"
#include "Reporter.h" #include "zeek/Reporter.h"
#include "ZeekString.h" #include "zeek/ZeekString.h"
zeek::detail::CCL* zeek::detail::curr_ccl = nullptr; zeek::detail::CCL* zeek::detail::curr_ccl = nullptr;
zeek::detail::CCL*& curr_ccl = zeek::detail::curr_ccl; zeek::detail::CCL*& curr_ccl = zeek::detail::curr_ccl;

12
src/RE.h
View file

@ -2,16 +2,16 @@
#pragma once #pragma once
#include "List.h" #include <sys/types.h> // for u_char
#include "CCL.h" #include <ctype.h>
#include "EquivClass.h"
#include <set> #include <set>
#include <map> #include <map>
#include <string> #include <string>
#include <sys/types.h> // for u_char #include "zeek/List.h"
#include <ctype.h> #include "zeek/CCL.h"
#include "zeek/EquivClass.h"
typedef int (*cce_func)(int); typedef int (*cce_func)(int);
namespace zeek { class String; } namespace zeek { class String; }

2
src/RandTest.cc
View file

@ -12,7 +12,7 @@
Modified for Bro by Seth Hall - July 2010 Modified for Bro by Seth Hall - July 2010
*/ */
#include "RandTest.h" #include "zeek/RandTest.h"
#include <math.h> #include <math.h>

4
src/Reassem.cc
View file

@ -1,11 +1,11 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "zeek-config.h" #include "zeek-config.h"
#include "Reassem.h" #include "zeek/Reassem.h"
#include <algorithm> #include <algorithm>
#include "Desc.h" #include "zeek/Desc.h"
using std::min; using std::min;

7
src/Reassem.h
View file

@ -2,14 +2,13 @@
#pragma once #pragma once
#include <map>
#include "Obj.h"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <sys/types.h> // for u_char #include <sys/types.h> // for u_char
#include <cstdint> #include <cstdint>
#include <map>
#include "zeek/Obj.h"
namespace zeek { namespace zeek {

28
src/Reporter.cc
View file

@ -3,24 +3,24 @@
// //
#include "zeek-config.h" #include "zeek-config.h"
#include "Reporter.h" #include "zeek/Reporter.h"
#include <unistd.h> #include <unistd.h>
#include <syslog.h> #include <syslog.h>
#include "Desc.h" #include "zeek/Desc.h"
#include "Event.h" #include "zeek/Event.h"
#include "Expr.h" #include "zeek/Expr.h"
#include "NetVar.h" #include "zeek/NetVar.h"
#include "RunState.h" #include "zeek/RunState.h"
#include "Conn.h" #include "zeek/Conn.h"
#include "Timer.h" #include "zeek/Timer.h"
#include "ID.h" #include "zeek/ID.h"
#include "EventHandler.h" #include "zeek/EventHandler.h"
#include "plugin/Plugin.h" #include "zeek/plugin/Plugin.h"
#include "plugin/Manager.h" #include "zeek/plugin/Manager.h"
#include "input.h" #include "zeek/input.h"
#include "file_analysis/File.h" #include "zeek/file_analysis/File.h"
#ifdef SYSLOG_INT #ifdef SYSLOG_INT
extern "C" { extern "C" {

4
src/Reporter.h
View file

@ -12,8 +12,8 @@
#include <unordered_set> #include <unordered_set>
#include <unordered_map> #include <unordered_map>
#include "ZeekList.h" #include "zeek/ZeekList.h"
#include "net_util.h" #include "zeek/net_util.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Analyzer, zeek, analyzer); ZEEK_FORWARD_DECLARE_NAMESPACED(Analyzer, zeek, analyzer);
ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis); ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis);

8
src/Rule.cc
View file

@ -1,9 +1,9 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "Rule.h" #include "zeek/Rule.h"
#include "RuleAction.h" #include "zeek/RuleAction.h"
#include "RuleCondition.h" #include "zeek/RuleCondition.h"
#include "RuleMatcher.h" #include "zeek/RuleMatcher.h"
namespace zeek::detail { namespace zeek::detail {

11
src/Rule.h
View file

@ -1,13 +1,12 @@
#pragma once #pragma once
#include "List.h"
#include "Obj.h"
#include <map>
#include <string>
#include <limits.h> #include <limits.h>
#include <stdint.h> #include <stdint.h>
#include <map>
#include <string>
#include "zeek/List.h"
#include "zeek/Obj.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(RuleCondition, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(RuleCondition, zeek::detail);
ZEEK_FORWARD_DECLARE_NAMESPACED(RuleAction, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(RuleAction, zeek::detail);

20
src/RuleAction.cc
View file

@ -1,16 +1,16 @@
#include <string>
using std::string;
#include "zeek-config.h" #include "zeek-config.h"
#include "zeek/RuleAction.h"
#include "RuleAction.h" #include <string>
#include "RuleMatcher.h"
#include "Conn.h"
#include "Event.h"
#include "NetVar.h"
#include "analyzer/protocol/pia/PIA.h"
#include "analyzer/Manager.h" #include "zeek/RuleMatcher.h"
#include "zeek/Conn.h"
#include "zeek/Event.h"
#include "zeek/NetVar.h"
#include "zeek/analyzer/protocol/pia/PIA.h"
#include "zeek/analyzer/Manager.h"
using std::string;
namespace zeek::detail { namespace zeek::detail {

5
src/RuleAction.h
View file

@ -1,10 +1,9 @@
#pragma once #pragma once
#include "analyzer/Tag.h" #include "zeek/analyzer/Tag.h"
#include <string>
#include <sys/types.h> // for u_char #include <sys/types.h> // for u_char
#include <string>
ZEEK_FORWARD_DECLARE_NAMESPACED(Rule, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Rule, zeek::detail);
ZEEK_FORWARD_DECLARE_NAMESPACED(RuleEndpointState, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(RuleEndpointState, zeek::detail);

16
src/RuleCondition.cc
View file

@ -1,13 +1,13 @@
#include "zeek-config.h" #include "zeek-config.h"
#include "RuleCondition.h" #include "zeek/RuleCondition.h"
#include "RuleMatcher.h" #include "zeek/RuleMatcher.h"
#include "analyzer/protocol/tcp/TCP.h" #include "zeek/analyzer/protocol/tcp/TCP.h"
#include "Reporter.h" #include "zeek/Reporter.h"
#include "Scope.h" #include "zeek/Scope.h"
#include "Func.h" #include "zeek/Func.h"
#include "ID.h" #include "zeek/ID.h"
#include "Val.h" #include "zeek/Val.h"
static inline bool is_established(const zeek::analyzer::tcp::TCP_Endpoint* e) static inline bool is_established(const zeek::analyzer::tcp::TCP_Endpoint* e)
{ {

Some files were not shown because too many files have changed in this diff Show more