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 0ebec5b6e1a0d45f380021f73793580c7fdac4a9..254fd3f92d53d34d05c0f03dd43b805cede7ff06 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp
+++ b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp
@@ -39,76 +39,47 @@ $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 <string>
-#include <vector>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <csignal>

 
 

-#include "ether_cap.h"
-#include "common.h"
-#include "raw_ip_packet.h"
+#include "stg/common.h"
+#include "stg/raw_ip_packet.h"
+#include "stg/traffcounter.h"
+#include "stg/plugin_creator.h"

 
 

-using namespace std;
+#include "ether_cap.h"

 
 //#define CAP_DEBUG 1
 
 //#define CAP_DEBUG 1

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

 
 

-//-----------------------------------------------------------------------------
-class BPF_CAP_CREATOR
-{
-private:
-    BPF_CAP * bpfc;
-
-public:
-    BPF_CAP_CREATOR()
-        : bpfc(new BPF_CAP())
-        {
-        };
-    ~BPF_CAP_CREATOR()
-        {
-        delete bpfc;
-        };
-
-    BPF_CAP * GetCapturer()
-    {
-    return bpfc;
-    };
-};

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

-BPF_CAP_CREATOR bcc;
+namespace
+{
+PLUGIN_CREATOR<BPF_CAP> bcc;
+}
+
+extern "C" PLUGIN * GetPlugin();

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

