Ticket 37. Int2TS() and TS2Int() methods define removed.

[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..cc64bc18c5bd41b08eb018cc5ccfd74156d82397 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
+++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
@@ -71,16 +71,14 @@ 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),


@@ -132,7 +130,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 +141,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;
         }