X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/afcbfd1a09e22ff4839ba5db42047c96f355506c..5dfab5bea026e33031d041b233c73e196469b4ac:/projects/stargazer/plugins/other/rscript/rscript.cpp?ds=inline diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp index 1e842d25..e675d488 100644 --- a/projects/stargazer/plugins/other/rscript/rscript.cpp +++ b/projects/stargazer/plugins/other/rscript/rscript.cpp @@ -22,13 +22,11 @@ #include "rscript.h" #include "ur_functor.h" -#include "send_functor.h" #include "stg/common.h" #include "stg/locker.h" #include "stg/users.h" #include "stg/user_property.h" -#include "stg/plugin_creator.h" #include "stg/logger.h" #include @@ -42,6 +40,9 @@ #include #include +#define RS_DEBUG (1) +#define MAX_SHORT_PCKT (3) + extern volatile time_t stgTime; using RS::REMOTE_SCRIPT; @@ -51,26 +52,18 @@ namespace { template struct USER_IS { - explicit USER_IS(USER_PTR u) : user(u) {} + explicit USER_IS(RS::UserPtr u) : user(u) {} bool operator()(const T & notifier) { return notifier.GetUser() == user; } - USER_PTR user; + RS::UserPtr user; }; -PLUGIN_CREATOR rsc; - } // namespace anonymous -extern "C" PLUGIN * GetPlugin(); -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -PLUGIN * GetPlugin() +extern "C" STG::Plugin* GetPlugin() { -return rsc.GetPlugin(); + static REMOTE_SCRIPT plugin; + return &plugin; } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -81,22 +74,21 @@ RS::SETTINGS::SETTINGS() { } //----------------------------------------------------------------------------- -int RS::SETTINGS::ParseSettings(const MODULE_SETTINGS & s) +int RS::SETTINGS::ParseSettings(const STG::ModuleSettings & s) { int p; -PARAM_VALUE pv; -std::vector::const_iterator pvi; +STG::ParamValue pv; netRouters.clear(); /////////////////////////// pv.param = "Port"; -pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv); +auto pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv); if (pvi == s.moduleParams.end() || pvi->value.empty()) { errorStr = "Parameter \'Port\' not found."; printfd(__FILE__, "Parameter 'Port' not found\n"); return -1; } -if (ParseIntInRange(pvi->value[0], 2, 65535, &p)) +if (ParseIntInRange(pvi->value[0], 2, 65535, &p) != 0) { errorStr = "Cannot parse parameter \'Port\': " + errorStr; printfd(__FILE__, "Cannot parse parameter 'Port'\n"); @@ -113,7 +105,7 @@ if (pvi == s.moduleParams.end() || pvi->value.empty()) return -1; } -if (ParseIntInRange(pvi->value[0], 5, 600, &sendPeriod)) +if (ParseIntInRange(pvi->value[0], 5, 600, &sendPeriod) != 0) { errorStr = "Cannot parse parameter \'SendPeriod\': " + errorStr; printfd(__FILE__, "Cannot parse parameter 'SendPeriod'\n"); @@ -153,13 +145,9 @@ subnetFile = pvi->value[0]; NRMapParser nrMapParser; if (!nrMapParser.ReadFile(subnetFile)) - { netRouters = nrMapParser.GetMap(); - } else - { - GetStgLogger()("mod_rscript: error opening subnets file '%s'", subnetFile.c_str()); - } + STG::PluginLogger::get("rscript")("mod_rscript: error opening subnets file '%s'", subnetFile.c_str()); return 0; } @@ -167,58 +155,38 @@ return 0; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- REMOTE_SCRIPT::REMOTE_SCRIPT() - : ctx(), - ipNotifierList(), - connNotifierList(), - authorizedUsers(), - errorStr(), - rsSettings(), - settings(), - sendPeriod(15), + : sendPeriod(15), halfPeriod(8), - nonstop(false), isRunning(false), - users(NULL), - netRouters(), - thread(), - mutex(), + users(nullptr), sock(0), onAddUserNotifier(*this), onDelUserNotifier(*this), - logger(GetPluginLogger(GetStgLogger(), "rscript")) -{ -pthread_mutex_init(&mutex, NULL); -} -//----------------------------------------------------------------------------- -REMOTE_SCRIPT::~REMOTE_SCRIPT() + logger(STG::PluginLogger::get("rscript")) { -pthread_mutex_destroy(&mutex); } //----------------------------------------------------------------------------- -void * REMOTE_SCRIPT::Run(void * d) +void REMOTE_SCRIPT::Run(std::stop_token token) { sigset_t signalSet; sigfillset(&signalSet); -pthread_sigmask(SIG_BLOCK, &signalSet, NULL); +pthread_sigmask(SIG_BLOCK, &signalSet, nullptr); -REMOTE_SCRIPT * rs = static_cast(d); +isRunning = true; -rs->isRunning = true; - -while (rs->nonstop) +while (!token.stop_requested()) { - rs->PeriodicSend(); + PeriodicSend(); sleep(2); } -rs->isRunning = false; -return NULL; +isRunning = false; } //----------------------------------------------------------------------------- int REMOTE_SCRIPT::ParseSettings() { -int ret = rsSettings.ParseSettings(settings); -if (ret) +auto ret = rsSettings.ParseSettings(settings); +if (ret != 0) errorStr = rsSettings.GetStrError(); sendPeriod = rsSettings.GetSendPeriod(); @@ -231,33 +199,19 @@ int REMOTE_SCRIPT::Start() { netRouters = rsSettings.GetSubnetsMap(); -InitEncrypt(&ctx, rsSettings.GetPassword()); +InitEncrypt(rsSettings.GetPassword()); users->AddNotifierUserAdd(&onAddUserNotifier); users->AddNotifierUserDel(&onDelUserNotifier); -nonstop = true; - if (GetUsers()) - { return -1; - } if (PrepareNet()) - { return -1; - } if (!isRunning) - { - if (pthread_create(&thread, NULL, Run, this)) - { - errorStr = "Cannot create thread."; - logger("Cannot create thread."); - printfd(__FILE__, "Cannot create thread\n"); - return -1; - } - } + m_thread = std::jthread([this](auto token){ Run(std::move(token)); }); errorStr = ""; return 0; @@ -268,7 +222,7 @@ int REMOTE_SCRIPT::Stop() if (!IsRunning()) return 0; -nonstop = false; +m_thread.request_stop(); std::for_each( authorizedUsers.begin(), @@ -284,7 +238,7 @@ if (isRunning) for (int i = 0; i < 25 && isRunning; i++) { struct timespec ts = {0, 200000000}; - nanosleep(&ts, NULL); + nanosleep(&ts, nullptr); } } @@ -294,13 +248,15 @@ users->DelNotifierUserAdd(&onAddUserNotifier); if (isRunning) { logger("Cannot stop thread."); - return -1; + m_thread.detach(); } +else + m_thread.join(); return 0; } //----------------------------------------------------------------------------- -int REMOTE_SCRIPT::Reload(const MODULE_SETTINGS & /*ms*/) +int REMOTE_SCRIPT::Reload(const STG::ModuleSettings & /*ms*/) { NRMapParser nrMapParser; @@ -312,7 +268,7 @@ if (nrMapParser.ReadFile(rsSettings.GetMapFileName())) } { - STG_LOCKER lock(&mutex); + std::lock_guard lock(m_mutex); printfd(__FILE__, "REMOTE_SCRIPT::Reload()\n"); @@ -352,9 +308,9 @@ return false; //----------------------------------------------------------------------------- void REMOTE_SCRIPT::PeriodicSend() { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); -std::map::iterator it(authorizedUsers.begin()); +auto it = authorizedUsers.begin(); while (it != authorizedUsers.end()) { if (difftime(stgTime, it->second.lastSentTime) - (rand() % halfPeriod) > sendPeriod) @@ -374,7 +330,7 @@ bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t bufSize, RS::USER & rsu, bo RS::PACKET_HEADER packetHead; memset(packetHead.padding, 0, sizeof(packetHead.padding)); -strcpy((char*)packetHead.magic, RS_ID); +memcpy(packetHead.magic, RS_ID, sizeof(RS_ID)); packetHead.protoVer[0] = '0'; packetHead.protoVer[1] = '2'; if (forceDisconnect) @@ -408,7 +364,7 @@ rsu.lastSentTime = stgTime; packetHead.ip = htonl(rsu.ip); packetHead.id = htonl(rsu.user->GetID()); -strncpy((char*)packetHead.login, rsu.user->GetLogin().c_str(), RS_LOGIN_LEN); +strncpy(reinterpret_cast(packetHead.login), rsu.user->GetLogin().c_str(), RS_LOGIN_LEN); packetHead.login[RS_LOGIN_LEN - 1] = 0; memcpy(buf, &packetHead, sizeof(packetHead)); @@ -421,27 +377,24 @@ if (packetHead.packetType == RS_ALIVE_PACKET) RS::PACKET_TAIL packetTail; memset(packetTail.padding, 0, sizeof(packetTail.padding)); -strcpy((char*)packetTail.magic, RS_ID); -std::vector::const_iterator it; +memcpy(packetTail.magic, RS_ID, sizeof(RS_ID)); std::string params; -for(it = rsSettings.GetUserParams().begin(); - it != rsSettings.GetUserParams().end(); - ++it) +for (const auto& param : rsSettings.GetUserParams()) { - std::string parameter(rsu.user->GetParamValue(it->c_str())); - if (params.length() + parameter.length() > RS_PARAMS_LEN - 1) + auto value = rsu.user->GetParamValue(param); + if (params.length() + value.length() > RS_PARAMS_LEN - 1) { - logger("Script params string length %d exceeds the limit of %d symbols.", params.length() + parameter.length(), RS_PARAMS_LEN); + logger("Script params string length %d exceeds the limit of %d symbols.", params.length() + value.length(), RS_PARAMS_LEN); break; } - params += parameter + " "; + params += value + " "; } -strncpy((char *)packetTail.params, params.c_str(), RS_PARAMS_LEN); +strncpy(reinterpret_cast(packetTail.params), params.c_str(), RS_PARAMS_LEN); packetTail.params[RS_PARAMS_LEN - 1] = 0; assert(sizeof(packetHead) + sizeof(packetTail) <= bufSize && "Insufficient buffer space"); -Encrypt(&ctx, buf + sizeof(packetHead), (char *)&packetTail, sizeof(packetTail) / 8); +Encrypt(buf + sizeof(packetHead), reinterpret_cast(&packetTail), sizeof(packetTail) / 8); return false; } @@ -458,11 +411,16 @@ if (PreparePacket(buffer, sizeof(buffer), rsu, forceDisconnect)) return true; } -std::for_each( - rsu.routers.begin(), - rsu.routers.end(), - PacketSender(sock, buffer, sizeof(buffer), static_cast(htons(rsSettings.GetPort()))) - ); +for (const auto& ip : rsu.routers) +{ + struct sockaddr_in sendAddr; + + sendAddr.sin_family = AF_INET; + sendAddr.sin_port = htons(rsSettings.GetPort()); + sendAddr.sin_addr.s_addr = ip; + + return sendto(sock, buffer, sizeof(buffer), 0, reinterpret_cast(&sendAddr), sizeof(sendAddr)) > 0; +} return false; } @@ -480,10 +438,10 @@ if (PreparePacket(buffer, sizeof(buffer), rsu, forceDisconnect)) struct sockaddr_in sendAddr; sendAddr.sin_family = AF_INET; -sendAddr.sin_port = static_cast(htons(rsSettings.GetPort())); +sendAddr.sin_port = htons(rsSettings.GetPort()); sendAddr.sin_addr.s_addr = routerIP; -ssize_t res = sendto(sock, buffer, sizeof(buffer), 0, (struct sockaddr *)&sendAddr, sizeof(sendAddr)); +ssize_t res = sendto(sock, buffer, sizeof(buffer), 0, reinterpret_cast(&sendAddr), sizeof(sendAddr)); if (res < 0) logger("sendto error: %s", strerror(errno)); @@ -493,15 +451,13 @@ return (res != sizeof(buffer)); //----------------------------------------------------------------------------- bool REMOTE_SCRIPT::GetUsers() { -USER_PTR u; +UserPtr u; int h = users->OpenSearch(); assert(h && "USERS::OpenSearch is always correct"); -while (!users->SearchNext(h, &u)) - { +while (users->SearchNext(h, &u) != 0) SetUserNotifiers(u); - } users->CloseSearch(h); return false; @@ -509,24 +465,20 @@ return false; //----------------------------------------------------------------------------- std::vector REMOTE_SCRIPT::IP2Routers(uint32_t ip) { -STG_LOCKER lock(&mutex); -for (size_t i = 0; i < netRouters.size(); ++i) - { - if ((ip & netRouters[i].subnetMask) == (netRouters[i].subnetIP & netRouters[i].subnetMask)) - { - return netRouters[i].routers; - } - } -return std::vector(); +std::lock_guard lock(m_mutex); +for (auto& nr : netRouters) + if ((ip & nr.subnetMask) == (nr.subnetIP & nr.subnetMask)) + return nr.routers; +return {}; } //----------------------------------------------------------------------------- -void REMOTE_SCRIPT::SetUserNotifiers(USER_PTR u) +void REMOTE_SCRIPT::SetUserNotifiers(UserPtr u) { ipNotifierList.push_front(RS::IP_NOTIFIER(*this, u)); connNotifierList.push_front(RS::CONNECTED_NOTIFIER(*this, u)); } //----------------------------------------------------------------------------- -void REMOTE_SCRIPT::UnSetUserNotifiers(USER_PTR u) +void REMOTE_SCRIPT::UnSetUserNotifiers(UserPtr u) { ipNotifierList.erase(std::remove_if(ipNotifierList.begin(), ipNotifierList.end(), @@ -539,19 +491,19 @@ connNotifierList.erase(std::remove_if(connNotifierList.begin(), } //----------------------------------------------------------------------------- -void REMOTE_SCRIPT::AddRSU(USER_PTR user) +void REMOTE_SCRIPT::AddRSU(UserPtr user) { RS::USER rsu(IP2Routers(user->GetCurrIP()), user); Send(rsu); -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); authorizedUsers.insert(std::make_pair(user->GetCurrIP(), rsu)); } //----------------------------------------------------------------------------- -void REMOTE_SCRIPT::DelRSU(USER_PTR user) +void REMOTE_SCRIPT::DelRSU(UserPtr user) { -STG_LOCKER lock(&mutex); -std::map::iterator it(authorizedUsers.begin()); +std::lock_guard lock(m_mutex); +auto it = authorizedUsers.begin(); while (it != authorizedUsers.end()) { if (it->second.user == user) @@ -562,9 +514,7 @@ while (it != authorizedUsers.end()) } ++it; } -/*const std::map::iterator it( - authorizedUsers.find(user->GetCurrIP()) - ); +/*const auto it = authorizedUsers.find(user->GetCurrIP()); if (it != authorizedUsers.end()) { Send(it->second, true); @@ -574,7 +524,7 @@ if (it != authorizedUsers.end()) //----------------------------------------------------------------------------- void RS::IP_NOTIFIER::Notify(const uint32_t & /*oldValue*/, const uint32_t & newValue) { -if (newValue) +if (newValue != 0) rs.AddRSU(user); else rs.DelRSU(user); @@ -588,19 +538,19 @@ else rs.DelRSU(user); } //----------------------------------------------------------------------------- -void REMOTE_SCRIPT::InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password) const +void REMOTE_SCRIPT::InitEncrypt(const std::string & password) const { unsigned char keyL[PASSWD_LEN]; // Пароль для шифровки memset(keyL, 0, PASSWD_LEN); -strncpy((char *)keyL, password.c_str(), PASSWD_LEN); -Blowfish_Init(ctx, keyL, PASSWD_LEN); +strncpy(reinterpret_cast(keyL), password.c_str(), PASSWD_LEN); +Blowfish_Init(&ctx, keyL, PASSWD_LEN); } //----------------------------------------------------------------------------- -void REMOTE_SCRIPT::Encrypt(BLOWFISH_CTX * ctx, void * dst, const void * src, size_t len8) const +void REMOTE_SCRIPT::Encrypt(void * dst, const void * src, size_t len8) const { if (dst != src) memcpy(dst, src, len8 * 8); for (size_t i = 0; i < len8; ++i) - Blowfish_Encrypt(ctx, static_cast(dst) + i * 2, static_cast(dst) + i * 2 + 1); + Blowfish_Encrypt(&ctx, static_cast(dst) + i * 2, static_cast(dst) + i * 2 + 1); } //-----------------------------------------------------------------------------