X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/73f478b15a61946b2c78843b968ba69b95551c09..1cd2b12bd4e4d86f6cd099240795f3ebeb3852b3:/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp index 4e9fa0ff..aa10327c 100644 --- a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp +++ b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp @@ -28,12 +28,23 @@ $Date: 2009/03/24 11:20:15 $ $Author: faust $ */ +#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 @@ -42,36 +53,17 @@ $Author: faust $ #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 -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -PLUGIN_CREATOR bcc; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -PLUGIN * GetPlugin() +extern "C" STG::Plugin* GetPlugin() { -return bcc.GetPlugin(); + static BPF_CAP plugin; + return &plugin; } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -int BPF_CAP_SETTINGS::ParseSettings(const MODULE_SETTINGS & s) +int BPF_CAP_SETTINGS::ParseSettings(const STG::ModuleSettings & s) { iface.erase(iface.begin(), iface.end()); @@ -110,23 +102,16 @@ return iface[num]; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -const std::string BPF_CAP::GetVersion() const +std::string BPF_CAP::GetVersion() const { -return "bpf_cap v.1.0"; +return "cap_bpf v.1.0"; } //----------------------------------------------------------------------------- BPF_CAP::BPF_CAP() - : capSettings(), - errorStr(), - bpfData(), - polld(), - thread(), - nonstop(false), - isRunning(false), + : isRunning(false), capSock(-1), - settings(), traffCnt(NULL), - logger(GetPluginLogger(GetStgLogger(), "cap_ether")) + logger(STG::PluginLogger::get("cap_bpf")) { } //----------------------------------------------------------------------------- @@ -152,16 +137,9 @@ if (BPFCapOpen() < 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 BPF_CAP::Stop() @@ -171,7 +149,7 @@ if (!isRunning) BPFCapClose(); -nonstop = false; +m_thread.request_stop(); //5 seconds to thread stops itself int i; @@ -186,49 +164,41 @@ for (i = 0; i < 25; i++) //after 5 seconds waiting thread still running. now killing it if (isRunning) - { - //TODO pthread_cancel() - if (pthread_kill(thread, SIGINT)) - { - errorStr = "Cannot kill thread."; - printfd(__FILE__, "Cannot kill thread\n"); - return -1; - } - } + m_thread.detach(); +else + m_thread.join(); return 0; } //----------------------------------------------------------------------------- -void * BPF_CAP::Run(void * d) +void BPF_CAP::Run(std::stop_token token) { sigset_t signalSet; sigfillset(&signalSet); pthread_sigmask(SIG_BLOCK, &signalSet, NULL); -BPF_CAP * dc = static_cast(d); -dc->isRunning = true; +isRunning = true; uint8_t hdr[96]; //68 + 14 + 4(size) + 9(SYS_IFACE) + 1(align to 4) = 96 -RAW_PACKET * rpp = (RAW_PACKET *)&hdr[14]; +STG::RawPacket * rpp = (STG::RawPacket *)&hdr[14]; memset(hdr, 0, sizeof(hdr)); rpp->dataLen = -1; char * iface; -while (dc->nonstop) +while (!token.stop_requested()) { - if (dc->BPFCapRead((char*)&hdr, 68 + 14, &iface)) + if (BPFCapRead((char*)&hdr, 68 + 14, &iface)) continue; if (!(hdr[12] == 0x8 && hdr[13] == 0x0)) continue; - dc->traffCnt->Process(*rpp); + traffCnt->process(*rpp); } -dc->isRunning = false; -return NULL; +isRunning = false; } //----------------------------------------------------------------------------- int BPF_CAP::BPFCapOpen() @@ -272,6 +242,7 @@ do if (bd->fd < 0) { errorStr = "Can't capture packets. Open bpf device for " + bd->iface + " error."; + logger("Cannot open device for interface '%s': %s", bd->iface.c_str(), strerror(errno)); printfd(__FILE__, "Cannot open BPF device\n"); return -1; } @@ -281,6 +252,7 @@ strncpy(ifr.ifr_name, bd->iface.c_str(), sizeof(ifr.ifr_name)); if (ioctl(bd->fd, BIOCSBLEN, (caddr_t)&l) < 0) { errorStr = bd->iface + " BIOCSBLEN " + std::string(strerror(errno)); + logger("ioctl (BIOCSBLEN) error for interface '%s': %s", bd->iface.c_str(), strerror(errno)); printfd(__FILE__, "ioctl failed: '%s'\n", errorStr.c_str()); return -1; } @@ -288,6 +260,7 @@ if (ioctl(bd->fd, BIOCSBLEN, (caddr_t)&l) < 0) if (ioctl(bd->fd, BIOCSETIF, (caddr_t)&ifr) < 0) { errorStr = bd->iface + " BIOCSETIF " + std::string(strerror(errno)); + logger("ioctl (BIOCSETIF) error for interface '%s': %s", bd->iface.c_str(), strerror(errno)); printfd(__FILE__, "ioctl failed: '%s'\n", errorStr.c_str()); return -1; } @@ -295,6 +268,7 @@ if (ioctl(bd->fd, BIOCSETIF, (caddr_t)&ifr) < 0) if (ioctl(bd->fd, BIOCIMMEDIATE, &im) < 0) { errorStr = bd->iface + " BIOCIMMEDIATE " + std::string(strerror(errno)); + logger("ioctl (BIOCIMMEDIATE) error for interface '%s': %s", bd->iface.c_str(), strerror(errno)); printfd(__FILE__, "ioctl failed: '%s'\n", errorStr.c_str()); return -1; } @@ -336,6 +310,7 @@ if (bd->canRead) bd->r = read(bd->fd, bd->buffer, BUFF_LEN); if (bd->r < 0) { + logger("read error: %s", strerror(errno)); struct timespec ts = {0, 20000000}; nanosleep(&ts, NULL); return -1;