Ticket 37. The stgTime argument added in TariffChangeIsAllowed()

[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 276c8df0559876d43d4bc9376b1133f38cf641ca..cc64bc18c5bd41b08eb018cc5ccfd74156d82397 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
+++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
@@ -32,22 +32,23 @@ $Date: 2009/12/13 13:45:13 $
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <sys/types.h>

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

 #include <unistd.h>
 #include <linux/if_ether.h>
 #include <linux/if_packet.h>
 #include <unistd.h>
 #include <linux/if_ether.h>
 #include <linux/if_packet.h>

-#include <signal.h>
-

 #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 "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


@@ -55,7 +56,12 @@ $Date: 2009/12/13 13:45:13 $
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

+namespace
+{

 PLUGIN_CREATOR<ETHER_CAP> ecc;
 PLUGIN_CREATOR<ETHER_CAP> ecc;

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

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


@@ -65,19 +71,18 @@ return ecc.GetPlugin();
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-//-----------------------------------------------------------------------------        
-const 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),
       isRunning(false),
       capSock(-1),

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

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


@@ -95,14 +100,15 @@ if (EthCapOpen() < 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 ETHER_CAP::Stop()
 }
 //-----------------------------------------------------------------------------
 int ETHER_CAP::Stop()


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

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


@@ -134,6 +141,7 @@ if (isRunning)
     if (isRunning)
         {
         errorStr = "ETHER_CAP not stopped.";
     if (isRunning)
         {
         errorStr = "ETHER_CAP not stopped.";

+        logger("Cannot stop thread.");

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


@@ -149,7 +157,11 @@ return 0;
 //-----------------------------------------------------------------------------
 void * ETHER_CAP::Run(void * d)
 {
 //-----------------------------------------------------------------------------
 void * ETHER_CAP::Run(void * d)
 {

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

 dc->isRunning = true;
 
 struct ETH_IP
 dc->isRunning = true;
 
 struct ETH_IP


@@ -160,13 +172,11 @@ char        padding[4];
 char        padding1[8];
 };
 
 char        padding1[8];
 };
 

-ETH_IP * ethIP;
-

 char ethip[sizeof(ETH_IP)];
 
 memset(&ethip, 0, sizeof(ETH_IP));
 
 char ethip[sizeof(ETH_IP)];
 
 memset(&ethip, 0, sizeof(ETH_IP));
 

-ethIP = (ETH_IP *)&ethip;
+ETH_IP * ethIP = static_cast<ETH_IP *>(static_cast<void *>(&ethip));

 ethIP->rp.dataLen = -1;
 
 char * iface = NULL;
 ethIP->rp.dataLen = -1;
 
 char * iface = NULL;


@@ -191,6 +201,8 @@ return NULL;
 int ETHER_CAP::EthCapOpen()
 {
 capSock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
 int ETHER_CAP::EthCapOpen()
 {
 capSock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));

+if (capSock < 0)
+    logger("Cannot create socket: %s", strerror(errno));

 return capSock;
 }
 //-----------------------------------------------------------------------------
 return capSock;
 }
 //-----------------------------------------------------------------------------


@@ -203,7 +215,7 @@ return 0;
 int ETHER_CAP::EthCapRead(void * buffer, int blen, char **)
 {
 struct sockaddr_ll  addr;
 int ETHER_CAP::EthCapRead(void * buffer, int blen, char **)
 {
 struct sockaddr_ll  addr;

-int addrLen, res;
+int addrLen;

 
 if (!WaitPackets(capSock))
     {
 
 if (!WaitPackets(capSock))
     {


@@ -212,14 +224,9 @@ if (!WaitPackets(capSock))
 
 addrLen = sizeof(addr);
 
 
 addrLen = sizeof(addr);
 

-res = recvfrom(capSock, ((char*)buffer) + 2, blen, 0, (struct sockaddr *)&addr, (socklen_t*)&addrLen);
-
-if (-1 == res)
+if (recvfrom(capSock, ((char*)buffer) + 2, blen, 0, (struct sockaddr *)&addr, (socklen_t*)&addrLen) < 0)

     {
     {

-    if (errno != EINTR)
-        {
-        printfd(__FILE__, "Error on recvfrom: '%s'\n", strerror(errno));
-        }
+    logger("recvfrom error: %s", strerror(errno));

     return ENODATA;
     }
 
     return ENODATA;
     }