More stgTime cleanup.

[stg.git] / projects / stargazer / plugins / capture / ether_freebsd / ether_cap.cpp

diff --git a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp
index 254fd3f92d53d34d05c0f03dd43b805cede7ff06..f063da9f2f4364f5ae77538bd73ee9cf730f2bea 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp
+++ b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp
@@ -28,12 +28,23 @@ $Date: 2009/03/24 11:20:15 $
 $Author: faust $
 */
 
+#include "ether_cap.h"
+
+#include "stg/common.h"
+#include "stg/raw_ip_packet.h"
+#include "stg/traffcounter.h"
+
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <csignal>
+
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
-#include <sys/poll.h>
 
 #include <net/bpf.h>
 #include <net/if.h>
@@ -42,41 +53,17 @@ $Author: faust $
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <cerrno>
-#include <cstdio>
-#include <cstring>
-#include <cstdlib>
-#include <csignal>
-
-#include "stg/common.h"
-#include "stg/raw_ip_packet.h"
-#include "stg/traffcounter.h"
-#include "stg/plugin_creator.h"
-
-#include "ether_cap.h"
-
 //#define CAP_DEBUG 1
 
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-namespace
-{
-PLUGIN_CREATOR<BPF_CAP> bcc;
-}
-
-extern "C" PLUGIN * GetPlugin();
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-PLUGIN * GetPlugin()
+extern "C" STG::Plugin* GetPlugin()
 {
-return bcc.GetPlugin();
+    static BPF_CAP plugin;
+    return &plugin;
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-int BPF_CAP_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
+int BPF_CAP_SETTINGS::ParseSettings(const STG::ModuleSettings & s)
 {
 iface.erase(iface.begin(), iface.end());
 
@@ -121,17 +108,11 @@ return "cap_bpf v.1.0";
 }
 //-----------------------------------------------------------------------------
 BPF_CAP::BPF_CAP()
-    : capSettings(),
-      errorStr(),
-      bpfData(),
-      polld(),
-      thread(),
-      nonstop(false),
+    : nonstop(false),
       isRunning(false),
       capSock(-1),
-      settings(),
       traffCnt(NULL),
-      logger(GetPluginLogger(GetStgLogger(), "cap_bpf"))
+      logger(STG::PluginLogger::get("cap_bpf"))
 {
 }
 //-----------------------------------------------------------------------------
@@ -217,7 +198,7 @@ dc->isRunning = true;
 
 uint8_t hdr[96]; //68 + 14 + 4(size) + 9(SYS_IFACE) + 1(align to 4) = 96
 
-RAW_PACKET *  rpp = (RAW_PACKET *)&hdr[14];
+STG::RawPacket *  rpp = (STG::RawPacket *)&hdr[14];
 memset(hdr, 0, sizeof(hdr));
 
 rpp->dataLen = -1;
@@ -231,7 +212,7 @@ while (dc->nonstop)
     if (!(hdr[12] == 0x8 && hdr[13] == 0x0))
         continue;
 
-    dc->traffCnt->Process(*rpp);
+    dc->traffCnt->process(*rpp);
     }
 
 dc->isRunning = false;