X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..15c40aa2f808c1d48aab717636238aea13880f88:/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 ed08e2bc..ece1d8c5 100644 --- a/projects/stargazer/plugins/other/rscript/rscript.h +++ b/projects/stargazer/plugins/other/rscript/rscript.h @@ -57,51 +57,47 @@ class REMOTE_SCRIPT; class RS_ADD_USER_NONIFIER: public NOTIFIER_BASE { public: - RS_ADD_USER_NONIFIER() {}; - virtual ~RS_ADD_USER_NONIFIER() {}; - - void SetRemoteScript(REMOTE_SCRIPT * a) { rs = a; } + RS_ADD_USER_NONIFIER(REMOTE_SCRIPT & r) : rs(r) {} + virtual ~RS_ADD_USER_NONIFIER() {} void Notify(const user_iter & user); private: - REMOTE_SCRIPT * rs; + REMOTE_SCRIPT & rs; }; //----------------------------------------------------------------------------- class RS_DEL_USER_NONIFIER: public NOTIFIER_BASE { public: - RS_DEL_USER_NONIFIER() {}; - virtual ~RS_DEL_USER_NONIFIER() {}; - - void SetRemoteScript(REMOTE_SCRIPT * a) { rs = a; } + RS_DEL_USER_NONIFIER(REMOTE_SCRIPT & r) : rs(r) {} + virtual ~RS_DEL_USER_NONIFIER() {} void Notify(const user_iter & user); private: - REMOTE_SCRIPT * rs; + REMOTE_SCRIPT & rs; }; //----------------------------------------------------------------------------- template class RS_CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE { public: - void Notify(const varParamType & oldValue, const varParamType & newValue); - void SetUser(user_iter u) { user = u; } - user_iter GetUser() {return user; } - void SetRemoteScript(REMOTE_SCRIPT * a) { rs = a; } + RS_CHG_AFTER_NOTIFIER(REMOTE_SCRIPT & r, user_iter u) : user(u), rs(r) {} + void Notify(const varParamType & oldValue, const varParamType & newValue); + user_iter GetUser() {return user; } private: user_iter user; - REMOTE_SCRIPT * rs; + REMOTE_SCRIPT & rs; }; //----------------------------------------------------------------------------- struct RS_USER { - RS_USER(); - RS_USER(const std::vector & r, user_iter it); -time_t lastSentTime; -user_iter user; +RS_USER(); +RS_USER(const std::vector & r, user_iter it); + +time_t lastSentTime; +user_iter user; std::vector routers; -int shortPacketsCount; +int shortPacketsCount; }; //----------------------------------------------------------------------------- class RS_SETTINGS @@ -181,7 +177,7 @@ private: mutable BLOWFISH_CTX ctx; - std::list > AfterChgIPNotifierList; + std::list > afterChgIPNotifierList; std::map authorizedUsers; mutable std::string errorStr; @@ -224,13 +220,13 @@ class DisconnectUser : public std::unary_functionAddUser(user); +rs.AddUser(user); } //----------------------------------------------------------------------------- inline void RS_DEL_USER_NONIFIER::Notify(const user_iter & user) { printfd(__FILE__, "DEL_USER_NONIFIER\n"); -rs->DelUser(user); +rs.DelUser(user); } //-----------------------------------------------------------------------------