Ticket 37. The time_t currentTime parameter added in

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

diff --git a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp
index 72e7f73bdcad694183f5cb94c03fe9dd33d1e241..36159fedc0ee18be241466606fe28a870f349447 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp
+++ b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp
@@ -117,21 +117,15 @@ return iface[num];
 //-----------------------------------------------------------------------------
 std::string BPF_CAP::GetVersion() const
 {
 //-----------------------------------------------------------------------------
 std::string BPF_CAP::GetVersion() const
 {

-return "bpf_cap v.1.0";
+return "cap_bpf v.1.0";

 }
 //-----------------------------------------------------------------------------
 BPF_CAP::BPF_CAP()
 }
 //-----------------------------------------------------------------------------
 BPF_CAP::BPF_CAP()

-    : capSettings(),
-      errorStr(),
-      bpfData(),
-      polld(),
-      thread(),
-      nonstop(false),
+    : nonstop(false),

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

-      settings(),

       traffCnt(NULL),
       traffCnt(NULL),

-      logger(GetPluginLogger(GetStgLogger(), "cap_ether"))
+      logger(GetPluginLogger(GetStgLogger(), "cap_bpf"))

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


@@ -197,7 +191,7 @@ if (isRunning)
     if (pthread_kill(thread, SIGINT))
         {
         errorStr = "Cannot kill thread.";
     if (pthread_kill(thread, SIGINT))
         {
         errorStr = "Cannot kill thread.";

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

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


@@ -347,7 +341,7 @@ if (bd->canRead)
     bd->r = read(bd->fd, bd->buffer, BUFF_LEN);
     if (bd->r < 0)
         {
     bd->r = read(bd->fd, bd->buffer, BUFF_LEN);
     if (bd->r < 0)
         {

-       logger("read error: %s", strerror(errno));
+        logger("read error: %s", strerror(errno));

         struct timespec ts = {0, 20000000};
         nanosleep(&ts, NULL);
         return -1;
         struct timespec ts = {0, 20000000};
         nanosleep(&ts, NULL);
         return -1;