Ticket 26. #include "stg/logger.h" directive removed.

[stg.git] / projects / stargazer / plugins / capture / divert_freebsd / divert_cap.cpp

diff --git a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
index 5d49f6924287769cfdb3d8987ae29081370cd2f5..400709bdbc00666bc163e2c7ba13738438c0ee6c 100644 (file)
--- a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
+++ b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
@@ -41,10 +41,12 @@ $Date: 2010/09/10 06:43:03 $
 #include <csignal>
 
 #include <algorithm>
 #include <csignal>
 
 #include <algorithm>

+#include <vector>

 
 

-#include "common.h"
+#include "stg/common.h"
+#include "stg/traffcounter.h"
+#include "stg/plugin_creator.h"

 #include "divert_cap.h"
 #include "divert_cap.h"

-#include "traffcounter.h"

 
 #define BUFF_LEN (16384) /* max mtu -> lo=16436  TODO why?*/
 
 
 #define BUFF_LEN (16384) /* max mtu -> lo=16436  TODO why?*/
 


@@ -52,56 +54,45 @@ $Date: 2010/09/10 06:43:03 $
 struct DIVERT_DATA {
 int sock;
 short int port;
 struct DIVERT_DATA {
 int sock;
 short int port;

-unsigned char buffer[BUFF_LEN];

 char iface[10];
 };
 //-----------------------------------------------------------------------------
 pollfd pollddiv;
 DIVERT_DATA cddiv;  //capture data
 //-----------------------------------------------------------------------------
 char iface[10];
 };
 //-----------------------------------------------------------------------------
 pollfd pollddiv;
 DIVERT_DATA cddiv;  //capture data
 //-----------------------------------------------------------------------------

-class DIVERT_CAP_CREATOR {
-private:
-    DIVERT_CAP * divc;
-
-public:
-    DIVERT_CAP_CREATOR()
-        : divc(new DIVERT_CAP())
-        {
-        }
-    ~DIVERT_CAP_CREATOR()
-        {
-        delete divc;
-        }
-
-    DIVERT_CAP * GetCapturer()
-    {
-    return divc;
-    }
-};
-//-----------------------------------------------------------------------------

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

-DIVERT_CAP_CREATOR dcc;
+namespace
+{
+PLUGIN_CREATOR<DIVERT_CAP> dcc;
+}
+
+extern "C" PLUGIN * GetPlugin();

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 PLUGIN * GetPlugin()
 {
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 PLUGIN * GetPlugin()
 {

-return dcc.GetCapturer();
+return dcc.GetPlugin();

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

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

 {
 {

-return "Divert_cap v.1.0";
+return "cap_divert v.1.0";

 }
 //-----------------------------------------------------------------------------
 DIVERT_CAP::DIVERT_CAP()
 }
 //-----------------------------------------------------------------------------
 DIVERT_CAP::DIVERT_CAP()

-    : port(0),
+    : settings(),
+      port(0),
+      disableForwarding(false),
+      errorStr(),
+      thread(),

       nonstop(false),
       isRunning(false),
       nonstop(false),
       isRunning(false),

-      traffCnt(NULL)
+      traffCnt(NULL),
+      logger(GetPluginLogger(GetStgLogger(), "cap_divert"))

 {
 }
 //-----------------------------------------------------------------------------
 {
 }
 //-----------------------------------------------------------------------------


@@ -119,14 +110,15 @@ if (DivertCapOpen() < 0)
 
 nonstop = true;
 
 
 nonstop = true;
 

-if (pthread_create(&thread, NULL, Run, this) == 0)
+if (pthread_create(&thread, NULL, Run, this))

     {
     {

-    return 0;
+    errorStr = "Cannot create thread.";
+    logger("Cannot create thread.");
+    printfd(__FILE__, "Cannot create thread\n");
+    return -1;

     }
 
     }
 

-errorStr = "Cannot create thread.";
-printfd(__FILE__, "Cannot create thread\n");
-return -1;
+return 0;

 }
 //-----------------------------------------------------------------------------
 int DIVERT_CAP::Stop()
 }
 //-----------------------------------------------------------------------------
 int DIVERT_CAP::Stop()


@@ -145,7 +137,8 @@ for (i = 0; i < 25; i++)
     if (!isRunning)
         break;
 
     if (!isRunning)
         break;
 

-    usleep(200000);
+    struct timespec ts = {0, 200000000};
+    nanosleep(&ts, NULL);

     }
 
 //after 5 seconds waiting thread still running. now killing it
     }
 
 //after 5 seconds waiting thread still running. now killing it


@@ -154,6 +147,7 @@ if (isRunning)
     if (pthread_kill(thread, SIGINT))
         {
         errorStr = "Cannot kill thread.";
     if (pthread_kill(thread, SIGINT))
         {
         errorStr = "Cannot kill thread.";

+        logger("Cannot send signal to thread.");

         printfd(__FILE__, "Cannot kill thread\n");
         return -1;
         }
         printfd(__FILE__, "Cannot kill thread\n");
         return -1;
         }


