X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/abd575e7ae51fd1462c8d4fe0229ed81ce8a564d..df9f528d8ea5b3ba19bebcaf0324c3282edeffcc:/projects/stargazer/plugins/other/rscript/rscript.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp index ebe2556d..00114df4 100644 --- a/projects/stargazer/plugins/other/rscript/rscript.cpp +++ b/projects/stargazer/plugins/other/rscript/rscript.cpp @@ -38,16 +38,29 @@ #include "ur_functor.h" #include "send_functor.h" -extern volatile const time_t stgTime; - -#define RS_MAX_ROUTERS (100) +extern volatile time_t stgTime; using RS::REMOTE_SCRIPT; +namespace { + +template +struct USER_IS +{ + USER_IS(USER_PTR u) : user(u) {} + bool operator()(const T & notifier) { return notifier.GetUser() == user; } + + USER_PTR user; +}; + +PLUGIN_CREATOR rsc; + +} // namespace anonymous + +extern "C" PLUGIN * GetPlugin(); //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -PLUGIN_CREATOR rsc; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -58,34 +71,6 @@ return rsc.GetPlugin(); //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -RS::USER::USER(const std::vector & r, USER_PTR it, REMOTE_SCRIPT & rs) - : lastSentTime(0), - user(it), - routers(r), - shortPacketsCount(0), - ip(user->GetCurrIP()), - notifier(rs, *this) -{ - user->AddConnectedAfterNotifier(¬ifier); -} -//----------------------------------------------------------------------------- -RS::USER::USER(const RS::USER & rhs) - : lastSentTime(rhs.lastSentTime), - user(rhs.user), - routers(rhs.routers), - shortPacketsCount(rhs.shortPacketsCount), - ip(rhs.ip), - notifier(rhs.notifier) -{ - user->DelConnectedAfterNotifier(&rhs.notifier); - user->AddConnectedAfterNotifier(¬ifier); -} -//----------------------------------------------------------------------------- -RS::USER::~USER() -{ - user->DelConnectedAfterNotifier(¬ifier); -} -//----------------------------------------------------------------------------- RS::SETTINGS::SETTINGS() : sendPeriod(0), port(0), @@ -101,7 +86,7 @@ int RS::SETTINGS::ParseSettings(const MODULE_SETTINGS & s) { int p; PARAM_VALUE pv; -vector::const_iterator pvi; +std::vector::const_iterator pvi; netRouters.clear(); /////////////////////////// pv.param = "Port"; @@ -118,7 +103,7 @@ if (ParseIntInRange(pvi->value[0], 2, 65535, &p)) 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); @@ -185,6 +170,7 @@ return 0; REMOTE_SCRIPT::REMOTE_SCRIPT() : ctx(), ipNotifierList(), + connNotifierList(), authorizedUsers(), errorStr(), rsSettings(), @@ -327,7 +313,7 @@ if (nrMapParser.ReadFile(rsSettings.GetMapFileName())) } { - STG_LOCKER lock(&mutex, __FILE__, __LINE__); + STG_LOCKER lock(&mutex); printfd(__FILE__, "REMOTE_SCRIPT::Reload()\n"); @@ -338,6 +324,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; } //----------------------------------------------------------------------------- @@ -364,23 +353,23 @@ return false; //----------------------------------------------------------------------------- void REMOTE_SCRIPT::PeriodicSend() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); -map::iterator it(authorizedUsers.begin()); +std::map::iterator it(authorizedUsers.begin()); while (it != authorizedUsers.end()) { if (difftime(stgTime, it->second.lastSentTime) - (rand() % halfPeriod) > sendPeriod) { - Send(it->first, it->second); + Send(it->second); } ++it; } } //----------------------------------------------------------------------------- #ifdef NDEBUG -bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t, uint32_t ip, RS::USER & rsu, bool forceDisconnect) const +bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t, RS::USER & rsu, bool forceDisconnect) const #else -bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t bufSize, uint32_t ip, RS::USER & rsu, bool forceDisconnect) const +bool REMOTE_SCRIPT::PreparePacket(char * buf, size_t bufSize, RS::USER & rsu, bool forceDisconnect) const #endif { RS::PACKET_HEADER packetHead; @@ -392,6 +381,7 @@ 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 { @@ -399,17 +389,25 @@ 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); packetHead.login[RS_LOGIN_LEN - 1] = 0; @@ -425,15 +423,18 @@ RS::PACKET_TAIL packetTail; memset(packetTail.padding, 0, sizeof(packetTail.padding)); strcpy((char*)packetTail.magic, RS_ID); -vector::const_iterator it; +std::vector::const_iterator it; std::string params; for(it = rsSettings.GetUserParams().begin(); it != rsSettings.GetUserParams().end(); ++it) { - std::string parameter(GetUserParam(rsu.user, *it)); + std::string parameter(rsu.user->GetParamValue(it->c_str())); if (params.length() + parameter.length() > RS_PARAMS_LEN - 1) + { + logger("Script params string length %d exceeds the limit of %d symbols.", params.length() + parameter.length(), RS_PARAMS_LEN); break; + } params += parameter + " "; } strncpy((char *)packetTail.params, params.c_str(), RS_PARAMS_LEN); @@ -446,13 +447,13 @@ Encrypt(&ctx, buf + sizeof(packetHead), (char *)&packetTail, sizeof(packetTail) 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; @@ -461,17 +462,17 @@ if (PreparePacket(buffer, sizeof(buffer), ip, rsu, forceDisconnect)) std::for_each( rsu.routers.begin(), rsu.routers.end(), - PacketSender(sock, buffer, sizeof(buffer), htons(rsSettings.GetPort())) + PacketSender(sock, buffer, sizeof(buffer), static_cast(htons(rsSettings.GetPort()))) ); 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; @@ -480,10 +481,10 @@ if (PreparePacket(buffer, sizeof(buffer), ip, rsu, forceDisconnect)) struct sockaddr_in sendAddr; sendAddr.sin_family = AF_INET; -sendAddr.sin_port = htons(rsSettings.GetPort()); +sendAddr.sin_port = static_cast(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, (struct sockaddr *)&sendAddr, sizeof(sendAddr)); if (res < 0) logger("sendto error: %s", strerror(errno)); @@ -500,45 +501,16 @@ assert(h && "USERS::OpenSearch is always correct"); while (!users->SearchNext(h, &u)) { - SetUserNotifier(u); + SetUserNotifiers(u); } users->CloseSearch(h); return false; } //----------------------------------------------------------------------------- -void REMOTE_SCRIPT::ChangedIP(USER_PTR u, uint32_t oldIP, uint32_t newIP) -{ -/* - * When ip changes process looks like: - * old => 0, 0 => new - * - */ -if (newIP) - { - RS::USER rsu(IP2Routers(newIP), u, *this); - Send(newIP, rsu); - - STG_LOCKER lock(&mutex, __FILE__, __LINE__); - authorizedUsers.insert(std::make_pair(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::vector REMOTE_SCRIPT::IP2Routers(uint32_t ip) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); for (size_t i = 0; i < netRouters.size(); ++i) { if ((ip & netRouters[i].subnetMask) == (netRouters[i].subnetIP & netRouters[i].subnetMask)) @@ -549,127 +521,75 @@ for (size_t i = 0; i < netRouters.size(); ++i) return std::vector(); } //----------------------------------------------------------------------------- -string REMOTE_SCRIPT::GetUserParam(USER_PTR u, const string & paramName) const +void REMOTE_SCRIPT::SetUserNotifiers(USER_PTR u) { -string value = ""; -if (strcasecmp(paramName.c_str(), "cash") == 0) - strprintf(&value, "%f", u->GetProperty().cash.Get()); -else -if (strcasecmp(paramName.c_str(), "freeMb") == 0) - strprintf(&value, "%f", u->GetProperty().freeMb.Get()); -else -if (strcasecmp(paramName.c_str(), "passive") == 0) - strprintf(&value, "%d", u->GetProperty().passive.Get()); -else -if (strcasecmp(paramName.c_str(), "disabled") == 0) - strprintf(&value, "%d", u->GetProperty().disabled.Get()); -else -if (strcasecmp(paramName.c_str(), "alwaysOnline") == 0) - strprintf(&value, "%d", u->GetProperty().alwaysOnline.Get()); -else -if (strcasecmp(paramName.c_str(), "tariffName") == 0 || - strcasecmp(paramName.c_str(), "tariff") == 0) - value = "\"" + u->GetProperty().tariffName.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "nextTariff") == 0) - value = "\"" + u->GetProperty().nextTariff.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "address") == 0) - value = "\"" + u->GetProperty().address.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "note") == 0) - value = "\"" + u->GetProperty().note.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "group") == 0) - value = "\"" + u->GetProperty().group.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "email") == 0) - value = "\"" + u->GetProperty().email.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "realName") == 0) - value = "\"" + u->GetProperty().realName.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "credit") == 0) - strprintf(&value, "%f", u->GetProperty().credit.Get()); -else -if (strcasecmp(paramName.c_str(), "userdata0") == 0) - value = "\"" + u->GetProperty().userdata0.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata1") == 0) - value = "\"" + u->GetProperty().userdata1.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata2") == 0) - value = "\"" + u->GetProperty().userdata2.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata3") == 0) - value = "\"" + u->GetProperty().userdata3.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata4") == 0) - value = "\"" + u->GetProperty().userdata4.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata5") == 0) - value = "\"" + u->GetProperty().userdata5.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata6") == 0) - value = "\"" + u->GetProperty().userdata6.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata7") == 0) - value = "\"" + u->GetProperty().userdata7.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata8") == 0) - value = "\"" + u->GetProperty().userdata8.Get() + "\""; -else -if (strcasecmp(paramName.c_str(), "userdata9") == 0) - value = "\"" + u->GetProperty().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.push_front(RS::IP_NOTIFIER(*this, u)); +connNotifierList.push_front(RS::CONNECTED_NOTIFIER(*this, u)); } //----------------------------------------------------------------------------- -void REMOTE_SCRIPT::SetUserNotifier(USER_PTR u) +void REMOTE_SCRIPT::UnSetUserNotifiers(USER_PTR u) { -ipNotifierList.push_front(RS::IP_NOTIFIER(*this, u)); +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()); -u->AddCurrIPAfterNotifier(&(*ipNotifierList.begin())); } //----------------------------------------------------------------------------- -void REMOTE_SCRIPT::UnSetUserNotifier(USER_PTR u) +void REMOTE_SCRIPT::AddRSU(USER_PTR user) { -list::iterator ipAIter; -std::list::iterator> toErase; +RS::USER rsu(IP2Routers(user->GetCurrIP()), user); +Send(rsu); -for (ipAIter = ipNotifierList.begin(); ipAIter != ipNotifierList.end(); ++ipAIter) +STG_LOCKER lock(&mutex); +authorizedUsers.insert(std::make_pair(user->GetCurrIP(), rsu)); +} +//----------------------------------------------------------------------------- +void REMOTE_SCRIPT::DelRSU(USER_PTR user) +{ +STG_LOCKER lock(&mutex); +std::map::iterator 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 std::map::iterator it( + authorizedUsers.find(user->GetCurrIP()) + ); +if (it != authorizedUsers.end()) { - ipNotifierList.erase(*eIter); - } + Send(it->second, true); + authorizedUsers.erase(it); + }*/ } //----------------------------------------------------------------------------- -void RS::IP_NOTIFIER::Notify(const uint32_t & oldValue, const uint32_t & newValue) +void RS::IP_NOTIFIER::Notify(const uint32_t & /*oldValue*/, const uint32_t & newValue) { -rs.ChangedIP(user, oldValue, newValue); +if (newValue) + rs.AddRSU(user); +else + rs.DelRSU(user); } //----------------------------------------------------------------------------- void RS::CONNECTED_NOTIFIER::Notify(const bool & /*oldValue*/, const bool & newValue) { -if (!newValue) - rs.Send(user.ip, user, true); +if (newValue) + rs.AddRSU(user); +else + rs.DelRSU(user); } //----------------------------------------------------------------------------- -void REMOTE_SCRIPT::InitEncrypt(BLOWFISH_CTX * ctx, const string & password) const +void REMOTE_SCRIPT::InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password) const { unsigned char keyL[PASSWD_LEN]; // Пароль для шифровки memset(keyL, 0, PASSWD_LEN); @@ -677,11 +597,11 @@ strncpy((char *)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(BLOWFISH_CTX * ctx, 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); } //-----------------------------------------------------------------------------