Merge branch 'master' into full-month-stats

[stg.git] / projects / stargazer / plugins / capture / cap_nf / cap_nf.cpp

diff --git a/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp b/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
index 4ef1ee8ebcd5158886613cde687312d14e561e6f..51ba49546d26fb7a4d8c9ee3be18b9be1b9750ac 100644 (file)
--- a/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
+++ b/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
@@ -37,39 +37,26 @@ $Author: faust $
 #include <cerrno>
 #include <cstring>
 
 #include <cerrno>
 #include <cstring>
 

-#include "common.h" 
-#include "cap_nf.h"
-#include "raw_ip_packet.h"
-
-#include "../../../traffcounter.h"
+#include <vector>

 
 

-class CAP_NF_CREATOR
-{
-public:
-    CAP_NF_CREATOR()
-        : nf(new NF_CAP())
-        {
-        };
-
-    ~CAP_NF_CREATOR()
-        {
-        delete nf;
-        };
+#include "stg/common.h" 
+#include "stg/raw_ip_packet.h"
+#include "stg/traffcounter.h"
+#include "stg/plugin_creator.h"
+#include "cap_nf.h"

 
 

-    NF_CAP * GetCapturer() { return nf; };
-private:
-    NF_CAP * nf;
-} cnc;
+PLUGIN_CREATOR<NF_CAP> cnc;

 
 

-BASE_PLUGIN * GetPlugin()
+PLUGIN * GetPlugin()

 {
 {

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

 }
 
 NF_CAP::NF_CAP()
     : traffCnt(NULL),
 }
 
 NF_CAP::NF_CAP()
     : traffCnt(NULL),

-      tidTCP(0),
-      tidUDP(0),
+      settings(),
+      tidTCP(),
+      tidUDP(),

       runningTCP(false),
       runningUDP(false),
       stoppedTCP(true),
       runningTCP(false),
       runningUDP(false),
       stoppedTCP(true),


@@ -77,7 +64,8 @@ NF_CAP::NF_CAP()
       portT(0),
       portU(0),
       sockTCP(-1),
       portT(0),
       portU(0),
       sockTCP(-1),

-      sockUDP(-1)
+      sockUDP(-1),
+      errorStr()

 {
 }
 
 {
 }
 


