X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a6680ce3d763763a6010c81c8a5a8f7a1ce052db..b9bafe1042839cd7295adf84448b4d08de9f5f46:/projects/stargazer/plugins/capture/pcap/pcap_cap.h diff --git a/projects/stargazer/plugins/capture/pcap/pcap_cap.h b/projects/stargazer/plugins/capture/pcap/pcap_cap.h index 3bdfd55e..e72c3e74 100644 --- a/projects/stargazer/plugins/capture/pcap/pcap_cap.h +++ b/projects/stargazer/plugins/capture/pcap/pcap_cap.h @@ -18,8 +18,7 @@ * Author : Maxim Mamontov */ -#ifndef PCAP_CAP_H -#define PCAP_CAP_H +#pragma once #include "stg/plugin.h" #include "stg/module_settings.h" @@ -27,23 +26,29 @@ #include #include +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow" +#include +#pragma GCC diagnostic pop #include -#include #include -class USERS; -class TARIFFS; -class ADMINS; -class TRAFFCOUNTER; -class SETTINGS; +namespace STG +{ + +struct Users; +struct Tariffs; +struct Admins; +struct TraffCounter; +struct Settings; -class TRAFFCOUNTER; +} struct DEV { DEV() : device("any"), filterExpression("ip"), handle(NULL), fd(-1) {} - DEV(const std::string & d) : device(d), filterExpression("ip"), handle(NULL), fd(-1) {} + explicit DEV(const std::string & d) : device(d), filterExpression("ip"), handle(NULL), fd(-1) {} DEV(const std::string & d, const std::string & f) : device(d), filterExpression(f), handle(NULL), fd(-1) {} @@ -56,25 +61,24 @@ struct DEV typedef std::vector DEV_MAP; -class PCAP_CAP : public PLUGIN { +class PCAP_CAP : public STG::Plugin { public: PCAP_CAP(); - virtual ~PCAP_CAP() {} - void SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; } + void SetTraffcounter(STG::TraffCounter * tc) override { traffCnt = tc; } - int Start(); - int Stop(); - int Reload(const MODULE_SETTINGS & /*ms*/) { return 0; } - bool IsRunning() { return isRunning; } + int Start() override; + int Stop() override; + int Reload(const STG::ModuleSettings & /*ms*/) override { return 0; } + bool IsRunning() override { return isRunning; } - void SetSettings(const MODULE_SETTINGS & s) { settings = s; } - int ParseSettings(); + void SetSettings(const STG::ModuleSettings & s) override { settings = s; } + int ParseSettings() override; - const std::string & GetStrError() const { return errorStr; } - std::string GetVersion() const; - uint16_t GetStartPosition() const { return 40; } - uint16_t GetStopPosition() const { return 40; } + const std::string & GetStrError() const override { return errorStr; } + std::string GetVersion() const override; + uint16_t GetStartPosition() const override { return 40; } + uint16_t GetStopPosition() const override { return 40; } private: PCAP_CAP(const PCAP_CAP & rvalue); @@ -83,20 +87,16 @@ private: void TryRead(const fd_set & set); void TryReadDev(const DEV & dev); - static void * Run(void *); + void Run(std::stop_token token); mutable std::string errorStr; - pthread_t thread; - bool nonstop; + std::jthread m_thread; bool isRunning; - MODULE_SETTINGS settings; + STG::ModuleSettings settings; DEV_MAP devices; - TRAFFCOUNTER * traffCnt; + STG::TraffCounter * traffCnt; - PLUGIN_LOGGER logger; + STG::PluginLogger logger; }; -//----------------------------------------------------------------------------- - -#endif