Another `stgTime` case.

[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 a97fa8e7d07e5490569f7f9c73e14d6107776717..7ca6c01f254327c947b5579080c7f65c3537c3bb 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
+++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
@@ -27,6 +27,17 @@ $Revision: 1.23 $
 $Date: 2009/12/13 13:45:13 $
 */
 
 $Date: 2009/12/13 13:45:13 $
 */
 

+#include "ether_cap.h"
+
+#include "stg/common.h"
+#include "stg/raw_ip_packet.h"
+#include "stg/traffcounter.h"
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
+#include <csignal>

 
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
 #include <sys/socket.h>
 #include <arpa/inet.h>


@@ -38,53 +49,27 @@ $Date: 2009/12/13 13:45:13 $
 #include <sys/ioctl.h>
 #include <net/if.h>
 
 #include <sys/ioctl.h>
 #include <net/if.h>
 

-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <cerrno>
-#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
 
 //#define CAP_DEBUG 1
 

-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-namespace
+extern "C" STG::Plugin* GetPlugin()

 {
 {

-PLUGIN_CREATOR<ETHER_CAP> ecc;
+    static ETHER_CAP plugin;
+    return &plugin;

 }
 }

-
-extern "C" PLUGIN * GetPlugin();
-//-----------------------------------------------------------------------------

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

-PLUGIN * GetPlugin()
-{
-return ecc.GetPlugin();
-}
-//-----------------------------------------------------------------------------

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

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

 std::string ETHER_CAP::GetVersion() const
 {
 std::string ETHER_CAP::GetVersion() const
 {

-return "Ether_cap v.1.2";
+return "cap_ether v.1.2";

 }
 //-----------------------------------------------------------------------------
 ETHER_CAP::ETHER_CAP()
 }
 //-----------------------------------------------------------------------------
 ETHER_CAP::ETHER_CAP()

-    : errorStr(),
-      thread(),
-      nonstop(false),
+    : nonstop(false),

       isRunning(false),
       capSock(-1),
       traffCnt(NULL),
       isRunning(false),
       capSock(-1),
       traffCnt(NULL),

-      logger(GetPluginLogger(GetStgLogger(), "cap_ether"))
+      logger(STG::PluginLogger::get("cap_ether"))

 {
 }
 //-----------------------------------------------------------------------------
 {
 }
 //-----------------------------------------------------------------------------


@@ -132,7 +117,7 @@ if (isRunning)
     if (pthread_kill(thread, SIGUSR1))
         {
         errorStr = "Cannot kill thread.";
     if (pthread_kill(thread, SIGUSR1))
         {
         errorStr = "Cannot kill thread.";

-       logger("Cannot send signal to thread.");
+        logger("Cannot send signal to thread.");

         return -1;
         }
     for (int i = 0; i < 25 && isRunning; ++i)
         return -1;
         }
     for (int i = 0; i < 25 && isRunning; ++i)


@@ -143,7 +128,7 @@ if (isRunning)
     if (isRunning)
         {
         errorStr = "ETHER_CAP not stopped.";
     if (isRunning)
         {
         errorStr = "ETHER_CAP not stopped.";

-       logger("Cannot stop thread.");
+        logger("Cannot stop thread.");

         printfd(__FILE__, "Cannot stop thread\n");
         return -1;
         }
         printfd(__FILE__, "Cannot stop thread\n");
         return -1;
         }


@@ -169,7 +154,7 @@ dc->isRunning = true;
 struct ETH_IP
 {
 uint16_t    ethHdr[8];
 struct ETH_IP
 {
 uint16_t    ethHdr[8];

-RAW_PACKET  rp;
+STG::RawPacket  rp;

 char        padding[4];
 char        padding1[8];
 };
 char        padding[4];
 char        padding1[8];
 };


@@ -193,7 +178,7 @@ while (dc->nonstop)
     if (ethIP->ethHdr[7] != 0x8)
         continue;
 
     if (ethIP->ethHdr[7] != 0x8)
         continue;
 

-    dc->traffCnt->Process(ethIP->rp);
+    dc->traffCnt->process(ethIP->rp);

     }
 
 dc->isRunning = false;
     }
 
 dc->isRunning = false;