@@ -87,7 +75,7 @@ NF_CAP::~NF_CAP()
 
 int NF_CAP::ParseSettings()
 {
 
 int NF_CAP::ParseSettings()
 {

-vector<PARAM_VALUE>::iterator it;
+std::vector<PARAM_VALUE>::iterator it;

 for (it = settings.moduleParams.begin(); it != settings.moduleParams.end(); ++it)
     {
     if (it->param == "TCPPort")
 for (it = settings.moduleParams.begin(); it != settings.moduleParams.end(); ++it)
     {
     if (it->param == "TCPPort")


@@ -160,7 +148,8 @@ if (portU && !stoppedUDP)
     CloseUDP();
     for (int i = 0; i < 25 && !stoppedUDP; ++i)
         {
     CloseUDP();
     for (int i = 0; i < 25 && !stoppedUDP; ++i)
         {

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

         }
     if (stoppedUDP)
         {
         }
     if (stoppedUDP)
         {


@@ -182,7 +171,8 @@ if (portT && !stoppedTCP)
     CloseTCP();
     for (int i = 0; i < 25 && !stoppedTCP; ++i)
         {
     CloseTCP();
     for (int i = 0; i < 25 && !stoppedTCP; ++i)
         {

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

         }
     if (stoppedTCP)
         {
         }
     if (stoppedTCP)
         {


@@ -254,6 +244,10 @@ return false;
 
 void * NF_CAP::RunUDP(void * c)
 {
 
 void * NF_CAP::RunUDP(void * c)
 {

+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+

 NF_CAP * cap = static_cast<NF_CAP *>(c);
 uint8_t buf[BUF_SIZE];
 int res;
 NF_CAP * cap = static_cast<NF_CAP *>(c);
 uint8_t buf[BUF_SIZE];
 int res;


@@ -262,7 +256,7 @@ socklen_t slen;
 cap->stoppedUDP = false;
 while (cap->runningUDP)
     {
 cap->stoppedUDP = false;
 while (cap->runningUDP)
     {

-    if (!cap->WaitPackets(cap->sockUDP))
+    if (!WaitPackets(cap->sockUDP))

         {
         continue;
         }
         {
         continue;
         }


@@ -278,9 +272,6 @@ while (cap->runningUDP)
         continue;
         }
 
         continue;
         }
 

-
-    // Wrong logic!
-    // Need to check actual data length and wait all data to receive

     if (res < 24)
         {
         if (errno != EINTR)
     if (res < 24)
         {
         if (errno != EINTR)


@@ -299,6 +290,10 @@ return NULL;
 
 void * NF_CAP::RunTCP(void * c)
 {
 
 void * NF_CAP::RunTCP(void * c)
 {

+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+

 NF_CAP * cap = static_cast<NF_CAP *>(c);
 uint8_t buf[BUF_SIZE];
 int res;
 NF_CAP * cap = static_cast<NF_CAP *>(c);
 uint8_t buf[BUF_SIZE];
 int res;


@@ -308,7 +303,7 @@ socklen_t slen;
 cap->stoppedTCP = false;
 while (cap->runningTCP)
     {
 cap->stoppedTCP = false;
 while (cap->runningTCP)
     {

-    if (!cap->WaitPackets(cap->sockTCP))
+    if (!WaitPackets(cap->sockTCP))

         {
         continue;
         }
         {
         continue;
         }


@@ -329,7 +324,7 @@ while (cap->runningTCP)
         continue;
         }
 
         continue;
         }
 

-    if (!cap->WaitPackets(sd))
+    if (!WaitPackets(sd))

         {
         close(sd);
         continue;
         {
         close(sd);
         continue;


@@ -390,51 +385,15 @@ for (int i = 0; i < packets; ++i)
     {
     NF_DATA * data = reinterpret_cast<NF_DATA *>(buf + 24 + i * 48);
 
     {
     NF_DATA * data = reinterpret_cast<NF_DATA *>(buf + 24 + i * 48);
 

-    /*ip.pckt[0] = 4 << 4;
-    ip.pckt[0] |= 5;
-    ip.pckt[9] = data->proto;
-    ip.dataLen = ntohl(data->octets);
-    *(uint32_t *)(ip.pckt + 12) = data->srcAddr;
-    *(uint32_t *)(ip.pckt + 16) = data->dstAddr;
-    *(uint16_t *)(ip.pckt + 20) = data->srcPort;
-    *(uint16_t *)(ip.pckt + 22) = data->dstPort;*/
-    ip.header.ipHeader.ip_v = 4;
-    ip.header.ipHeader.ip_hl = 5;
-    ip.header.ipHeader.ip_p = data->proto;
+    ip.rawPacket.header.ipHeader.ip_v = 4;
+    ip.rawPacket.header.ipHeader.ip_hl = 5;
+    ip.rawPacket.header.ipHeader.ip_p = data->proto;

     ip.dataLen = ntohl(data->octets);
     ip.dataLen = ntohl(data->octets);

-    ip.header.ipHeader.ip_src.s_addr = data->srcAddr;
-    ip.header.ipHeader.ip_dst.s_addr = data->dstAddr;
-    ip.header.sPort = data->srcPort;
-    ip.header.dPort = data->dstPort;
+    ip.rawPacket.header.ipHeader.ip_src.s_addr = data->srcAddr;
+    ip.rawPacket.header.ipHeader.ip_dst.s_addr = data->dstAddr;
+    ip.rawPacket.header.sPort = data->srcPort;
+    ip.rawPacket.header.dPort = data->dstPort;

 
     traffCnt->Process(ip);
     }
 }
 
     traffCnt->Process(ip);
     }
 }

-
-bool NF_CAP::WaitPackets(int sd) const
-{
-fd_set rfds;
-FD_ZERO(&rfds);
-FD_SET(sd, &rfds);
-
-struct timeval tv;
-tv.tv_sec = 0;
-tv.tv_usec = 500000;
-
-int res = select(sd + 1, &rfds, NULL, NULL, &tv);
-if (res == -1) // Error
-    {
-    if (errno != EINTR)
-        {
-        printfd(__FILE__, "Error on select: '%s'\n", strerror(errno));
-        }
-    return false;
-    }
-
-if (res == 0) // Timeout
-    {
-    return false;
-    }
-
-return true;
-}