X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..479b8853c2ab18c98926a9369a03888021e9b986:/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp diff --git a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp index 5c76be91..3ac60d1f 100644 --- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp +++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp @@ -27,84 +27,49 @@ $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 #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 - -//----------------------------------------------------------------------------- -class ETHER_CAP_CREATOR +extern "C" STG::Plugin* GetPlugin() { -private: - ETHER_CAP * ec; - -public: - ETHER_CAP_CREATOR() - : ec(new ETHER_CAP()) - { - }; - ~ETHER_CAP_CREATOR() - { - delete ec; - }; - - ETHER_CAP * GetCapturer() - { - return ec; - }; -}; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -ETHER_CAP_CREATOR ecc; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -BASE_PLUGIN * GetPlugin() -{ -return ecc.GetCapturer(); + static ETHER_CAP plugin; + return &plugin; } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -const string ETHER_CAP::GetVersion() const -{ -return "Ether_cap v.1.2"; -} //----------------------------------------------------------------------------- -ETHER_CAP::ETHER_CAP() +std::string ETHER_CAP::GetVersion() const { -isRunning = false; -nonstop = false; +return "cap_ether v.1.2"; } //----------------------------------------------------------------------------- -void ETHER_CAP::SetTraffcounter(TRAFFCOUNTER * tc) -{ -traffCnt = tc; -} -//----------------------------------------------------------------------------- -const string & ETHER_CAP::GetStrError() const +ETHER_CAP::ETHER_CAP() + : isRunning(false), + capSock(-1), + traffCnt(NULL), + logger(STG::PluginLogger::get("cap_ether")) { -return errorStr; } //----------------------------------------------------------------------------- int ETHER_CAP::Start() @@ -119,16 +84,9 @@ if (EthCapOpen() < 0) return -1; } -nonstop = true; - -if (pthread_create(&thread, NULL, Run, this) == 0) - { - return 0; - } +m_thread = std::jthread([this](auto token){ Run(std::move(token)); }); -errorStr = "Cannot create thread."; -printfd(__FILE__, "Cannot create thread\n"); -return -1; +return 0; } //----------------------------------------------------------------------------- int ETHER_CAP::Stop() @@ -136,71 +94,52 @@ 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++) { - usleep(200000); + struct timespec ts = {0, 200000000}; + nanosleep(&ts, NULL); } //after 5 seconds waiting thread still running. now killing it if (isRunning) - { - if (pthread_kill(thread, SIGUSR1)) - { - errorStr = "Cannot kill thread."; - return -1; - } - for (int i = 0; i < 25 && isRunning; ++i) - usleep(200000); - if (isRunning) - { - errorStr = "ETHER_CAP not stopped."; - printfd(__FILE__, "Cannot stop thread\n"); - return -1; - } - else - { - pthread_join(thread, NULL); - } - } + m_thread.detach(); +else + m_thread.join(); EthCapClose(); return 0; } //----------------------------------------------------------------------------- -bool ETHER_CAP::IsRunning() -{ -return isRunning; -} -//----------------------------------------------------------------------------- -void * ETHER_CAP::Run(void * d) +void ETHER_CAP::Run(std::stop_token token) { -ETHER_CAP * dc = (ETHER_CAP *)d; -dc->isRunning = true; +sigset_t signalSet; +sigfillset(&signalSet); +pthread_sigmask(SIG_BLOCK, &signalSet, NULL); + +isRunning = true; struct ETH_IP { uint16_t ethHdr[8]; -RAW_PACKET rp; +STG::RawPacket rp; 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; -while (dc->nonstop) +while (!token.stop_requested()) { - if (dc->EthCapRead(ðip, 68 + 14, &iface)) + if (EthCapRead(ðip, 68 + 14, &iface)) { continue; } @@ -208,26 +147,17 @@ while (dc->nonstop) if (ethIP->ethHdr[7] != 0x8) continue; - dc->traffCnt->Process(ethIP->rp); + traffCnt->process(ethIP->rp); } -dc->isRunning = false; -return NULL; -} -//----------------------------------------------------------------------------- -uint16_t ETHER_CAP::GetStartPosition() const -{ -return 10; -} -//----------------------------------------------------------------------------- -uint16_t ETHER_CAP::GetStopPosition() const -{ -return 10; +isRunning = false; } //----------------------------------------------------------------------------- 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; } //----------------------------------------------------------------------------- @@ -240,7 +170,7 @@ return 0; int ETHER_CAP::EthCapRead(void * buffer, int blen, char **) { struct sockaddr_ll addr; -int addrLen, res; +socklen_t addrLen; if (!WaitPackets(capSock)) { @@ -249,44 +179,11 @@ 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, static_cast(buffer) + 2, blen, 0, reinterpret_cast(&addr), &addrLen) < 0) { - if (errno != EINTR) - { - printfd(__FILE__, "Error on recvfrom: '%s'\n", strerror(errno)); - } + logger("recvfrom error: %s", strerror(errno)); return ENODATA; } 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; -}