X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/41793fe3ee6f5b0ddbb8d20afad9ffcc3a923e22..a1211c21a5e253a1068042fa9bfdf19056c534ac:/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp?ds=sidebyside

diff --git a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
index 11aa475a..bd075fee 100644
--- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
+++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
@@ -44,49 +44,29 @@ $Date: 2009/12/13 13:45:13 $
 #include <sys/ioctl.h>
 #include <net/if.h>
 
+#include "stg/common.h"
+#include "stg/raw_ip_packet.h"
+#include "stg/traffcounter.h"
+#include "stg/plugin_creator.h"
 #include "ether_cap.h"
-#include "common.h"
-#include "raw_ip_packet.h"
 
 //#define CAP_DEBUG 1
 
-
-//-----------------------------------------------------------------------------
-class ETHER_CAP_CREATOR
-{
-private:
-    ETHER_CAP * ec;
-
-public:
-    ETHER_CAP_CREATOR()
-        : ec(new ETHER_CAP())
-        {
-        };
-    ~ETHER_CAP_CREATOR()
-        {
-        delete ec;
-        };
-
-    ETHER_CAP * GetCapturer()
-        {
-        return ec;
-        };
-};
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-ETHER_CAP_CREATOR ecc;
+PLUGIN_CREATOR<ETHER_CAP> ecc;
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-BASE_PLUGIN * GetPlugin()
+PLUGIN * GetPlugin()
 {
-return ecc.GetCapturer();
+return ecc.GetPlugin();
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------        
-const string ETHER_CAP::GetVersion() const
+const std::string ETHER_CAP::GetVersion() const
 {
 return "Ether_cap v.1.2";
 }
@@ -99,16 +79,6 @@ ETHER_CAP::ETHER_CAP()
 {
 }
 //-----------------------------------------------------------------------------
-void ETHER_CAP::SetTraffcounter(TRAFFCOUNTER * tc)
-{
-traffCnt = tc;
-}
-//-----------------------------------------------------------------------------
-const string & ETHER_CAP::GetStrError() const
-{
-return errorStr;
-}
-//-----------------------------------------------------------------------------
 int ETHER_CAP::Start()
 {
 if (isRunning)
@@ -171,11 +141,6 @@ EthCapClose();
 return 0;
 }
 //-----------------------------------------------------------------------------
-bool ETHER_CAP::IsRunning()
-{
-return isRunning;
-}
-//-----------------------------------------------------------------------------
 void * ETHER_CAP::Run(void * d)
 {
 ETHER_CAP * dc = (ETHER_CAP *)d;
@@ -217,16 +182,6 @@ dc->isRunning = false;
 return NULL;
 }
 //-----------------------------------------------------------------------------
-uint16_t ETHER_CAP::GetStartPosition() const
-{
-return 10;
-}
-//-----------------------------------------------------------------------------
-uint16_t ETHER_CAP::GetStopPosition() const
-{
-return 10;
-}
-//-----------------------------------------------------------------------------
 int ETHER_CAP::EthCapOpen()
 {
 capSock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));