X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/5e6957abc520ebcba78b1bf5fccd5f257a1bd0a5..6e9c03d53920b4c53c9b93303ae676be0f100585:/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp?ds=inline diff --git a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp index 97b70a0b..45ca9b1f 100644 --- a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp +++ b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp @@ -18,13 +18,18 @@ * Author : Boris Mikhailenko */ -#include -#include #include #include +#include +#include +#include + #include "stg/raw_ip_packet.h" #include "stg/traffcounter.h" +#include "stg/plugin_creator.h" +#include "stg/common.h" + #include "ipq_cap.h" extern "C" @@ -32,50 +37,40 @@ extern "C" #include "libipq.h" } -class IPQ_CAP_CREATOR { -private: - IPQ_CAP * ic; - -public: - IPQ_CAP_CREATOR() - : ic(new IPQ_CAP()) - { - } - ~IPQ_CAP_CREATOR() - { - delete ic; - } - - IPQ_CAP * GetCapturer() - { - return ic; - } -}; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -IPQ_CAP_CREATOR icc; +namespace +{ +PLUGIN_CREATOR icc; +} + +extern "C" PLUGIN * GetPlugin(); //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- PLUGIN * GetPlugin() { -return icc.GetCapturer(); +return icc.GetPlugin(); } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -const std::string IPQ_CAP::GetVersion() const +std::string IPQ_CAP::GetVersion() const { -return "ipq_cap v.1.2"; +return "cap_ipq v.1.2"; } //----------------------------------------------------------------------------- IPQ_CAP::IPQ_CAP() : ipq_h(NULL), + errorStr(), + thread(), nonstop(false), isRunning(false), capSock(-1), - traffCnt(NULL) + traffCnt(NULL), + buf(), + logger(GetPluginLogger(GetStgLogger(), "cap_ipq")) { memset(buf, 0, BUFSIZE); } @@ -110,7 +105,8 @@ for (int i = 0; i < 25; i++) { if (!isRunning) break; - usleep(200000); + struct timespec ts = {0, 200000000}; + nanosleep(&ts, NULL); } //after 5 seconds waiting thread still running. now killing it if (isRunning) @@ -122,7 +118,8 @@ if (isRunning) } for (int i = 0; i < 25 && isRunning; ++i) { - usleep(200000); + struct timespec ts = {0, 200000000}; + nanosleep(&ts, NULL); } if (isRunning) { @@ -139,9 +136,13 @@ return 0; //----------------------------------------------------------------------------- void * IPQ_CAP::Run(void * d) { +sigset_t signalSet; +sigfillset(&signalSet); +pthread_sigmask(SIG_BLOCK, &signalSet, NULL); + RAW_PACKET raw_packet; -IPQ_CAP * dc = (IPQ_CAP *)d; +IPQ_CAP * dc = static_cast(d); dc->isRunning = true; memset(&raw_packet, 0, sizeof(raw_packet)); raw_packet.dataLen = -1; @@ -165,6 +166,7 @@ ipq_h = ipq_create_handle(0, PF_INET); if (ipq_h == NULL) { ipq_destroy_handle(ipq_h); + logger("Cannot create IPQ handle. Error: '%s', '%s'", ipq_errstr(), strerror(errno)); errorStr = "Cannot create ipq handle!"; return -1; } @@ -172,6 +174,7 @@ int status = ipq_set_mode(ipq_h, IPQ_COPY_PACKET, PAYLOAD_LEN); if (status < 0) { ipq_destroy_handle(ipq_h); + logger("Cannot set IPQ_COPY_PACKET mode."); errorStr = "Cannot set IPQ_COPY_PACKET mode!"; return -1; }