Fixed problem running plugin in non-debug mode.

[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 108c4e0d6a9e73cbb1c02123bb72003314b88f9d..254fd3f92d53d34d05c0f03dd43b805cede7ff06 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp
+++ b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp
@@ -39,19 +39,20 @@ $Author: faust $
 #include <net/if.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

-
-#include <errno.h>

 #include <fcntl.h>
 #include <fcntl.h>

-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>

 #include <unistd.h>
 
 #include <unistd.h>
 

+#include <cerrno>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <csignal>
+

 #include "stg/common.h"
 #include "stg/raw_ip_packet.h"
 #include "stg/traffcounter.h"
 #include "stg/plugin_creator.h"
 #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
 #include "ether_cap.h"
 
 //#define CAP_DEBUG 1


@@ -59,7 +60,12 @@ $Author: faust $
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

+namespace
+{

 PLUGIN_CREATOR<BPF_CAP> bcc;
 PLUGIN_CREATOR<BPF_CAP> bcc;

+}
+
+extern "C" PLUGIN * GetPlugin();

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


@@ -72,8 +78,6 @@ return bcc.GetPlugin();
 //-----------------------------------------------------------------------------
 int BPF_CAP_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {
 //-----------------------------------------------------------------------------
 int BPF_CAP_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {

-std::string ifaces;
-

 iface.erase(iface.begin(), iface.end());
 
 if (s.moduleParams.empty())
 iface.erase(iface.begin(), iface.end());
 
 if (s.moduleParams.empty())


@@ -111,9 +115,9 @@ return iface[num];
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-const 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()


@@ -126,7 +130,8 @@ BPF_CAP::BPF_CAP()
       isRunning(false),
       capSock(-1),
       settings(),
       isRunning(false),
       capSock(-1),
       settings(),

-      traffCnt(NULL)
+      traffCnt(NULL),
+      logger(GetPluginLogger(GetStgLogger(), "cap_bpf"))

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


@@ -154,14 +159,15 @@ if (BPFCapOpen() < 0)
 
 nonstop = true;
 
 
 nonstop = true;
 

-if (pthread_create(&thread, NULL, Run, this) == 0)
+if (pthread_create(&thread, NULL, Run, this))

     {
     {

-    return 0;
+    errorStr = "Cannot create thread.";
+    logger("Cannot create thread.");
+    printfd(__FILE__, "Cannot create thread\n");
+    return -1;

     }
 
     }
 

-errorStr = "Cannot create thread.";
-printfd(__FILE__, "Cannot create thread\n");
-return -1;
+return 0;

 }
 //-----------------------------------------------------------------------------
 int BPF_CAP::Stop()
 }
 //-----------------------------------------------------------------------------
 int BPF_CAP::Stop()


@@ -191,6 +197,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.");

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


@@ -201,7 +208,11 @@ return 0;
 //-----------------------------------------------------------------------------
 void * BPF_CAP::Run(void * d)
 {
 //-----------------------------------------------------------------------------
 void * BPF_CAP::Run(void * d)
 {

-BPF_CAP * dc = (BPF_CAP *)d;
+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+
+BPF_CAP * dc = static_cast<BPF_CAP *>(d);

 dc->isRunning = true;
 
 uint8_t hdr[96]; //68 + 14 + 4(size) + 9(SYS_IFACE) + 1(align to 4) = 96
 dc->isRunning = true;
 
 uint8_t hdr[96]; //68 + 14 + 4(size) + 9(SYS_IFACE) + 1(align to 4) = 96


@@ -268,6 +279,7 @@ do
 if (bd->fd < 0)
     {
     errorStr = "Can't capture packets. Open bpf device for " + bd->iface + " error.";
 if (bd->fd < 0)
     {
     errorStr = "Can't capture packets. Open bpf device for " + bd->iface + " error.";

+    logger("Cannot open device for interface '%s': %s", bd->iface.c_str(), strerror(errno));

     printfd(__FILE__, "Cannot open BPF device\n");
     return -1;
     }
     printfd(__FILE__, "Cannot open BPF device\n");
     return -1;
     }


@@ -277,6 +289,7 @@ strncpy(ifr.ifr_name, bd->iface.c_str(), sizeof(ifr.ifr_name));
 if (ioctl(bd->fd, BIOCSBLEN, (caddr_t)&l) < 0)
     {
     errorStr = bd->iface + " BIOCSBLEN " + std::string(strerror(errno));
 if (ioctl(bd->fd, BIOCSBLEN, (caddr_t)&l) < 0)
     {
     errorStr = bd->iface + " BIOCSBLEN " + std::string(strerror(errno));

+    logger("ioctl (BIOCSBLEN) error for interface '%s': %s", bd->iface.c_str(), strerror(errno));

     printfd(__FILE__, "ioctl failed: '%s'\n", errorStr.c_str());
     return -1;
     }
     printfd(__FILE__, "ioctl failed: '%s'\n", errorStr.c_str());
     return -1;
     }


@@ -284,6 +297,7 @@ if (ioctl(bd->fd, BIOCSBLEN, (caddr_t)&l) < 0)
 if (ioctl(bd->fd, BIOCSETIF, (caddr_t)&ifr) < 0)
     {
     errorStr = bd->iface + " BIOCSETIF " + std::string(strerror(errno));
 if (ioctl(bd->fd, BIOCSETIF, (caddr_t)&ifr) < 0)
     {
     errorStr = bd->iface + " BIOCSETIF " + std::string(strerror(errno));

+    logger("ioctl (BIOCSETIF) error for interface '%s': %s", bd->iface.c_str(), strerror(errno));

     printfd(__FILE__, "ioctl failed: '%s'\n", errorStr.c_str());
     return -1;
     }
     printfd(__FILE__, "ioctl failed: '%s'\n", errorStr.c_str());
     return -1;
     }


@@ -291,6 +305,7 @@ if (ioctl(bd->fd, BIOCSETIF, (caddr_t)&ifr) < 0)
 if (ioctl(bd->fd, BIOCIMMEDIATE, &im) < 0)
     {
     errorStr = bd->iface + " BIOCIMMEDIATE " + std::string(strerror(errno));
 if (ioctl(bd->fd, BIOCIMMEDIATE, &im) < 0)
     {
     errorStr = bd->iface + " BIOCIMMEDIATE " + std::string(strerror(errno));

+    logger("ioctl (BIOCIMMEDIATE) error for interface '%s': %s", bd->iface.c_str(), strerror(errno));

     printfd(__FILE__, "ioctl failed: '%s'\n", errorStr.c_str());
     return -1;
     }
     printfd(__FILE__, "ioctl failed: '%s'\n", errorStr.c_str());
     return -1;
     }


@@ -332,6 +347,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));

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