Merge pull request #1 from yuriio147/mysql-store-db-port

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

diff --git a/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp b/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
index 1885835bec3edd4c9d775b198194885a1a22e1a2..289846869a4bb2d4b8e2116e548ff08a065120f7 100644 (file)
--- a/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
+++ b/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
@@ -25,8 +25,9 @@ $Date: 2010/09/10 06:43:03 $
 
 #include "divert_cap.h"
 
-#include "stg/common.h"
 #include "stg/traffcounter.h"
+#include "stg/raw_ip_packet.h"
+#include "stg/common.h"
 
 #include <algorithm>
 #include <vector>
@@ -64,7 +65,7 @@ DIVERT_DATA cddiv;  //capture data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-extern "C" Plugin* GetPlugin()
+extern "C" STG::Plugin* GetPlugin()
 {
     static DIVERT_CAP plugin;
     return &plugin;
@@ -83,7 +84,7 @@ DIVERT_CAP::DIVERT_CAP()
       nonstop(false),
       isRunning(false),
       traffCnt(NULL),
-      logger(PluginLogger::get("cap_divert"))
+      logger(STG::PluginLogger::get("cap_divert"))
 {
 }
 //-----------------------------------------------------------------------------
@@ -156,18 +157,18 @@ pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
 DIVERT_CAP * dc = static_cast<DIVERT_CAP *>(d);
 dc->isRunning = true;
 
-char buffer[pcktSize + 14];
+char buffer[STG::packetSize + 14];
 while (dc->nonstop)
     {
-    RAW_PACKET rp;
+    STG::RawPacket rp;
     dc->DivertCapRead(buffer, sizeof(buffer), NULL);
 
     if (buffer[12] != 0x8)
         continue;
 
-    memcpy(rp.rawPacket.pckt, &buffer[14], pcktSize);
+    memcpy(&rp.rawPacket, &buffer[14], STG::packetSize);
 
-    dc->traffCnt->Process(rp);
+    dc->traffCnt->process(rp);
     }
 
 dc->isRunning = false;
@@ -276,8 +277,8 @@ return 0;
 int DIVERT_CAP::ParseSettings()
 {
 int p;
-PARAM_VALUE pv;
-std::vector<PARAM_VALUE>::const_iterator pvi;
+STG::ParamValue pv;
+std::vector<STG::ParamValue>::const_iterator pvi;
 
 pv.param = "Port";
 pvi = std::find(settings.moduleParams.begin(), settings.moduleParams.end(), pv);