X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/81087d4ae038fe0d793ee56e14120cd216ea3a7f..39c6313308afb248b140d98b8052f1b484549df2:/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 9f6304d8..6c31eb95 100644
--- a/projects/stargazer/plugins/other/ping/ping.h
+++ b/projects/stargazer/plugins/other/ping/ping.h
@@ -10,96 +10,103 @@
 #include <pthread.h>
 
 #include <string>
+#include <list>
 
-#include "os_int.h"
-#include "base_plugin.h"
-#include "notifer.h"
-#include "user_ips.h"
-#include "pinger.h"
-#include "../../../users.h"
+#include "stg/os_int.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"
 
-using namespace std;
-
-extern "C" BASE_PLUGIN * GetPlugin();
+extern "C" PLUGIN * GetPlugin();
 
 class PING;
+class USER;
+class SETTINGS;
 //-----------------------------------------------------------------------------*/
-class CHG_CURRIP_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE<uint32_t>
-{
+class CHG_CURRIP_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE<uint32_t> {
 public:
-    CHG_CURRIP_NOTIFIER_PING(const PING & p, user_iter u) : user(u), ping(p) {}
+    CHG_CURRIP_NOTIFIER_PING(const PING & p, USER_PTR u)
+        : PROPERTY_NOTIFIER_BASE<uint32_t>(), user(u), ping(p) {}
+    CHG_CURRIP_NOTIFIER_PING(const CHG_CURRIP_NOTIFIER_PING & rvalue)
+        : PROPERTY_NOTIFIER_BASE<uint32_t>(),
+          user(rvalue.user), ping(rvalue.ping) {}
     void Notify(const uint32_t & oldIP, const uint32_t & newIP);
-    user_iter GetUser() { return user; }
+    USER_PTR GetUser() const { return user; }
 
 private:
-    user_iter user;
+    CHG_CURRIP_NOTIFIER_PING & operator=(const CHG_CURRIP_NOTIFIER_PING & rvalue);
+
+    USER_PTR user;
     const PING & ping;
 };
 //-----------------------------------------------------------------------------
-class CHG_IPS_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE<USER_IPS>
-{
+class CHG_IPS_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE<USER_IPS> {
 public:
-    CHG_IPS_NOTIFIER_PING(const PING & p, user_iter u) : user(u), ping(p) {}
+    CHG_IPS_NOTIFIER_PING(const PING & p, USER_PTR u)
+        : PROPERTY_NOTIFIER_BASE<USER_IPS>(), user(u), ping(p) {}
+    CHG_IPS_NOTIFIER_PING(const CHG_IPS_NOTIFIER_PING & rvalue)
+        : PROPERTY_NOTIFIER_BASE<USER_IPS>(),
+          user(rvalue.user), ping(rvalue.ping) {}
     void Notify(const USER_IPS & oldIPS, const USER_IPS & newIPS);
-    user_iter GetUser() { return user; }
+    USER_PTR GetUser() const { return user; }
 
 private:
-    user_iter user;
+    CHG_IPS_NOTIFIER_PING & operator=(const CHG_IPS_NOTIFIER_PING & rvalue);
+
+    USER_PTR user;
     const PING & ping;
 };
 //-----------------------------------------------------------------------------
-class ADD_USER_NONIFIER_PING: public NOTIFIER_BASE<user_iter>
-{
+class ADD_USER_NONIFIER_PING: public NOTIFIER_BASE<USER_PTR> {
 public:
-    ADD_USER_NONIFIER_PING(PING & p) : ping(p) {}
+    ADD_USER_NONIFIER_PING(PING & p) : NOTIFIER_BASE<USER_PTR>(), ping(p) {}
     virtual ~ADD_USER_NONIFIER_PING() {}
-    void Notify(const user_iter & user);
+    void Notify(const USER_PTR & user);
 
 private:
+    ADD_USER_NONIFIER_PING(const ADD_USER_NONIFIER_PING & rvalue);
+    ADD_USER_NONIFIER_PING & operator=(const ADD_USER_NONIFIER_PING & rvalue);
+
     PING & ping;
 };
 //-----------------------------------------------------------------------------
-class DEL_USER_NONIFIER_PING: public NOTIFIER_BASE<user_iter>
-{
+class DEL_USER_NONIFIER_PING: public NOTIFIER_BASE<USER_PTR> {
 public:
-    DEL_USER_NONIFIER_PING(PING & p) : ping(p) {}
+    DEL_USER_NONIFIER_PING(PING & p) : NOTIFIER_BASE<USER_PTR>(), ping(p) {}
     virtual ~DEL_USER_NONIFIER_PING() {}
-    void Notify(const user_iter & user);
+    void Notify(const USER_PTR & user);
 
 private:
+    DEL_USER_NONIFIER_PING(const DEL_USER_NONIFIER_PING & rvalue);
+    DEL_USER_NONIFIER_PING & operator=(const DEL_USER_NONIFIER_PING & rvalue);
+
     PING & ping;
 };
 //-----------------------------------------------------------------------------
-class PING_SETTINGS
-{
+class PING_SETTINGS {
 public:
-    PING_SETTINGS();
+    PING_SETTINGS() : pingDelay(0), errorStr() {}
     virtual ~PING_SETTINGS() {}
-    const string& GetStrError() const { return errorStr; }
+    const std::string & GetStrError() const { return errorStr; }
     int ParseSettings(const MODULE_SETTINGS & s);
-    int GetPingDelay() { return pingDelay; }
+    int GetPingDelay() const { return pingDelay; }
 private:
-    int ParseIntInRange(const string & str, int min, int max, int * val);
-
     int pingDelay;
-    mutable string errorStr;
+    mutable std::string errorStr;
 };
 //-----------------------------------------------------------------------------
-class PING: public BASE_PLUGIN
-{
+class PING : public 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);
+    void SetUsers(USERS * u) { users = u; }
+    void SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int ParseSettings();
 
     int Start();
@@ -107,40 +114,37 @@ public:
     int Reload() { return 0; }
     bool IsRunning();
 
-    const string & GetStrError() const;
-    const string GetVersion() const;
-    uint16_t GetStartPosition() const;
-    uint16_t GetStopPosition() const;
+    const std::string & GetStrError() const { return errorStr; }
+    const std::string GetVersion() const { return "Pinger v.1.01"; }
+    uint16_t GetStartPosition() const { return 10; }
+    uint16_t GetStopPosition() const { return 10; }
 
-    void AddUser(user_iter u);
-    void DelUser(user_iter u);
+    void AddUser(USER_PTR u);
+    void DelUser(USER_PTR u);
 
 private:
+    PING(const PING & rvalue);
+    PING & operator=(const PING & rvalue);
+
     void GetUsers();
-    void SetUserNotifiers(user_iter u);
-    void UnSetUserNotifiers(user_iter u);
+    void SetUserNotifiers(USER_PTR u);
+    void UnSetUserNotifiers(USER_PTR u);
     static void * Run(void * d);
 
-    mutable string errorStr;
+    mutable std::string errorStr;
     PING_SETTINGS pingSettings;
     MODULE_SETTINGS settings;
     USERS * users;
-    list<user_iter> usersList;
-
-    /*
-    ÍÙ ÄÏÌÖÎÙ ÐÅÒÅÐÒÏ×ÅÒÉÔØ ×ÏÚÍÏÖÎÏÓÔØ ÐÉÎÇÏ×ÁÎÉÑ ÀÚÅÒÁ ÐÒÉ ÉÚÍÅÎÅÎÉÉ
-    ÓÌÅÄÕÀÝÉÈ ÅÇÏ ÐÁÒÁÍÅÔÒÏ×:
-    - currIP
-    - ips
-    */
+    std::list<USER_PTR> usersList;
+
     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;
+    std::list<CHG_CURRIP_NOTIFIER_PING> ChgCurrIPNotifierList;
+    std::list<CHG_IPS_NOTIFIER_PING> ChgIPNotifierList;
 
     ADD_USER_NONIFIER_PING onAddUserNotifier;
     DEL_USER_NONIFIER_PING onDelUserNotifier;