X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/abd575e7ae51fd1462c8d4fe0229ed81ce8a564d..80aca6d78d4ff5d514216fe96c44e2ee75c4e933:/projects/stargazer/plugins/other/rscript/rscript.h?ds=sidebyside diff --git a/projects/stargazer/plugins/other/rscript/rscript.h b/projects/stargazer/plugins/other/rscript/rscript.h index 001d65e1..6c97b598 100644 --- a/projects/stargazer/plugins/other/rscript/rscript.h +++ b/projects/stargazer/plugins/other/rscript/rscript.h @@ -19,20 +19,10 @@ * Author : Maxim Mamontov */ -#ifndef RSCRIPT_H -#define RSCRIPT_H - -#include - -#include -#include -#include -#include -#include +#pragma once #include "stg/plugin.h" #include "stg/module_settings.h" -#include "stg/os_int.h" #include "stg/notifer.h" #include "stg/user.h" #include "stg/blowfish.h" @@ -41,14 +31,23 @@ #include "nrmap_parser.h" -extern "C" PLUGIN * GetPlugin(); - -#define RS_DEBUG (1) - -#define MAX_SHORT_PCKT (3) - -class SETTINGS; -class USERS; +#include +#include +#include +#include +#include +#include +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow" +#include +#pragma GCC diagnostic pop +#include + +namespace STG +{ +struct Settings; +struct Settings; +} namespace RS { @@ -57,13 +56,14 @@ class REMOTE_SCRIPT; class UpdateRouter; class DisconnectUser; +using UserPtr = STG::User*; + //----------------------------------------------------------------------------- -class ADD_USER_NONIFIER: public NOTIFIER_BASE { +class ADD_USER_NONIFIER: public STG::NotifierBase { public: - ADD_USER_NONIFIER(REMOTE_SCRIPT & r) - : NOTIFIER_BASE(), rs(r) {} - virtual ~ADD_USER_NONIFIER() {} - void Notify(const USER_PTR & user); + explicit ADD_USER_NONIFIER(REMOTE_SCRIPT & r) + : rs(r) {} + void Notify(const UserPtr & user); private: ADD_USER_NONIFIER(const ADD_USER_NONIFIER & rhs); @@ -72,12 +72,11 @@ private: REMOTE_SCRIPT & rs; }; //----------------------------------------------------------------------------- -class DEL_USER_NONIFIER: public NOTIFIER_BASE { +class DEL_USER_NONIFIER: public STG::NotifierBase { public: - DEL_USER_NONIFIER(REMOTE_SCRIPT & r) - : NOTIFIER_BASE(), rs(r) {} - virtual ~DEL_USER_NONIFIER() {} - void Notify(const USER_PTR & user); + explicit DEL_USER_NONIFIER(REMOTE_SCRIPT & r) + : rs(r) {} + void Notify(const UserPtr & user); private: DEL_USER_NONIFIER(const DEL_USER_NONIFIER & rhs); @@ -86,50 +85,70 @@ private: REMOTE_SCRIPT & rs; }; //----------------------------------------------------------------------------- -class IP_NOTIFIER: public PROPERTY_NOTIFIER_BASE { +class IP_NOTIFIER: public STG::PropertyNotifierBase { public: - IP_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u) - : PROPERTY_NOTIFIER_BASE(), user(u), rs(r) {} + IP_NOTIFIER(REMOTE_SCRIPT & r, UserPtr u) + : user(u), rs(r) { user->AddCurrIPAfterNotifier(this); } IP_NOTIFIER(const IP_NOTIFIER & rhs) - : PROPERTY_NOTIFIER_BASE(), user(rhs.user), rs(rhs.rs) {} + : user(rhs.user), rs(rhs.rs) { user->AddCurrIPAfterNotifier(this); } + ~IP_NOTIFIER() { user->DelCurrIPAfterNotifier(this); } + + IP_NOTIFIER & operator=(const IP_NOTIFIER & rhs) + { + user->DelCurrIPAfterNotifier(this); + user = rhs.user; + user->AddCurrIPAfterNotifier(this); + return *this; + } + void Notify(const uint32_t & oldValue, const uint32_t & newValue); - USER_PTR GetUser() { return user; } + UserPtr GetUser() const { return user; } private: - IP_NOTIFIER & operator=(const IP_NOTIFIER & rhs); - USER_PTR user; + UserPtr user; REMOTE_SCRIPT & rs; }; //----------------------------------------------------------------------------- -class USER; -//----------------------------------------------------------------------------- -class CONNECTED_NOTIFIER: public PROPERTY_NOTIFIER_BASE { +class CONNECTED_NOTIFIER: public STG::PropertyNotifierBase { public: - CONNECTED_NOTIFIER(REMOTE_SCRIPT & r, USER & u) - : PROPERTY_NOTIFIER_BASE(), user(u), rs(r) {} + CONNECTED_NOTIFIER(REMOTE_SCRIPT & r, UserPtr u) + : user(u), rs(r) { user->AddConnectedAfterNotifier(this); } CONNECTED_NOTIFIER(const CONNECTED_NOTIFIER & rhs) - : PROPERTY_NOTIFIER_BASE(), user(rhs.user), rs(rhs.rs) {} + : user(rhs.user), rs(rhs.rs) { user->AddConnectedAfterNotifier(this); } + ~CONNECTED_NOTIFIER() { user->DelConnectedAfterNotifier(this); } + + CONNECTED_NOTIFIER & operator=(const CONNECTED_NOTIFIER & rhs) + { + user->DelConnectedAfterNotifier(this); + user = rhs.user; + user->AddConnectedAfterNotifier(this); + return *this; + } + void Notify(const bool & oldValue, const bool & newValue); + UserPtr GetUser() const { return user; } private: - CONNECTED_NOTIFIER & operator=(const CONNECTED_NOTIFIER & rhs); - USER & user; + UserPtr user; REMOTE_SCRIPT & rs; }; //----------------------------------------------------------------------------- struct USER { - USER(const std::vector & r, USER_PTR it, REMOTE_SCRIPT & rs); - USER(const USER & rhs); - ~USER(); + USER(const std::vector & r, UserPtr it) + : lastSentTime(0), + user(it), + routers(r), + shortPacketsCount(0), + ip(user->GetCurrIP()) + {} time_t lastSentTime; - USER_PTR user; + UserPtr user; std::vector routers; int shortPacketsCount; uint32_t ip; - CONNECTED_NOTIFIER notifier; }; //----------------------------------------------------------------------------- class SETTINGS { @@ -137,9 +156,9 @@ public: SETTINGS(); virtual ~SETTINGS() {} const std::string & GetStrError() const { return errorStr; } - int ParseSettings(const MODULE_SETTINGS & s); + int ParseSettings(const STG::ModuleSettings & s); int GetSendPeriod() const { return sendPeriod; } - int GetPort() const { return port; } + uint16_t GetPort() const { return port; } const std::vector & GetSubnetsMap() const { return netRouters; } const std::vector & GetUserParams() const { return userParams; } const std::string & GetPassword() const { return password; } @@ -148,87 +167,86 @@ public: private: int sendPeriod; uint16_t port; - string errorStr; + std::string errorStr; std::vector netRouters; - std::vector userParams; - string password; - string subnetFile; + std::vector userParams; + std::string password; + std::string subnetFile; }; //----------------------------------------------------------------------------- -class REMOTE_SCRIPT : public PLUGIN { +class REMOTE_SCRIPT : public STG::Plugin { public: REMOTE_SCRIPT(); - virtual ~REMOTE_SCRIPT(); - void SetUsers(USERS * u) { users = u; } - void SetSettings(const MODULE_SETTINGS & s) { settings = s; } - int ParseSettings(); + void SetUsers(STG::Users * u) override { users = u; } + void SetSettings(const STG::ModuleSettings & s) override { settings = s; } + int ParseSettings() override; - int Start(); - int Stop(); - int Reload(); - bool IsRunning() { return isRunning; } + int Start() override; + int Stop() override; + int Reload(const STG::ModuleSettings & ms) override; + bool IsRunning() override { return isRunning; } - const std::string & GetStrError() const { return errorStr; } - const std::string GetVersion() const { return "Remote script v 0.3"; } - uint16_t GetStartPosition() const { return 10; } - uint16_t GetStopPosition() const { return 10; } + const std::string & GetStrError() const override { return errorStr; } + std::string GetVersion() const override { return "Remote script v 0.3"; } + uint16_t GetStartPosition() const override { return 10; } + uint16_t GetStopPosition() const override { return 10; } - void DelUser(USER_PTR u) { UnSetUserNotifier(u); } - void AddUser(USER_PTR u) { SetUserNotifier(u); } + void DelUser(UserPtr u) { UnSetUserNotifiers(u); } + void AddUser(UserPtr u) { SetUserNotifiers(u); } - void ChangedIP(USER_PTR u, uint32_t oldIP, uint32_t newIP); + void AddRSU(UserPtr user); + void DelRSU(UserPtr user); private: REMOTE_SCRIPT(const REMOTE_SCRIPT & rhs); REMOTE_SCRIPT & operator=(const REMOTE_SCRIPT & rhs); - static void * Run(void *); + void Run(std::stop_token token); bool PrepareNet(); bool FinalizeNet(); - bool Send(uint32_t ip, USER & rsu, bool forceDisconnect = false) const; - bool SendDirect(uint32_t ip, USER & rsu, uint32_t routerIP, bool forceDisconnect = false) const; - bool PreparePacket(char * buf, size_t bufSize, uint32_t ip, USER &rsu, bool forceDisconnect = false) const; + bool Send(USER & rsu, bool forceDisconnect = false) const; + bool SendDirect(USER & rsu, uint32_t routerIP, bool forceDisconnect = false) const; + bool PreparePacket(char * buf, size_t bufSize, USER &rsu, bool forceDisconnect = false) const; void PeriodicSend(); std::vector IP2Routers(uint32_t ip); bool GetUsers(); - std::string GetUserParam(USER_PTR u, const std::string & paramName) const; - void SetUserNotifier(USER_PTR u); - void UnSetUserNotifier(USER_PTR u); + void SetUserNotifiers(UserPtr u); + void UnSetUserNotifiers(UserPtr u); - void InitEncrypt(BLOWFISH_CTX * ctx, const string & password) const; - void Encrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, size_t len8) const; + void InitEncrypt(const std::string & password) const; + void Encrypt(void * dst, const void * src, size_t len8) const; mutable BLOWFISH_CTX ctx; std::list ipNotifierList; + std::list connNotifierList; std::map authorizedUsers; mutable std::string errorStr; SETTINGS rsSettings; - MODULE_SETTINGS settings; + STG::ModuleSettings settings; int sendPeriod; int halfPeriod; - bool nonstop; bool isRunning; - USERS * users; + STG::Users * users; std::vector netRouters; - pthread_t thread; - pthread_mutex_t mutex; + std::jthread m_thread; + std::mutex m_mutex; int sock; ADD_USER_NONIFIER onAddUserNotifier; DEL_USER_NONIFIER onDelUserNotifier; - PLUGIN_LOGGER logger; + STG::PluginLogger logger; friend class RS::UpdateRouter; friend class RS::DisconnectUser; @@ -237,26 +255,24 @@ private: //----------------------------------------------------------------------------- class DisconnectUser : public std::unary_function &, void> { public: - DisconnectUser(REMOTE_SCRIPT & rs) : rscript(rs) {} + explicit DisconnectUser(REMOTE_SCRIPT & rs) : rscript(rs) {} void operator()(std::pair & p) { - rscript.Send(p.first, p.second, true); + rscript.Send(p.second, true); } private: REMOTE_SCRIPT & rscript; }; //----------------------------------------------------------------------------- -inline void ADD_USER_NONIFIER::Notify(const USER_PTR & user) +inline void ADD_USER_NONIFIER::Notify(const UserPtr & user) { rs.AddUser(user); } //----------------------------------------------------------------------------- -inline void DEL_USER_NONIFIER::Notify(const USER_PTR & user) +inline void DEL_USER_NONIFIER::Notify(const UserPtr & user) { rs.DelUser(user); } //----------------------------------------------------------------------------- } // namespace RS - -#endif