X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a9c940996bac5c61168f06ef61bc20225fb7a65e..5014a9d76df7cbe75b175d635908049ccd702c81:/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp?ds=inline diff --git a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp index 97e9b171..fd83c485 100644 --- 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 #include #include -#include -#include -#include -#include #include #include #include -#include - #include #include +#include +#include +#include +#include +#include + #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 @@ -55,7 +56,12 @@ $Date: 2009/12/13 13:45:13 $ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- +namespace +{ PLUGIN_CREATOR ecc; +} + +extern "C" PLUGIN * GetPlugin(); //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -65,10 +71,10 @@ 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() @@ -77,7 +83,8 @@ ETHER_CAP::ETHER_CAP() nonstop(false), isRunning(false), capSock(-1), - traffCnt(NULL) + traffCnt(NULL), + logger(GetPluginLogger(GetStgLogger(), "cap_ether")) { } //----------------------------------------------------------------------------- @@ -95,14 +102,15 @@ if (EthCapOpen() < 0) 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() @@ -115,7 +123,8 @@ nonstop = false; //5 seconds to thread stops itself for (int i = 0; i < 25 && isRunning; i++) { - usleep(200000); + struct timespec ts = {0, 200000000}; + nanosleep(&ts, NULL); } //after 5 seconds waiting thread still running. now killing it if (isRunning) @@ -123,13 +132,18 @@ if (isRunning) 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) - usleep(200000); + { + struct timespec ts = {0, 200000000}; + nanosleep(&ts, NULL); + } if (isRunning) { errorStr = "ETHER_CAP not stopped."; + logger("Cannot stop thread."); printfd(__FILE__, "Cannot stop thread\n"); return -1; } @@ -145,7 +159,11 @@ return 0; //----------------------------------------------------------------------------- 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(d); dc->isRunning = true; struct ETH_IP @@ -156,13 +174,11 @@ char padding[4]; char padding1[8]; }; -ETH_IP * ethIP; - char ethip[sizeof(ETH_IP)]; memset(ðip, 0, sizeof(ETH_IP)); -ethIP = (ETH_IP *)ðip; +ETH_IP * ethIP = static_cast(static_cast(ðip)); ethIP->rp.dataLen = -1; char * iface = NULL; @@ -187,6 +203,8 @@ return NULL; 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; } //----------------------------------------------------------------------------- @@ -199,7 +217,7 @@ return 0; int ETHER_CAP::EthCapRead(void * buffer, int blen, char **) { struct sockaddr_ll addr; -int addrLen, res; +int addrLen; if (!WaitPackets(capSock)) { @@ -208,14 +226,9 @@ if (!WaitPackets(capSock)) 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; }