X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/abd575e7ae51fd1462c8d4fe0229ed81ce8a564d..8d7e73beecd0d372eb59ad74bf60e25f67013201:/projects/stargazer/plugins/other/rscript/rscript.h?ds=inline diff --git a/projects/stargazer/plugins/other/rscript/rscript.h b/projects/stargazer/plugins/other/rscript/rscript.h index 001d65e1..e0412fb0 100644 --- a/projects/stargazer/plugins/other/rscript/rscript.h +++ b/projects/stargazer/plugins/other/rscript/rscript.h @@ -89,47 +89,66 @@ private: class IP_NOTIFIER: public PROPERTY_NOTIFIER_BASE { public: IP_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u) - : PROPERTY_NOTIFIER_BASE(), user(u), rs(r) {} + : PROPERTY_NOTIFIER_BASE(), user(u), rs(r) { user->AddCurrIPAfterNotifier(this); } IP_NOTIFIER(const IP_NOTIFIER & rhs) - : PROPERTY_NOTIFIER_BASE(), user(rhs.user), rs(rhs.rs) {} + : PROPERTY_NOTIFIER_BASE(), 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; } + USER_PTR GetUser() const { return user; } private: - IP_NOTIFIER & operator=(const IP_NOTIFIER & rhs); USER_PTR user; REMOTE_SCRIPT & rs; }; //----------------------------------------------------------------------------- -class USER; -//----------------------------------------------------------------------------- class CONNECTED_NOTIFIER: public PROPERTY_NOTIFIER_BASE { public: - CONNECTED_NOTIFIER(REMOTE_SCRIPT & r, USER & u) - : PROPERTY_NOTIFIER_BASE(), user(u), rs(r) {} + CONNECTED_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u) + : PROPERTY_NOTIFIER_BASE(), user(u), rs(r) { user->AddConnectedAfterNotifier(this); } CONNECTED_NOTIFIER(const CONNECTED_NOTIFIER & rhs) - : PROPERTY_NOTIFIER_BASE(), user(rhs.user), rs(rhs.rs) {} + : PROPERTY_NOTIFIER_BASE(), 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); + USER_PTR GetUser() const { return user; } private: - CONNECTED_NOTIFIER & operator=(const CONNECTED_NOTIFIER & rhs); - USER & user; + USER_PTR 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, USER_PTR it) + : user(it), + routers(r), + shortPacketsCount(0), + ip(user->GetCurrIP()) + {} time_t lastSentTime; USER_PTR user; std::vector routers; int shortPacketsCount; uint32_t ip; - CONNECTED_NOTIFIER notifier; }; //----------------------------------------------------------------------------- class SETTINGS { @@ -139,7 +158,7 @@ public: const std::string & GetStrError() const { return errorStr; } int ParseSettings(const MODULE_SETTINGS & 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,11 +167,11 @@ 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 { @@ -170,14 +189,15 @@ public: bool IsRunning() { return isRunning; } const std::string & GetStrError() const { return errorStr; } - const std::string GetVersion() const { return "Remote script v 0.3"; } + std::string GetVersion() const { return "Remote script v 0.3"; } uint16_t GetStartPosition() const { return 10; } uint16_t GetStopPosition() const { return 10; } - void DelUser(USER_PTR u) { UnSetUserNotifier(u); } - void AddUser(USER_PTR u) { SetUserNotifier(u); } + void DelUser(USER_PTR u) { UnSetUserNotifiers(u); } + void AddUser(USER_PTR u) { SetUserNotifiers(u); } - void ChangedIP(USER_PTR u, uint32_t oldIP, uint32_t newIP); + void AddRSU(USER_PTR user); + void DelRSU(USER_PTR user); private: REMOTE_SCRIPT(const REMOTE_SCRIPT & rhs); @@ -187,24 +207,24 @@ private: 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(USER_PTR u); + void UnSetUserNotifiers(USER_PTR 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(BLOWFISH_CTX * ctx, const std::string & password) const; + void Encrypt(BLOWFISH_CTX * ctx, 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; @@ -240,7 +260,7 @@ class DisconnectUser : public std::unary_function & p) { - rscript.Send(p.first, p.second, true); + rscript.Send(p.second, true); } private: REMOTE_SCRIPT & rscript;