Update README.

[stg.git] / projects / stargazer / plugins / other / ping / ping.h

diff --git a/projects/stargazer/plugins/other/ping/ping.h b/projects/stargazer/plugins/other/ping/ping.h
index c94c17e87c87f3fca1350a9a887c5731f6f4fc3c..b52a5e1cd180825e655ad0b3c1e08e1ad0d10247 100644 (file)
--- a/projects/stargazer/plugins/other/ping/ping.h
+++ b/projects/stargazer/plugins/other/ping/ping.h
@@ -1,155 +1,95 @@
- /*
- $Revision: 1.16 $
- $Date: 2009/06/23 11:32:28 $
- $Author: faust $
- */
+#pragma once

 
 

-#ifndef PING_H
-#define PING_H
+#include "stg/plugin.h"
+#include "stg/module_settings.h"
+#include "stg/subscriptions.h"
+#include "stg/user_ips.h"
+#include "stg/pinger.h"
+#include "stg/users.h"
+#include "stg/logger.h"

 
 #include <string>
 
 #include <string>

-#include <pthread.h>
-
-#include "os_int.h"
-#include "base_plugin.h"
-#include "notifer.h"
-#include "user_ips.h"
-#include "pinger.h"
-#include "../../../users.h"
-
-using namespace std;
-
-extern "C" BASE_PLUGIN * GetPlugin();
-
-class PING;
-//-----------------------------------------------------------------------------*/
-class CHG_CURRIP_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE<uint32_t>
+#include <vector>
+#include <tuple>
+#include <list>
+#include <mutex>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#include <jthread.hpp>
+#pragma GCC diagnostic pop
+#include <cstdint>
+
+namespace STG

 {
 {

-public:
-    void        Notify(const uint32_t & oldIP, const uint32_t & newIP);
-    void        SetUser(user_iter u) { user = u; }
-    user_iter   GetUser() {return user; }
-    void        SetPinger(const PING * p) { ping = p; }
-
-private:
-    user_iter   user;
-    const PING * ping;
-};
+struct USER;
+struct SETTINGS;
+
+using UserPtr = User*;

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-class CHG_IPS_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE<USER_IPS>
+class PING_SETTINGS

 {
 {

-public:
-    void        Notify(const USER_IPS & oldIPS, const USER_IPS & newIPS);
-    void        SetUser(user_iter u) { user = u; }
-    user_iter   GetUser() {return user; }
-    void        SetPinger(const PING * p) { ping = p; }
-
-private:
-    user_iter   user;
-    const PING * ping;
+    public:
+        PING_SETTINGS() : pingDelay(0) {}
+        const std::string & GetStrError() const { return errorStr; }
+        int ParseSettings(const ModuleSettings & s);
+        int GetPingDelay() const { return pingDelay; }
+    private:
+        int pingDelay;
+        std::string errorStr;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class ADD_USER_NONIFIER_PING: public NOTIFIER_BASE<user_iter>
+class PING : public Plugin

 {
 {

-public:
-    ADD_USER_NONIFIER_PING(){};
-    virtual ~ADD_USER_NONIFIER_PING(){};
+    public:
+        PING();

 
 

-    void SetPinger(PING * p) { ping = p; }
-    void Notify(const user_iter & user);
+        void SetUsers(Users * u) override { users = u; }
+        void SetSettings(const ModuleSettings & s) override { settings = s; }
+        int ParseSettings() override;

 
 

-private:
-    PING * ping;
-};
-//-----------------------------------------------------------------------------
-class DEL_USER_NONIFIER_PING: public NOTIFIER_BASE<user_iter>
-{
-public:
-    DEL_USER_NONIFIER_PING(){};
-    virtual ~DEL_USER_NONIFIER_PING(){};
+        int Start() override;
+        int Stop() override;
+        int Reload(const ModuleSettings & /*ms*/) override { return 0; }
+        bool IsRunning() override;

 
 

-    void SetPinger(PING * p) { ping = p; }
-    void Notify(const user_iter & user);
+        const std::string & GetStrError() const override { return errorStr; }
+        std::string GetVersion() const override { return "Pinger v.1.01"; }
+        uint16_t GetStartPosition() const override { return 10; }
+        uint16_t GetStopPosition() const override { return 10; }

 
 

-private:
-    PING * ping;
-};
-//-----------------------------------------------------------------------------
-class PING_SETTINGS
-{
-public:
-                    PING_SETTINGS();
-    virtual         ~PING_SETTINGS(){};
-    const string&   GetStrError() const { return errorStr; }
-    int             ParseSettings(const MODULE_SETTINGS & s);
-    int             GetPingDelay(){ return pingDelay; };
-private:
-    int             ParseIntInRange(const string & str, int min, int max, int * val);
-    int             pingDelay;
-    mutable string  errorStr;
-};
-//-----------------------------------------------------------------------------
-class PING: public BASE_PLUGIN
-{
-friend class CHG_CURRIP_NOTIFIER_PING;
-friend class CHG_IPS_NOTIFIER_PING;
-public:
-    PING();
-    virtual ~PING();
-
-    void                SetUsers(USERS * u);
-    void                SetTariffs(TARIFFS *){};
-    void                SetAdmins(ADMINS *){};
-    void                SetTraffcounter(TRAFFCOUNTER *){};
-    void                SetStore(BASE_STORE *){};
-    void                SetStgSettings(const SETTINGS *){};
-    void                SetSettings(const MODULE_SETTINGS & s);
-    int                 ParseSettings();
-
-    int                 Start();
-    int                 Stop();
-    int                 Reload() { return 0; };
-    bool                IsRunning();
-
-    const string      & GetStrError() const;
-    const string        GetVersion() const;
-    uint16_t            GetStartPosition() const;
-    uint16_t            GetStopPosition() const;
-
-    void                AddUser(user_iter u);
-    void                DelUser(user_iter u);
-
-private:
-    void                GetUsers();
-    void                SetUserNotifiers(user_iter u);
-    void                UnSetUserNotifiers(user_iter u);
-    static void *       Run(void * d);
-    mutable string      errorStr;
-    PING_SETTINGS       pingSettings;
-    MODULE_SETTINGS     settings;
-    USERS             * users;
-    list<user_iter>     usersList;
-
-    /*
-    ÍÙ ÄÏÌÖÎÙ ÐÅÒÅÐÒÏ×ÅÒÉÔØ ×ÏÚÍÏÖÎÏÓÔØ ÐÉÎÇÏ×ÁÎÉÑ ÀÚÅÒÁ ÐÒÉ ÉÚÍÅÎÅÎÉÉ
-    ÓÌÅÄÕÀÝÉÈ ÅÇÏ ÐÁÒÁÍÅÔÒÏ×:
-    - currIP
-    - ips
-    */
-    pthread_t           thread;
-    pthread_mutex_t     mutex;
-    bool                nonstop;
-    bool                isRunning;
-    mutable STG_PINGER  pinger;
-
-    list<CHG_CURRIP_NOTIFIER_PING>   ChgCurrIPNotifierList;
-    list<CHG_IPS_NOTIFIER_PING>      ChgIPNotifierList;
-
-    ADD_USER_NONIFIER_PING      onAddUserNotifier;
-    DEL_USER_NONIFIER_PING      onDelUserNotifier;
-};
-//-----------------------------------------------------------------------------
+        void AddUser(UserPtr u);
+        void DelUser(UserPtr u);
+
+    private:
+        explicit PING(const PING & rvalue);
+        PING & operator=(const PING & rvalue);

 
 

-#endif
+        void GetUsers();
+        void SetUserNotifiers(UserPtr u);
+        void UnSetUserNotifiers(UserPtr u);
+        void Run(std::stop_token token);

 
 

+        std::string errorStr;
+        PING_SETTINGS pingSettings;
+        ModuleSettings settings;
+        Users * users;
+        std::list<UserPtr> usersList;
+
+        std::jthread m_thread;
+        std::mutex m_mutex;
+        bool isRunning;
+        STG_PINGER m_pinger;
+
+        void updateCurrIP(uint32_t oldVal, uint32_t newVal);
+        void updateIPs(const UserIPs& oldVal, const UserIPs& newVal);
+
+        ScopedConnection m_onAddUserConn;
+        ScopedConnection m_onDelUserConn;
+
+        using ConnHolder = std::tuple<int, ScopedConnection, ScopedConnection>;
+        std::vector<ConnHolder> m_conns;
+
+        PluginLogger logger;
+};

 
 

+}