X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a9c940996bac5c61168f06ef61bc20225fb7a65e..d230cb2411b6d2d6603a930f165bbd3138831eeb:/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp index 7f60c7eb..45ca9b1f 100644 --- a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp +++ b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp @@ -18,14 +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" @@ -36,7 +40,12 @@ extern "C" //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- +namespace +{ PLUGIN_CREATOR icc; +} + +extern "C" PLUGIN * GetPlugin(); //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -47,9 +56,9 @@ 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() @@ -60,7 +69,8 @@ IPQ_CAP::IPQ_CAP() isRunning(false), capSock(-1), traffCnt(NULL), - buf() + buf(), + logger(GetPluginLogger(GetStgLogger(), "cap_ipq")) { memset(buf, 0, BUFSIZE); } @@ -95,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) @@ -107,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) { @@ -124,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; @@ -150,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; } @@ -157,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; }