Merge remote-tracking branch 'github/master'

[stg.git] / projects / stargazer / plugins / capture / nfqueue / nfqueue.h

diff --git a/projects/stargazer/plugins/capture/nfqueue/nfqueue.h b/projects/stargazer/plugins/capture/nfqueue/nfqueue.h
index 7d71bcd23e38885547b093c10bd7e84cbc3caed1..097cf3b3fea5241ad641febabed2d1d9a9f3f058 100644 (file)
--- a/projects/stargazer/plugins/capture/nfqueue/nfqueue.h
+++ b/projects/stargazer/plugins/capture/nfqueue/nfqueue.h
@@ -26,14 +26,16 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

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

 
 namespace STG
 {
 
 
 namespace STG
 {
 

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

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


@@ -69,12 +71,11 @@ private:
     NFQ_CAP(const NFQ_CAP & rvalue);
     NFQ_CAP & operator=(const NFQ_CAP & rvalue);
 
     NFQ_CAP(const NFQ_CAP & rvalue);
     NFQ_CAP & operator=(const NFQ_CAP & rvalue);
 

-    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;
 
     bool                isRunning;
     STG::ModuleSettings     settings;