X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/1f6214607a4f2b727484a4ae9e9411044dae8051..db7b9b78524bcdd1f2a5d82c1696bcd2f96d9491:/projects/stargazer/plugins/other/rscript/rscript.h diff --git a/projects/stargazer/plugins/other/rscript/rscript.h b/projects/stargazer/plugins/other/rscript/rscript.h index 81cc1e17..794c4c2b 100644 --- a/projects/stargazer/plugins/other/rscript/rscript.h +++ b/projects/stargazer/plugins/other/rscript/rscript.h @@ -60,44 +60,75 @@ class SETTINGS; //----------------------------------------------------------------------------- class RS_ADD_USER_NONIFIER: public NOTIFIER_BASE { public: - RS_ADD_USER_NONIFIER(REMOTE_SCRIPT & r) : rs(r) {} + RS_ADD_USER_NONIFIER(REMOTE_SCRIPT & r) + : NOTIFIER_BASE(), rs(r) {} virtual ~RS_ADD_USER_NONIFIER() {} 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; }; //----------------------------------------------------------------------------- class RS_DEL_USER_NONIFIER: public NOTIFIER_BASE { public: - RS_DEL_USER_NONIFIER(REMOTE_SCRIPT & r) : rs(r) {} + RS_DEL_USER_NONIFIER(REMOTE_SCRIPT & r) + : NOTIFIER_BASE(), rs(r) {} virtual ~RS_DEL_USER_NONIFIER() {} 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(REMOTE_SCRIPT & r, USER_PTR u) + : PROPERTY_NOTIFIER_BASE(), user(u), rs(r) {} + RS_CHG_AFTER_NOTIFIER(const RS_CHG_AFTER_NOTIFIER & rvalue) + : PROPERTY_NOTIFIER_BASE(), 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 { @@ -114,7 +145,6 @@ public: const std::string & GetMapFileName() const { return subnetFile; } private: - int ParseIntInRange(const std::string & str, int min, int max, int * val); int sendPeriod; uint16_t port; string errorStr; @@ -130,11 +160,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(); @@ -145,8 +170,8 @@ public: const std::string & GetStrError() const { return errorStr; } const std::string GetVersion() const { return "Remote script v 0.3"; } - uint16_t GetStartPosition() const { return 20; } - uint16_t GetStopPosition() const { return 20; } + 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); } @@ -154,6 +179,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(); @@ -216,13 +244,11 @@ class DisconnectUser : public std::unary_function