X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/167dbb4ec68681f83c8c15116f57ef7b8f749dea..1c324d5b2380a68f209e65969079677dbaf1c511:/projects/stargazer/plugins/other/rscript/rscript.cpp diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp index ed9702f7..e675d488 100644 --- a/projects/stargazer/plugins/other/rscript/rscript.cpp +++ b/projects/stargazer/plugins/other/rscript/rscript.cpp @@ -19,132 +19,93 @@ * Author : Maxim Mamontov */ -/* - $Revision: 1.33 $ - $Date: 2010/04/16 12:30:37 $ - $Author: faust $ -*/ +#include "rscript.h" -#include +#include "ur_functor.h" + +#include "stg/common.h" +#include "stg/locker.h" +#include "stg/users.h" +#include "stg/user_property.h" +#include "stg/logger.h" + +#include #include #include -#include +#include +#include +#include -#include "rscript.h" -#include "common.h" -#include "ur_functor.h" -#include "send_functor.h" +#include +#include -extern volatile const time_t stgTime; +#define RS_DEBUG (1) +#define MAX_SHORT_PCKT (3) -#define RS_MAX_ROUTERS (100) +extern volatile time_t stgTime; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -class RS_CREATOR -{ -private: - REMOTE_SCRIPT * rs; +using RS::REMOTE_SCRIPT; -public: - RS_CREATOR() - : rs(new REMOTE_SCRIPT()) - { - }; - ~RS_CREATOR() - { - delete rs; - }; +namespace { - REMOTE_SCRIPT * GetPlugin() - { - return rs; - }; +template +struct USER_IS +{ + explicit USER_IS(RS::UserPtr u) : user(u) {} + bool operator()(const T & notifier) { return notifier.GetUser() == user; } + + RS::UserPtr user; }; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -RS_CREATOR rsc; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -BASE_PLUGIN * GetPlugin() + +} // namespace anonymous + +extern "C" STG::Plugin* GetPlugin() { -return rsc.GetPlugin(); + static REMOTE_SCRIPT plugin; + return &plugin; } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -RS_USER::RS_USER() - : lastSentTime(0), - shortPacketsCount(0) -{ -} -//----------------------------------------------------------------------------- -RS_USER::RS_USER(const std::vector & r, user_iter it) - : lastSentTime(0), - user(it), - routers(r), - shortPacketsCount(0) -{ -} -//----------------------------------------------------------------------------- -RS_SETTINGS::RS_SETTINGS() +RS::SETTINGS::SETTINGS() : sendPeriod(0), port(0) { } //----------------------------------------------------------------------------- -int RS_SETTINGS::ParseIntInRange(const string & str, int min, int max, int * val) -{ -if (str2x(str.c_str(), *val)) - { - errorStr = "Incorrect value \'" + str + "\'."; - return -1; - } -if (*val < min || *val > max) - { - errorStr = "Value \'" + str + "\' out of range."; - return -1; - } -return 0; -} -//----------------------------------------------------------------------------- -int RS_SETTINGS::ParseSettings(const MODULE_SETTINGS & s) +int RS::SETTINGS::ParseSettings(const STG::ModuleSettings & s) { int p; -PARAM_VALUE pv; -vector::const_iterator pvi; +STG::ParamValue pv; netRouters.clear(); /////////////////////////// pv.param = "Port"; -pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv); -if (pvi == s.moduleParams.end()) +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"); return -1; } -port = p; +port = static_cast(p); /////////////////////////// pv.param = "SendPeriod"; pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv); -if (pvi == s.moduleParams.end()) +if (pvi == s.moduleParams.end() || pvi->value.empty()) { errorStr = "Parameter \'SendPeriod\' not found."; printfd(__FILE__, "Parameter 'SendPeriod' not found\n"); 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,7 +114,7 @@ if (ParseIntInRange(pvi->value[0], 5, 600, &sendPeriod)) /////////////////////////// pv.param = "UserParams"; pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv); -if (pvi == s.moduleParams.end()) +if (pvi == s.moduleParams.end() || pvi->value.empty()) { errorStr = "Parameter \'UserParams\' not found."; printfd(__FILE__, "Parameter 'UserParams' not found\n"); @@ -163,7 +124,7 @@ userParams = pvi->value; /////////////////////////// pv.param = "Password"; pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv); -if (pvi == s.moduleParams.end()) +if (pvi == s.moduleParams.end() || pvi->value.empty()) { errorStr = "Parameter \'Password\' not found."; printfd(__FILE__, "Parameter 'Password' not found\n"); @@ -173,7 +134,7 @@ password = pvi->value[0]; /////////////////////////// pv.param = "SubnetFile"; pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv); -if (pvi == s.moduleParams.end()) +if (pvi == s.moduleParams.end() || pvi->value.empty()) { errorStr = "Parameter \'SubnetFile\' not found."; printfd(__FILE__, "Parameter 'SubnetFile' not found\n"); @@ -183,20 +144,10 @@ subnetFile = pvi->value[0]; NRMapParser nrMapParser; -if (nrMapParser.ReadFile(subnetFile)) - { - errorStr = nrMapParser.GetErrorStr(); - return -1; - } - -netRouters = nrMapParser.GetMap(); - -if (netRouters.empty()) - { - errorStr = "Parameter(s) \'Subnet*\' not found."; - printfd(__FILE__, "Parameter(s) 'Subnet*' not found\n"); - return -1; - } +if (!nrMapParser.ReadFile(subnetFile)) + netRouters = nrMapParser.GetMap(); +else + STG::PluginLogger::get("rscript")("mod_rscript: error opening subnets file '%s'", subnetFile.c_str()); return 0; } @@ -206,41 +157,36 @@ return 0; REMOTE_SCRIPT::REMOTE_SCRIPT() : sendPeriod(15), halfPeriod(8), - nonstop(false), isRunning(false), - users(NULL), + users(nullptr), sock(0), onAddUserNotifier(*this), - onDelUserNotifier(*this) + onDelUserNotifier(*this), + logger(STG::PluginLogger::get("rscript")) { -pthread_mutex_init(&mutex, NULL); } //----------------------------------------------------------------------------- -REMOTE_SCRIPT::~REMOTE_SCRIPT() +void REMOTE_SCRIPT::Run(std::stop_token token) { -pthread_mutex_destroy(&mutex); -} -//----------------------------------------------------------------------------- -void * REMOTE_SCRIPT::Run(void * d) -{ -REMOTE_SCRIPT * rs = static_cast(d); +sigset_t signalSet; +sigfillset(&signalSet); +pthread_sigmask(SIG_BLOCK, &signalSet, nullptr); -rs->isRunning = true; +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(); @@ -253,35 +199,19 @@ int REMOTE_SCRIPT::Start() { netRouters = rsSettings.GetSubnetsMap(); -InitEncrypt(&ctx, rsSettings.GetPassword()); - -//onAddUserNotifier.SetRemoteScript(this); -//onDelUserNotifier.SetRemoteScript(this); +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."; - printfd(__FILE__, "Cannot create thread\n"); - return -1; - } - } + m_thread = std::jthread([this](auto token){ Run(std::move(token)); }); errorStr = ""; return 0; @@ -292,7 +222,7 @@ int REMOTE_SCRIPT::Stop() if (!IsRunning()) return 0; -nonstop = false; +m_thread.request_stop(); std::for_each( authorizedUsers.begin(), @@ -307,40 +237,38 @@ if (isRunning) //5 seconds to thread stops itself for (int i = 0; i < 25 && isRunning; i++) { - usleep(200000); - } - - //after 5 seconds waiting thread still running. now killing it - if (isRunning) - { - if (pthread_kill(thread, SIGINT)) - { - errorStr = "Cannot kill thread."; - printfd(__FILE__, "Cannot kill thread\n"); - return -1; - } - printfd(__FILE__, "REMOTE_SCRIPT killed Run\n"); + struct timespec ts = {0, 200000000}; + nanosleep(&ts, nullptr); } } users->DelNotifierUserDel(&onDelUserNotifier); users->DelNotifierUserAdd(&onAddUserNotifier); +if (isRunning) + { + logger("Cannot stop thread."); + m_thread.detach(); + } +else + m_thread.join(); + return 0; } //----------------------------------------------------------------------------- -int REMOTE_SCRIPT::Reload() +int REMOTE_SCRIPT::Reload(const STG::ModuleSettings & /*ms*/) { NRMapParser nrMapParser; if (nrMapParser.ReadFile(rsSettings.GetMapFileName())) { errorStr = nrMapParser.GetErrorStr(); + logger("Map file reading error: %s", errorStr.c_str()); return -1; } { - STG_LOCKER lock(&mutex, __FILE__, __LINE__); + std::lock_guard lock(m_mutex); printfd(__FILE__, "REMOTE_SCRIPT::Reload()\n"); @@ -351,6 +279,9 @@ std::for_each(authorizedUsers.begin(), authorizedUsers.end(), UpdateRouter(*this)); +logger("%s reloaded successfully.", rsSettings.GetMapFileName().c_str()); +printfd(__FILE__, "REMOTE_SCRIPT::Reload() %s reloaded successfully.\n"); + return 0; } //----------------------------------------------------------------------------- @@ -361,6 +292,7 @@ sock = socket(AF_INET, SOCK_DGRAM, 0); if (sock < 0) { errorStr = "Cannot create socket."; + logger("Canot create a socket: %s", strerror(errno)); printfd(__FILE__, "Cannot create socket\n"); return true; } @@ -376,31 +308,35 @@ return false; //----------------------------------------------------------------------------- void REMOTE_SCRIPT::PeriodicSend() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +std::lock_guard lock(m_mutex); -map::iterator it(authorizedUsers.begin()); +auto it = authorizedUsers.begin(); while (it != authorizedUsers.end()) { if (difftime(stgTime, it->second.lastSentTime) - (rand() % halfPeriod) > sendPeriod) - //if (stgTime - it->second.lastSentTime > sendPeriod) { - Send(it->first, it->second); + Send(it->second); } ++it; } } //----------------------------------------------------------------------------- -bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t bufSize, uint32_t ip, RS_USER & rsu, bool forceDisconnect) const +#ifdef NDEBUG +bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t, RS::USER & rsu, bool forceDisconnect) const +#else +bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t bufSize, RS::USER & rsu, bool forceDisconnect) const +#endif { -RS_PACKET_HEADER packetHead; +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) { packetHead.packetType = RS_DISCONNECT_PACKET; + printfd(__FILE__, "RSCRIPT: force disconnect for '%s'\n", rsu.user->GetLogin().c_str()); } else { @@ -408,19 +344,27 @@ else { //SendLong packetHead.packetType = rsu.user->IsInetable() ? RS_CONNECT_PACKET : RS_DISCONNECT_PACKET; + if (rsu.user->IsInetable()) + printfd(__FILE__, "RSCRIPT: connect for '%s'\n", rsu.user->GetLogin().c_str()); + else + printfd(__FILE__, "RSCRIPT: disconnect for '%s'\n", rsu.user->GetLogin().c_str()); } else { //SendShort packetHead.packetType = rsu.user->IsInetable() ? RS_ALIVE_PACKET : RS_DISCONNECT_PACKET; + if (rsu.user->IsInetable()) + printfd(__FILE__, "RSCRIPT: alive for '%s'\n", rsu.user->GetLogin().c_str()); + else + printfd(__FILE__, "RSCRIPT: disconnect for '%s'\n", rsu.user->GetLogin().c_str()); } } rsu.shortPacketsCount++; rsu.lastSentTime = stgTime; -packetHead.ip = htonl(ip); +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)); @@ -430,57 +374,62 @@ if (packetHead.packetType == RS_ALIVE_PACKET) return false; } -RS_PACKET_TAIL packetTail; +RS::PACKET_TAIL packetTail; memset(packetTail.padding, 0, sizeof(packetTail.padding)); -strcpy((char*)packetTail.magic, RS_ID); -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()) + { + auto value = rsu.user->GetParamValue(param); + if (params.length() + value.length() > RS_PARAMS_LEN - 1) { - std::string parameter(GetUserParam(rsu.user, *it)); - if (params.length() + parameter.length() > RS_PARAMS_LEN - 1) + logger("Script params string length %d exceeds the limit of %d symbols.", params.length() + value.length(), RS_PARAMS_LEN); break; - params += parameter + " "; } -strncpy((char *)packetTail.params, params.c_str(), RS_PARAMS_LEN); + params += value + " "; + } +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; } //----------------------------------------------------------------------------- -bool REMOTE_SCRIPT::Send(uint32_t ip, RS_USER & rsu, bool forceDisconnect) const +bool REMOTE_SCRIPT::Send(RS::USER & rsu, bool forceDisconnect) const { char buffer[RS_MAX_PACKET_LEN]; memset(buffer, 0, sizeof(buffer)); -if (PreparePacket(buffer, sizeof(buffer), ip, rsu, forceDisconnect)) +if (PreparePacket(buffer, sizeof(buffer), rsu, forceDisconnect)) { printfd(__FILE__, "REMOTE_SCRIPT::Send() - Invalid packet length!\n"); return true; } -std::for_each( - rsu.routers.begin(), - rsu.routers.end(), - PacketSender(sock, buffer, sizeof(buffer), 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; } //----------------------------------------------------------------------------- -bool REMOTE_SCRIPT::SendDirect(uint32_t ip, RS_USER & rsu, uint32_t routerIP, bool forceDisconnect) const +bool REMOTE_SCRIPT::SendDirect(RS::USER & rsu, uint32_t routerIP, bool forceDisconnect) const { char buffer[RS_MAX_PACKET_LEN]; -if (PreparePacket(buffer, sizeof(buffer), ip, rsu, forceDisconnect)) +if (PreparePacket(buffer, sizeof(buffer), rsu, forceDisconnect)) { printfd(__FILE__, "REMOTE_SCRIPT::SendDirect() - Invalid packet length!\n"); return true; @@ -492,204 +441,116 @@ sendAddr.sin_family = AF_INET; sendAddr.sin_port = htons(rsSettings.GetPort()); sendAddr.sin_addr.s_addr = routerIP; -int 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)); return (res != sizeof(buffer)); } //----------------------------------------------------------------------------- bool REMOTE_SCRIPT::GetUsers() { -user_iter u; +UserPtr u; int h = users->OpenSearch(); -if (!h) - { - errorStr = "users->OpenSearch() error."; - printfd(__FILE__, "OpenSearch() error\n"); - return true; - } +assert(h && "USERS::OpenSearch is always correct"); -while (!users->SearchNext(h, &u)) - { - SetUserNotifier(u); - } +while (users->SearchNext(h, &u) != 0) + SetUserNotifiers(u); users->CloseSearch(h); return false; } //----------------------------------------------------------------------------- -void REMOTE_SCRIPT::ChangedIP(user_iter u, uint32_t oldIP, uint32_t newIP) +std::vector REMOTE_SCRIPT::IP2Routers(uint32_t ip) { -/* - * When ip changes process looks like: - * old => 0, 0 => new - * - */ -if (newIP) - { - RS_USER rsu(IP2Routers(newIP), u); - Send(newIP, rsu); - - STG_LOCKER lock(&mutex, __FILE__, __LINE__); - authorizedUsers[newIP] = rsu; - } -else - { - STG_LOCKER lock(&mutex, __FILE__, __LINE__); - const map::iterator it( - authorizedUsers.find(oldIP) - ); - if (it != authorizedUsers.end()) - { - Send(oldIP, it->second, true); - authorizedUsers.erase(it); - } - } +std::lock_guard lock(m_mutex); +for (auto& nr : netRouters) + if ((ip & nr.subnetMask) == (nr.subnetIP & nr.subnetMask)) + return nr.routers; +return {}; } //----------------------------------------------------------------------------- -std::vector REMOTE_SCRIPT::IP2Routers(uint32_t ip) +void REMOTE_SCRIPT::SetUserNotifiers(UserPtr u) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); -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(); +ipNotifierList.push_front(RS::IP_NOTIFIER(*this, u)); +connNotifierList.push_front(RS::CONNECTED_NOTIFIER(*this, u)); } //----------------------------------------------------------------------------- -string REMOTE_SCRIPT::GetUserParam(user_iter u, const string & paramName) const +void REMOTE_SCRIPT::UnSetUserNotifiers(UserPtr u) { -string value = ""; -if (strcasecmp(paramName.c_str(), "cash") == 0) - strprintf(&value, "%f", u->property.cash.Get()); -else -if (strcasecmp(paramName.c_str(), "freeMb") == 0) - strprintf(&value, "%f", u->property.freeMb.Get()); -else -if (strcasecmp(paramName.c_str(), "passive") == 0) - strprintf(&value, "%d", u->property.passive.Get()); -else -if (strcasecmp(paramName.c_str(), "disabled") == 0) - strprintf(&value, "%d", u->property.disabled.Get()); -else -if (strcasecmp(paramName.c_str(), "alwaysOnline") == 0) - strprintf(&value, "%d", u->property.alwaysOnline.Get()); -else -if (strcasecmp(paramName.c_str(), "tariffName") == 0 || - strcasecmp(paramName.c_str(), "tariff") == 0) - value = "\"" + u->property.tariffName.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "nextTariff") == 0) - value = "\"" + u->property.nextTariff.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "address") == 0) - value = "\"" + u->property.address.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "note") == 0) - value = "\"" + u->property.note.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "group") == 0) - value = "\"" + u->property.group.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "email") == 0) - value = "\"" + u->property.email.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "realName") == 0) - value = "\"" + u->property.realName.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "credit") == 0) - strprintf(&value, "%f", u->property.credit.Get()); -else -if (strcasecmp(paramName.c_str(), "userdata0") == 0) - value = "\"" + u->property.userdata0.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata1") == 0) - value = "\"" + u->property.userdata1.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata2") == 0) - value = "\"" + u->property.userdata2.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata3") == 0) - value = "\"" + u->property.userdata3.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata4") == 0) - value = "\"" + u->property.userdata4.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata5") == 0) - value = "\"" + u->property.userdata5.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata6") == 0) - value = "\"" + u->property.userdata6.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata7") == 0) - value = "\"" + u->property.userdata7.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata8") == 0) - value = "\"" + u->property.userdata8.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata9") == 0) - value = "\"" + u->property.userdata9.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "enabledDirs") == 0) - value = u->GetEnabledDirs(); -else - printfd(__FILE__, "Unknown value name: %s\n", paramName.c_str()); -return value; +ipNotifierList.erase(std::remove_if(ipNotifierList.begin(), + ipNotifierList.end(), + USER_IS(u)), + ipNotifierList.end()); +connNotifierList.erase(std::remove_if(connNotifierList.begin(), + connNotifierList.end(), + USER_IS(u)), + connNotifierList.end()); + } //----------------------------------------------------------------------------- -void REMOTE_SCRIPT::SetUserNotifier(user_iter u) +void REMOTE_SCRIPT::AddRSU(UserPtr user) { -RS_CHG_AFTER_NOTIFIER afterChgIPNotifier(*this, u); +RS::USER rsu(IP2Routers(user->GetCurrIP()), user); +Send(rsu); -afterChgIPNotifierList.push_front(afterChgIPNotifier); - -u->AddCurrIPAfterNotifier(&(*afterChgIPNotifierList.begin())); +std::lock_guard lock(m_mutex); +authorizedUsers.insert(std::make_pair(user->GetCurrIP(), rsu)); } //----------------------------------------------------------------------------- -void REMOTE_SCRIPT::UnSetUserNotifier(user_iter u) +void REMOTE_SCRIPT::DelRSU(UserPtr user) { -list >::iterator ipAIter; -std::list >::iterator> toErase; - -for (ipAIter = afterChgIPNotifierList.begin(); ipAIter != afterChgIPNotifierList.end(); ++ipAIter) +std::lock_guard lock(m_mutex); +auto it = authorizedUsers.begin(); +while (it != authorizedUsers.end()) { - if (ipAIter->GetUser() == u) + if (it->second.user == user) { - u->DelCurrIPAfterNotifier(&(*ipAIter)); - toErase.push_back(ipAIter); + Send(it->second, true); + authorizedUsers.erase(it); + return; } + ++it; } - -std::list >::iterator>::iterator eIter; - -for (eIter = toErase.begin(); eIter != toErase.end(); ++eIter) +/*const auto it = authorizedUsers.find(user->GetCurrIP()); +if (it != authorizedUsers.end()) { - afterChgIPNotifierList.erase(*eIter); - } + Send(it->second, true); + authorizedUsers.erase(it); + }*/ } //----------------------------------------------------------------------------- -template -void RS_CHG_AFTER_NOTIFIER::Notify(const varParamType & oldValue, const varParamType & newValue) +void RS::IP_NOTIFIER::Notify(const uint32_t & /*oldValue*/, const uint32_t & newValue) { -rs.ChangedIP(user, oldValue, newValue); +if (newValue != 0) + rs.AddRSU(user); +else + rs.DelRSU(user); +} +//----------------------------------------------------------------------------- +void RS::CONNECTED_NOTIFIER::Notify(const bool & /*oldValue*/, const bool & newValue) +{ +if (newValue) + rs.AddRSU(user); +else + rs.DelRSU(user); } //----------------------------------------------------------------------------- -void REMOTE_SCRIPT::InitEncrypt(BLOWFISH_CTX * ctx, const 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, char * dst, const char * 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, (uint32_t *)(dst + i * 8), (uint32_t *)(dst + i * 8 + 4)); + Blowfish_Encrypt(&ctx, static_cast(dst) + i * 2, static_cast(dst) + i * 2 + 1); } //-----------------------------------------------------------------------------