X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/3a45cd9275dc9279e133deb0932402ae5f4d0b5f..355911106bc27f5504eb904a064367ef1b5f0aba:/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 24d44763..ca52adf8 100644 --- a/projects/stargazer/plugins/other/rscript/rscript.h +++ b/projects/stargazer/plugins/other/rscript/rscript.h @@ -65,6 +65,9 @@ public: void Notify(const USER_PTR & user); private: + RS_ADD_USER_NONIFIER(const RS_ADD_USER_NONIFIER & rvalue); + RS_ADD_USER_NONIFIER & operator=(const RS_ADD_USER_NONIFIER); + REMOTE_SCRIPT & rs; }; //----------------------------------------------------------------------------- @@ -75,29 +78,55 @@ public: void Notify(const USER_PTR & user); private: + RS_DEL_USER_NONIFIER(const RS_DEL_USER_NONIFIER & rvalue); + RS_DEL_USER_NONIFIER & operator=(const RS_DEL_USER_NONIFIER); + REMOTE_SCRIPT & rs; }; //----------------------------------------------------------------------------- -template -class RS_CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE { +template +class RS_CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE { public: RS_CHG_AFTER_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u) : user(u), rs(r) {} - void Notify(const varParamType & oldValue, const varParamType & newValue); - USER_PTR GetUser() {return user; } + RS_CHG_AFTER_NOTIFIER(const RS_CHG_AFTER_NOTIFIER & rvalue) + : user(rvalue.user), rs(rvalue.rs) + {} + void Notify(const T & oldValue, const T & newValue); + USER_PTR GetUser() { return user; } private: + RS_CHG_AFTER_NOTIFIER & operator=(const RS_CHG_AFTER_NOTIFIER & rvalue); + USER_PTR user; REMOTE_SCRIPT & rs; }; //----------------------------------------------------------------------------- struct RS_USER { -RS_USER(); -RS_USER(const std::vector & r, USER_PTR it); - -time_t lastSentTime; -USER_PTR user; -std::vector routers; -int shortPacketsCount; + RS_USER() + : lastSentTime(0), + user(NULL), + routers(), + shortPacketsCount(0) + {} + RS_USER(const std::vector & r, USER_PTR it) + : lastSentTime(0), + user(it), + routers(r), + shortPacketsCount(0) + {} + RS_USER(const RS_USER & rvalue) + : lastSentTime(rvalue.lastSentTime), + user(rvalue.user), + routers(rvalue.routers), + shortPacketsCount(rvalue.shortPacketsCount) + {} + + RS_USER & operator=(const RS_USER & rvalue); + + time_t lastSentTime; + USER_PTR user; + std::vector routers; + int shortPacketsCount; }; //----------------------------------------------------------------------------- class RS_SETTINGS { @@ -129,11 +158,6 @@ public: virtual ~REMOTE_SCRIPT(); void SetUsers(USERS * u) { users = u; } - void SetTariffs(TARIFFS *) {} - void SetAdmins(ADMINS *) {} - void SetTraffcounter(TRAFFCOUNTER *) {} - void SetStore(STORE *) {} - void SetStgSettings(const SETTINGS *) {} void SetSettings(const MODULE_SETTINGS & s) { settings = s; } int ParseSettings(); @@ -153,6 +177,9 @@ public: void ChangedIP(USER_PTR u, uint32_t oldIP, uint32_t newIP); private: + REMOTE_SCRIPT(const REMOTE_SCRIPT & rvalue); + REMOTE_SCRIPT & operator=(const REMOTE_SCRIPT & rvalue); + static void * Run(void *); bool PrepareNet(); bool FinalizeNet(); @@ -215,13 +242,11 @@ class DisconnectUser : public std::unary_function