X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/19684ed5aca4366468f3d9cac0848edd46a1d1cf..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 cbb9f97f..e0412fb0 100644 --- a/projects/stargazer/plugins/other/rscript/rscript.h +++ b/projects/stargazer/plugins/other/rscript/rscript.h @@ -140,6 +140,7 @@ struct USER { USER(const std::vector & r, USER_PTR it) : user(it), routers(r), + shortPacketsCount(0), ip(user->GetCurrIP()) {} @@ -157,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; } @@ -166,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 { @@ -188,7 +189,7 @@ 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; } @@ -213,13 +214,12 @@ private: std::vector IP2Routers(uint32_t ip); bool GetUsers(); - std::string GetUserParam(USER_PTR u, const std::string & paramName) const; 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;