Minor code tidy: gRPC is a separate module in the analyser

directory / namespace.

Author: cybermaggedon

include/cyberprobe/analyser/grpc.h

@@ -0,0 +1,43 @@
+
+////////////////////////////////////////////////////////////////////////////
+//
+// gRPC stuff
+//
+////////////////////////////////////////////////////////////////////////////
+
+#ifndef CYBERPROBE_ANALYSER_GRPC_H
+#define CYBERPROBE_ANALYSER_GRPC_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <memory>
+#include <string>
+#include <cyberprobe/event/event.h>
+
+namespace cyberprobe {
+
+namespace analyser {
+
+#ifdef WITH_GRPC
+
+    class eventstream_client;
+
+    class grpc_manager {
+    public:
+        grpc_manager() {}
+        std::map<std::string, std::shared_ptr<eventstream_client> > client;
+        static std::shared_ptr<grpc_manager> create();
+        void observe(std::shared_ptr<event::event>, const std::string& svc);
+        void close();
+        virtual ~grpc_manager();
+    };
+
+#endif
+
+}
+
+}
+
+#endif

include/cyberprobe/analyser/lua.h

@@ -32,6 +32,10 @@ extern "C" {
 #include <cyberprobe/protocol/tls_handshake_protocol.h>
 #include <cyberprobe/event/event.h>
 
+#ifdef WITH_GRPC
+#include <cyberprobe/analyser/grpc.h>
+#endif
+
 namespace cyberprobe {
 
 namespace analyser {
@@ -442,18 +446,6 @@ delete[] buf;
 
 #ifdef WITH_GRPC
 
-    class eventstream_client;
-
-    class grpc_manager {
-    public:
-        grpc_manager() {}
-        std::map<std::string, std::shared_ptr<eventstream_client> > client;
-        static std::shared_ptr<grpc_manager> create();
-        void observe(std::shared_ptr<event::event>, const std::string& svc);
-        void close();
-        virtual ~grpc_manager();
-    };
-
     class grpc_userdata {
     public:
 

src/Makefile.am

@@ -179,7 +179,7 @@ endif
 if WITH_PROTOBUF
 if WITH_GRPC
 
-libcybermon_la_SOURCES += event/event_grpc.C
+libcybermon_la_SOURCES += analyser/grpc.C
 
 eventstream_service_SOURCES = eventstream-service.C network/socket.C	\
 	../include/cyberprobe/network/socket.h

src/event/event_grpc.C renamed to src/analyser/grpc.C

@@ -9,7 +9,7 @@
 #include <thread>
 
 #include <cyberprobe/event/event.h>
-#include <cyberprobe/analyser/lua.h>
+#include <cyberprobe/analyser/grpc.h>
 
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>