Merge pull request #6 from andrewbeard/master

Initial changes for Zeek compatability
ntop · Apr 20, 2020 · 3f3a9e1 · 3f3a9e1
2 parents 91d2787 + afc948b
commit 3f3a9e1
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 6 deletions.
diff --git a/scripts/__load__.bro b/scripts/__load__.bro
diff --git a/scripts/__load__.zeek b/scripts/__load__.zeek
@@ -0,0 +1,5 @@
+#
+# This is loaded unconditionally at Zeek startup.
+# 
+
+@load ./init.zeek
diff --git a/scripts/init.bro → scripts/init.zeek b/scripts/init.bro → scripts/init.zeek
diff --git a/src/PF_RING.cc b/src/PF_RING.cc
@@ -1,4 +1,4 @@
-#include "bro-config.h"
+#include "zeek-config.h"
 #include "stdlib.h"
 
 #include "PF_RING.h"

diff --git a/src/PF_RING.h b/src/PF_RING.h
@@ -6,6 +6,7 @@
 extern "C" {
 #include <stdio.h>
 #include <pfring.h>
+#include <pcap.h>
 }
 
 #include "iosource/PktSrc.h"

diff --git a/src/Plugin.cc b/src/Plugin.cc
@@ -1,5 +1,6 @@
 #include "Plugin.h"
 #include "PF_RING.h"
+#include "iosource/Component.h"
 
 namespace plugin { namespace Bro_PF_RING { Plugin plugin; } }
 

diff --git a/bro-pkg.meta → zkg.meta b/bro-pkg.meta → zkg.meta