X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/3a45cd9275dc9279e133deb0932402ae5f4d0b5f..05072df6840a3e6622d235cd48e0ced723e05b26:/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 aecbfb15..29e4974e 100644 --- a/projects/stargazer/plugins/other/ping/ping.h +++ b/projects/stargazer/plugins/other/ping/ping.h @@ -19,6 +19,7 @@ #include "stg/user_ips.h" #include "stg/pinger.h" #include "stg/users.h" +#include "stg/logger.h" extern "C" PLUGIN * GetPlugin(); @@ -28,49 +29,67 @@ class SETTINGS; //-----------------------------------------------------------------------------*/ class CHG_CURRIP_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE { public: - CHG_CURRIP_NOTIFIER_PING(const PING & p, USER_PTR u) : user(u), ping(p) {} + CHG_CURRIP_NOTIFIER_PING(const PING & p, USER_PTR u) + : PROPERTY_NOTIFIER_BASE(), user(u), ping(p) {} + CHG_CURRIP_NOTIFIER_PING(const CHG_CURRIP_NOTIFIER_PING & rvalue) + : PROPERTY_NOTIFIER_BASE(), + user(rvalue.user), ping(rvalue.ping) {} void Notify(const uint32_t & oldIP, const uint32_t & newIP); USER_PTR GetUser() const { return user; } private: + 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 { public: - CHG_IPS_NOTIFIER_PING(const PING & p, USER_PTR u) : user(u), ping(p) {} + CHG_IPS_NOTIFIER_PING(const PING & p, USER_PTR u) + : PROPERTY_NOTIFIER_BASE(), user(u), ping(p) {} + CHG_IPS_NOTIFIER_PING(const CHG_IPS_NOTIFIER_PING & rvalue) + : PROPERTY_NOTIFIER_BASE(), + user(rvalue.user), ping(rvalue.ping) {} void Notify(const USER_IPS & oldIPS, const USER_IPS & newIPS); USER_PTR GetUser() const { return user; } private: + 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 { public: - ADD_USER_NONIFIER_PING(PING & p) : ping(p) {} + ADD_USER_NONIFIER_PING(PING & p) : NOTIFIER_BASE(), ping(p) {} virtual ~ADD_USER_NONIFIER_PING() {} 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 { public: - DEL_USER_NONIFIER_PING(PING & p) : ping(p) {} + DEL_USER_NONIFIER_PING(PING & p) : NOTIFIER_BASE(), ping(p) {} virtual ~DEL_USER_NONIFIER_PING() {} 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 { public: - PING_SETTINGS(); + PING_SETTINGS() : pingDelay(0), errorStr() {} virtual ~PING_SETTINGS() {} const std::string & GetStrError() const { return errorStr; } int ParseSettings(const MODULE_SETTINGS & s); @@ -87,13 +106,8 @@ public: PING(); virtual ~PING(); - void SetUsers(USERS * u); - void SetTariffs(TARIFFS *) {} - void SetAdmins(ADMINS *) {} - void SetTraffcounter(TRAFFCOUNTER *) {} - void SetStore(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(); @@ -101,15 +115,18 @@ public: int Reload() { return 0; } bool IsRunning(); - const std::string & GetStrError() const; - const std::string GetVersion() const; - uint16_t GetStartPosition() const; - uint16_t GetStopPosition() const; + const std::string & GetStrError() const { return errorStr; } + std::string GetVersion() const { return "Pinger v.1.01"; } + uint16_t GetStartPosition() const { return 10; } + uint16_t GetStopPosition() const { return 10; } 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_PTR u); void UnSetUserNotifiers(USER_PTR u); @@ -121,12 +138,6 @@ private: USERS * users; std::list usersList; - /* - ÍÙ ÄÏÌÖÎÙ ÐÅÒÅÐÒÏ×ÅÒÉÔØ ×ÏÚÍÏÖÎÏÓÔØ ÐÉÎÇÏ×ÁÎÉÑ ÀÚÅÒÁ ÐÒÉ ÉÚÍÅÎÅÎÉÉ - ÓÌÅÄÕÀÝÉÈ ÅÇÏ ÐÁÒÁÍÅÔÒÏ×: - - currIP - - ips - */ pthread_t thread; pthread_mutex_t mutex; bool nonstop; @@ -138,6 +149,8 @@ private: ADD_USER_NONIFIER_PING onAddUserNotifier; DEL_USER_NONIFIER_PING onDelUserNotifier; + + PLUGIN_LOGGER logger; }; //-----------------------------------------------------------------------------