X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..355911106bc27f5504eb904a064367ef1b5f0aba:/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp index 5c76be91..632c1846 100644 --- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp +++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp @@ -32,79 +32,54 @@ $Date: 2009/12/13 13:45:13 $ #include #include #include -#include -#include -#include -#include #include #include #include -#include - #include #include -#include "ether_cap.h" -#include "common.h" -#include "raw_ip_packet.h" - -//#define CAP_DEBUG 1 +#include +#include +#include +#include +#include +#include "stg/common.h" +#include "stg/raw_ip_packet.h" +#include "stg/traffcounter.h" +#include "stg/plugin_creator.h" -//----------------------------------------------------------------------------- -class ETHER_CAP_CREATOR -{ -private: - ETHER_CAP * ec; +#include "ether_cap.h" -public: - ETHER_CAP_CREATOR() - : ec(new ETHER_CAP()) - { - }; - ~ETHER_CAP_CREATOR() - { - delete ec; - }; +//#define CAP_DEBUG 1 - ETHER_CAP * GetCapturer() - { - return ec; - }; -}; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -ETHER_CAP_CREATOR ecc; +PLUGIN_CREATOR ecc; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -BASE_PLUGIN * GetPlugin() +PLUGIN * GetPlugin() { -return ecc.GetCapturer(); +return ecc.GetPlugin(); } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -const string ETHER_CAP::GetVersion() const +const std::string ETHER_CAP::GetVersion() const { return "Ether_cap v.1.2"; } //----------------------------------------------------------------------------- ETHER_CAP::ETHER_CAP() + : errorStr(), + thread(), + nonstop(false), + isRunning(false), + capSock(-1), + traffCnt(NULL) { -isRunning = false; -nonstop = false; -} -//----------------------------------------------------------------------------- -void ETHER_CAP::SetTraffcounter(TRAFFCOUNTER * tc) -{ -traffCnt = tc; -} -//----------------------------------------------------------------------------- -const string & ETHER_CAP::GetStrError() const -{ -return errorStr; } //----------------------------------------------------------------------------- int ETHER_CAP::Start() @@ -141,7 +116,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) @@ -152,7 +128,10 @@ if (isRunning) 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."; @@ -169,13 +148,12 @@ EthCapClose(); return 0; } //----------------------------------------------------------------------------- -bool ETHER_CAP::IsRunning() -{ -return isRunning; -} -//----------------------------------------------------------------------------- void * ETHER_CAP::Run(void * d) { +sigset_t signalSet; +sigfillset(&signalSet); +pthread_sigmask(SIG_BLOCK, &signalSet, NULL); + ETHER_CAP * dc = (ETHER_CAP *)d; dc->isRunning = true; @@ -215,16 +193,6 @@ dc->isRunning = false; return NULL; } //----------------------------------------------------------------------------- -uint16_t ETHER_CAP::GetStartPosition() const -{ -return 10; -} -//----------------------------------------------------------------------------- -uint16_t ETHER_CAP::GetStopPosition() const -{ -return 10; -} -//----------------------------------------------------------------------------- int ETHER_CAP::EthCapOpen() { capSock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); @@ -262,31 +230,3 @@ if (-1 == res) return 0; } -//----------------------------------------------------------------------------- -bool ETHER_CAP::WaitPackets(int sd) const -{ -fd_set rfds; -FD_ZERO(&rfds); -FD_SET(sd, &rfds); - -struct timeval tv; -tv.tv_sec = 0; -tv.tv_usec = 500000; - -int res = select(sd + 1, &rfds, NULL, NULL, &tv); -if (res == -1) // Error - { - if (errno != EINTR) - { - printfd(__FILE__, "Error on select: '%s'\n", strerror(errno)); - } - return false; - } - -if (res == 0) // Timeout - { - return false; - } - -return true; -}