Users container changed from vector to list

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

diff --git a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
index 5c76be916d56fcb58c572100c79e064f3693eaa7..f6cdc067aca9b5e02eb654b5202370b3121ed906 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
+++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
@@ -45,15 +45,14 @@ $Date: 2009/12/13 13:45:13 $
 #include <net/if.h>
 
 #include "ether_cap.h"
 #include <net/if.h>
 
 #include "ether_cap.h"

-#include "common.h"
-#include "raw_ip_packet.h"
+#include "stg/common.h"
+#include "stg/raw_ip_packet.h"
+#include "stg/traffcounter.h"

 
 //#define CAP_DEBUG 1
 
 
 //#define CAP_DEBUG 1
 

-

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-class ETHER_CAP_CREATOR
-{
+class ETHER_CAP_CREATOR {

 private:
     ETHER_CAP * ec;
 
 private:
     ETHER_CAP * ec;
 


@@ -61,16 +60,16 @@ public:
     ETHER_CAP_CREATOR()
         : ec(new ETHER_CAP())
         {
     ETHER_CAP_CREATOR()
         : ec(new ETHER_CAP())
         {

-        };
+        }

     ~ETHER_CAP_CREATOR()
         {
         delete ec;
     ~ETHER_CAP_CREATOR()
         {
         delete ec;

-        };
+        }

 
     ETHER_CAP * GetCapturer()
         {
         return ec;
 
     ETHER_CAP * GetCapturer()
         {
         return ec;

-        };
+        }

 };
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------


@@ -79,32 +78,24 @@ ETHER_CAP_CREATOR ecc;
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

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

 {
 return ecc.GetCapturer();
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------        
 {
 return ecc.GetCapturer();
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------        

-const string ETHER_CAP::GetVersion() const
+const std::string ETHER_CAP::GetVersion() const

 {
 return "Ether_cap v.1.2";
 }
 //-----------------------------------------------------------------------------
 ETHER_CAP::ETHER_CAP()
 {
 return "Ether_cap v.1.2";
 }
 //-----------------------------------------------------------------------------
 ETHER_CAP::ETHER_CAP()

+    : nonstop(false),
+      isRunning(false),
+      capSock(-1),
+      traffCnt(NULL)

 {
 {

-isRunning = false;
-nonstop = false;
-}
-//-----------------------------------------------------------------------------
-void ETHER_CAP::SetTraffcounter(TRAFFCOUNTER * tc)
-{
-traffCnt = tc;
-}
-//-----------------------------------------------------------------------------
-const string & ETHER_CAP::GetStrError() const
-{
-return errorStr;

 }
 //-----------------------------------------------------------------------------
 int ETHER_CAP::Start()
 }
 //-----------------------------------------------------------------------------
 int ETHER_CAP::Start()


@@ -169,11 +160,6 @@ EthCapClose();
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-bool ETHER_CAP::IsRunning()
-{
-return isRunning;
-}
-//-----------------------------------------------------------------------------

 void * ETHER_CAP::Run(void * d)
 {
 ETHER_CAP * dc = (ETHER_CAP *)d;
 void * ETHER_CAP::Run(void * d)
 {
 ETHER_CAP * dc = (ETHER_CAP *)d;


@@ -215,16 +201,6 @@ dc->isRunning = false;
 return NULL;
 }
 //-----------------------------------------------------------------------------
 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));
 int ETHER_CAP::EthCapOpen()
 {
 capSock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));