GH-1079: Use full paths starting with zeek/ when including files

src/iosource/BPF_Program.cc

@@ -1,14 +1,13 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "zeek-config.h"
-
-#include "BPF_Program.h"
+#include "zeek/iosource/BPF_Program.h"
 
 #include <string.h>
 
 #ifdef DONT_HAVE_LIBPCAP_PCAP_FREECODE
 extern "C" {
-#include "pcap-int.h"
+#include <pcap-int.h>
 
 int pcap_freecode(pcap_t* unused, struct bpf_program* program)
 	{

src/iosource/BPF_Program.h

@@ -2,12 +2,12 @@
 
 #pragma once
 
+#include <stdint.h>
+
 extern "C" {
 #include <pcap.h>
 }
 
-#include <stdint.h>
-
 namespace zeek::iosource::detail {
 
 // BPF_Programs are an abstraction around struct bpf_program,

src/iosource/Component.cc

@@ -1,9 +1,9 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "Component.h"
+#include "zeek/iosource/Component.h"
 
-#include "Desc.h"
-#include "Reporter.h"
+#include "zeek/Desc.h"
+#include "zeek/Reporter.h"
 
 namespace zeek::iosource {
 

src/iosource/Component.h

@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "plugin/Component.h"
+#include "zeek/plugin/Component.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(IOSource, zeek, iosource);
 ZEEK_FORWARD_DECLARE_NAMESPACED(PktSrc, zeek, iosource);

src/iosource/Manager.cc

@@ -1,22 +1,22 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
+#include "zeek/iosource/Manager.h"
+
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <assert.h>
 
-#include "Manager.h"
-#include "Component.h"
-#include "IOSource.h"
-#include "RunState.h"
-#include "PktSrc.h"
-#include "PktDumper.h"
-#include "plugin/Manager.h"
-#include "broker/Manager.h"
-#include "NetVar.h"
-
-#include "util.h"
+#include "zeek/iosource/Component.h"
+#include "zeek/iosource/IOSource.h"
+#include "zeek/iosource/PktSrc.h"
+#include "zeek/iosource/PktDumper.h"
+#include "zeek/plugin/Manager.h"
+#include "zeek/broker/Manager.h"
+#include "zeek/NetVar.h"
+#include "zeek/RunState.h"
+#include "zeek/util.h"
 
 #define DEFAULT_PREFIX "pcap"
 

src/iosource/Manager.h

@@ -8,8 +8,8 @@
 #include <vector>
 #include <map>
 
-#include "IOSource.h"
-#include "Flare.h"
+#include "zeek/iosource/IOSource.h"
+#include "zeek/Flare.h"
 
 struct timespec;
 struct kevent;

src/iosource/Packet.cc

@@ -1,11 +1,4 @@
-#include "Packet.h"
-#include "Sessions.h"
-#include "Desc.h"
-#include "IP.h"
-#include "iosource/Manager.h"
-#include "packet_analysis/Manager.h"
-#include "Var.h"
-#include "TunnelEncapsulation.h"
+#include "zeek/iosource/Packet.h"
 
 extern "C" {
 #include <pcap.h>
@@ -21,6 +14,14 @@ extern "C" {
 #endif
 }
 
+#include "zeek/Sessions.h"
+#include "zeek/Desc.h"
+#include "zeek/IP.h"
+#include "zeek/iosource/Manager.h"
+#include "zeek/packet_analysis/Manager.h"
+#include "zeek/Var.h"
+#include "zeek/TunnelEncapsulation.h"
+
 namespace zeek {
 
 void Packet::Init(int arg_link_type, pkt_timeval *arg_ts, uint32_t arg_caplen,

src/iosource/Packet.h

@@ -13,7 +13,8 @@ typedef struct bpf_timeval pkt_timeval;
 typedef struct timeval pkt_timeval;
 #endif
 
-#include "pcap.h" // For DLT_ constants
+#include <pcap.h> // For DLT_ constants
+
 #include "zeek/NetVar.h" // For BifEnum::Tunnel
 #include "zeek/TunnelEncapsulation.h"
 #include "zeek/IP.h"

src/iosource/PktDumper.cc

@@ -3,8 +3,8 @@
 
 #include "zeek-config.h"
 
-#include "PktDumper.h"
-#include "DebugLogger.h"
+#include "zeek/iosource/PktDumper.h"
+#include "zeek/DebugLogger.h"
 
 namespace zeek::iosource {
 

src/iosource/PktSrc.cc

@@ -1,18 +1,18 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "zeek-config.h"
-#include "PktSrc.h"
+#include "zeek/iosource/PktSrc.h"
 
 #include <sys/stat.h>
 
-#include "util.h"
-#include "Hash.h"
-#include "RunState.h"
-#include "Sessions.h"
-#include "broker/Manager.h"
-#include "iosource/Manager.h"
-#include "packet_analysis/Manager.h"
-#include "BPF_Program.h"
+#include "zeek/util.h"
+#include "zeek/Hash.h"
+#include "zeek/RunState.h"
+#include "zeek/Sessions.h"
+#include "zeek/broker/Manager.h"
+#include "zeek/iosource/Manager.h"
+#include "zeek/packet_analysis/Manager.h"
+#include "zeek/iosource/BPF_Program.h"
 
 #include "pcap/pcap.bif.h"
 

src/iosource/PktSrc.h

@@ -2,12 +2,11 @@
 
 #pragma once
 
+#include <sys/types.h> // for u_char
 #include <vector>
 
-#include "IOSource.h"
-#include "Packet.h"
-
-#include <sys/types.h> // for u_char
+#include "zeek/iosource/IOSource.h"
+#include "zeek/iosource/Packet.h"
 
 struct pcap_pkthdr;
 ZEEK_FORWARD_DECLARE_NAMESPACED(BPF_Program, zeek::iosource::detail);

src/iosource/pcap/Dumper.cc

@@ -1,11 +1,12 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
+#include "zeek/iosource/pcap/Dumper.h"
+
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "Dumper.h"
-#include "../PktSrc.h"
-#include "../../RunState.h"
+#include "zeek/iosource/PktSrc.h"
+#include "zeek/RunState.h"
 
 #include "pcap.bif.h"
 

src/iosource/pcap/Dumper.h

@@ -6,7 +6,7 @@ extern "C" {
 #include <pcap.h>
 }
 
-#include "../PktDumper.h"
+#include "zeek/iosource/PktDumper.h"
 
 namespace zeek::iosource::pcap {
 

src/iosource/pcap/Plugin.cc

@@ -1,9 +1,9 @@
 // See the file  in the main distribution directory for copyright.
 
-#include "Source.h"
-#include "Dumper.h"
-#include "plugin/Plugin.h"
-#include "iosource/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/iosource/Component.h"
+#include "zeek/iosource/pcap/Source.h"
+#include "zeek/iosource/pcap/Dumper.h"
 
 namespace zeek::plugin::detail::Zeek_Pcap {
 

src/iosource/pcap/Source.cc

@@ -1,19 +1,18 @@
 // See the file  in the main distribution directory for copyright.
 
 #include "zeek-config.h"
-
-#include "Source.h"
-#include "iosource/Packet.h"
-#include "iosource/BPF_Program.h"
-
-#include "Event.h"
-
-#include "pcap.bif.h"
+#include "zeek/iosource/pcap/Source.h"
 
 #ifdef HAVE_PCAP_INT_H
 #include <pcap-int.h>
 #endif
 
+#include "zeek/iosource/Packet.h"
+#include "zeek/iosource/BPF_Program.h"
+#include "zeek/Event.h"
+
+#include "pcap.bif.h"
+
 namespace zeek::iosource::pcap {
 
 PcapSource::~PcapSource()

src/iosource/pcap/Source.h

@@ -2,13 +2,13 @@
 
 #pragma once
 
-#include "../PktSrc.h"
+#include <sys/types.h> // for u_char
 
 extern "C" {
 #include <pcap.h>
 }
 
-#include <sys/types.h> // for u_char
+#include "zeek/iosource/PktSrc.h"
 
 namespace zeek::iosource::pcap {
 

src/iosource/pcap/pcap.bif

@@ -6,9 +6,9 @@ const snaplen: count;
 const bufsize: count;
 
 %%{
-#include "pcap.h"
+#include <pcap.h>
 
-#include "iosource/Manager.h"
+#include "zeek/iosource/Manager.h"
 %%}
 
 ## Precompiles a PCAP filter and binds it to a given identifier.