From c44cbe1febdde6c4386a5ead8a68be412cc6c712 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Tue, 2 Feb 2021 19:13:51 -0800 Subject: [PATCH] Prefix #includes of .bif.h files with zeek/ This enables locating the headers within the install-tree using the dirs provided by `zeek-config --include_dir`. To enable locating these headers within the build-tree, this change also creates a 'build/src/include/zeek -> ..' symlink. --- src/CMakeLists.txt | 8 +++ src/Sessions.cc | 2 +- src/Stmt.cc | 2 +- src/analyzer/Manager.cc | 2 +- src/analyzer/Manager.h | 2 +- .../protocol/bittorrent/BitTorrent.cc | 2 +- .../protocol/bittorrent/BitTorrentTracker.cc | 2 +- .../protocol/bittorrent/bittorrent.pac | 2 +- src/analyzer/protocol/conn-size/ConnSize.cc | 2 +- src/analyzer/protocol/dce-rpc/DCE_RPC.h | 4 +- src/analyzer/protocol/dce-rpc/dce_rpc.pac | 6 +- src/analyzer/protocol/dhcp/DHCP.cc | 4 +- src/analyzer/protocol/dhcp/dhcp.pac | 4 +- src/analyzer/protocol/dnp3/DNP3.cc | 2 +- src/analyzer/protocol/dnp3/dnp3.pac | 2 +- src/analyzer/protocol/dns/DNS.cc | 2 +- src/analyzer/protocol/file/File.cc | 2 +- src/analyzer/protocol/finger/Finger.cc | 2 +- src/analyzer/protocol/ftp/FTP.cc | 2 +- src/analyzer/protocol/gnutella/Gnutella.cc | 2 +- src/analyzer/protocol/gssapi/GSSAPI.cc | 2 +- src/analyzer/protocol/gssapi/GSSAPI.h | 4 +- src/analyzer/protocol/gssapi/gssapi.pac | 2 +- src/analyzer/protocol/gtpv1/GTPv1.cc | 2 +- src/analyzer/protocol/gtpv1/gtpv1.pac | 2 +- src/analyzer/protocol/http/HTTP.cc | 2 +- src/analyzer/protocol/http/HTTP.h | 2 +- src/analyzer/protocol/icmp/ICMP.cc | 2 +- src/analyzer/protocol/ident/Ident.cc | 2 +- src/analyzer/protocol/imap/imap.pac | 2 +- src/analyzer/protocol/irc/IRC.cc | 2 +- src/analyzer/protocol/krb/KRB.cc | 4 +- src/analyzer/protocol/krb/KRB_TCP.cc | 4 +- src/analyzer/protocol/krb/krb.pac | 4 +- src/analyzer/protocol/krb/krb_TCP.pac | 4 +- src/analyzer/protocol/login/Login.cc | 2 +- src/analyzer/protocol/login/NVT.cc | 2 +- src/analyzer/protocol/login/RSH.cc | 2 +- src/analyzer/protocol/login/Rlogin.cc | 2 +- src/analyzer/protocol/login/Telnet.cc | 2 +- src/analyzer/protocol/mime/MIME.cc | 2 +- src/analyzer/protocol/modbus/Modbus.cc | 2 +- src/analyzer/protocol/modbus/modbus.pac | 2 +- src/analyzer/protocol/mqtt/mqtt.pac | 4 +- src/analyzer/protocol/mysql/MySQL.cc | 2 +- src/analyzer/protocol/mysql/MySQL.h | 4 +- src/analyzer/protocol/mysql/mysql.pac | 2 +- src/analyzer/protocol/ncp/NCP.cc | 4 +- src/analyzer/protocol/ncp/ncp.pac | 2 +- src/analyzer/protocol/netbios/NetbiosSSN.cc | 2 +- src/analyzer/protocol/ntlm/NTLM.cc | 2 +- src/analyzer/protocol/ntlm/NTLM.h | 4 +- src/analyzer/protocol/ntlm/ntlm.pac | 6 +- src/analyzer/protocol/ntp/NTP.cc | 2 +- src/analyzer/protocol/ntp/NTP.h | 6 +- src/analyzer/protocol/ntp/ntp.pac | 4 +- src/analyzer/protocol/pop3/POP3.cc | 2 +- src/analyzer/protocol/radius/RADIUS.cc | 2 +- src/analyzer/protocol/radius/RADIUS.h | 4 +- src/analyzer/protocol/radius/radius.pac | 2 +- src/analyzer/protocol/rdp/RDP.cc | 4 +- src/analyzer/protocol/rdp/RDP.h | 4 +- src/analyzer/protocol/rdp/RDPEUDP.cc | 4 +- src/analyzer/protocol/rdp/RDPEUDP.h | 4 +- src/analyzer/protocol/rdp/rdp-analyzer.pac | 2 +- src/analyzer/protocol/rdp/rdp.pac | 2 +- src/analyzer/protocol/rdp/rdpeudp.pac | 2 +- src/analyzer/protocol/rfb/RFB.cc | 2 +- src/analyzer/protocol/rfb/RFB.h | 4 +- src/analyzer/protocol/rfb/rfb.pac | 2 +- src/analyzer/protocol/rpc/MOUNT.cc | 2 +- src/analyzer/protocol/rpc/NFS.cc | 2 +- src/analyzer/protocol/rpc/Portmap.cc | 2 +- src/analyzer/protocol/rpc/RPC.cc | 2 +- src/analyzer/protocol/rpc/XDR.cc | 2 +- src/analyzer/protocol/sip/SIP.cc | 2 +- src/analyzer/protocol/sip/SIP.h | 4 +- src/analyzer/protocol/sip/SIP_TCP.cc | 2 +- src/analyzer/protocol/sip/sip.pac | 2 +- src/analyzer/protocol/sip/sip_TCP.pac | 2 +- src/analyzer/protocol/smb/smb.pac | 66 +++++++++---------- src/analyzer/protocol/smtp/SMTP.cc | 2 +- src/analyzer/protocol/snmp/SNMP.cc | 4 +- src/analyzer/protocol/snmp/snmp.pac | 4 +- src/analyzer/protocol/socks/SOCKS.cc | 4 +- src/analyzer/protocol/socks/socks.pac | 2 +- src/analyzer/protocol/ssh/SSH.cc | 4 +- src/analyzer/protocol/ssh/SSH.h | 4 +- src/analyzer/protocol/ssh/ssh.pac | 6 +- src/analyzer/protocol/ssl/DTLS.cc | 6 +- src/analyzer/protocol/ssl/DTLS.h | 2 +- src/analyzer/protocol/ssl/SSL.cc | 6 +- src/analyzer/protocol/ssl/SSL.h | 2 +- src/analyzer/protocol/ssl/dtls.pac | 4 +- src/analyzer/protocol/ssl/ssl-defs.pac | 2 +- src/analyzer/protocol/ssl/ssl.pac | 2 +- src/analyzer/protocol/ssl/tls-handshake.pac | 4 +- .../protocol/stepping-stone/SteppingStone.cc | 2 +- src/analyzer/protocol/syslog/Syslog.cc | 2 +- src/analyzer/protocol/syslog/syslog.pac | 2 +- src/analyzer/protocol/tcp/ContentLine.cc | 2 +- src/analyzer/protocol/tcp/Stats.cc | 2 +- src/analyzer/protocol/tcp/TCP.cc | 4 +- src/analyzer/protocol/tcp/TCP_Endpoint.cc | 2 +- src/analyzer/protocol/tcp/TCP_Reassembler.cc | 2 +- src/analyzer/protocol/teredo/Teredo.cc | 2 +- src/analyzer/protocol/udp/UDP.cc | 2 +- src/analyzer/protocol/vxlan/VXLAN.cc | 2 +- src/analyzer/protocol/xmpp/xmpp.pac | 2 +- src/broker/Data.cc | 2 +- src/broker/Manager.cc | 8 +-- src/broker/Store.h | 4 +- src/file_analysis/AnalyzerSet.cc | 2 +- src/file_analysis/Manager.cc | 2 +- src/file_analysis/analyzer/entropy/Entropy.h | 2 +- src/file_analysis/analyzer/extract/Extract.h | 2 +- .../analyzer/extract/functions.bif | 2 +- src/file_analysis/analyzer/hash/Hash.h | 2 +- src/file_analysis/analyzer/pe/pe-analyzer.pac | 2 +- .../analyzer/unified2/unified2-analyzer.pac | 4 +- src/file_analysis/analyzer/x509/OCSP.cc | 4 +- src/file_analysis/analyzer/x509/X509.cc | 4 +- src/file_analysis/analyzer/x509/X509Common.cc | 8 +-- src/file_analysis/analyzer/x509/functions.bif | 2 +- .../analyzer/x509/x509-extension.pac | 4 +- src/input/Manager.cc | 2 +- src/input/readers/ascii/Ascii.cc | 2 +- src/input/readers/benchmark/Benchmark.cc | 2 +- src/input/readers/binary/Binary.cc | 2 +- src/input/readers/config/Config.cc | 2 +- src/input/readers/raw/Raw.cc | 2 +- src/input/readers/sqlite/SQLite.cc | 6 +- src/iosource/PktSrc.cc | 2 +- src/iosource/pcap/Dumper.cc | 2 +- src/iosource/pcap/Source.cc | 2 +- src/logging/Manager.cc | 2 +- src/logging/writers/ascii/Ascii.cc | 2 +- src/logging/writers/none/None.cc | 2 +- src/logging/writers/sqlite/SQLite.cc | 2 +- src/packet_analysis/protocol/arp/ARP.cc | 2 +- .../src/FOO.cc | 4 +- .../src/FOO.h | 2 +- testing/btest/plugins/file-plugin/src/Foo.cc | 6 +- .../btest/plugins/protocol-plugin/src/Foo.cc | 2 +- 144 files changed, 239 insertions(+), 231 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0bc5ceac2b..8121369943 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,16 @@ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/include ) +# Allows header file inclusion via zeek/ within the build tree +execute_process(COMMAND "${CMAKE_COMMAND}" -E make_directory + "${CMAKE_CURRENT_BINARY_DIR}/include") +execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink + ".." + "${CMAKE_CURRENT_BINARY_DIR}/include/zeek") + # This collects generated bif and pac files from subdirectories. set(bro_ALL_GENERATED_OUTPUTS CACHE INTERNAL "automatically generated files" FORCE) diff --git a/src/Sessions.cc b/src/Sessions.cc index 878bb21786..62f0714aa8 100644 --- a/src/Sessions.cc +++ b/src/Sessions.cc @@ -28,7 +28,7 @@ #include "zeek/iosource/IOSource.h" #include "zeek/packet_analysis/Manager.h" -#include "analyzer/protocol/stepping-stone/events.bif.h" +#include "zeek/analyzer/protocol/stepping-stone/events.bif.h" // These represent NetBIOS services on ephemeral ports. They're numbered // so that we can use a single int to hold either an actual TCP/UDP server diff --git a/src/Stmt.cc b/src/Stmt.cc index fe3bf8090e..4a9aa882a3 100644 --- a/src/Stmt.cc +++ b/src/Stmt.cc @@ -20,7 +20,7 @@ #include "zeek/IntrusivePtr.h" #include "zeek/logging/Manager.h" -#include "logging/logging.bif.h" +#include "zeek/logging/logging.bif.h" namespace zeek::detail { diff --git a/src/analyzer/Manager.cc b/src/analyzer/Manager.cc index 67f7d6373a..3d30d79868 100644 --- a/src/analyzer/Manager.cc +++ b/src/analyzer/Manager.cc @@ -16,7 +16,7 @@ #include "zeek/plugin/Manager.h" -#include "analyzer/protocol/tcp/events.bif.h" +#include "zeek/analyzer/protocol/tcp/events.bif.h" namespace zeek::analyzer { diff --git a/src/analyzer/Manager.h b/src/analyzer/Manager.h index aea50ce4d0..7137a57390 100644 --- a/src/analyzer/Manager.h +++ b/src/analyzer/Manager.h @@ -32,7 +32,7 @@ #include "zeek/net_util.h" #include "zeek/IP.h" -#include "analyzer/analyzer.bif.h" +#include "zeek/analyzer/analyzer.bif.h" namespace zeek { namespace analyzer { diff --git a/src/analyzer/protocol/bittorrent/BitTorrent.cc b/src/analyzer/protocol/bittorrent/BitTorrent.cc index 7527df7360..d4cd7ea8a0 100644 --- a/src/analyzer/protocol/bittorrent/BitTorrent.cc +++ b/src/analyzer/protocol/bittorrent/BitTorrent.cc @@ -3,7 +3,7 @@ #include "zeek/analyzer/protocol/bittorrent/BitTorrent.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" -#include "analyzer/protocol/bittorrent/events.bif.h" +#include "zeek/analyzer/protocol/bittorrent/events.bif.h" namespace zeek::analyzer::bittorrent { diff --git a/src/analyzer/protocol/bittorrent/BitTorrentTracker.cc b/src/analyzer/protocol/bittorrent/BitTorrentTracker.cc index 803b5d09c3..c01a087c3b 100644 --- a/src/analyzer/protocol/bittorrent/BitTorrentTracker.cc +++ b/src/analyzer/protocol/bittorrent/BitTorrentTracker.cc @@ -8,7 +8,7 @@ #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" -#include "analyzer/protocol/bittorrent/events.bif.h" +#include "zeek/analyzer/protocol/bittorrent/events.bif.h" # define FMT_INT "%" PRId64 # define FMT_UINT "%" PRIu64 diff --git a/src/analyzer/protocol/bittorrent/bittorrent.pac b/src/analyzer/protocol/bittorrent/bittorrent.pac index eb2fe7e579..3e9fad78e9 100644 --- a/src/analyzer/protocol/bittorrent/bittorrent.pac +++ b/src/analyzer/protocol/bittorrent/bittorrent.pac @@ -6,7 +6,7 @@ %extern{ #define MSGLEN_LIMIT 0x40000 -#include "analyzer/protocol/bittorrent/events.bif.h" +#include "zeek/analyzer/protocol/bittorrent/events.bif.h" %} analyzer BitTorrent withcontext { diff --git a/src/analyzer/protocol/conn-size/ConnSize.cc b/src/analyzer/protocol/conn-size/ConnSize.cc index 98acb55f1e..468d6fb17d 100644 --- a/src/analyzer/protocol/conn-size/ConnSize.cc +++ b/src/analyzer/protocol/conn-size/ConnSize.cc @@ -9,7 +9,7 @@ #include "zeek/Reporter.h" #include "zeek/RunState.h" -#include "analyzer/protocol/conn-size/events.bif.h" +#include "zeek/analyzer/protocol/conn-size/events.bif.h" namespace zeek::analyzer::conn_size { diff --git a/src/analyzer/protocol/dce-rpc/DCE_RPC.h b/src/analyzer/protocol/dce-rpc/DCE_RPC.h index ae19d87db0..27566f7518 100644 --- a/src/analyzer/protocol/dce-rpc/DCE_RPC.h +++ b/src/analyzer/protocol/dce-rpc/DCE_RPC.h @@ -6,8 +6,8 @@ #include "zeek/analyzer/protocol/tcp/TCP.h" #include "zeek/IPAddr.h" -#include "analyzer/protocol/dce-rpc/events.bif.h" -#include "analyzer/protocol/dce-rpc/dce_rpc_pac.h" +#include "zeek/analyzer/protocol/dce-rpc/events.bif.h" +#include "zeek/analyzer/protocol/dce-rpc/dce_rpc_pac.h" namespace zeek::analyzer::dce_rpc { diff --git a/src/analyzer/protocol/dce-rpc/dce_rpc.pac b/src/analyzer/protocol/dce-rpc/dce_rpc.pac index f7089ace53..859fc08a6f 100644 --- a/src/analyzer/protocol/dce-rpc/dce_rpc.pac +++ b/src/analyzer/protocol/dce-rpc/dce_rpc.pac @@ -2,9 +2,9 @@ %include zeek.pac %extern{ -#include "analyzer/protocol/dce-rpc/consts.bif.h" -#include "analyzer/protocol/dce-rpc/types.bif.h" -#include "analyzer/protocol/dce-rpc/events.bif.h" +#include "zeek/analyzer/protocol/dce-rpc/consts.bif.h" +#include "zeek/analyzer/protocol/dce-rpc/types.bif.h" +#include "zeek/analyzer/protocol/dce-rpc/events.bif.h" %} analyzer DCE_RPC withcontext { diff --git a/src/analyzer/protocol/dhcp/DHCP.cc b/src/analyzer/protocol/dhcp/DHCP.cc index a66405fdcc..f395944c6d 100644 --- a/src/analyzer/protocol/dhcp/DHCP.cc +++ b/src/analyzer/protocol/dhcp/DHCP.cc @@ -1,7 +1,7 @@ #include "zeek/analyzer/protocol/dhcp/DHCP.h" -#include "analyzer/protocol/dhcp/events.bif.h" -#include "analyzer/protocol/dhcp/types.bif.h" +#include "zeek/analyzer/protocol/dhcp/events.bif.h" +#include "zeek/analyzer/protocol/dhcp/types.bif.h" namespace zeek::analyzer::dhcp { diff --git a/src/analyzer/protocol/dhcp/dhcp.pac b/src/analyzer/protocol/dhcp/dhcp.pac index 6305f15429..f6a1a0010d 100644 --- a/src/analyzer/protocol/dhcp/dhcp.pac +++ b/src/analyzer/protocol/dhcp/dhcp.pac @@ -2,8 +2,8 @@ %include zeek.pac %extern{ -#include "analyzer/protocol/dhcp/types.bif.h" -#include "analyzer/protocol/dhcp/events.bif.h" +#include "zeek/analyzer/protocol/dhcp/types.bif.h" +#include "zeek/analyzer/protocol/dhcp/events.bif.h" %} analyzer DHCP withcontext { diff --git a/src/analyzer/protocol/dnp3/DNP3.cc b/src/analyzer/protocol/dnp3/DNP3.cc index 0cd02d0dc5..4a419fc1a8 100644 --- a/src/analyzer/protocol/dnp3/DNP3.cc +++ b/src/analyzer/protocol/dnp3/DNP3.cc @@ -99,7 +99,7 @@ #include "zeek/analyzer/protocol/dnp3/DNP3.h" #include "zeek/Reporter.h" -#include "analyzer/protocol/dnp3/events.bif.h" +#include "zeek/analyzer/protocol/dnp3/events.bif.h" constexpr unsigned int PSEUDO_LENGTH_INDEX = 2; // index of len field of DNP3 Pseudo Link Layer constexpr unsigned int PSEUDO_CONTROL_FIELD_INDEX = 3; // index of ctrl field of DNP3 Pseudo Link Layer diff --git a/src/analyzer/protocol/dnp3/dnp3.pac b/src/analyzer/protocol/dnp3/dnp3.pac index 9810e9dfc8..4f92522355 100644 --- a/src/analyzer/protocol/dnp3/dnp3.pac +++ b/src/analyzer/protocol/dnp3/dnp3.pac @@ -3,7 +3,7 @@ %include zeek.pac %extern{ -#include "analyzer/protocol/dnp3/events.bif.h" +#include "zeek/analyzer/protocol/dnp3/events.bif.h" %} analyzer DNP3 withcontext { diff --git a/src/analyzer/protocol/dns/DNS.cc b/src/analyzer/protocol/dns/DNS.cc index c760020636..8b4ec7168b 100644 --- a/src/analyzer/protocol/dns/DNS.cc +++ b/src/analyzer/protocol/dns/DNS.cc @@ -15,7 +15,7 @@ #include "zeek/Event.h" #include "zeek/RunState.h" -#include "analyzer/protocol/dns/events.bif.h" +#include "zeek/analyzer/protocol/dns/events.bif.h" namespace zeek::analyzer::dns { diff --git a/src/analyzer/protocol/file/File.cc b/src/analyzer/protocol/file/File.cc index 8668f12bb3..6324246cbe 100644 --- a/src/analyzer/protocol/file/File.cc +++ b/src/analyzer/protocol/file/File.cc @@ -7,7 +7,7 @@ #include "zeek/Reporter.h" #include "zeek/util.h" -#include "analyzer/protocol/file/events.bif.h" +#include "zeek/analyzer/protocol/file/events.bif.h" namespace zeek::analyzer::file { diff --git a/src/analyzer/protocol/finger/Finger.cc b/src/analyzer/protocol/finger/Finger.cc index fdcebb16bc..6573e9507b 100644 --- a/src/analyzer/protocol/finger/Finger.cc +++ b/src/analyzer/protocol/finger/Finger.cc @@ -9,7 +9,7 @@ #include "zeek/Event.h" #include "zeek/analyzer/protocol/tcp/ContentLine.h" -#include "analyzer/protocol/finger/events.bif.h" +#include "zeek/analyzer/protocol/finger/events.bif.h" namespace zeek::analyzer::finger { diff --git a/src/analyzer/protocol/ftp/FTP.cc b/src/analyzer/protocol/ftp/FTP.cc index 57cdb6e0a3..dc441a65ca 100644 --- a/src/analyzer/protocol/ftp/FTP.cc +++ b/src/analyzer/protocol/ftp/FTP.cc @@ -13,7 +13,7 @@ #include "zeek/analyzer/protocol/login/NVT.h" #include "zeek/RuleMatcher.h" -#include "analyzer/protocol/ftp/events.bif.h" +#include "zeek/analyzer/protocol/ftp/events.bif.h" namespace zeek::analyzer::ftp { diff --git a/src/analyzer/protocol/gnutella/Gnutella.cc b/src/analyzer/protocol/gnutella/Gnutella.cc index 7c1193da00..661863c33d 100644 --- a/src/analyzer/protocol/gnutella/Gnutella.cc +++ b/src/analyzer/protocol/gnutella/Gnutella.cc @@ -12,7 +12,7 @@ #include "zeek/analyzer/protocol/pia/PIA.h" #include "zeek/analyzer/Manager.h" -#include "analyzer/protocol/gnutella/events.bif.h" +#include "zeek/analyzer/protocol/gnutella/events.bif.h" namespace zeek::analyzer::gnutella { diff --git a/src/analyzer/protocol/gssapi/GSSAPI.cc b/src/analyzer/protocol/gssapi/GSSAPI.cc index 59988a83cf..eb4362587b 100644 --- a/src/analyzer/protocol/gssapi/GSSAPI.cc +++ b/src/analyzer/protocol/gssapi/GSSAPI.cc @@ -5,7 +5,7 @@ #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" #include "zeek/Reporter.h" -#include "analyzer/protocol/gssapi/events.bif.h" +#include "zeek/analyzer/protocol/gssapi/events.bif.h" namespace zeek::analyzer::gssapi { diff --git a/src/analyzer/protocol/gssapi/GSSAPI.h b/src/analyzer/protocol/gssapi/GSSAPI.h index ed64a8ec54..0f288c228f 100644 --- a/src/analyzer/protocol/gssapi/GSSAPI.h +++ b/src/analyzer/protocol/gssapi/GSSAPI.h @@ -4,8 +4,8 @@ #include "zeek/analyzer/protocol/tcp/TCP.h" -#include "analyzer/protocol/gssapi/events.bif.h" -#include "analyzer/protocol/gssapi/gssapi_pac.h" +#include "zeek/analyzer/protocol/gssapi/events.bif.h" +#include "zeek/analyzer/protocol/gssapi/gssapi_pac.h" namespace zeek::analyzer::gssapi { diff --git a/src/analyzer/protocol/gssapi/gssapi.pac b/src/analyzer/protocol/gssapi/gssapi.pac index 73ca7c5a1b..3e56c7424e 100644 --- a/src/analyzer/protocol/gssapi/gssapi.pac +++ b/src/analyzer/protocol/gssapi/gssapi.pac @@ -5,7 +5,7 @@ #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/Analyzer.h" -#include "analyzer/protocol/gssapi/events.bif.h" +#include "zeek/analyzer/protocol/gssapi/events.bif.h" %} analyzer GSSAPI withcontext { diff --git a/src/analyzer/protocol/gtpv1/GTPv1.cc b/src/analyzer/protocol/gtpv1/GTPv1.cc index 49276179ea..47ce102aad 100644 --- a/src/analyzer/protocol/gtpv1/GTPv1.cc +++ b/src/analyzer/protocol/gtpv1/GTPv1.cc @@ -3,7 +3,7 @@ #include "zeek/analyzer/protocol/gtpv1/GTPv1.h" #include "zeek/packet_analysis/protocol/iptunnel/IPTunnel.h" -#include "analyzer/protocol/gtpv1/events.bif.h" +#include "zeek/analyzer/protocol/gtpv1/events.bif.h" namespace zeek::analyzer::gtpv1 { diff --git a/src/analyzer/protocol/gtpv1/gtpv1.pac b/src/analyzer/protocol/gtpv1/gtpv1.pac index 3910471b08..a98d4e046f 100644 --- a/src/analyzer/protocol/gtpv1/gtpv1.pac +++ b/src/analyzer/protocol/gtpv1/gtpv1.pac @@ -6,7 +6,7 @@ #include "zeek/TunnelEncapsulation.h" #include "zeek/Reporter.h" -#include "analyzer/protocol/gtpv1/events.bif.h" +#include "zeek/analyzer/protocol/gtpv1/events.bif.h" %} analyzer GTPv1 withcontext { diff --git a/src/analyzer/protocol/http/HTTP.cc b/src/analyzer/protocol/http/HTTP.cc index 3f902b79b7..c0f3ece9c6 100644 --- a/src/analyzer/protocol/http/HTTP.cc +++ b/src/analyzer/protocol/http/HTTP.cc @@ -14,7 +14,7 @@ #include "zeek/analyzer/protocol/mime/MIME.h" #include "zeek/file_analysis/Manager.h" -#include "analyzer/protocol/http/events.bif.h" +#include "zeek/analyzer/protocol/http/events.bif.h" namespace zeek::analyzer::http { diff --git a/src/analyzer/protocol/http/HTTP.h b/src/analyzer/protocol/http/HTTP.h index 09e6a559ae..927c19df97 100644 --- a/src/analyzer/protocol/http/HTTP.h +++ b/src/analyzer/protocol/http/HTTP.h @@ -10,7 +10,7 @@ #include "zeek/binpac_zeek.h" #include "zeek/IPAddr.h" -#include "analyzer/protocol/http/events.bif.h" +#include "zeek/analyzer/protocol/http/events.bif.h" namespace zeek::analyzer::http { diff --git a/src/analyzer/protocol/icmp/ICMP.cc b/src/analyzer/protocol/icmp/ICMP.cc index fb77af1fc6..1a3ccbaae2 100644 --- a/src/analyzer/protocol/icmp/ICMP.cc +++ b/src/analyzer/protocol/icmp/ICMP.cc @@ -14,7 +14,7 @@ #include "zeek/Desc.h" #include "zeek/Reporter.h" -#include "analyzer/protocol/icmp/events.bif.h" +#include "zeek/analyzer/protocol/icmp/events.bif.h" namespace zeek::analyzer::icmp { diff --git a/src/analyzer/protocol/ident/Ident.cc b/src/analyzer/protocol/ident/Ident.cc index 146d2c9ccf..09a9273c77 100644 --- a/src/analyzer/protocol/ident/Ident.cc +++ b/src/analyzer/protocol/ident/Ident.cc @@ -9,7 +9,7 @@ #include "zeek/NetVar.h" #include "zeek/Event.h" -#include "analyzer/protocol/ident/events.bif.h" +#include "zeek/analyzer/protocol/ident/events.bif.h" namespace zeek::analyzer::ident { diff --git a/src/analyzer/protocol/imap/imap.pac b/src/analyzer/protocol/imap/imap.pac index d2381793ec..e885d5e729 100644 --- a/src/analyzer/protocol/imap/imap.pac +++ b/src/analyzer/protocol/imap/imap.pac @@ -16,7 +16,7 @@ using IMAPAnalyzer = zeek::analyzer::imap::IMAP_Analyzer*; #include "zeek/Reporter.h" #include "zeek/analyzer/protocol/imap/IMAP.h" -#include "analyzer/protocol/imap/events.bif.h" +#include "zeek/analyzer/protocol/imap/events.bif.h" %} diff --git a/src/analyzer/protocol/irc/IRC.cc b/src/analyzer/protocol/irc/IRC.cc index e75d2a6ac4..1b529f1bb9 100644 --- a/src/analyzer/protocol/irc/IRC.cc +++ b/src/analyzer/protocol/irc/IRC.cc @@ -9,7 +9,7 @@ #include "zeek/analyzer/protocol/zip/ZIP.h" #include "zeek/analyzer/Manager.h" -#include "analyzer/protocol/irc/events.bif.h" +#include "zeek/analyzer/protocol/irc/events.bif.h" using namespace std; diff --git a/src/analyzer/protocol/krb/KRB.cc b/src/analyzer/protocol/krb/KRB.cc index 929bfb13c9..6e50cfeb93 100644 --- a/src/analyzer/protocol/krb/KRB.cc +++ b/src/analyzer/protocol/krb/KRB.cc @@ -4,8 +4,8 @@ #include -#include "analyzer/protocol/krb/types.bif.h" -#include "analyzer/protocol/krb/events.bif.h" +#include "zeek/analyzer/protocol/krb/types.bif.h" +#include "zeek/analyzer/protocol/krb/events.bif.h" namespace zeek::analyzer::krb { diff --git a/src/analyzer/protocol/krb/KRB_TCP.cc b/src/analyzer/protocol/krb/KRB_TCP.cc index 78b777526a..81bf002c76 100644 --- a/src/analyzer/protocol/krb/KRB_TCP.cc +++ b/src/analyzer/protocol/krb/KRB_TCP.cc @@ -3,8 +3,8 @@ #include "zeek/analyzer/protocol/krb/KRB_TCP.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" -#include "analyzer/protocol/krb/types.bif.h" -#include "analyzer/protocol/krb/events.bif.h" +#include "zeek/analyzer/protocol/krb/types.bif.h" +#include "zeek/analyzer/protocol/krb/events.bif.h" namespace zeek::analyzer::krb_tcp { diff --git a/src/analyzer/protocol/krb/krb.pac b/src/analyzer/protocol/krb/krb.pac index f4631ac1ab..498d1cca39 100644 --- a/src/analyzer/protocol/krb/krb.pac +++ b/src/analyzer/protocol/krb/krb.pac @@ -9,8 +9,8 @@ using KRBAnalyzer = zeek::analyzer::krb::KRB_Analyzer*; #include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/krb/KRB.h" -#include "analyzer/protocol/krb/types.bif.h" -#include "analyzer/protocol/krb/events.bif.h" +#include "zeek/analyzer/protocol/krb/types.bif.h" +#include "zeek/analyzer/protocol/krb/events.bif.h" %} extern type KRBAnalyzer; diff --git a/src/analyzer/protocol/krb/krb_TCP.pac b/src/analyzer/protocol/krb/krb_TCP.pac index 0373f65cf2..9d00c1be16 100644 --- a/src/analyzer/protocol/krb/krb_TCP.pac +++ b/src/analyzer/protocol/krb/krb_TCP.pac @@ -9,8 +9,8 @@ using KRBTCPAnalyzer = zeek::analyzer::krb_tcp::KRB_Analyzer*; #include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/krb/KRB_TCP.h" -#include "analyzer/protocol/krb/types.bif.h" -#include "analyzer/protocol/krb/events.bif.h" +#include "zeek/analyzer/protocol/krb/types.bif.h" +#include "zeek/analyzer/protocol/krb/events.bif.h" %} extern type KRBTCPAnalyzer; diff --git a/src/analyzer/protocol/login/Login.cc b/src/analyzer/protocol/login/Login.cc index 2c23cb1ba4..74f73b4b64 100644 --- a/src/analyzer/protocol/login/Login.cc +++ b/src/analyzer/protocol/login/Login.cc @@ -13,7 +13,7 @@ #include "zeek/Event.h" #include "zeek/Var.h" -#include "analyzer/protocol/login/events.bif.h" +#include "zeek/analyzer/protocol/login/events.bif.h" namespace zeek::analyzer::login { diff --git a/src/analyzer/protocol/login/NVT.cc b/src/analyzer/protocol/login/NVT.cc index 1925ad8f58..641d9a86b8 100644 --- a/src/analyzer/protocol/login/NVT.cc +++ b/src/analyzer/protocol/login/NVT.cc @@ -11,7 +11,7 @@ #include "zeek/Reporter.h" #include "zeek/analyzer/protocol/tcp/TCP.h" -#include "analyzer/protocol/login/events.bif.h" +#include "zeek/analyzer/protocol/login/events.bif.h" #define IS_3_BYTE_OPTION(c) (c >= 251 && c <= 254) diff --git a/src/analyzer/protocol/login/RSH.cc b/src/analyzer/protocol/login/RSH.cc index eaa227765f..094930480a 100644 --- a/src/analyzer/protocol/login/RSH.cc +++ b/src/analyzer/protocol/login/RSH.cc @@ -7,7 +7,7 @@ #include "zeek/Event.h" #include "zeek/Reporter.h" -#include "analyzer/protocol/login/events.bif.h" +#include "zeek/analyzer/protocol/login/events.bif.h" namespace zeek::analyzer::login { diff --git a/src/analyzer/protocol/login/Rlogin.cc b/src/analyzer/protocol/login/Rlogin.cc index 8a441f8625..c19e4cedfa 100644 --- a/src/analyzer/protocol/login/Rlogin.cc +++ b/src/analyzer/protocol/login/Rlogin.cc @@ -7,7 +7,7 @@ #include "zeek/Event.h" #include "zeek/Reporter.h" -#include "analyzer/protocol/login/events.bif.h" +#include "zeek/analyzer/protocol/login/events.bif.h" namespace zeek::analyzer::login { diff --git a/src/analyzer/protocol/login/Telnet.cc b/src/analyzer/protocol/login/Telnet.cc index 5179843d6c..f9ee436a62 100644 --- a/src/analyzer/protocol/login/Telnet.cc +++ b/src/analyzer/protocol/login/Telnet.cc @@ -5,7 +5,7 @@ #include "zeek/analyzer/protocol/login/Telnet.h" #include "zeek/analyzer/protocol/login/NVT.h" -#include "analyzer/protocol/login/events.bif.h" +#include "zeek/analyzer/protocol/login/events.bif.h" namespace zeek::analyzer::login { diff --git a/src/analyzer/protocol/mime/MIME.cc b/src/analyzer/protocol/mime/MIME.cc index 84947312c2..938c02469d 100644 --- a/src/analyzer/protocol/mime/MIME.cc +++ b/src/analyzer/protocol/mime/MIME.cc @@ -7,7 +7,7 @@ #include "zeek/digest.h" #include "zeek/file_analysis/Manager.h" -#include "analyzer/protocol/mime/events.bif.h" +#include "zeek/analyzer/protocol/mime/events.bif.h" // Here are a few things to do: // diff --git a/src/analyzer/protocol/modbus/Modbus.cc b/src/analyzer/protocol/modbus/Modbus.cc index 5803cec40c..321850e497 100644 --- a/src/analyzer/protocol/modbus/Modbus.cc +++ b/src/analyzer/protocol/modbus/Modbus.cc @@ -1,7 +1,7 @@ #include "zeek/analyzer/protocol/modbus/Modbus.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" -#include "analyzer/protocol/modbus/events.bif.h" +#include "zeek/analyzer/protocol/modbus/events.bif.h" namespace zeek::analyzer::modbus { diff --git a/src/analyzer/protocol/modbus/modbus.pac b/src/analyzer/protocol/modbus/modbus.pac index e768840fbe..4961d1ae08 100644 --- a/src/analyzer/protocol/modbus/modbus.pac +++ b/src/analyzer/protocol/modbus/modbus.pac @@ -10,7 +10,7 @@ %include zeek.pac %extern{ -#include "analyzer/protocol/modbus/events.bif.h" +#include "zeek/analyzer/protocol/modbus/events.bif.h" %} analyzer ModbusTCP withcontext { diff --git a/src/analyzer/protocol/mqtt/mqtt.pac b/src/analyzer/protocol/mqtt/mqtt.pac index 82aa991fab..f01a727e1b 100644 --- a/src/analyzer/protocol/mqtt/mqtt.pac +++ b/src/analyzer/protocol/mqtt/mqtt.pac @@ -5,8 +5,8 @@ %extern{ #include "zeek/analyzer/protocol/mqtt/MQTT.h" - #include "analyzer/protocol/mqtt/events.bif.h" - #include "analyzer/protocol/mqtt/types.bif.h" + #include "zeek/analyzer/protocol/mqtt/events.bif.h" + #include "zeek/analyzer/protocol/mqtt/types.bif.h" %} analyzer MQTT withcontext { diff --git a/src/analyzer/protocol/mysql/MySQL.cc b/src/analyzer/protocol/mysql/MySQL.cc index 7a5ae507b2..03935c3620 100644 --- a/src/analyzer/protocol/mysql/MySQL.cc +++ b/src/analyzer/protocol/mysql/MySQL.cc @@ -5,7 +5,7 @@ #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" #include "zeek/Reporter.h" -#include "analyzer/protocol/mysql/events.bif.h" +#include "zeek/analyzer/protocol/mysql/events.bif.h" namespace zeek::analyzer::mysql { diff --git a/src/analyzer/protocol/mysql/MySQL.h b/src/analyzer/protocol/mysql/MySQL.h index 518613bd68..a09f256ca6 100644 --- a/src/analyzer/protocol/mysql/MySQL.h +++ b/src/analyzer/protocol/mysql/MySQL.h @@ -4,8 +4,8 @@ #include "zeek/analyzer/protocol/tcp/TCP.h" -#include "analyzer/protocol/mysql/events.bif.h" -#include "analyzer/protocol/mysql/mysql_pac.h" +#include "zeek/analyzer/protocol/mysql/events.bif.h" +#include "zeek/analyzer/protocol/mysql/mysql_pac.h" namespace zeek::analyzer::mysql { diff --git a/src/analyzer/protocol/mysql/mysql.pac b/src/analyzer/protocol/mysql/mysql.pac index 1cf589c891..1ef0eea8b1 100644 --- a/src/analyzer/protocol/mysql/mysql.pac +++ b/src/analyzer/protocol/mysql/mysql.pac @@ -8,7 +8,7 @@ %include zeek.pac %extern{ - #include "analyzer/protocol/mysql/events.bif.h" + #include "zeek/analyzer/protocol/mysql/events.bif.h" %} analyzer MySQL withcontext { diff --git a/src/analyzer/protocol/ncp/NCP.cc b/src/analyzer/protocol/ncp/NCP.cc index b1b13e935b..d6b3f235bc 100644 --- a/src/analyzer/protocol/ncp/NCP.cc +++ b/src/analyzer/protocol/ncp/NCP.cc @@ -9,8 +9,8 @@ #include "zeek/Sessions.h" -#include "analyzer/protocol/ncp/events.bif.h" -#include "analyzer/protocol/ncp/consts.bif.h" +#include "zeek/analyzer/protocol/ncp/events.bif.h" +#include "zeek/analyzer/protocol/ncp/consts.bif.h" using namespace std; diff --git a/src/analyzer/protocol/ncp/ncp.pac b/src/analyzer/protocol/ncp/ncp.pac index d86187c2ad..e766dc7b29 100644 --- a/src/analyzer/protocol/ncp/ncp.pac +++ b/src/analyzer/protocol/ncp/ncp.pac @@ -3,7 +3,7 @@ %include zeek.pac %extern{ -#include "analyzer/protocol/ncp/events.bif.h" +#include "zeek/analyzer/protocol/ncp/events.bif.h" %} analyzer NCP withcontext {}; diff --git a/src/analyzer/protocol/netbios/NetbiosSSN.cc b/src/analyzer/protocol/netbios/NetbiosSSN.cc index 4c731f444c..a065000263 100644 --- a/src/analyzer/protocol/netbios/NetbiosSSN.cc +++ b/src/analyzer/protocol/netbios/NetbiosSSN.cc @@ -11,7 +11,7 @@ #include "zeek/Event.h" #include "zeek/RunState.h" -#include "analyzer/protocol/netbios/events.bif.h" +#include "zeek/analyzer/protocol/netbios/events.bif.h" constexpr double netbios_ssn_session_timeout = 15.0; diff --git a/src/analyzer/protocol/ntlm/NTLM.cc b/src/analyzer/protocol/ntlm/NTLM.cc index a12625db29..de1906fa74 100644 --- a/src/analyzer/protocol/ntlm/NTLM.cc +++ b/src/analyzer/protocol/ntlm/NTLM.cc @@ -5,7 +5,7 @@ #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" #include "zeek/Reporter.h" -#include "analyzer/protocol/ntlm/events.bif.h" +#include "zeek/analyzer/protocol/ntlm/events.bif.h" namespace zeek::analyzer::ntlm { diff --git a/src/analyzer/protocol/ntlm/NTLM.h b/src/analyzer/protocol/ntlm/NTLM.h index aec0c9b246..f49899b3a6 100644 --- a/src/analyzer/protocol/ntlm/NTLM.h +++ b/src/analyzer/protocol/ntlm/NTLM.h @@ -4,8 +4,8 @@ #include "zeek/analyzer/protocol/tcp/TCP.h" -#include "analyzer/protocol/ntlm/events.bif.h" -#include "analyzer/protocol/ntlm/ntlm_pac.h" +#include "zeek/analyzer/protocol/ntlm/events.bif.h" +#include "zeek/analyzer/protocol/ntlm/ntlm_pac.h" namespace zeek::analyzer::ntlm { diff --git a/src/analyzer/protocol/ntlm/ntlm.pac b/src/analyzer/protocol/ntlm/ntlm.pac index a686f306a2..7fc13b3720 100644 --- a/src/analyzer/protocol/ntlm/ntlm.pac +++ b/src/analyzer/protocol/ntlm/ntlm.pac @@ -5,8 +5,8 @@ #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/Analyzer.h" -#include "analyzer/protocol/ntlm/types.bif.h" -#include "analyzer/protocol/ntlm/events.bif.h" +#include "zeek/analyzer/protocol/ntlm/types.bif.h" +#include "zeek/analyzer/protocol/ntlm/events.bif.h" %} analyzer NTLM withcontext { @@ -27,4 +27,4 @@ flow NTLM_Flow(is_orig: bool) { datagram = NTLM_SSP_Token(is_orig) withcontext(connection, this); }; -%include ntlm-analyzer.pac \ No newline at end of file +%include ntlm-analyzer.pac diff --git a/src/analyzer/protocol/ntp/NTP.cc b/src/analyzer/protocol/ntp/NTP.cc index b5dbcae06e..09beb00ac5 100644 --- a/src/analyzer/protocol/ntp/NTP.cc +++ b/src/analyzer/protocol/ntp/NTP.cc @@ -2,7 +2,7 @@ #include "zeek/Reporter.h" -#include "analyzer/protocol/ntp/events.bif.h" +#include "zeek/analyzer/protocol/ntp/events.bif.h" namespace zeek::analyzer::ntp { diff --git a/src/analyzer/protocol/ntp/NTP.h b/src/analyzer/protocol/ntp/NTP.h index d640bf348f..0e829f9288 100644 --- a/src/analyzer/protocol/ntp/NTP.h +++ b/src/analyzer/protocol/ntp/NTP.h @@ -2,9 +2,9 @@ #include "zeek/analyzer/protocol/udp/UDP.h" -#include "analyzer/protocol/ntp/events.bif.h" -#include "analyzer/protocol/ntp/types.bif.h" -#include "analyzer/protocol/ntp/ntp_pac.h" +#include "zeek/analyzer/protocol/ntp/events.bif.h" +#include "zeek/analyzer/protocol/ntp/types.bif.h" +#include "zeek/analyzer/protocol/ntp/ntp_pac.h" namespace zeek::analyzer::ntp { diff --git a/src/analyzer/protocol/ntp/ntp.pac b/src/analyzer/protocol/ntp/ntp.pac index 807082b491..6e6d9c1dac 100644 --- a/src/analyzer/protocol/ntp/ntp.pac +++ b/src/analyzer/protocol/ntp/ntp.pac @@ -3,8 +3,8 @@ %include zeek.pac %extern{ - #include "analyzer/protocol/ntp/types.bif.h" - #include "analyzer/protocol/ntp/events.bif.h" + #include "zeek/analyzer/protocol/ntp/types.bif.h" + #include "zeek/analyzer/protocol/ntp/events.bif.h" %} analyzer NTP withcontext { diff --git a/src/analyzer/protocol/pop3/POP3.cc b/src/analyzer/protocol/pop3/POP3.cc index 3a43b6b60a..516d42168a 100644 --- a/src/analyzer/protocol/pop3/POP3.cc +++ b/src/analyzer/protocol/pop3/POP3.cc @@ -12,7 +12,7 @@ #include "zeek/Reporter.h" #include "zeek/analyzer/Manager.h" -#include "analyzer/protocol/pop3/events.bif.h" +#include "zeek/analyzer/protocol/pop3/events.bif.h" namespace zeek::analyzer::pop3 { diff --git a/src/analyzer/protocol/radius/RADIUS.cc b/src/analyzer/protocol/radius/RADIUS.cc index cb5d5541b3..889f8d9e05 100644 --- a/src/analyzer/protocol/radius/RADIUS.cc +++ b/src/analyzer/protocol/radius/RADIUS.cc @@ -2,7 +2,7 @@ #include "zeek/Reporter.h" -#include "analyzer/protocol/radius/events.bif.h" +#include "zeek/analyzer/protocol/radius/events.bif.h" namespace zeek::analyzer::radius { diff --git a/src/analyzer/protocol/radius/RADIUS.h b/src/analyzer/protocol/radius/RADIUS.h index 8cb4e39884..1e1648c84f 100644 --- a/src/analyzer/protocol/radius/RADIUS.h +++ b/src/analyzer/protocol/radius/RADIUS.h @@ -2,8 +2,8 @@ #include "zeek/analyzer/protocol/udp/UDP.h" -#include "analyzer/protocol/radius/events.bif.h" -#include "analyzer/protocol/radius/radius_pac.h" +#include "zeek/analyzer/protocol/radius/events.bif.h" +#include "zeek/analyzer/protocol/radius/radius_pac.h" namespace zeek::analyzer::radius { diff --git a/src/analyzer/protocol/radius/radius.pac b/src/analyzer/protocol/radius/radius.pac index 0a9c64b560..99fd68e67d 100644 --- a/src/analyzer/protocol/radius/radius.pac +++ b/src/analyzer/protocol/radius/radius.pac @@ -6,7 +6,7 @@ %include zeek.pac %extern{ - #include "analyzer/protocol/radius/events.bif.h" + #include "zeek/analyzer/protocol/radius/events.bif.h" %} analyzer RADIUS withcontext { diff --git a/src/analyzer/protocol/rdp/RDP.cc b/src/analyzer/protocol/rdp/RDP.cc index 585cca7d2b..b889ea3ac6 100644 --- a/src/analyzer/protocol/rdp/RDP.cc +++ b/src/analyzer/protocol/rdp/RDP.cc @@ -2,8 +2,8 @@ #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" #include "zeek/Reporter.h" -#include "analyzer/protocol/rdp/events.bif.h" -#include "analyzer/protocol/rdp/types.bif.h" +#include "zeek/analyzer/protocol/rdp/events.bif.h" +#include "zeek/analyzer/protocol/rdp/types.bif.h" namespace zeek::analyzer::rdp { diff --git a/src/analyzer/protocol/rdp/RDP.h b/src/analyzer/protocol/rdp/RDP.h index 1ee55b8a96..fb14167627 100644 --- a/src/analyzer/protocol/rdp/RDP.h +++ b/src/analyzer/protocol/rdp/RDP.h @@ -3,8 +3,8 @@ #include "zeek/analyzer/protocol/tcp/TCP.h" #include "zeek/analyzer/protocol/pia/PIA.h" -#include "analyzer/protocol/rdp/events.bif.h" -#include "analyzer/protocol/rdp/rdp_pac.h" +#include "zeek/analyzer/protocol/rdp/events.bif.h" +#include "zeek/analyzer/protocol/rdp/rdp_pac.h" namespace zeek::analyzer::rdp { diff --git a/src/analyzer/protocol/rdp/RDPEUDP.cc b/src/analyzer/protocol/rdp/RDPEUDP.cc index 5f70e80c7f..6300f7986e 100644 --- a/src/analyzer/protocol/rdp/RDPEUDP.cc +++ b/src/analyzer/protocol/rdp/RDPEUDP.cc @@ -2,8 +2,8 @@ #include "zeek/Reporter.h" -#include "analyzer/protocol/rdp/events.bif.h" -#include "analyzer/protocol/rdp/rdpeudp_pac.h" +#include "zeek/analyzer/protocol/rdp/events.bif.h" +#include "zeek/analyzer/protocol/rdp/rdpeudp_pac.h" namespace zeek::analyzer::rdpeudp { diff --git a/src/analyzer/protocol/rdp/RDPEUDP.h b/src/analyzer/protocol/rdp/RDPEUDP.h index fa178d5957..13c5651633 100644 --- a/src/analyzer/protocol/rdp/RDPEUDP.h +++ b/src/analyzer/protocol/rdp/RDPEUDP.h @@ -2,8 +2,8 @@ #include "zeek/analyzer/protocol/udp/UDP.h" -#include "analyzer/protocol/rdp/events.bif.h" -#include "analyzer/protocol/rdp/rdpeudp_pac.h" +#include "zeek/analyzer/protocol/rdp/events.bif.h" +#include "zeek/analyzer/protocol/rdp/rdpeudp_pac.h" namespace zeek::analyzer::rdpeudp { diff --git a/src/analyzer/protocol/rdp/rdp-analyzer.pac b/src/analyzer/protocol/rdp/rdp-analyzer.pac index 3984bdd89f..3f4007824a 100644 --- a/src/analyzer/protocol/rdp/rdp-analyzer.pac +++ b/src/analyzer/protocol/rdp/rdp-analyzer.pac @@ -2,7 +2,7 @@ #include "zeek/Desc.h" #include "zeek/file_analysis/Manager.h" -#include "analyzer/protocol/rdp/types.bif.h" +#include "zeek/analyzer/protocol/rdp/types.bif.h" %} refine flow RDP_Flow += { diff --git a/src/analyzer/protocol/rdp/rdp.pac b/src/analyzer/protocol/rdp/rdp.pac index 5f267dbe13..62ffcd2d64 100644 --- a/src/analyzer/protocol/rdp/rdp.pac +++ b/src/analyzer/protocol/rdp/rdp.pac @@ -2,7 +2,7 @@ %include zeek.pac %extern{ - #include "analyzer/protocol/rdp/events.bif.h" + #include "zeek/analyzer/protocol/rdp/events.bif.h" %} analyzer RDP withcontext { diff --git a/src/analyzer/protocol/rdp/rdpeudp.pac b/src/analyzer/protocol/rdp/rdpeudp.pac index 61a90f9aca..67ccb8cb2b 100644 --- a/src/analyzer/protocol/rdp/rdpeudp.pac +++ b/src/analyzer/protocol/rdp/rdpeudp.pac @@ -2,7 +2,7 @@ %include zeek.pac %extern{ - #include "analyzer/protocol/rdp/events.bif.h" + #include "zeek/analyzer/protocol/rdp/events.bif.h" %} analyzer RDPEUDP withcontext { diff --git a/src/analyzer/protocol/rfb/RFB.cc b/src/analyzer/protocol/rfb/RFB.cc index f3f29ad45a..6f443c4975 100644 --- a/src/analyzer/protocol/rfb/RFB.cc +++ b/src/analyzer/protocol/rfb/RFB.cc @@ -3,7 +3,7 @@ #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" #include "zeek/Reporter.h" -#include "analyzer/protocol/rfb/events.bif.h" +#include "zeek/analyzer/protocol/rfb/events.bif.h" namespace zeek::analyzer::rfb { diff --git a/src/analyzer/protocol/rfb/RFB.h b/src/analyzer/protocol/rfb/RFB.h index e260569b61..37b5f5cdae 100644 --- a/src/analyzer/protocol/rfb/RFB.h +++ b/src/analyzer/protocol/rfb/RFB.h @@ -2,8 +2,8 @@ #include "zeek/analyzer/protocol/tcp/TCP.h" -#include "analyzer/protocol/rfb/events.bif.h" -#include "analyzer/protocol/rfb/rfb_pac.h" +#include "zeek/analyzer/protocol/rfb/events.bif.h" +#include "zeek/analyzer/protocol/rfb/rfb_pac.h" namespace zeek::analyzer::rfb { diff --git a/src/analyzer/protocol/rfb/rfb.pac b/src/analyzer/protocol/rfb/rfb.pac index fa80c8c3bd..ad24faf64d 100644 --- a/src/analyzer/protocol/rfb/rfb.pac +++ b/src/analyzer/protocol/rfb/rfb.pac @@ -6,7 +6,7 @@ %include zeek.pac %extern{ - #include "analyzer/protocol/rfb/events.bif.h" + #include "zeek/analyzer/protocol/rfb/events.bif.h" %} analyzer RFB withcontext { diff --git a/src/analyzer/protocol/rpc/MOUNT.cc b/src/analyzer/protocol/rpc/MOUNT.cc index 2ff1e63a67..c321486cb8 100644 --- a/src/analyzer/protocol/rpc/MOUNT.cc +++ b/src/analyzer/protocol/rpc/MOUNT.cc @@ -11,7 +11,7 @@ #include "zeek/analyzer/protocol/rpc/XDR.h" #include "zeek/Event.h" -#include "analyzer/protocol/rpc/events.bif.h" +#include "zeek/analyzer/protocol/rpc/events.bif.h" namespace zeek::analyzer::rpc { namespace detail { diff --git a/src/analyzer/protocol/rpc/NFS.cc b/src/analyzer/protocol/rpc/NFS.cc index d11a54ccff..856a1b6254 100644 --- a/src/analyzer/protocol/rpc/NFS.cc +++ b/src/analyzer/protocol/rpc/NFS.cc @@ -11,7 +11,7 @@ #include "zeek/analyzer/protocol/rpc/XDR.h" #include "zeek/Event.h" -#include "analyzer/protocol/rpc/events.bif.h" +#include "zeek/analyzer/protocol/rpc/events.bif.h" namespace zeek::analyzer::rpc { namespace detail { diff --git a/src/analyzer/protocol/rpc/Portmap.cc b/src/analyzer/protocol/rpc/Portmap.cc index 633084bf82..302428a56b 100644 --- a/src/analyzer/protocol/rpc/Portmap.cc +++ b/src/analyzer/protocol/rpc/Portmap.cc @@ -7,7 +7,7 @@ #include "zeek/Event.h" #include "zeek/analyzer/protocol/rpc/XDR.h" -#include "analyzer/protocol/rpc/events.bif.h" +#include "zeek/analyzer/protocol/rpc/events.bif.h" #define PMAPPROC_NULL 0 #define PMAPPROC_SET 1 diff --git a/src/analyzer/protocol/rpc/RPC.cc b/src/analyzer/protocol/rpc/RPC.cc index 9a26b4034e..51f0529c63 100644 --- a/src/analyzer/protocol/rpc/RPC.cc +++ b/src/analyzer/protocol/rpc/RPC.cc @@ -12,7 +12,7 @@ #include "zeek/Sessions.h" #include "zeek/RunState.h" -#include "analyzer/protocol/rpc/events.bif.h" +#include "zeek/analyzer/protocol/rpc/events.bif.h" namespace { // local namespace const bool DEBUG_rpc_resync = false; diff --git a/src/analyzer/protocol/rpc/XDR.cc b/src/analyzer/protocol/rpc/XDR.cc index 0eff4ae885..f3534410bf 100644 --- a/src/analyzer/protocol/rpc/XDR.cc +++ b/src/analyzer/protocol/rpc/XDR.cc @@ -6,7 +6,7 @@ #include #include -#include "analyzer/protocol/rpc/events.bif.h" +#include "zeek/analyzer/protocol/rpc/events.bif.h" uint32_t zeek::analyzer::rpc::extract_XDR_uint32(const u_char*& buf, int& len) { diff --git a/src/analyzer/protocol/sip/SIP.cc b/src/analyzer/protocol/sip/SIP.cc index 893c976799..c1ec48ac64 100644 --- a/src/analyzer/protocol/sip/SIP.cc +++ b/src/analyzer/protocol/sip/SIP.cc @@ -1,6 +1,6 @@ #include "zeek/analyzer/protocol/sip/SIP.h" -#include "analyzer/protocol/sip/events.bif.h" +#include "zeek/analyzer/protocol/sip/events.bif.h" namespace zeek::analyzer::sip { diff --git a/src/analyzer/protocol/sip/SIP.h b/src/analyzer/protocol/sip/SIP.h index 20fbcba69a..18ec010a8b 100644 --- a/src/analyzer/protocol/sip/SIP.h +++ b/src/analyzer/protocol/sip/SIP.h @@ -2,8 +2,8 @@ #include "zeek/analyzer/protocol/udp/UDP.h" -#include "analyzer/protocol/sip/events.bif.h" -#include "analyzer/protocol/sip/sip_pac.h" +#include "zeek/analyzer/protocol/sip/events.bif.h" +#include "zeek/analyzer/protocol/sip/sip_pac.h" namespace zeek::analyzer::sip{ diff --git a/src/analyzer/protocol/sip/SIP_TCP.cc b/src/analyzer/protocol/sip/SIP_TCP.cc index 4be1b5657e..3b54762af7 100644 --- a/src/analyzer/protocol/sip/SIP_TCP.cc +++ b/src/analyzer/protocol/sip/SIP_TCP.cc @@ -6,7 +6,7 @@ #include "zeek/analyzer/protocol/sip/SIP_TCP.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" -#include "analyzer/protocol/sip/events.bif.h" +#include "zeek/analyzer/protocol/sip/events.bif.h" namespace zeek::analyzer::sip_tcp { diff --git a/src/analyzer/protocol/sip/sip.pac b/src/analyzer/protocol/sip/sip.pac index 833fc4e517..d2f06ae422 100644 --- a/src/analyzer/protocol/sip/sip.pac +++ b/src/analyzer/protocol/sip/sip.pac @@ -5,7 +5,7 @@ %include zeek.pac %extern{ -#include "analyzer/protocol/sip/events.bif.h" +#include "zeek/analyzer/protocol/sip/events.bif.h" %} analyzer SIP withcontext { diff --git a/src/analyzer/protocol/sip/sip_TCP.pac b/src/analyzer/protocol/sip/sip_TCP.pac index 10a0dd5fa7..62c9398782 100644 --- a/src/analyzer/protocol/sip/sip_TCP.pac +++ b/src/analyzer/protocol/sip/sip_TCP.pac @@ -8,7 +8,7 @@ %include zeek.pac %extern{ -#include "analyzer/protocol/sip/events.bif.h" +#include "zeek/analyzer/protocol/sip/events.bif.h" %} analyzer SIP_TCP withcontext { diff --git a/src/analyzer/protocol/smb/smb.pac b/src/analyzer/protocol/smb/smb.pac index d679591503..dd909552ab 100644 --- a/src/analyzer/protocol/smb/smb.pac +++ b/src/analyzer/protocol/smb/smb.pac @@ -5,42 +5,42 @@ #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/Analyzer.h" -#include "analyzer/protocol/smb/smb1_events.bif.h" -#include "analyzer/protocol/smb/smb2_events.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_events.bif.h" +#include "zeek/analyzer/protocol/smb/smb2_events.bif.h" -#include "analyzer/protocol/smb/types.bif.h" -#include "analyzer/protocol/smb/events.bif.h" -#include "analyzer/protocol/smb/consts.bif.h" +#include "zeek/analyzer/protocol/smb/types.bif.h" +#include "zeek/analyzer/protocol/smb/events.bif.h" +#include "zeek/analyzer/protocol/smb/consts.bif.h" -#include "analyzer/protocol/smb/smb1_com_check_directory.bif.h" -#include "analyzer/protocol/smb/smb1_com_close.bif.h" -#include "analyzer/protocol/smb/smb1_com_create_directory.bif.h" -#include "analyzer/protocol/smb/smb1_com_echo.bif.h" -#include "analyzer/protocol/smb/smb1_com_logoff_andx.bif.h" -#include "analyzer/protocol/smb/smb1_com_negotiate.bif.h" -#include "analyzer/protocol/smb/smb1_com_nt_cancel.bif.h" -#include "analyzer/protocol/smb/smb1_com_nt_create_andx.bif.h" -#include "analyzer/protocol/smb/smb1_com_query_information.bif.h" -#include "analyzer/protocol/smb/smb1_com_read_andx.bif.h" -#include "analyzer/protocol/smb/smb1_com_session_setup_andx.bif.h" -#include "analyzer/protocol/smb/smb1_com_transaction.bif.h" -#include "analyzer/protocol/smb/smb1_com_transaction_secondary.bif.h" -#include "analyzer/protocol/smb/smb1_com_transaction2.bif.h" -#include "analyzer/protocol/smb/smb1_com_transaction2_secondary.bif.h" -#include "analyzer/protocol/smb/smb1_com_tree_connect_andx.bif.h" -#include "analyzer/protocol/smb/smb1_com_tree_disconnect.bif.h" -#include "analyzer/protocol/smb/smb1_com_write_andx.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_check_directory.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_close.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_create_directory.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_echo.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_logoff_andx.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_negotiate.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_nt_cancel.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_nt_create_andx.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_query_information.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_read_andx.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_session_setup_andx.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_transaction.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_transaction_secondary.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_transaction2.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_transaction2_secondary.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_tree_connect_andx.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_tree_disconnect.bif.h" +#include "zeek/analyzer/protocol/smb/smb1_com_write_andx.bif.h" -#include "analyzer/protocol/smb/smb2_com_close.bif.h" -#include "analyzer/protocol/smb/smb2_com_create.bif.h" -#include "analyzer/protocol/smb/smb2_com_negotiate.bif.h" -#include "analyzer/protocol/smb/smb2_com_read.bif.h" -#include "analyzer/protocol/smb/smb2_com_session_setup.bif.h" -#include "analyzer/protocol/smb/smb2_com_set_info.bif.h" -#include "analyzer/protocol/smb/smb2_com_tree_connect.bif.h" -#include "analyzer/protocol/smb/smb2_com_tree_disconnect.bif.h" -#include "analyzer/protocol/smb/smb2_com_write.bif.h" -#include "analyzer/protocol/smb/smb2_com_transform_header.bif.h" +#include "zeek/analyzer/protocol/smb/smb2_com_close.bif.h" +#include "zeek/analyzer/protocol/smb/smb2_com_create.bif.h" +#include "zeek/analyzer/protocol/smb/smb2_com_negotiate.bif.h" +#include "zeek/analyzer/protocol/smb/smb2_com_read.bif.h" +#include "zeek/analyzer/protocol/smb/smb2_com_session_setup.bif.h" +#include "zeek/analyzer/protocol/smb/smb2_com_set_info.bif.h" +#include "zeek/analyzer/protocol/smb/smb2_com_tree_connect.bif.h" +#include "zeek/analyzer/protocol/smb/smb2_com_tree_disconnect.bif.h" +#include "zeek/analyzer/protocol/smb/smb2_com_write.bif.h" +#include "zeek/analyzer/protocol/smb/smb2_com_transform_header.bif.h" %} analyzer SMB withcontext { diff --git a/src/analyzer/protocol/smtp/SMTP.cc b/src/analyzer/protocol/smtp/SMTP.cc index 328a60c935..c6729b86fd 100644 --- a/src/analyzer/protocol/smtp/SMTP.cc +++ b/src/analyzer/protocol/smtp/SMTP.cc @@ -10,7 +10,7 @@ #include "zeek/Reporter.h" #include "zeek/analyzer/Manager.h" -#include "analyzer/protocol/smtp/events.bif.h" +#include "zeek/analyzer/protocol/smtp/events.bif.h" #undef SMTP_CMD_DEF #define SMTP_CMD_DEF(cmd) #cmd, diff --git a/src/analyzer/protocol/snmp/SNMP.cc b/src/analyzer/protocol/snmp/SNMP.cc index d3aeb9c8fd..307c586a64 100644 --- a/src/analyzer/protocol/snmp/SNMP.cc +++ b/src/analyzer/protocol/snmp/SNMP.cc @@ -4,8 +4,8 @@ #include "zeek/Func.h" #include "zeek/Reporter.h" -#include "analyzer/protocol/snmp/types.bif.h" -#include "analyzer/protocol/snmp/events.bif.h" +#include "zeek/analyzer/protocol/snmp/types.bif.h" +#include "zeek/analyzer/protocol/snmp/events.bif.h" namespace zeek::analyzer::snmp { diff --git a/src/analyzer/protocol/snmp/snmp.pac b/src/analyzer/protocol/snmp/snmp.pac index e32a9610cf..c345f98f49 100644 --- a/src/analyzer/protocol/snmp/snmp.pac +++ b/src/analyzer/protocol/snmp/snmp.pac @@ -3,8 +3,8 @@ %extern{ #include "zeek/Reporter.h" -#include "analyzer/protocol/snmp/types.bif.h" -#include "analyzer/protocol/snmp/events.bif.h" +#include "zeek/analyzer/protocol/snmp/types.bif.h" +#include "zeek/analyzer/protocol/snmp/events.bif.h" %} analyzer SNMP withcontext { diff --git a/src/analyzer/protocol/socks/SOCKS.cc b/src/analyzer/protocol/socks/SOCKS.cc index e4a1a48a7b..628d968519 100644 --- a/src/analyzer/protocol/socks/SOCKS.cc +++ b/src/analyzer/protocol/socks/SOCKS.cc @@ -2,8 +2,8 @@ #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" -#include "analyzer/protocol/socks/socks_pac.h" -#include "analyzer/protocol/socks/events.bif.h" +#include "zeek/analyzer/protocol/socks/socks_pac.h" +#include "zeek/analyzer/protocol/socks/events.bif.h" namespace zeek::analyzer::socks { diff --git a/src/analyzer/protocol/socks/socks.pac b/src/analyzer/protocol/socks/socks.pac index 8778527193..933f4d53b9 100644 --- a/src/analyzer/protocol/socks/socks.pac +++ b/src/analyzer/protocol/socks/socks.pac @@ -5,7 +5,7 @@ #include "zeek/analyzer/protocol/socks/SOCKS.h" #include "zeek/Reporter.h" -#include "analyzer/protocol/socks/events.bif.h" +#include "zeek/analyzer/protocol/socks/events.bif.h" %} analyzer SOCKS withcontext { diff --git a/src/analyzer/protocol/ssh/SSH.cc b/src/analyzer/protocol/ssh/SSH.cc index 2b1fca11ef..f95a17d8d2 100644 --- a/src/analyzer/protocol/ssh/SSH.cc +++ b/src/analyzer/protocol/ssh/SSH.cc @@ -5,8 +5,8 @@ #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" #include "zeek/Reporter.h" -#include "analyzer/protocol/ssh/types.bif.h" -#include "analyzer/protocol/ssh/events.bif.h" +#include "zeek/analyzer/protocol/ssh/types.bif.h" +#include "zeek/analyzer/protocol/ssh/events.bif.h" namespace zeek::analyzer::ssh { diff --git a/src/analyzer/protocol/ssh/SSH.h b/src/analyzer/protocol/ssh/SSH.h index 53a07eee3a..10c3b8f658 100644 --- a/src/analyzer/protocol/ssh/SSH.h +++ b/src/analyzer/protocol/ssh/SSH.h @@ -4,8 +4,8 @@ #include "zeek/analyzer/protocol/tcp/TCP.h" -#include "analyzer/protocol/ssh/events.bif.h" -#include "analyzer/protocol/ssh/ssh_pac.h" +#include "zeek/analyzer/protocol/ssh/events.bif.h" +#include "zeek/analyzer/protocol/ssh/ssh_pac.h" namespace zeek::analyzer::ssh { diff --git a/src/analyzer/protocol/ssh/ssh.pac b/src/analyzer/protocol/ssh/ssh.pac index 5fe486d966..e1581a0e74 100644 --- a/src/analyzer/protocol/ssh/ssh.pac +++ b/src/analyzer/protocol/ssh/ssh.pac @@ -8,8 +8,8 @@ %include zeek.pac %extern{ - #include "analyzer/protocol/ssh/types.bif.h" - #include "analyzer/protocol/ssh/events.bif.h" + #include "zeek/analyzer/protocol/ssh/types.bif.h" + #include "zeek/analyzer/protocol/ssh/events.bif.h" %} analyzer SSH withcontext { @@ -30,4 +30,4 @@ flow SSH_Flow(is_orig: bool) { flowunit = SSH_PDU(is_orig) withcontext(connection, this); }; -%include ssh-analyzer.pac \ No newline at end of file +%include ssh-analyzer.pac diff --git a/src/analyzer/protocol/ssl/DTLS.cc b/src/analyzer/protocol/ssl/DTLS.cc index 2dc30d4de6..09f9e7c305 100644 --- a/src/analyzer/protocol/ssl/DTLS.cc +++ b/src/analyzer/protocol/ssl/DTLS.cc @@ -2,9 +2,9 @@ #include "zeek/Reporter.h" #include "zeek/util.h" -#include "analyzer/protocol/ssl/events.bif.h" -#include "analyzer/protocol/ssl/dtls_pac.h" -#include "analyzer/protocol/ssl/tls-handshake_pac.h" +#include "zeek/analyzer/protocol/ssl/events.bif.h" +#include "zeek/analyzer/protocol/ssl/dtls_pac.h" +#include "zeek/analyzer/protocol/ssl/tls-handshake_pac.h" namespace zeek::analyzer::dtls { diff --git a/src/analyzer/protocol/ssl/DTLS.h b/src/analyzer/protocol/ssl/DTLS.h index 64e37f5a0f..1554c1bb6e 100644 --- a/src/analyzer/protocol/ssl/DTLS.h +++ b/src/analyzer/protocol/ssl/DTLS.h @@ -2,7 +2,7 @@ #include "zeek/analyzer/protocol/udp/UDP.h" -#include "analyzer/protocol/ssl/events.bif.h" +#include "zeek/analyzer/protocol/ssl/events.bif.h" namespace binpac { namespace DTLS { class SSL_Conn; } } namespace binpac { namespace TLSHandshake { class Handshake_Conn; } } diff --git a/src/analyzer/protocol/ssl/SSL.cc b/src/analyzer/protocol/ssl/SSL.cc index 718ec92b69..aeaa63a7a0 100644 --- a/src/analyzer/protocol/ssl/SSL.cc +++ b/src/analyzer/protocol/ssl/SSL.cc @@ -4,9 +4,9 @@ #include "zeek/Reporter.h" #include "zeek/util.h" -#include "analyzer/protocol/ssl/events.bif.h" -#include "analyzer/protocol/ssl/ssl_pac.h" -#include "analyzer/protocol/ssl/tls-handshake_pac.h" +#include "zeek/analyzer/protocol/ssl/events.bif.h" +#include "zeek/analyzer/protocol/ssl/ssl_pac.h" +#include "zeek/analyzer/protocol/ssl/tls-handshake_pac.h" namespace zeek::analyzer::ssl { diff --git a/src/analyzer/protocol/ssl/SSL.h b/src/analyzer/protocol/ssl/SSL.h index b9ddda8a5b..bb1ee98941 100644 --- a/src/analyzer/protocol/ssl/SSL.h +++ b/src/analyzer/protocol/ssl/SSL.h @@ -2,7 +2,7 @@ #include "zeek/analyzer/protocol/tcp/TCP.h" -#include "analyzer/protocol/ssl/events.bif.h" +#include "zeek/analyzer/protocol/ssl/events.bif.h" namespace binpac { namespace SSL { class SSL_Conn; } } diff --git a/src/analyzer/protocol/ssl/dtls.pac b/src/analyzer/protocol/ssl/dtls.pac index 025d1ee261..45be44fe68 100644 --- a/src/analyzer/protocol/ssl/dtls.pac +++ b/src/analyzer/protocol/ssl/dtls.pac @@ -10,8 +10,8 @@ using DTLSAnalyzer = zeek::analyzer::dtls::DTLS_Analyzer*; #include "zeek/analyzer/protocol/ssl/DTLS.h" -#include "analyzer/protocol/ssl/events.bif.h" -#include "analyzer/protocol/ssl/consts.bif.h" +#include "zeek/analyzer/protocol/ssl/events.bif.h" +#include "zeek/analyzer/protocol/ssl/consts.bif.h" %} extern type DTLSAnalyzer; diff --git a/src/analyzer/protocol/ssl/ssl-defs.pac b/src/analyzer/protocol/ssl/ssl-defs.pac index 9c84c52c90..072c7d5de6 100644 --- a/src/analyzer/protocol/ssl/ssl-defs.pac +++ b/src/analyzer/protocol/ssl/ssl-defs.pac @@ -87,7 +87,7 @@ function version_ok(vers : uint16) : bool %extern{ #include -#include "analyzer/protocol/ssl/events.bif.h" +#include "zeek/analyzer/protocol/ssl/events.bif.h" using std::string; %} diff --git a/src/analyzer/protocol/ssl/ssl.pac b/src/analyzer/protocol/ssl/ssl.pac index d0c06a3a4c..07a7ab9955 100644 --- a/src/analyzer/protocol/ssl/ssl.pac +++ b/src/analyzer/protocol/ssl/ssl.pac @@ -16,7 +16,7 @@ using SSLAnalyzer = zeek::analyzer::ssl::SSL_Analyzer*; #include "zeek/Desc.h" #include "zeek/analyzer/protocol/ssl/SSL.h" -#include "analyzer/protocol/ssl/events.bif.h" +#include "zeek/analyzer/protocol/ssl/events.bif.h" %} extern type SSLAnalyzer; diff --git a/src/analyzer/protocol/ssl/tls-handshake.pac b/src/analyzer/protocol/ssl/tls-handshake.pac index 4ceb759ae5..00193bca72 100644 --- a/src/analyzer/protocol/ssl/tls-handshake.pac +++ b/src/analyzer/protocol/ssl/tls-handshake.pac @@ -6,8 +6,8 @@ %extern{ #include "zeek/Desc.h" -#include "analyzer/protocol/ssl/types.bif.h" -#include "analyzer/protocol/ssl/events.bif.h" +#include "zeek/analyzer/protocol/ssl/types.bif.h" +#include "zeek/analyzer/protocol/ssl/events.bif.h" %} analyzer TLSHandshake withcontext { diff --git a/src/analyzer/protocol/stepping-stone/SteppingStone.cc b/src/analyzer/protocol/stepping-stone/SteppingStone.cc index cac857c5cb..2aa7d45a6c 100644 --- a/src/analyzer/protocol/stepping-stone/SteppingStone.cc +++ b/src/analyzer/protocol/stepping-stone/SteppingStone.cc @@ -12,7 +12,7 @@ #include "zeek/Sessions.h" #include "zeek/util.h" -#include "analyzer/protocol/stepping-stone/events.bif.h" +#include "zeek/analyzer/protocol/stepping-stone/events.bif.h" namespace zeek::analyzer::stepping_stone { diff --git a/src/analyzer/protocol/syslog/Syslog.cc b/src/analyzer/protocol/syslog/Syslog.cc index ab9748ee6c..7c46ab0342 100644 --- a/src/analyzer/protocol/syslog/Syslog.cc +++ b/src/analyzer/protocol/syslog/Syslog.cc @@ -1,7 +1,7 @@ #include "zeek/analyzer/protocol/syslog/Syslog.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" -#include "analyzer/protocol/syslog/events.bif.h" +#include "zeek/analyzer/protocol/syslog/events.bif.h" namespace zeek::analyzer::syslog { diff --git a/src/analyzer/protocol/syslog/syslog.pac b/src/analyzer/protocol/syslog/syslog.pac index c5a9e251a7..4a5dfe2ede 100644 --- a/src/analyzer/protocol/syslog/syslog.pac +++ b/src/analyzer/protocol/syslog/syslog.pac @@ -3,7 +3,7 @@ %include zeek.pac %extern{ -#include "analyzer/protocol/syslog/events.bif.h" +#include "zeek/analyzer/protocol/syslog/events.bif.h" %} analyzer Syslog withcontext { diff --git a/src/analyzer/protocol/tcp/ContentLine.cc b/src/analyzer/protocol/tcp/ContentLine.cc index 679f8c1f37..8de2d50c19 100644 --- a/src/analyzer/protocol/tcp/ContentLine.cc +++ b/src/analyzer/protocol/tcp/ContentLine.cc @@ -3,7 +3,7 @@ #include "zeek/analyzer/protocol/tcp/TCP.h" #include "zeek/Reporter.h" -#include "analyzer/protocol/tcp/events.bif.h" +#include "zeek/analyzer/protocol/tcp/events.bif.h" namespace zeek::analyzer::tcp { diff --git a/src/analyzer/protocol/tcp/Stats.cc b/src/analyzer/protocol/tcp/Stats.cc index 73d65551b7..96b085954b 100644 --- a/src/analyzer/protocol/tcp/Stats.cc +++ b/src/analyzer/protocol/tcp/Stats.cc @@ -2,7 +2,7 @@ #include "zeek/File.h" -#include "analyzer/protocol/tcp/events.bif.h" +#include "zeek/analyzer/protocol/tcp/events.bif.h" namespace zeek::analyzer::tcp { diff --git a/src/analyzer/protocol/tcp/TCP.cc b/src/analyzer/protocol/tcp/TCP.cc index 549612e501..de60ddc60d 100644 --- a/src/analyzer/protocol/tcp/TCP.cc +++ b/src/analyzer/protocol/tcp/TCP.cc @@ -16,8 +16,8 @@ #include "zeek/Sessions.h" #include "zeek/DebugLogger.h" -#include "analyzer/protocol/tcp/events.bif.h" -#include "analyzer/protocol/tcp/types.bif.h" +#include "zeek/analyzer/protocol/tcp/events.bif.h" +#include "zeek/analyzer/protocol/tcp/types.bif.h" namespace { // local namespace const bool DEBUG_tcp_data_sent = false; diff --git a/src/analyzer/protocol/tcp/TCP_Endpoint.cc b/src/analyzer/protocol/tcp/TCP_Endpoint.cc index aeb9f2d822..792a513132 100644 --- a/src/analyzer/protocol/tcp/TCP_Endpoint.cc +++ b/src/analyzer/protocol/tcp/TCP_Endpoint.cc @@ -14,7 +14,7 @@ #include "zeek/File.h" #include "zeek/Val.h" -#include "analyzer/protocol/tcp/events.bif.h" +#include "zeek/analyzer/protocol/tcp/events.bif.h" namespace zeek::analyzer::tcp { diff --git a/src/analyzer/protocol/tcp/TCP_Reassembler.cc b/src/analyzer/protocol/tcp/TCP_Reassembler.cc index 8d87ad36db..86070cf9fa 100644 --- a/src/analyzer/protocol/tcp/TCP_Reassembler.cc +++ b/src/analyzer/protocol/tcp/TCP_Reassembler.cc @@ -10,7 +10,7 @@ #include "zeek/Reporter.h" #include "zeek/RuleMatcher.h" -#include "analyzer/protocol/tcp/events.bif.h" +#include "zeek/analyzer/protocol/tcp/events.bif.h" namespace zeek::analyzer::tcp { diff --git a/src/analyzer/protocol/teredo/Teredo.cc b/src/analyzer/protocol/teredo/Teredo.cc index e0003007ba..ef18c39f73 100644 --- a/src/analyzer/protocol/teredo/Teredo.cc +++ b/src/analyzer/protocol/teredo/Teredo.cc @@ -9,7 +9,7 @@ #include "zeek/RunState.h" #include "zeek/packet_analysis/protocol/iptunnel/IPTunnel.h" -#include "analyzer/protocol/teredo/events.bif.h" +#include "zeek/analyzer/protocol/teredo/events.bif.h" namespace zeek::analyzer::teredo { diff --git a/src/analyzer/protocol/udp/UDP.cc b/src/analyzer/protocol/udp/UDP.cc index b494ffcf0a..4ea5ccfbf3 100644 --- a/src/analyzer/protocol/udp/UDP.cc +++ b/src/analyzer/protocol/udp/UDP.cc @@ -11,7 +11,7 @@ #include "zeek/Reporter.h" #include "zeek/Conn.h" -#include "analyzer/protocol/udp/events.bif.h" +#include "zeek/analyzer/protocol/udp/events.bif.h" namespace zeek::analyzer::udp { diff --git a/src/analyzer/protocol/vxlan/VXLAN.cc b/src/analyzer/protocol/vxlan/VXLAN.cc index 780c2573eb..dd103dd8c3 100644 --- a/src/analyzer/protocol/vxlan/VXLAN.cc +++ b/src/analyzer/protocol/vxlan/VXLAN.cc @@ -15,7 +15,7 @@ extern "C" { #include "zeek/packet_analysis/Manager.h" #include "zeek/packet_analysis/protocol/iptunnel/IPTunnel.h" -#include "analyzer/protocol/vxlan/events.bif.h" +#include "zeek/analyzer/protocol/vxlan/events.bif.h" namespace zeek::analyzer::vxlan { diff --git a/src/analyzer/protocol/xmpp/xmpp.pac b/src/analyzer/protocol/xmpp/xmpp.pac index a81751583b..721410d6a7 100644 --- a/src/analyzer/protocol/xmpp/xmpp.pac +++ b/src/analyzer/protocol/xmpp/xmpp.pac @@ -16,7 +16,7 @@ using XMPPAnalyzer = zeek::analyzer::xmpp::XMPP_Analyzer*; #include "zeek/Reporter.h" #include "zeek/analyzer/protocol/xmpp/XMPP.h" -#include "analyzer/protocol/xmpp/events.bif.h" +#include "zeek/analyzer/protocol/xmpp/events.bif.h" %} extern type XMPPAnalyzer; diff --git a/src/broker/Data.cc b/src/broker/Data.cc index 088c0c6ed0..6fdeb23cea 100644 --- a/src/broker/Data.cc +++ b/src/broker/Data.cc @@ -11,7 +11,7 @@ #include "zeek/Func.h" #include "zeek/module_util.h" -#include "broker/data.bif.h" +#include "zeek/broker/data.bif.h" using namespace std; diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc index 0c265a732f..98abfbe56f 100644 --- a/src/broker/Manager.cc +++ b/src/broker/Manager.cc @@ -21,10 +21,10 @@ #include "zeek/SerializationFormat.h" #include "zeek/RunState.h" -#include "broker/comm.bif.h" -#include "broker/data.bif.h" -#include "broker/messaging.bif.h" -#include "broker/store.bif.h" +#include "zeek/broker/comm.bif.h" +#include "zeek/broker/data.bif.h" +#include "zeek/broker/messaging.bif.h" +#include "zeek/broker/store.bif.h" using namespace std; diff --git a/src/broker/Store.h b/src/broker/Store.h index 029c84d884..fb9a516fac 100644 --- a/src/broker/Store.h +++ b/src/broker/Store.h @@ -8,8 +8,8 @@ #include "zeek/OpaqueVal.h" #include "zeek/Trigger.h" -#include "broker/store.bif.h" -#include "broker/data.bif.h" +#include "zeek/broker/store.bif.h" +#include "zeek/broker/data.bif.h" namespace zeek::Broker::detail { diff --git a/src/file_analysis/AnalyzerSet.cc b/src/file_analysis/AnalyzerSet.cc index b1498b7ad8..802b77d5ce 100644 --- a/src/file_analysis/AnalyzerSet.cc +++ b/src/file_analysis/AnalyzerSet.cc @@ -7,7 +7,7 @@ #include "zeek/CompHash.h" #include "zeek/Val.h" -#include "file_analysis/file_analysis.bif.h" +#include "zeek/file_analysis/file_analysis.bif.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/Manager.cc b/src/file_analysis/Manager.cc index 55fa7cbb5a..cadca7368e 100644 --- a/src/file_analysis/Manager.cc +++ b/src/file_analysis/Manager.cc @@ -12,7 +12,7 @@ #include "zeek/plugin/Manager.h" #include "zeek/analyzer/Manager.h" -#include "file_analysis/file_analysis.bif.h" +#include "zeek/file_analysis/file_analysis.bif.h" using namespace std; diff --git a/src/file_analysis/analyzer/entropy/Entropy.h b/src/file_analysis/analyzer/entropy/Entropy.h index 01718eb16b..10e99f70a1 100644 --- a/src/file_analysis/analyzer/entropy/Entropy.h +++ b/src/file_analysis/analyzer/entropy/Entropy.h @@ -9,7 +9,7 @@ #include "zeek/file_analysis/File.h" #include "zeek/file_analysis/Analyzer.h" -#include "file_analysis/analyzer/entropy/events.bif.h" +#include "zeek/file_analysis/analyzer/entropy/events.bif.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/analyzer/extract/Extract.h b/src/file_analysis/analyzer/extract/Extract.h index 0c9a6ed7bf..8a02ba8289 100644 --- a/src/file_analysis/analyzer/extract/Extract.h +++ b/src/file_analysis/analyzer/extract/Extract.h @@ -8,7 +8,7 @@ #include "zeek/file_analysis/File.h" #include "zeek/file_analysis/Analyzer.h" -#include "file_analysis/analyzer/extract/events.bif.h" +#include "zeek/file_analysis/analyzer/extract/events.bif.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/analyzer/extract/functions.bif b/src/file_analysis/analyzer/extract/functions.bif index c75127f87f..96a1b07da1 100644 --- a/src/file_analysis/analyzer/extract/functions.bif +++ b/src/file_analysis/analyzer/extract/functions.bif @@ -5,7 +5,7 @@ module FileExtract; %%{ #include "zeek/zeek/file_analysis/Manager.h" -#include "file_analysis/file_analysis.bif.h" +#include "zeek/file_analysis/file_analysis.bif.h" %%} ## :zeek:see:`FileExtract::set_limit`. diff --git a/src/file_analysis/analyzer/hash/Hash.h b/src/file_analysis/analyzer/hash/Hash.h index 7f869f90f5..e5b72bd2e5 100644 --- a/src/file_analysis/analyzer/hash/Hash.h +++ b/src/file_analysis/analyzer/hash/Hash.h @@ -9,7 +9,7 @@ #include "zeek/file_analysis/File.h" #include "zeek/file_analysis/Analyzer.h" -#include "file_analysis/analyzer/hash/events.bif.h" +#include "zeek/file_analysis/analyzer/hash/events.bif.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/analyzer/pe/pe-analyzer.pac b/src/file_analysis/analyzer/pe/pe-analyzer.pac index 8b02aa3661..2316289ad5 100644 --- a/src/file_analysis/analyzer/pe/pe-analyzer.pac +++ b/src/file_analysis/analyzer/pe/pe-analyzer.pac @@ -2,7 +2,7 @@ #include "zeek/Event.h" #include "zeek/file_analysis/File.h" -#include "file_analysis/analyzer/pe/events.bif.h" +#include "zeek/file_analysis/analyzer/pe/events.bif.h" %} %header{ diff --git a/src/file_analysis/analyzer/unified2/unified2-analyzer.pac b/src/file_analysis/analyzer/unified2/unified2-analyzer.pac index f1af68ea00..dbb7c88079 100644 --- a/src/file_analysis/analyzer/unified2/unified2-analyzer.pac +++ b/src/file_analysis/analyzer/unified2/unified2-analyzer.pac @@ -4,8 +4,8 @@ #include "zeek/file_analysis/File.h" #include "zeek/IPAddr.h" -#include "file_analysis/analyzer/unified2/events.bif.h" -#include "file_analysis/analyzer/unified2/types.bif.h" +#include "zeek/file_analysis/analyzer/unified2/events.bif.h" +#include "zeek/file_analysis/analyzer/unified2/types.bif.h" %} %code{ diff --git a/src/file_analysis/analyzer/x509/OCSP.cc b/src/file_analysis/analyzer/x509/OCSP.cc index dda8dd50d6..9108f48cf9 100644 --- a/src/file_analysis/analyzer/x509/OCSP.cc +++ b/src/file_analysis/analyzer/x509/OCSP.cc @@ -16,8 +16,8 @@ #include "zeek/file_analysis/File.h" #include "zeek/file_analysis/Manager.h" -#include "file_analysis/analyzer/x509/types.bif.h" -#include "file_analysis/analyzer/x509/ocsp_events.bif.h" +#include "zeek/file_analysis/analyzer/x509/types.bif.h" +#include "zeek/file_analysis/analyzer/x509/ocsp_events.bif.h" // helper function of sk_X509_value to avoid namespace problem // sk_X509_value(X,Y) = > SKM_sk_value(X509,X,Y) diff --git a/src/file_analysis/analyzer/x509/X509.cc b/src/file_analysis/analyzer/x509/X509.cc index 47a8a4a14c..2f2899b0aa 100644 --- a/src/file_analysis/analyzer/x509/X509.cc +++ b/src/file_analysis/analyzer/x509/X509.cc @@ -18,8 +18,8 @@ #include "zeek/file_analysis/File.h" #include "zeek/file_analysis/Manager.h" -#include "file_analysis/analyzer/x509/events.bif.h" -#include "file_analysis/analyzer/x509/types.bif.h" +#include "zeek/file_analysis/analyzer/x509/events.bif.h" +#include "zeek/file_analysis/analyzer/x509/types.bif.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/analyzer/x509/X509Common.cc b/src/file_analysis/analyzer/x509/X509Common.cc index 71bd69be59..cb78d1d48c 100644 --- a/src/file_analysis/analyzer/x509/X509Common.cc +++ b/src/file_analysis/analyzer/x509/X509Common.cc @@ -10,10 +10,10 @@ #include "zeek/Reporter.h" -#include "file_analysis/analyzer/x509/x509-extension_pac.h" -#include "file_analysis/analyzer/x509/events.bif.h" -#include "file_analysis/analyzer/x509/ocsp_events.bif.h" -#include "file_analysis/analyzer/x509/types.bif.h" +#include "zeek/file_analysis/analyzer/x509/x509-extension_pac.h" +#include "zeek/file_analysis/analyzer/x509/events.bif.h" +#include "zeek/file_analysis/analyzer/x509/ocsp_events.bif.h" +#include "zeek/file_analysis/analyzer/x509/types.bif.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/analyzer/x509/functions.bif b/src/file_analysis/analyzer/x509/functions.bif index 21916c02f3..a754ec19b0 100644 --- a/src/file_analysis/analyzer/x509/functions.bif +++ b/src/file_analysis/analyzer/x509/functions.bif @@ -9,7 +9,7 @@ #include "zeek/file_analysis/analyzer/x509/X509.h" #include "zeek/net_util.h" -#include "file_analysis/analyzer/x509/types.bif.h" +#include "zeek/file_analysis/analyzer/x509/types.bif.h" // construct an error record static zeek::RecordValPtr x509_result_record(uint64_t num, const char* reason, zeek::ValPtr chainVector = nullptr) diff --git a/src/file_analysis/analyzer/x509/x509-extension.pac b/src/file_analysis/analyzer/x509/x509-extension.pac index b98e6a31b2..03d6931028 100644 --- a/src/file_analysis/analyzer/x509/x509-extension.pac +++ b/src/file_analysis/analyzer/x509/x509-extension.pac @@ -7,8 +7,8 @@ %extern{ #include "zeek/file_analysis/File.h" -#include "file_analysis/analyzer/x509/types.bif.h" -#include "file_analysis/analyzer/x509/events.bif.h" +#include "zeek/file_analysis/analyzer/x509/types.bif.h" +#include "zeek/file_analysis/analyzer/x509/events.bif.h" %} analyzer X509Extension withcontext { diff --git a/src/input/Manager.cc b/src/input/Manager.cc index 6a8b4ac4eb..09b2b0cff3 100644 --- a/src/input/Manager.cc +++ b/src/input/Manager.cc @@ -21,7 +21,7 @@ #include "zeek/file_analysis/Manager.h" #include "zeek/threading/SerialTypes.h" -#include "input/input.bif.h" +#include "zeek/input/input.bif.h" using namespace std; using zeek::threading::Value; diff --git a/src/input/readers/ascii/Ascii.cc b/src/input/readers/ascii/Ascii.cc index 330cbc9f5a..b08d73e938 100644 --- a/src/input/readers/ascii/Ascii.cc +++ b/src/input/readers/ascii/Ascii.cc @@ -10,7 +10,7 @@ #include "zeek/threading/SerialTypes.h" -#include "input/readers/ascii/ascii.bif.h" +#include "zeek/input/readers/ascii/ascii.bif.h" using namespace std; using zeek::threading::Value; diff --git a/src/input/readers/benchmark/Benchmark.cc b/src/input/readers/benchmark/Benchmark.cc index adc1f7319a..3c604320ab 100644 --- a/src/input/readers/benchmark/Benchmark.cc +++ b/src/input/readers/benchmark/Benchmark.cc @@ -10,7 +10,7 @@ #include "zeek/threading/SerialTypes.h" #include "zeek/threading/Manager.h" -#include "input/readers/benchmark/benchmark.bif.h" +#include "zeek/input/readers/benchmark/benchmark.bif.h" using zeek::threading::Value; using zeek::threading::Field; diff --git a/src/input/readers/binary/Binary.cc b/src/input/readers/binary/Binary.cc index 6c77cd0c85..d794b2d3bc 100644 --- a/src/input/readers/binary/Binary.cc +++ b/src/input/readers/binary/Binary.cc @@ -6,7 +6,7 @@ #include "zeek/threading/SerialTypes.h" -#include "input/readers/binary/binary.bif.h" +#include "zeek/input/readers/binary/binary.bif.h" using namespace std; using zeek::threading::Value; diff --git a/src/input/readers/config/Config.cc b/src/input/readers/config/Config.cc index ec6226de99..e673664204 100644 --- a/src/input/readers/config/Config.cc +++ b/src/input/readers/config/Config.cc @@ -14,7 +14,7 @@ #include "zeek/input/Manager.h" #include "zeek/threading/SerialTypes.h" -#include "input/readers/config/config.bif.h" +#include "zeek/input/readers/config/config.bif.h" using zeek::threading::Value; using zeek::threading::Field; diff --git a/src/input/readers/raw/Raw.cc b/src/input/readers/raw/Raw.cc index 230b233e49..0695e1b5bb 100644 --- a/src/input/readers/raw/Raw.cc +++ b/src/input/readers/raw/Raw.cc @@ -15,7 +15,7 @@ #include "zeek/input/readers/raw/Plugin.h" #include "zeek/threading/SerialTypes.h" -#include "input/readers/raw/raw.bif.h" +#include "zeek/input/readers/raw/raw.bif.h" extern "C" { #include "zeek/setsignal.h" diff --git a/src/input/readers/sqlite/SQLite.cc b/src/input/readers/sqlite/SQLite.cc index 9522fc3c70..0785ae226b 100644 --- a/src/input/readers/sqlite/SQLite.cc +++ b/src/input/readers/sqlite/SQLite.cc @@ -11,9 +11,9 @@ #include "zeek/threading/SerialTypes.h" -#include "input/readers/sqlite/sqlite.bif.h" -#include "logging/writers/sqlite/sqlite.bif.h" -#include "logging/writers/ascii/ascii.bif.h" +#include "zeek/input/readers/sqlite/sqlite.bif.h" +#include "zeek/logging/writers/sqlite/sqlite.bif.h" +#include "zeek/logging/writers/ascii/ascii.bif.h" using zeek::threading::Value; using zeek::threading::Field; diff --git a/src/iosource/PktSrc.cc b/src/iosource/PktSrc.cc index d74458b3b4..8e3cf40110 100644 --- a/src/iosource/PktSrc.cc +++ b/src/iosource/PktSrc.cc @@ -14,7 +14,7 @@ #include "zeek/packet_analysis/Manager.h" #include "zeek/iosource/BPF_Program.h" -#include "iosource/pcap/pcap.bif.h" +#include "zeek/iosource/pcap/pcap.bif.h" namespace zeek::iosource { diff --git a/src/iosource/pcap/Dumper.cc b/src/iosource/pcap/Dumper.cc index e84fbef861..e64552391a 100644 --- a/src/iosource/pcap/Dumper.cc +++ b/src/iosource/pcap/Dumper.cc @@ -8,7 +8,7 @@ #include "zeek/iosource/PktSrc.h" #include "zeek/RunState.h" -#include "iosource/pcap/pcap.bif.h" +#include "zeek/iosource/pcap/pcap.bif.h" namespace zeek::iosource::pcap { diff --git a/src/iosource/pcap/Source.cc b/src/iosource/pcap/Source.cc index c7401f15d3..605c0e50af 100644 --- a/src/iosource/pcap/Source.cc +++ b/src/iosource/pcap/Source.cc @@ -11,7 +11,7 @@ #include "zeek/iosource/BPF_Program.h" #include "zeek/Event.h" -#include "iosource/pcap/pcap.bif.h" +#include "zeek/iosource/pcap/pcap.bif.h" namespace zeek::iosource::pcap { diff --git a/src/logging/Manager.cc b/src/logging/Manager.cc index 564f7c95c0..11efb7b802 100644 --- a/src/logging/Manager.cc +++ b/src/logging/Manager.cc @@ -26,7 +26,7 @@ #include "zeek/plugin/Plugin.h" #include "zeek/plugin/Manager.h" -#include "logging/logging.bif.h" +#include "zeek/logging/logging.bif.h" using namespace std; diff --git a/src/logging/writers/ascii/Ascii.cc b/src/logging/writers/ascii/Ascii.cc index 926960faf4..23d4c2833d 100644 --- a/src/logging/writers/ascii/Ascii.cc +++ b/src/logging/writers/ascii/Ascii.cc @@ -21,7 +21,7 @@ #include "zeek/logging/Manager.h" #include "zeek/threading/SerialTypes.h" -#include "logging/writers/ascii/ascii.bif.h" +#include "zeek/logging/writers/ascii/ascii.bif.h" using namespace std; using zeek::threading::Value; diff --git a/src/logging/writers/none/None.cc b/src/logging/writers/none/None.cc index ab02c12cef..6f46a847cd 100644 --- a/src/logging/writers/none/None.cc +++ b/src/logging/writers/none/None.cc @@ -3,7 +3,7 @@ #include #include -#include "logging/writers/none/none.bif.h" +#include "zeek/logging/writers/none/none.bif.h" namespace zeek::logging::writer::detail { diff --git a/src/logging/writers/sqlite/SQLite.cc b/src/logging/writers/sqlite/SQLite.cc index e67f644660..af0e48bad3 100644 --- a/src/logging/writers/sqlite/SQLite.cc +++ b/src/logging/writers/sqlite/SQLite.cc @@ -9,7 +9,7 @@ #include "zeek/threading/SerialTypes.h" -#include "logging/writers/sqlite/sqlite.bif.h" +#include "zeek/logging/writers/sqlite/sqlite.bif.h" using namespace std; using zeek::threading::Value; diff --git a/src/packet_analysis/protocol/arp/ARP.cc b/src/packet_analysis/protocol/arp/ARP.cc index 5f1bb95e46..bae1a1cf54 100644 --- a/src/packet_analysis/protocol/arp/ARP.cc +++ b/src/packet_analysis/protocol/arp/ARP.cc @@ -15,7 +15,7 @@ #include "zeek/Event.h" -#include "packet_analysis/protocol/arp/events.bif.h" +#include "zeek/packet_analysis/protocol/arp/events.bif.h" using namespace zeek::packet_analysis::ARP; diff --git a/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/src/FOO.cc b/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/src/FOO.cc index a9f7d873b9..3eea2c8121 100644 --- a/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/src/FOO.cc +++ b/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/src/FOO.cc @@ -1,8 +1,8 @@ #include "FOO.h" -#include "analyzer/protocol/tcp/TCP_Reassembler.h" +#include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" -#include "Reporter.h" +#include "zeek/Reporter.h" #include "foo.bif.h" diff --git a/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/src/FOO.h b/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/src/FOO.h index d5f85248a1..29af81f2d3 100644 --- a/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/src/FOO.h +++ b/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/src/FOO.h @@ -3,7 +3,7 @@ #include "foo.bif.h" -#include "analyzer/protocol/tcp/TCP.h" +#include "zeek/analyzer/protocol/tcp/TCP.h" #include "foo_pac.h" diff --git a/testing/btest/plugins/file-plugin/src/Foo.cc b/testing/btest/plugins/file-plugin/src/Foo.cc index d4001e4e49..067b15ef4a 100644 --- a/testing/btest/plugins/file-plugin/src/Foo.cc +++ b/testing/btest/plugins/file-plugin/src/Foo.cc @@ -1,9 +1,9 @@ #include "Foo.h" -#include "file_analysis/File.h" +#include "events.bif.h" -#include -#include +#include +#include using namespace btest::plugin::Demo_Foo; diff --git a/testing/btest/plugins/protocol-plugin/src/Foo.cc b/testing/btest/plugins/protocol-plugin/src/Foo.cc index 1735330369..d1cf72196e 100644 --- a/testing/btest/plugins/protocol-plugin/src/Foo.cc +++ b/testing/btest/plugins/protocol-plugin/src/Foo.cc @@ -3,7 +3,7 @@ #include "foo_pac.h" #include "events.bif.h" -#include +#include using namespace btest::plugin::Demo_Foo;