Complete replacement notifiers with subscriptions.

[stg.git] / 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 3bdfd55e9ace99ce2597658be653403554645197..e72c3e749e2eec3f11a11890556251a5afae64b4 100644 (file)
--- 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 <faust@stargazer.dp.ua>
 */
 
 * Author : Maxim Mamontov <faust@stargazer.dp.ua>
 */
 

-#ifndef PCAP_CAP_H
-#define PCAP_CAP_H
+#pragma once

 
 #include "stg/plugin.h"
 #include "stg/module_settings.h"
 
 #include "stg/plugin.h"
 #include "stg/module_settings.h"


@@ -27,23 +26,29 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#include <jthread.hpp>
+#pragma GCC diagnostic pop

 
 #include <pcap.h>
 
 #include <pcap.h>

-#include <pthread.h>

 #include <sys/select.h>
 
 #include <sys/select.h>
 

-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) {}
 
 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) {}
 
     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> DEV_MAP;
 
 
 typedef std::vector<DEV> DEV_MAP;
 

-class PCAP_CAP : public PLUGIN {
+class PCAP_CAP : public STG::Plugin {

 public:
     PCAP_CAP();
 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);
 
 private:
     PCAP_CAP(const PCAP_CAP & rvalue);


@@ -83,20 +87,16 @@ private:
     void TryRead(const fd_set & set);
     void TryReadDev(const DEV & dev);
 
     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;
 
 
     mutable std::string errorStr;
 

-    pthread_t           thread;
-    bool                nonstop;
+    std::jthread        m_thread;

     bool                isRunning;
     bool                isRunning;

-    MODULE_SETTINGS     settings;
+    STG::ModuleSettings     settings;

     DEV_MAP             devices;
 
     DEV_MAP             devices;
 

-    TRAFFCOUNTER *      traffCnt;
+    STG::TraffCounter *      traffCnt;

 
 

-    PLUGIN_LOGGER       logger;
+    STG::PluginLogger       logger;

 };
 };

-//-----------------------------------------------------------------------------
-
-#endif