From a68848db159cc1cafa82f9d383432fda459c8745 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 17 Jul 2021 09:11:16 +0200
Subject: Merging upstream version 1.2.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/filter/copy.h    |  8 ++++----
 src/filter/ipsplit.h |  6 +++---
 src/filter/layer.h   | 36 ++++++++++++++++++------------------
 src/filter/split.h   |  6 +++---
 src/filter/timing.h  |  8 ++++----
 5 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'src/filter')

diff --git a/src/filter/copy.h b/src/filter/copy.h
index 96c8db0..d65a552 100644
--- a/src/filter/copy.h
+++ b/src/filter/copy.h
@@ -18,13 +18,13 @@
  * along with dnsjit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "core/log.h"
-#include "core/object.h"
-#include "core/receiver.h"
+#include <dnsjit/core/log.h>
+#include <dnsjit/core/object.h>
+#include <dnsjit/core/receiver.h>
 
 #ifndef __dnsjit_filter_copy_h
 #define __dnsjit_filter_copy_h
 
-#include "filter/copy.hh"
+#include <dnsjit/filter/copy.hh>
 
 #endif
diff --git a/src/filter/ipsplit.h b/src/filter/ipsplit.h
index 16c932e..aa64878 100644
--- a/src/filter/ipsplit.h
+++ b/src/filter/ipsplit.h
@@ -18,12 +18,12 @@
  * along with dnsjit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "core/log.h"
-#include "core/receiver.h"
+#include <dnsjit/core/log.h>
+#include <dnsjit/core/receiver.h>
 
 #ifndef __dnsjit_filter_ipsplit_h
 #define __dnsjit_filter_ipsplit_h
 
-#include "filter/ipsplit.hh"
+#include <dnsjit/filter/ipsplit.hh>
 
 #endif
diff --git a/src/filter/layer.h b/src/filter/layer.h
index da8671c..d7dde4a 100644
--- a/src/filter/layer.h
+++ b/src/filter/layer.h
@@ -18,27 +18,27 @@
  * along with dnsjit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "core/log.h"
-#include "core/receiver.h"
-#include "core/producer.h"
-#include "core/object/pcap.h"
-#include "core/object/null.h"
-#include "core/object/ether.h"
-#include "core/object/loop.h"
-#include "core/object/linuxsll.h"
-#include "core/object/ieee802.h"
-#include "core/object/ip.h"
-#include "core/object/ip6.h"
-#include "core/object/gre.h"
-#include "core/object/icmp.h"
-#include "core/object/icmp6.h"
-#include "core/object/udp.h"
-#include "core/object/tcp.h"
-#include "core/object/payload.h"
+#include <dnsjit/core/log.h>
+#include <dnsjit/core/receiver.h>
+#include <dnsjit/core/producer.h>
+#include <dnsjit/core/object/pcap.h>
+#include <dnsjit/core/object/null.h>
+#include <dnsjit/core/object/ether.h>
+#include <dnsjit/core/object/loop.h>
+#include <dnsjit/core/object/linuxsll.h>
+#include <dnsjit/core/object/ieee802.h>
+#include <dnsjit/core/object/ip.h>
+#include <dnsjit/core/object/ip6.h>
+#include <dnsjit/core/object/gre.h>
+#include <dnsjit/core/object/icmp.h>
+#include <dnsjit/core/object/icmp6.h>
+#include <dnsjit/core/object/udp.h>
+#include <dnsjit/core/object/tcp.h>
+#include <dnsjit/core/object/payload.h>
 
 #ifndef __dnsjit_filter_layer_h
 #define __dnsjit_filter_layer_h
 
-#include "filter/layer.hh"
+#include <dnsjit/filter/layer.hh>
 
 #endif
diff --git a/src/filter/split.h b/src/filter/split.h
index 921b649..2b0be09 100644
--- a/src/filter/split.h
+++ b/src/filter/split.h
@@ -18,12 +18,12 @@
  * along with dnsjit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "core/log.h"
-#include "core/receiver.h"
+#include <dnsjit/core/log.h>
+#include <dnsjit/core/receiver.h>
 
 #ifndef __dnsjit_filter_split_h
 #define __dnsjit_filter_split_h
 
-#include "filter/split.hh"
+#include <dnsjit/filter/split.hh>
 
 #endif
diff --git a/src/filter/timing.h b/src/filter/timing.h
index c00c43d..283155c 100644
--- a/src/filter/timing.h
+++ b/src/filter/timing.h
@@ -18,13 +18,13 @@
  * along with dnsjit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "core/log.h"
-#include "core/receiver.h"
-#include "core/producer.h"
+#include <dnsjit/core/log.h>
+#include <dnsjit/core/receiver.h>
+#include <dnsjit/core/producer.h>
 
 #ifndef __dnsjit_filter_timing_h
 #define __dnsjit_filter_timing_h
 
-#include "filter/timing.hh"
+#include <dnsjit/filter/timing.hh>
 
 #endif
-- 
cgit v1.2.3