-BASE_PLUGIN * GetPlugin()
+PLUGIN * GetPlugin()

 {
 {

-return bcc.GetCapturer();
+return bcc.GetPlugin();

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 int BPF_CAP_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 int BPF_CAP_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {

-//char sep[]= ", \t\n\r";
-//char *s;
-string ifaces;
-//char * str;
-//char *p;
-

 iface.erase(iface.begin(), iface.end());
 
 iface.erase(iface.begin(), iface.end());
 

-//PARAM_VALUE pv;
-//pv.param = "WorkDir";
-//vector<PARAM_VALUE>::const_iterator pvi;
-

 if (s.moduleParams.empty())
     {
     errorStr = "Parameter \'iface\' not found.";
 if (s.moduleParams.empty())
     {
     errorStr = "Parameter \'iface\' not found.";


@@ -130,36 +101,10 @@ for (unsigned i = 0; i < s.moduleParams.size(); i++)
         }
     }
 
         }
     }
 

-/*if (cf.ReadString("Iface", &ifaces, "NoIface") < 0)
-    {
-    errorStr = "Cannot read parameter \'Iface\' from " + cf.GetFileName();
-    return -1;
-    }
-
-str = new char[ifaces.size() + 1];
-strcpy(str, ifaces.c_str());
-p = str;
-
-while((s = strtok(p, sep)))
-    {
-    printfd(__FILE__, "iface[] = %s\n", s);
-    p = NULL;
-    iface.push_back(s);
-    //strncpy(iface[i++], s, DEV_NAME_LEN);
-    //devNum++;
-    }
-
-delete[] str;
-if (!ifaces.size())
-    {
-    errorStr = "Error read parameter \'Iface\' from " + cf.GetFileName();
-    return -1;
-    }*/
-

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-string BPF_CAP_SETTINGS::GetIface(unsigned int num)
+std::string BPF_CAP_SETTINGS::GetIface(unsigned int num)

 {
 if (num >= iface.size())
     {
 {
 if (num >= iface.size())
     {


@@ -170,20 +115,24 @@ return iface[num];
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-const 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),
+      isRunning(false),
+      capSock(-1),
+      settings(),
+      traffCnt(NULL),
+      logger(GetPluginLogger(GetStgLogger(), "cap_bpf"))

 {
 {

-isRunning = false;
-nonstop = false;
-}
-//-----------------------------------------------------------------------------
-void BPF_CAP::SetSettings(const MODULE_SETTINGS & s)
-{
-settings = s;

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


@@ -197,16 +146,6 @@ if (ret)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

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

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


@@ -220,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()


@@ -246,7 +186,8 @@ for (i = 0; i < 25; i++)
     if (!isRunning)
         break;
 
     if (!isRunning)
         break;
 

-    usleep(200000);
+    struct timespec ts = {0, 200000000};
+    nanosleep(&ts, NULL);

     }
 
 //after 5 seconds waiting thread still running. now killing it
     }
 
 //after 5 seconds waiting thread still running. now killing it


@@ -256,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;
         }


@@ -264,14 +206,13 @@ if (isRunning)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

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

 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


@@ -284,12 +225,11 @@ char * iface;
 
 while (dc->nonstop)
     {
 
 while (dc->nonstop)
     {

-    dc->BPFCapRead((char*)&hdr, 68 + 14, &iface);
+    if (dc->BPFCapRead((char*)&hdr, 68 + 14, &iface))
+        continue;

 
     if (!(hdr[12] == 0x8 && hdr[13] == 0x0))
 
     if (!(hdr[12] == 0x8 && hdr[13] == 0x0))

-    {

         continue;
         continue;

-    }

 
     dc->traffCnt->Process(*rpp);
     }
 
     dc->traffCnt->Process(*rpp);
     }


@@ -298,19 +238,8 @@ dc->isRunning = false;
 return NULL;
 }
 //-----------------------------------------------------------------------------
 return NULL;
 }
 //-----------------------------------------------------------------------------

-uint16_t BPF_CAP::GetStartPosition() const
-{
-return 0;
-}
-//-----------------------------------------------------------------------------
-uint16_t BPF_CAP::GetStopPosition() const
-{
-return 0;
-}
-//-----------------------------------------------------------------------------

 int BPF_CAP::BPFCapOpen()
 {
 int BPF_CAP::BPFCapOpen()
 {

-//for (int i = 0; i < settings->devNum; i++)

 int i = 0;
 BPF_DATA bd;
 pollfd pd;
 int i = 0;
 BPF_DATA bd;
 pollfd pd;


@@ -319,9 +248,9 @@ while ((bd.iface = capSettings.GetIface(i)) != "")
     {
     bpfData.push_back(bd);
     if (BPFCapOpen(&bpfData[i]) < 0)
     {
     bpfData.push_back(bd);
     if (BPFCapOpen(&bpfData[i]) < 0)

-    {
-    return -1;
-    }
+        {
+        return -1;
+        }

 
     pd.events = POLLIN;
     pd.fd = bpfData[i].fd;
 
     pd.events = POLLIN;
     pd.fd = bpfData[i].fd;


@@ -332,7 +261,6 @@ while ((bd.iface = capSettings.GetIface(i)) != "")
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-//int BPF_CAP::BPFCapOpen(string ifaceToOpen)

 int BPF_CAP::BPFCapOpen(BPF_DATA * bd)
 {
 char devbpf[20];
 int BPF_CAP::BPFCapOpen(BPF_DATA * bd)
 {
 char devbpf[20];


@@ -341,57 +269,54 @@ int l = BUFF_LEN;
 int im = 1;
 struct ifreq ifr;
 
 int im = 1;
 struct ifreq ifr;
 

-do  {
+do
+    {

     sprintf(devbpf, "/dev/bpf%d", i);
     i++;
     bd->fd = open(devbpf, O_RDONLY);
     sprintf(devbpf, "/dev/bpf%d", i);
     i++;
     bd->fd = open(devbpf, O_RDONLY);

-    //cd[n].fd = open(devbpf, O_RDONLY);

     } while(bd->fd < 0 && errno == EBUSY);
     } while(bd->fd < 0 && errno == EBUSY);

-      //while(cd[n].fd < 0 && errno == EBUSY);

 
 

-//if (cd[n].fd < 0)

 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;
     }
 

-//strncpy(ifr.ifr_name, settings->iface[n], sizeof(ifr.ifr_name));

 strncpy(ifr.ifr_name, bd->iface.c_str(), sizeof(ifr.ifr_name));
 
 strncpy(ifr.ifr_name, bd->iface.c_str(), sizeof(ifr.ifr_name));
 

-//if (ioctl(cd[n].fd, BIOCSBLEN, (caddr_t)&l) < 0)

 if (ioctl(bd->fd, BIOCSBLEN, (caddr_t)&l) < 0)
     {
 if (ioctl(bd->fd, BIOCSBLEN, (caddr_t)&l) < 0)
     {

-    errorStr = bd->iface + " BIOCSBLEN " + string(strerror(errno));
+    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;
     }
 

-//if (ioctl(cd[n].fd, BIOCSETIF, (caddr_t)&ifr) < 0 )

 if (ioctl(bd->fd, BIOCSETIF, (caddr_t)&ifr) < 0)
     {
 if (ioctl(bd->fd, BIOCSETIF, (caddr_t)&ifr) < 0)
     {

-    errorStr = bd->iface + " BIOCSETIF " + string(strerror(errno));
+    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;
     }
 

-//if (ioctl(cd[n].fd, BIOCIMMEDIATE, &im) < 0 )

 if (ioctl(bd->fd, BIOCIMMEDIATE, &im) < 0)
     {
 if (ioctl(bd->fd, BIOCIMMEDIATE, &im) < 0)
     {

-    errorStr = bd->iface + " BIOCIMMEDIATE " + string(strerror(errno));
+    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;
     }
 
 return bd->fd;
     printfd(__FILE__, "ioctl failed: '%s'\n", errorStr.c_str());
     return -1;
     }
 
 return bd->fd;

-//return 0;

 }
 //-----------------------------------------------------------------------------
 int BPF_CAP::BPFCapClose()
 {
 for (unsigned int i = 0; i < bpfData.size(); i++)
 }
 //-----------------------------------------------------------------------------
 int BPF_CAP::BPFCapClose()
 {
 for (unsigned int i = 0; i < bpfData.size(); i++)

-  close(bpfData[i].fd);
+    close(bpfData[i].fd);

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------


@@ -403,12 +328,16 @@ for (unsigned int i = 0; i < polld.size(); i++)
     {
     if (polld[i].revents & POLLIN)
         {
     {
     if (polld[i].revents & POLLIN)
         {

-        BPFCapRead(buffer, blen, capIface, &bpfData[i]);
+        if (BPFCapRead(buffer, blen, capIface, &bpfData[i]))
+            {
+            polld[i].revents = 0;
+            continue;
+            }

         polld[i].revents = 0;
         return 0;
         }
     }
         polld[i].revents = 0;
         return 0;
         }
     }

-return 0;
+return -1;

 }
 //-----------------------------------------------------------------------------
 int BPF_CAP::BPFCapRead(char * buffer, int blen, char **, BPF_DATA * bd)
 }
 //-----------------------------------------------------------------------------
 int BPF_CAP::BPFCapRead(char * buffer, int blen, char **, BPF_DATA * bd)


@@ -418,8 +347,10 @@ 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)
         {

-        //printfd(__FILE__, " error read\n");
-        usleep(20000);
+        logger("read error: %s", strerror(errno));
+        struct timespec ts = {0, 20000000};
+        nanosleep(&ts, NULL);
+        return -1;

         }
 
     bd->p = bd->buffer;
         }
 
     bd->p = bd->buffer;


@@ -430,8 +361,6 @@ if (bd->canRead)
 if(bd->r > bd->sum)
     {
     memcpy(buffer, (char*)(bd->p) + bd->bh->bh_hdrlen, blen);
 if(bd->r > bd->sum)
     {
     memcpy(buffer, (char*)(bd->p) + bd->bh->bh_hdrlen, blen);

-    //strncpy(iface, settings->iface[n], 9);
-    //*iface = settings->iface[n];

 
     bd->sum += BPF_WORDALIGN(bd->bh->bh_hdrlen + bd->bh->bh_caplen);
     bd->p = bd->p + BPF_WORDALIGN(bd->bh->bh_hdrlen + bd->bh->bh_caplen);
 
     bd->sum += BPF_WORDALIGN(bd->bh->bh_hdrlen + bd->bh->bh_caplen);
     bd->p = bd->p + BPF_WORDALIGN(bd->bh->bh_hdrlen + bd->bh->bh_caplen);


@@ -447,4 +376,3 @@ if(bd->r <= bd->sum)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-