Merge remote-tracking branch 'github/master'

[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 f47c6b8dae3b293642cddeacc9888eaf921f8580..24d7f2537159bb79051c57333f26fe4551d21fcf 100644 (file)
--- a/projects/stargazer/plugins/capture/pcap/pcap_cap.h
+++ b/projects/stargazer/plugins/capture/pcap/pcap_cap.h
@@ -26,16 +26,19 @@
 
 #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>
 
 namespace STG
 {
 
 #include <sys/select.h>
 
 namespace STG
 {
 

-struct Users;
-struct Tariffs;
+class Users;
+class Tariffs;

 struct Admins;
 struct TraffCounter;
 struct Settings;
 struct Admins;
 struct TraffCounter;
 struct Settings;


@@ -45,7 +48,7 @@ struct Settings;
 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) {}
 


@@ -84,12 +87,11 @@ 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;
     STG::ModuleSettings     settings;
     DEV_MAP             devices;
     bool                isRunning;
     STG::ModuleSettings     settings;
     DEV_MAP             devices;