@@ -164,19 +158,23 @@ return 0;
 //-----------------------------------------------------------------------------
 void * DIVERT_CAP::Run(void * d)
 {
 //-----------------------------------------------------------------------------
 void * DIVERT_CAP::Run(void * d)
 {

-DIVERT_CAP * dc = (DIVERT_CAP *)d;
+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+
+DIVERT_CAP * dc = static_cast<DIVERT_CAP *>(d);

 dc->isRunning = true;
 
 dc->isRunning = true;
 

-char buffer[64];
+char buffer[pcktSize + 14];

 while (dc->nonstop)
     {
     RAW_PACKET rp;
 while (dc->nonstop)
     {
     RAW_PACKET rp;

-    dc->DivertCapRead(buffer, 64, NULL);
+    dc->DivertCapRead(buffer, sizeof(buffer), NULL);

 
     if (buffer[12] != 0x8)
         continue;
 
 
     if (buffer[12] != 0x8)
         continue;
 

-    memcpy(rp.pckt, &buffer[14], pcktSize);
+    memcpy(rp.rawPacket.pckt, &buffer[14], pcktSize);

 
     dc->traffCnt->Process(rp);
     }
 
     dc->traffCnt->Process(rp);
     }


@@ -207,6 +205,7 @@ cddiv.sock = socket(PF_INET, SOCK_RAW, IPPROTO_DIVERT);
 if (cddiv.sock < 0)
     {
     errorStr = "Create divert socket error.";
 if (cddiv.sock < 0)
     {
     errorStr = "Create divert socket error.";

+    logger("Cannot create a socket: %s", strerror(errno));

     printfd(__FILE__, "Cannot create divert socket\n");
     return -1;
     }
     printfd(__FILE__, "Cannot create divert socket\n");
     return -1;
     }


@@ -224,6 +223,7 @@ ret = bind(cddiv.sock, (struct sockaddr *)&divAddr, sizeof(divAddr));
 if (ret < 0)
     {
     errorStr = "Bind divert socket error.";
 if (ret < 0)
     {
     errorStr = "Bind divert socket error.";

+    logger("Cannot bind the scoket: %s", strerror(errno));

     printfd(__FILE__, "Cannot bind divert socket\n");
     return -1;
     }
     printfd(__FILE__, "Cannot bind divert socket\n");
     return -1;
     }


@@ -261,7 +261,16 @@ if ((bytes = recvfrom (cddiv.sock, buf, BUFF_LEN,
     if (iface)
         *iface = cddiv.iface;
 
     if (iface)
         *iface = cddiv.iface;
 

-    sendto(cddiv.sock, buf, bytes, 0, (struct sockaddr*)&divertaddr, divertaddrSize);
+    if (!disableForwarding)
+        {
+        if (sendto(cddiv.sock, buf, bytes, 0, (struct sockaddr*)&divertaddr, divertaddrSize) < 0)
+            logger("sendto error: %s", strerror(errno));
+        }
+    }
+else
+    {
+    if (bytes < 0)
+        logger("recvfrom error: %s", strerror(errno));

     }
 
 return 0;
     }
 
 return 0;


@@ -277,17 +286,15 @@ int DIVERT_CAP::ParseSettings()
 {
 int p;
 PARAM_VALUE pv;
 {
 int p;
 PARAM_VALUE pv;

-vector<PARAM_VALUE>::const_iterator pvi;
+std::vector<PARAM_VALUE>::const_iterator pvi;

 
 pv.param = "Port";
 pvi = std::find(settings.moduleParams.begin(), settings.moduleParams.end(), pv);
 if (pvi == settings.moduleParams.end())
     {
 
 pv.param = "Port";
 pvi = std::find(settings.moduleParams.begin(), settings.moduleParams.end(), pv);
 if (pvi == settings.moduleParams.end())
     {

-    port = 15701;
-    return 0;
+    p = 15701;

     }
     }

-
-if (ParseIntInRange(pvi->value[0], 1, 65535, &p))
+else if (ParseIntInRange(pvi->value[0], 1, 65535, &p))

     {
     errorStr = "Cannot parse parameter \'Port\': " + errorStr;
     printfd(__FILE__, "Cannot parse parameter 'Port'\n");
     {
     errorStr = "Cannot parse parameter \'Port\': " + errorStr;
     printfd(__FILE__, "Cannot parse parameter 'Port'\n");


@@ -296,21 +303,22 @@ if (ParseIntInRange(pvi->value[0], 1, 65535, &p))
 
 port = p;
 
 
 port = p;
 

-return 0;
-}
-//-----------------------------------------------------------------------------
-int DIVERT_CAP::ParseIntInRange(const std::string & str, int min, int max, int * val)
-{
-if (str2x(str.c_str(), *val))
+bool d = false;
+pv.param = "DisableForwarding";
+pvi = std::find(settings.moduleParams.begin(), settings.moduleParams.end(), pv);
+if (pvi == settings.moduleParams.end())

     {
     {

-    errorStr = "Incorrect value \'" + str + "\'.";
-    return -1;
+    disableForwarding = false;

     }
     }

-if (*val < min || *val > max)
+else if (ParseYesNo(pvi->value[0], &d))

     {
     {

-    errorStr = "Value \'" + str + "\' out of range.";
+    errorStr = "Cannot parse parameter \'DisableForwarding\': " + errorStr;
+    printfd(__FILE__, "Cannot parse parameter 'DisableForwarding'\n");

     return -1;
     }
     return -1;
     }

+
+disableForwarding = d;
+

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------