Merge branch 'master' into full-month-stats

[stg.git] / projects / stargazer / plugins / capture / ipq_linux / ipq_cap.cpp

diff --git a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp
index 6cf5b0f94559eaa8c0b1d8156936aa058868a2d4..055993063d44b96d617f2b164ce89a11f9663aca 100644 (file)
--- a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp
+++ b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp
@@ -23,6 +23,7 @@
 
 #include <csignal>
 #include <cerrno>
 
 #include <csignal>
 #include <cerrno>

+#include <cstring>

 
 #include "stg/raw_ip_packet.h"
 #include "stg/traffcounter.h"
 
 #include "stg/raw_ip_packet.h"
 #include "stg/traffcounter.h"


@@ -39,7 +40,12 @@ extern "C"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

+namespace
+{

 PLUGIN_CREATOR<IPQ_CAP> icc;
 PLUGIN_CREATOR<IPQ_CAP> icc;

+}
+
+extern "C" PLUGIN * GetPlugin();

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------


@@ -50,7 +56,7 @@ return icc.GetPlugin();
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-const std::string IPQ_CAP::GetVersion() const
+std::string IPQ_CAP::GetVersion() const

 {
 return "ipq_cap v.1.2";
 }
 {
 return "ipq_cap v.1.2";
 }


@@ -160,6 +166,7 @@ ipq_h = ipq_create_handle(0, PF_INET);
 if (ipq_h == NULL)
     {
     ipq_destroy_handle(ipq_h);
 if (ipq_h == NULL)
     {
     ipq_destroy_handle(ipq_h);

+    logger("Cannot create IPQ handle. Error: '%s', '%s'", ipq_errstr(), strerror(errno));

     errorStr = "Cannot create ipq handle!";
     return -1;
     }
     errorStr = "Cannot create ipq handle!";
     return -1;
     }


@@ -167,6 +174,7 @@ int status = ipq_set_mode(ipq_h, IPQ_COPY_PACKET, PAYLOAD_LEN);
 if (status < 0)
     {
     ipq_destroy_handle(ipq_h);
 if (status < 0)
     {
     ipq_destroy_handle(ipq_h);

+    logger("Cannot set IPQ_COPY_PACKET mode.");

     errorStr = "Cannot set IPQ_COPY_PACKET mode!";
     return -1;
     }
     errorStr = "Cannot set IPQ_COPY_PACKET mode!";
     return -1;
     }