Add missing include to conffiles.h.

[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..6a82811224b9886b1a24e6fc56911adb153dc96c 100644 (file)
--- a/projects/stargazer/plugins/other/ping/ping.h
+++ b/projects/stargazer/plugins/other/ping/ping.h
@@ -1,155 +1,143 @@
- /*
- $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/notifer.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 <list>
+#include <mutex>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#include <jthread.hpp>
+#pragma GCC diagnostic pop
+#include <cstdint>

 
 

-#include "os_int.h"
-#include "base_plugin.h"
-#include "notifer.h"
-#include "user_ips.h"
-#include "pinger.h"
-#include "../../../users.h"
-
-using namespace std;
+class PING;

 
 

-extern "C" BASE_PLUGIN * GetPlugin();
+namespace STG
+{
+struct USER;
+struct SETTINGS;
+}

 
 

-class PING;
+using UserPtr = STG::User*;

 //-----------------------------------------------------------------------------*/
 //-----------------------------------------------------------------------------*/

-class CHG_CURRIP_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE<uint32_t>
-{
+class CHG_CURRIP_NOTIFIER_PING: public STG::PropertyNotifierBase<uint32_t> {

 public:
 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; }
+    CHG_CURRIP_NOTIFIER_PING(const PING & p, UserPtr u)
+        : user(u), ping(p) {}
+    void Notify(const uint32_t & oldIP, const uint32_t & newIP);
+    UserPtr GetUser() const { return user; }

 
 private:
 
 private:

-    user_iter   user;
-    const PING * ping;
+    CHG_CURRIP_NOTIFIER_PING & operator=(const CHG_CURRIP_NOTIFIER_PING &);
+
+    UserPtr user;
+    const PING & ping;

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

-class CHG_IPS_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE<USER_IPS>
-{
+class CHG_IPS_NOTIFIER_PING: public STG::PropertyNotifierBase<STG::UserIPs> {

 public:
 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; }
+    CHG_IPS_NOTIFIER_PING(const PING & p, UserPtr u)
+        : user(u), ping(p) {}
+    void Notify(const STG::UserIPs & oldIPS, const STG::UserIPs & newIPS);
+    UserPtr GetUser() const { return user; }

 
 private:
 
 private:

-    user_iter   user;
-    const PING * ping;
+    CHG_IPS_NOTIFIER_PING & operator=(const CHG_IPS_NOTIFIER_PING &);
+
+    UserPtr user;
+    const PING & ping;

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

-class ADD_USER_NONIFIER_PING: public NOTIFIER_BASE<user_iter>
-{
+class ADD_USER_NONIFIER_PING: public STG::NotifierBase<UserPtr> {

 public:
 public:

-    ADD_USER_NONIFIER_PING(){};
-    virtual ~ADD_USER_NONIFIER_PING(){};
-
-    void SetPinger(PING * p) { ping = p; }
-    void Notify(const user_iter & user);
+    explicit ADD_USER_NONIFIER_PING(PING & p) : ping(p) {}
+    void Notify(const UserPtr & user);

 
 private:
 
 private:

-    PING * ping;
+    ADD_USER_NONIFIER_PING(const ADD_USER_NONIFIER_PING &);
+    ADD_USER_NONIFIER_PING & operator=(const ADD_USER_NONIFIER_PING &);
+
+    PING & ping;

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

-class DEL_USER_NONIFIER_PING: public NOTIFIER_BASE<user_iter>
-{
+class DEL_USER_NONIFIER_PING: public STG::NotifierBase<UserPtr> {

 public:
 public:

-    DEL_USER_NONIFIER_PING(){};
-    virtual ~DEL_USER_NONIFIER_PING(){};
-
-    void SetPinger(PING * p) { ping = p; }
-    void Notify(const user_iter & user);
+    explicit DEL_USER_NONIFIER_PING(PING & p) : ping(p) {}
+    void Notify(const UserPtr & user);

 
 private:
 
 private:

-    PING * ping;
+    DEL_USER_NONIFIER_PING(const DEL_USER_NONIFIER_PING &);
+    DEL_USER_NONIFIER_PING & operator=(const DEL_USER_NONIFIER_PING &);
+
+    PING & ping;

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

-class PING_SETTINGS
-{
+class PING_SETTINGS {

 public:
 public:

-                    PING_SETTINGS();
-    virtual         ~PING_SETTINGS(){};
-    const string&   GetStrError() const { return errorStr; }
-    int             ParseSettings(const MODULE_SETTINGS & s);
-    int             GetPingDelay(){ return pingDelay; };
+    PING_SETTINGS() : pingDelay(0) {}
+    const std::string & GetStrError() const { return errorStr; }
+    int ParseSettings(const STG::ModuleSettings & s);
+    int GetPingDelay() const { return pingDelay; }

 private:
 private:

-    int             ParseIntInRange(const string & str, int min, int max, int * val);
-    int             pingDelay;
-    mutable string  errorStr;
+    int pingDelay;
+    mutable std::string errorStr;

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

-class PING: public BASE_PLUGIN
-{
+class PING : public STG::Plugin {

 friend class CHG_CURRIP_NOTIFIER_PING;
 friend class CHG_IPS_NOTIFIER_PING;
 public:
     PING();
 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);
+
+    void SetUsers(STG::Users * u) override { users = u; }
+    void SetSettings(const STG::ModuleSettings & s) override { settings = s; }
+    int ParseSettings() override;
+
+    int Start() override;
+    int Stop() override;
+    int Reload(const STG::ModuleSettings & /*ms*/) override { return 0; }
+    bool IsRunning() override;
+
+    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; }
+
+    void AddUser(UserPtr u);
+    void DelUser(UserPtr u);

 
 private:
 
 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;
-};
-//-----------------------------------------------------------------------------
+    explicit PING(const PING & rvalue);
+    PING & operator=(const PING & rvalue);
+
+    void GetUsers();
+    void SetUserNotifiers(UserPtr u);
+    void UnSetUserNotifiers(UserPtr u);
+    void Run(std::stop_token token);

 
 

-#endif
+    mutable std::string errorStr;
+    PING_SETTINGS pingSettings;
+    STG::ModuleSettings settings;
+    STG::Users * users;
+    std::list<UserPtr> usersList;

 
 

+    std::jthread m_thread;
+    std::mutex m_mutex;
+    bool isRunning;
+    mutable STG_PINGER pinger;

 
 

+    std::list<CHG_CURRIP_NOTIFIER_PING> ChgCurrIPNotifierList;
+    std::list<CHG_IPS_NOTIFIER_PING> ChgIPNotifierList;
+
+    ADD_USER_NONIFIER_PING onAddUserNotifier;
+    DEL_USER_NONIFIER_PING onDelUserNotifier;
+
+    STG::PluginLogger logger;
+};