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

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.