Include header for select in inetaccess.cpp

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

diff --git a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
index 2bc83cad4f03042e0daba9e5407606a55a53cc6b..5c7ec36432b7a81cf63185bb4143272df12f4b70 100644 (file)
--- a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
+++ b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
@@ -41,6 +41,7 @@ $Date: 2010/09/10 06:43:03 $
 
 #include "common.h"
 #include "divert_cap.h"
 
 #include "common.h"
 #include "divert_cap.h"

+#include "traffcounter.h"

 
 #define BUFF_LEN (16384) /* max mtu -> lo=16436  TODO why?*/
 
 
 #define BUFF_LEN (16384) /* max mtu -> lo=16436  TODO why?*/
 


@@ -63,16 +64,16 @@ public:
     DIVERT_CAP_CREATOR()
         : divc(new DIVERT_CAP())
         {
     DIVERT_CAP_CREATOR()
         : divc(new DIVERT_CAP())
         {

-        };
+        }

     ~DIVERT_CAP_CREATOR()
         {
         delete divc;
     ~DIVERT_CAP_CREATOR()
         {
         delete divc;

-        };
+        }

 
     DIVERT_CAP * GetCapturer()
     {
     return divc;
 
     DIVERT_CAP * GetCapturer()
     {
     return divc;

-    };
+    }

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


@@ -101,16 +102,6 @@ DIVERT_CAP::DIVERT_CAP()
 {
 }
 //-----------------------------------------------------------------------------
 {
 }
 //-----------------------------------------------------------------------------

-void DIVERT_CAP::SetTraffcounter(TRAFFCOUNTER * tc)
-{
-traffCnt = tc;
-}
-//-----------------------------------------------------------------------------
-const std::string & DIVERT_CAP::GetStrError() const
-{
-return errorStr;
-}
-//-----------------------------------------------------------------------------

 int DIVERT_CAP::Start()
 {
 if (isRunning)
 int DIVERT_CAP::Start()
 {
 if (isRunning)


@@ -168,51 +159,22 @@ if (isRunning)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

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

 void * DIVERT_CAP::Run(void * d)
 {
 DIVERT_CAP * dc = (DIVERT_CAP *)d;
 dc->isRunning = true;
 
 void * DIVERT_CAP::Run(void * d)
 {
 DIVERT_CAP * dc = (DIVERT_CAP *)d;
 dc->isRunning = true;
 

-/*struct ETH_IP
-{
-uint16_t    ethHdr[8];
-RAW_PACKET  rp;
-char        padding[4];
-char        padding1[8];
-};
-
-ETH_IP * ethIP;
-
-char ethip[sizeof(ETH_IP)];
-
-//memset(&ethIP, 0, sizeof(ethIP));
-memset(&ethip, 0, sizeof(ETH_IP));
-
-ethIP = (ETH_IP *)&ethip;
-ethIP->rp.dataLen = -1;
-*/
-//char * iface = NULL;

 char buffer[64];
 while (dc->nonstop)
     {
     RAW_PACKET rp;
     dc->DivertCapRead(buffer, 64, NULL);
 
 char buffer[64];
 while (dc->nonstop)
     {
     RAW_PACKET rp;
     dc->DivertCapRead(buffer, 64, NULL);
 

-    //printf("%x %x %x %x \n", buffer[0], buffer[4], buffer[8], buffer[12]);
-    //printf("%x %x %x %x \n", buffer[16], buffer[20], buffer[24], buffer[28]);
-    //printf("%x %x %x %x \n", buffer[32], buffer[36], buffer[40], buffer[44]);
-

     if (buffer[12] != 0x8)
         continue;
 
     memcpy(rp.pckt, &buffer[14], pcktSize);
 
     if (buffer[12] != 0x8)
         continue;
 
     memcpy(rp.pckt, &buffer[14], pcktSize);
 

-    //dc->traffCnt->Process(*((RAW_PACKET*)( &buffer[14] ))); // - too dirty!

     dc->traffCnt->Process(rp);
     }
 
     dc->traffCnt->Process(rp);
     }
 


@@ -220,22 +182,6 @@ dc->isRunning = false;
 return NULL;
 }
 //-----------------------------------------------------------------------------
 return NULL;
 }
 //-----------------------------------------------------------------------------

-uint16_t DIVERT_CAP::GetStartPosition() const
-{
-return 10;
-}
-//-----------------------------------------------------------------------------
-uint16_t DIVERT_CAP::GetStopPosition() const
-{
-return 10;
-}
-//-----------------------------------------------------------------------------
-/*****************************************************************************/
-/*****************************************************************************/
-/*****************************************************************************/
-/*****************************************************************************/
-/*****************************************************************************/
-//-----------------------------------------------------------------------------

 int DIVERT_CAP::DivertCapOpen()
 {
 memset(&pollddiv, 0, sizeof(pollddiv));
 int DIVERT_CAP::DivertCapOpen()
 {
 memset(&pollddiv, 0, sizeof(pollddiv));


@@ -365,9 +311,3 @@ if (*val < min || *val > max)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-void DIVERT_CAP::SetSettings(const MODULE_SETTINGS & s)
-{
-settings = s;
-}
-//-----------------------------------------------------------------------------
-