X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/89bf1ada977fd8c84e395de5e664f3d4dff912a6..1cb912e4f90473f78d2f0f10ab5c9b2c5bd36440:/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 fd83c485..3ac60d1f 100644 --- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp +++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp @@ -27,6 +27,17 @@ $Revision: 1.23 $ $Date: 2009/12/13 13:45:13 $ */ +#include "ether_cap.h" + +#include "stg/common.h" +#include "stg/raw_ip_packet.h" +#include "stg/traffcounter.h" + +#include +#include +#include +#include +#include #include #include @@ -38,36 +49,12 @@ $Date: 2009/12/13 13:45:13 $ #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 -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -namespace -{ -PLUGIN_CREATOR ecc; -} - -extern "C" PLUGIN * GetPlugin(); -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -PLUGIN * GetPlugin() +extern "C" STG::Plugin* GetPlugin() { -return ecc.GetPlugin(); + static ETHER_CAP plugin; + return &plugin; } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -78,13 +65,10 @@ return "cap_ether v.1.2"; } //----------------------------------------------------------------------------- ETHER_CAP::ETHER_CAP() - : errorStr(), - thread(), - nonstop(false), - isRunning(false), + : isRunning(false), capSock(-1), traffCnt(NULL), - logger(GetPluginLogger(GetStgLogger(), "cap_ether")) + logger(STG::PluginLogger::get("cap_ether")) { } //----------------------------------------------------------------------------- @@ -100,15 +84,7 @@ if (EthCapOpen() < 0) return -1; } -nonstop = true; - -if (pthread_create(&thread, NULL, Run, this)) - { - errorStr = "Cannot create thread."; - logger("Cannot create thread."); - printfd(__FILE__, "Cannot create thread\n"); - return -1; - } +m_thread = std::jthread([this](auto token){ Run(std::move(token)); }); return 0; } @@ -118,7 +94,7 @@ int ETHER_CAP::Stop() if (!isRunning) return 0; -nonstop = false; +m_thread.request_stop(); //5 seconds to thread stops itself for (int i = 0; i < 25 && isRunning; i++) @@ -128,48 +104,26 @@ for (int i = 0; i < 25 && isRunning; i++) } //after 5 seconds waiting thread still running. now killing it 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) - { - 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; - } - else - { - pthread_join(thread, NULL); - } - } + m_thread.detach(); +else + m_thread.join(); EthCapClose(); return 0; } //----------------------------------------------------------------------------- -void * ETHER_CAP::Run(void * d) +void ETHER_CAP::Run(std::stop_token token) { sigset_t signalSet; sigfillset(&signalSet); pthread_sigmask(SIG_BLOCK, &signalSet, NULL); -ETHER_CAP * dc = static_cast(d); -dc->isRunning = true; +isRunning = true; struct ETH_IP { uint16_t ethHdr[8]; -RAW_PACKET rp; +STG::RawPacket rp; char padding[4]; char padding1[8]; }; @@ -183,9 +137,9 @@ ethIP->rp.dataLen = -1; char * iface = NULL; -while (dc->nonstop) +while (!token.stop_requested()) { - if (dc->EthCapRead(ðip, 68 + 14, &iface)) + if (EthCapRead(ðip, 68 + 14, &iface)) { continue; } @@ -193,11 +147,10 @@ while (dc->nonstop) if (ethIP->ethHdr[7] != 0x8) continue; - dc->traffCnt->Process(ethIP->rp); + traffCnt->process(ethIP->rp); } -dc->isRunning = false; -return NULL; +isRunning = false; } //----------------------------------------------------------------------------- int ETHER_CAP::EthCapOpen() @@ -217,7 +170,7 @@ return 0; int ETHER_CAP::EthCapRead(void * buffer, int blen, char **) { struct sockaddr_ll addr; -int addrLen; +socklen_t addrLen; if (!WaitPackets(capSock)) { @@ -226,7 +179,7 @@ if (!WaitPackets(capSock)) addrLen = sizeof(addr); -if (recvfrom(capSock, ((char*)buffer) + 2, blen, 0, (struct sockaddr *)&addr, (socklen_t*)&addrLen) < 0) +if (recvfrom(capSock, static_cast(buffer) + 2, blen, 0, reinterpret_cast(&addr), &addrLen) < 0) { logger("recvfrom error: %s", strerror(errno)); return ENODATA;