Admin, service and corporation sesnsors added for SUMX

[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 11a96ef1ef281ffffa6621d6ba67707aec3d7e92..3d6c55b5b7139b2ac037db4f25a65266a1dfaa01 100644 (file)
--- a/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
+++ b/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
@@ -37,33 +37,19 @@ $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"
-
-class CAP_NF_CREATOR
-{
-public:
-    CAP_NF_CREATOR()
-        : nf(new NF_CAP())
-        {
-        };
+#include <vector>

 
 

-    ~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()
 }
 
 NF_CAP::NF_CAP()


@@ -87,7 +73,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")


@@ -278,9 +264,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)


@@ -390,22 +373,14 @@ 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.ipHeader.ip_v = 4;
-    ip.ipHeader.ip_hl = 5;
-    ip.ipHeader.ip_p = data->proto;
+    ip.header.ipHeader.ip_v = 4;
+    ip.header.ipHeader.ip_hl = 5;
+    ip.header.ipHeader.ip_p = data->proto;

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

-    ip.ipHeader.ip_src.s_addr = data->srcAddr;
-    ip.ipHeader.ip_dst.s_addr = data->dstAddr;
-    ip.sPort = data->srcPort;
-    ip.dPort = data->dstPort;
+    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;

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