X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/dd226cecb0cb5dad554ed3adf7bf60d2eb059a30..1cb912e4f90473f78d2f0f10ab5c9b2c5bd36440:/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp index 8be662e9..c607b2ac 100644 --- a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp +++ b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp @@ -18,52 +18,36 @@ * Author : Boris Mikhailenko */ -/* - $Revision: 1.79 $ - $Date: 2010/03/25 15:18:48 $ - $Author: faust $ - */ - #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif -#include -#include -#include // close +#include "inetaccess.h" + +#include "stg/common.h" +#include "stg/locker.h" +#include "stg/tariff.h" +#include "stg/settings.h" +#include #include #include #include // snprintf #include #include -#include -#include "stg/common.h" -#include "stg/locker.h" -#include "stg/tariff.h" -#include "stg/user_property.h" -#include "stg/settings.h" -#include "stg/plugin_creator.h" -#include "inetaccess.h" +#include +#include +#include // close -extern volatile time_t stgTime; +#define IA_PROTO_VER (6) -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -namespace -{ -PLUGIN_CREATOR iac; -} +extern volatile time_t stgTime; -extern "C" PLUGIN * GetPlugin(); -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -PLUGIN * GetPlugin() +extern "C" STG::Plugin* GetPlugin() { -return iac.GetPlugin(); + static AUTH_IA plugin; + return &plugin; } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -72,17 +56,16 @@ AUTH_IA_SETTINGS::AUTH_IA_SETTINGS() : userDelay(0), userTimeout(0), port(0), - errorStr(), freeMbShowType(freeMbCash), logProtocolErrors(false) { } //----------------------------------------------------------------------------- -int AUTH_IA_SETTINGS::ParseSettings(const MODULE_SETTINGS & s) +int AUTH_IA_SETTINGS::ParseSettings(const STG::ModuleSettings & s) { int p; -PARAM_VALUE pv; -std::vector::const_iterator pvi; +STG::ParamValue pv; +std::vector::const_iterator pvi; /////////////////////////// pv.param = "Port"; pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv); @@ -171,7 +154,7 @@ else if (!str2x(freeMbType.c_str(), n)) printfd(__FILE__, "%s\n", errorStr.c_str()); return -1; } - freeMbShowType = (FREEMB)(freeMb0 + n); + freeMbShowType = static_cast(n); } else { @@ -301,40 +284,16 @@ return phaseTime; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- AUTH_IA::AUTH_IA() - : ctxS(), - errorStr(), - iaSettings(), - settings(), - nonstop(false), - isRunningRun(false), + : isRunningRun(false), isRunningRunTimeouter(false), users(NULL), stgSettings(NULL), - ip2user(), - recvThread(), - timeouterThread(), - mutex(), listenSocket(-1), - connSynAck6(), - connSynAck8(), - disconnSynAck6(), - disconnSynAck8(), - aliveSyn6(), - aliveSyn8(), - fin6(), - fin8(), - packetTypes(), enabledDirs(0xFFffFFff), - onDelUserNotifier(*this), - logger(GetPluginLogger(GetStgLogger(), "auth_ia")) + logger(STG::PluginLogger::get("auth_ia")) { InitContext("pr7Hhen", 7, &ctxS); -pthread_mutexattr_t attr; -pthread_mutexattr_init(&attr); -pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); -pthread_mutex_init(&mutex, &attr); - memset(&connSynAck6, 0, sizeof(CONN_SYN_ACK_6)); memset(&connSynAck8, 0, sizeof(CONN_SYN_ACK_8)); memset(&disconnSynAck6, 0, sizeof(DISCONN_SYN_ACK_6)); @@ -377,40 +336,21 @@ packetTypes["ERR"] = ERROR_N; //----------------------------------------------------------------------------- AUTH_IA::~AUTH_IA() { -pthread_mutex_destroy(&mutex); } //----------------------------------------------------------------------------- int AUTH_IA::Start() { -users->AddNotifierUserDel(&onDelUserNotifier); -nonstop = true; +m_onDelUserConn = users->onDel([this](auto user){ DelUser(user); }); if (PrepareNet()) - { return -1; - } -if (!isRunningRun) - { - if (pthread_create(&recvThread, NULL, Run, this)) - { - errorStr = "Cannot create thread."; - printfd(__FILE__, "Cannot create recv thread\n"); - logger("Cannot create recv thread."); - return -1; - } - } +if (!m_thread.joinable()) + m_thread = std::jthread([this](auto token){ Run(std::move(token)); }); + +if (!m_timeouterThread.joinable()) + m_timeouterThread = std::jthread([this](auto token){ RunTimeouter(std::move(token)); }); -if (!isRunningRunTimeouter) - { - if (pthread_create(&timeouterThread, NULL, RunTimeouter, this)) - { - errorStr = "Cannot create thread."; - printfd(__FILE__, "Cannot create timeouter thread\n"); - logger("Cannot create timeouter thread."); - return -1; - } - } errorStr = ""; return 0; } @@ -420,7 +360,8 @@ int AUTH_IA::Stop() if (!IsRunning()) return 0; -nonstop = false; +m_thread.request_stop(); +m_timeouterThread.request_stop(); std::for_each( ip2user.begin(), @@ -450,7 +391,17 @@ if (isRunningRunTimeouter) } } -users->DelNotifierUserDel(&onDelUserNotifier); +m_onDelUserConn.disconnect(); + +if (isRunningRun) + m_thread.detach(); +else + m_thread.join(); + +if (isRunningRunTimeouter) + m_timeouterThread.detach(); +else + m_timeouterThread.join(); if (isRunningRun || isRunningRunTimeouter) return -1; @@ -459,61 +410,55 @@ printfd(__FILE__, "AUTH_IA::Stoped successfully.\n"); return 0; } //----------------------------------------------------------------------------- -void * AUTH_IA::Run(void * d) +void AUTH_IA::Run(std::stop_token token) { sigset_t signalSet; sigfillset(&signalSet); pthread_sigmask(SIG_BLOCK, &signalSet, NULL); -AUTH_IA * ia = static_cast(d); - -ia->isRunningRun = true; +isRunningRun = true; char buffer[512]; time_t touchTime = stgTime - MONITOR_TIME_DELAY_SEC; -while (ia->nonstop) +while (!token.stop_requested()) { - ia->RecvData(buffer, sizeof(buffer)); - if ((touchTime + MONITOR_TIME_DELAY_SEC <= stgTime) && ia->stgSettings->GetMonitoring()) + RecvData(buffer, sizeof(buffer)); + if ((touchTime + MONITOR_TIME_DELAY_SEC <= stgTime) && stgSettings->GetMonitoring()) { touchTime = stgTime; - std::string monFile = ia->stgSettings->GetMonitorDir() + "/inetaccess_r"; - TouchFile(monFile.c_str()); + std::string monFile = stgSettings->GetMonitorDir() + "/inetaccess_r"; + TouchFile(monFile); } } -ia->isRunningRun = false; -return NULL; +isRunningRun = false; } //----------------------------------------------------------------------------- -void * AUTH_IA::RunTimeouter(void * d) +void AUTH_IA::RunTimeouter(std::stop_token token) { sigset_t signalSet; sigfillset(&signalSet); pthread_sigmask(SIG_BLOCK, &signalSet, NULL); -AUTH_IA * ia = static_cast(d); - -ia->isRunningRunTimeouter = true; +isRunningRunTimeouter = true; int a = -1; -std::string monFile = ia->stgSettings->GetMonitorDir() + "/inetaccess_t"; -while (ia->nonstop) +std::string monFile = stgSettings->GetMonitorDir() + "/inetaccess_t"; +while (!token.stop_requested()) { struct timespec ts = {0, 20000000}; nanosleep(&ts, NULL); - ia->Timeouter(); + Timeouter(); // TODO change counter to timer and MONITOR_TIME_DELAY_SEC - if (++a % (50 * 60) == 0 && ia->stgSettings->GetMonitoring()) + if (++a % (50 * 60) == 0 && stgSettings->GetMonitoring()) { - TouchFile(monFile.c_str()); + TouchFile(monFile); } } -ia->isRunningRunTimeouter = false; -return NULL; +isRunningRunTimeouter = false; } //----------------------------------------------------------------------------- int AUTH_IA::ParseSettings() @@ -524,6 +469,22 @@ if (ret) return ret; } //----------------------------------------------------------------------------- +int AUTH_IA::Reload(const STG::ModuleSettings & ms) +{ +AUTH_IA_SETTINGS newIaSettings; +if (newIaSettings.ParseSettings(ms)) + { + printfd(__FILE__, "AUTH_IA::Reload() - Failed to reload InetAccess.\n"); + logger("AUTH_IA: Cannot reload InetAccess. Errors found."); + return -1; + } + +printfd(__FILE__, "AUTH_IA::Reload() - Reloaded InetAccess successfully.\n"); +logger("AUTH_IA: Reloaded InetAccess successfully."); +iaSettings = newIaSettings; +return 0; +} +//----------------------------------------------------------------------------- int AUTH_IA::PrepareNet() { struct sockaddr_in listenAddr; @@ -538,10 +499,10 @@ if (listenSocket < 0) } listenAddr.sin_family = AF_INET; -listenAddr.sin_port = htons(static_cast(iaSettings.GetUserPort())); +listenAddr.sin_port = htons(iaSettings.GetUserPort()); listenAddr.sin_addr.s_addr = inet_addr("0.0.0.0"); -if (bind(listenSocket, (struct sockaddr*)&listenAddr, sizeof(listenAddr)) < 0) +if (bind(listenSocket, reinterpret_cast(&listenAddr), sizeof(listenAddr)) < 0) { errorStr = "AUTH_IA: Bind failed."; logger("Cannot bind the socket: %s", strerror(errno)); @@ -566,7 +527,7 @@ if (!WaitPackets(listenSocket)) // Timeout struct sockaddr_in outerAddr; socklen_t outerAddrLen(sizeof(outerAddr)); -ssize_t dataLen = recvfrom(listenSocket, buffer, bufferSize, 0, (struct sockaddr *)&outerAddr, &outerAddrLen); +ssize_t dataLen = recvfrom(listenSocket, buffer, bufferSize, 0, reinterpret_cast(&outerAddr), &outerAddrLen); if (!dataLen) // EOF { @@ -599,7 +560,7 @@ memset(login, 0, PASSWD_LEN); DecryptString(login, buffer + 8, PASSWD_LEN, &ctxS); -USER_PTR user; +UserPtr user; if (users->FindByName(login, &user)) { logger("User's connect failed: user '%s' not found. IP %s", @@ -612,21 +573,21 @@ if (users->FindByName(login, &user)) printfd(__FILE__, "User '%s' FOUND!\n", user->GetLogin().c_str()); -if (user->GetProperty().disabled.Get()) +if (user->GetProperties().disabled.Get()) { logger("Cannont authorize '%s', user is disabled.", login); SendError(sip, sport, protoVer, IconvString("Учетная запись заблокирована.", "utf8", "koi8-ru")); return 0; } -if (user->GetProperty().passive.Get()) +if (user->GetProperties().passive.Get()) { logger("Cannont authorize '%s', user is passive.", login); SendError(sip, sport, protoVer, IconvString("Учетная запись заморожена.", "utf8", "koi8-ru")); return 0; } -if (!user->GetProperty().ips.Get().IsIPInIPS(sip)) +if (!user->GetProperties().ips.Get().find(sip)) { printfd(__FILE__, "User %s. IP address is incorrect. IP %s\n", user->GetLogin().c_str(), inet_ntostring(sip).c_str()); @@ -674,7 +635,7 @@ return 0; //----------------------------------------------------------------------------- int AUTH_IA::Timeouter() { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); std::map::iterator it; it = ip2user.begin(); @@ -690,7 +651,7 @@ while (it != ip2user.end()) && (currTime - it->second.phase.GetTime()) > iaSettings.GetUserDelay()) { if (iaSettings.LogProtocolErrors()) - logger("User '%s'. Protocol version: %d. Phase 2: connect request timeout (%f > %d).", it->second.login.c_str(), it->second.protoVer, (currTime - it->second.phase.GetTime()).AsDouble(), iaSettings.GetUserDelay()); + logger("User '%s'. Protocol version: %d. Phase 2: connect request timeout (%f > %d).", it->second.login.c_str(), it->second.protoVer, (currTime - it->second.phase.GetTime()).AsDouble(), iaSettings.GetUserDelay().GetSec()); it->second.phase.SetPhase1(); printfd(__FILE__, "Phase changed from 2 to 1. Reason: timeout\n"); ip2user.erase(it++); @@ -734,7 +695,7 @@ while (it != ip2user.end()) if ((currTime - it->second.phase.GetTime()) > iaSettings.GetUserTimeout()) { if (iaSettings.LogProtocolErrors()) - logger("User '%s'. Protocol version: %d. Phase 3: alive timeout (%f > %d).", it->second.login.c_str(), it->second.protoVer, (currTime - it->second.phase.GetTime()).AsDouble(), iaSettings.GetUserTimeout()); + logger("User '%s'. Protocol version: %d. Phase 3: alive timeout (%f > %d).", it->second.login.c_str(), it->second.protoVer, (currTime - it->second.phase.GetTime()).AsDouble(), iaSettings.GetUserTimeout().GetSec()); users->Unauthorize(it->second.user->GetLogin(), this); ip2user.erase(it++); continue; @@ -745,7 +706,7 @@ while (it != ip2user.end()) && ((currTime - it->second.phase.GetTime()) > iaSettings.GetUserDelay())) { if (iaSettings.LogProtocolErrors()) - logger("User '%s'. Protocol version: %d. Phase 4: disconnect request timeout (%f > %d).", it->second.login.c_str(), it->second.protoVer, (currTime - it->second.phase.GetTime()).AsDouble(), iaSettings.GetUserDelay()); + logger("User '%s'. Protocol version: %d. Phase 4: disconnect request timeout (%f > %d).", it->second.login.c_str(), it->second.protoVer, (currTime - it->second.phase.GetTime()).AsDouble(), iaSettings.GetUserDelay().GetSec()); it->second.phase.SetPhase3(); printfd(__FILE__, "Phase changed from 4 to 3. Reason: timeout\n"); } @@ -756,17 +717,17 @@ while (it != ip2user.end()) return 0; } //----------------------------------------------------------------------------- -int AUTH_IA::PacketProcessor(void * buff, size_t dataLen, uint32_t sip, uint16_t sport, int protoVer, USER_PTR user) +int AUTH_IA::PacketProcessor(void * buff, size_t dataLen, uint32_t sip, uint16_t sport, int protoVer, UserPtr user) { std::string login(user->GetLogin()); const size_t offset = LOGIN_LEN + 2 + 6; // LOGIN_LEN + sizeOfMagic + sizeOfVer; -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); std::map::iterator it(ip2user.find(sip)); if (it == ip2user.end()) { - USER_PTR userPtr; + UserPtr userPtr; if (!users->FindByIPIdx(sip, &userPtr)) { if (userPtr->GetID() != user->GetID()) @@ -810,11 +771,11 @@ else if (user->GetID() != it->second.user->GetID()) IA_USER * iaUser = &(it->second); -if (iaUser->password != user->GetProperty().password.Get()) +if (iaUser->password != user->GetProperties().password.Get()) { - const std::string & password = user->GetProperty().password.Get(); + const std::string & password = user->GetProperties().password.Get(); InitContext(password.c_str(), password.length(), &iaUser->ctx); - iaUser->password = user->GetProperty().password.Get(); + iaUser->password = user->GetProperties().password.Get(); } DecryptString(static_cast(buff) + offset, static_cast(buff) + offset, (dataLen - offset), &iaUser->ctx); @@ -939,7 +900,7 @@ switch (pi->second) return -1; } //----------------------------------------------------------------------------- -void AUTH_IA::DelUser(USER_PTR u) +void AUTH_IA::DelUser(UserPtr u) { uint32_t ip = u->GetCurrIP(); @@ -949,7 +910,7 @@ if (!ip) std::map::iterator it; -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); it = ip2user.find(ip); if (it == ip2user.end()) { @@ -982,14 +943,14 @@ switch (protoVer) sendAddr.sin_addr.s_addr = ip; err.len = 1; - strncpy((char*)err.type, "ERR", 16); - strncpy((char*)err.text, text.c_str(), MAX_MSG_LEN); + memcpy(err.type, "ERR", 3); + memcpy(err.text, text.c_str(), std::min(text.length(), MAX_MSG_LEN)); #ifdef ARCH_BE SwapBytes(err.len); #endif - res = sendto(listenSocket, &err, sizeof(err), 0, (struct sockaddr*)&sendAddr, sizeof(sendAddr)); + res = sendto(listenSocket, &err, sizeof(err), 0, reinterpret_cast(&sendAddr), sizeof(sendAddr)); printfd(__FILE__, "SendError %d bytes sent\n", res); break; @@ -1002,14 +963,14 @@ switch (protoVer) sendAddr.sin_addr.s_addr = ip; err8.len = 256; - strncpy((char*)err8.type, "ERR", 16); - strncpy((char*)err8.text, text.c_str(), MAX_MSG_LEN); + memcpy(err8.type, "ERR", 3); + memcpy(err8.text, text.c_str(), std::min(text.length(), MAX_MSG_LEN)); #ifdef ARCH_BE SwapBytes(err8.len); #endif - res = sendto(listenSocket, &err8, sizeof(err8), 0, (struct sockaddr*)&sendAddr, sizeof(sendAddr)); + res = sendto(listenSocket, &err8, sizeof(err8), 0, reinterpret_cast(&sendAddr), sizeof(sendAddr)); printfd(__FILE__, "SendError_8 %d bytes sent\n", res); break; } @@ -1017,7 +978,7 @@ switch (protoVer) return 0; } //----------------------------------------------------------------------------- -int AUTH_IA::Send(uint32_t ip, uint16_t port, const char * buffer, size_t len) +int AUTH_IA::Send(uint32_t ip, uint16_t port, const void* buffer, size_t len) { struct sockaddr_in sendAddr; @@ -1025,19 +986,19 @@ sendAddr.sin_family = AF_INET; sendAddr.sin_port = htons(port); sendAddr.sin_addr.s_addr = ip; -if (sendto(listenSocket, buffer, len, 0, (struct sockaddr*)&sendAddr, sizeof(sendAddr)) == static_cast(len)) +if (sendto(listenSocket, buffer, len, 0, reinterpret_cast(&sendAddr), sizeof(sendAddr)) == static_cast(len)) return 0; return -1; } //----------------------------------------------------------------------------- -int AUTH_IA::SendMessage(const STG_MSG & msg, uint32_t ip) const +int AUTH_IA::SendMessage(const STG::Message & msg, uint32_t ip) const { printfd(__FILE__, "SendMessage userIP=%s\n", inet_ntostring(ip).c_str()); std::map::iterator it; -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); it = ip2user.find(ip); if (it == ip2user.end()) { @@ -1048,7 +1009,7 @@ it->second.messagesToSend.push_back(msg); return 0; } //----------------------------------------------------------------------------- -int AUTH_IA::RealSendMessage6(const STG_MSG & msg, uint32_t ip, IA_USER & user) +int AUTH_IA::RealSendMessage6(const STG::Message & msg, uint32_t ip, IA_USER & user) { printfd(__FILE__, "RealSendMessage 6 user=%s\n", user.login.c_str()); @@ -1056,9 +1017,9 @@ INFO_6 info; memset(&info, 0, sizeof(INFO_6)); info.len = 256; -strncpy((char*)info.type, "INFO", 16); +memcpy(info.type, "INFO", 4); info.infoType = 'I'; -strncpy((char*)info.text, msg.text.c_str(), 235); +memcpy(info.text, msg.text.c_str(), std::min(msg.text.length(), 235)); info.text[234] = 0; size_t len = info.len; @@ -1072,7 +1033,7 @@ EncryptString(buffer, buffer, len, &user.ctx); return Send(ip, iaSettings.GetUserPort(), buffer, len); } //----------------------------------------------------------------------------- -int AUTH_IA::RealSendMessage7(const STG_MSG & msg, uint32_t ip, IA_USER & user) +int AUTH_IA::RealSendMessage7(const STG::Message & msg, uint32_t ip, IA_USER & user) { printfd(__FILE__, "RealSendMessage 7 user=%s\n", user.login.c_str()); @@ -1080,7 +1041,7 @@ INFO_7 info; memset(&info, 0, sizeof(INFO_7)); info.len = 264; -strncpy((char*)info.type, "INFO_7", 16); +memcpy(info.type, "INFO_7", 6); info.infoType = static_cast(msg.header.type); info.showTime = static_cast(msg.header.showTime); info.sendTime = msg.header.creationTime; @@ -1091,7 +1052,7 @@ SwapBytes(info.len); SwapBytes(info.sendTime); #endif -strncpy((char*)info.text, msg.text.c_str(), MAX_MSG_LEN - 1); +memcpy(info.text, msg.text.c_str(), std::min(msg.text.length(), MAX_MSG_LEN - 1)); info.text[MAX_MSG_LEN - 1] = 0; char buffer[300]; @@ -1101,7 +1062,7 @@ EncryptString(buffer, buffer, len, &user.ctx); return Send(ip, iaSettings.GetUserPort(), buffer, len); } //----------------------------------------------------------------------------- -int AUTH_IA::RealSendMessage8(const STG_MSG & msg, uint32_t ip, IA_USER & user) +int AUTH_IA::RealSendMessage8(const STG::Message & msg, uint32_t ip, IA_USER & user) { printfd(__FILE__, "RealSendMessage 8 user=%s\n", user.login.c_str()); @@ -1109,12 +1070,12 @@ INFO_8 info; memset(&info, 0, sizeof(INFO_8)); info.len = 1056; -strncpy((char*)info.type, "INFO_8", 16); +memcpy(info.type, "INFO_8", 6); info.infoType = static_cast(msg.header.type); info.showTime = static_cast(msg.header.showTime); info.sendTime = msg.header.creationTime; -strncpy((char*)info.text, msg.text.c_str(), IA_MAX_MSG_LEN_8 - 1); +memcpy(info.text, msg.text.c_str(), std::min(msg.text.length(), IA_MAX_MSG_LEN_8 - 1)); info.text[IA_MAX_MSG_LEN_8 - 1] = 0; size_t len = info.len; @@ -1187,7 +1148,7 @@ if ((iaUser->phase.GetPhase() == 2) && (connAck->rnd == iaUser->rnd + 1)) return -1; } } -printfd(__FILE__, "Invalid phase or control number. Phase: %d. Control number: %d\n", iaUser->phase.GetPhase(), connAck->rnd); +printfd(__FILE__, "Invalid phase or control number. Phase: %d. Control number: %d, expected: %d\n", iaUser->phase.GetPhase(), connAck->rnd, iaUser->rnd + 1); if (iaSettings.LogProtocolErrors()) { if (iaUser->phase.GetPhase() != 2) @@ -1232,7 +1193,7 @@ if ((iaUser->phase.GetPhase() == 2) && (connAck->rnd == iaUser->rnd + 1)) return -1; } } -printfd(__FILE__, "Invalid phase or control number. Phase: %d. Control number: %d\n", iaUser->phase.GetPhase(), connAck->rnd); +printfd(__FILE__, "Invalid phase or control number. Phase: %d. Control number: %d, expected: %d\n", iaUser->phase.GetPhase(), connAck->rnd, iaUser->rnd + 1); if (iaSettings.LogProtocolErrors()) { if (iaUser->phase.GetPhase() != 2) @@ -1381,12 +1342,12 @@ int AUTH_IA::Send_CONN_SYN_ACK_6(IA_USER * iaUser, uint32_t sip) //+++ Fill static data in connSynAck +++ // TODO Move this code. It must be executed only once connSynAck6.len = Min8(sizeof(CONN_SYN_ACK_6)); -strcpy((char*)connSynAck6.type, "CONN_SYN_ACK"); +memcpy(connSynAck6.type, "CONN_SYN_ACK", 12); for (int j = 0; j < DIR_NUM; j++) { - strncpy((char*)connSynAck6.dirName[j], - stgSettings->GetDirName(j).c_str(), - sizeof(string16)); + memcpy(connSynAck6.dirName[j], + stgSettings->GetDirName(j).c_str(), + std::min(stgSettings->GetDirName(j).length(), sizeof(string16))); connSynAck6.dirName[j][sizeof(string16) - 1] = 0; } @@ -1395,8 +1356,10 @@ for (int j = 0; j < DIR_NUM; j++) iaUser->rnd = static_cast(random()); connSynAck6.rnd = iaUser->rnd; -connSynAck6.userTimeOut = iaSettings.GetUserTimeout(); -connSynAck6.aliveDelay = iaSettings.GetUserDelay(); +printfd(__FILE__, "Sending CONN_SYN_ACK with control number %d.\n", iaUser->rnd); + +connSynAck6.userTimeOut = iaSettings.GetUserTimeout().GetSec(); +connSynAck6.aliveDelay = iaSettings.GetUserDelay().GetSec(); #ifdef ARCH_BE SwapBytes(connSynAck6.len); @@ -1405,8 +1368,8 @@ SwapBytes(connSynAck6.userTimeOut); SwapBytes(connSynAck6.aliveDelay); #endif -EncryptString((char*)&connSynAck6, (char*)&connSynAck6, Min8(sizeof(CONN_SYN_ACK_6)), &iaUser->ctx); -return Send(sip, iaSettings.GetUserPort(), (char*)&connSynAck6, Min8(sizeof(CONN_SYN_ACK_6)));; +EncryptString(&connSynAck6, &connSynAck6, Min8(sizeof(CONN_SYN_ACK_6)), &iaUser->ctx); +return Send(sip, iaSettings.GetUserPort(), &connSynAck6, Min8(sizeof(CONN_SYN_ACK_6)));; } //----------------------------------------------------------------------------- int AUTH_IA::Send_CONN_SYN_ACK_7(IA_USER * iaUser, uint32_t sip) @@ -1416,19 +1379,19 @@ return Send_CONN_SYN_ACK_6(iaUser, sip); //----------------------------------------------------------------------------- int AUTH_IA::Send_CONN_SYN_ACK_8(IA_USER * iaUser, uint32_t sip) { -strcpy((char*)connSynAck8.hdr.magic, IA_ID); +memcpy(connSynAck8.hdr.magic, IA_ID, strlen(IA_ID)); connSynAck8.hdr.protoVer[0] = 0; connSynAck8.hdr.protoVer[1] = 8; //+++ Fill static data in connSynAck +++ // TODO Move this code. It must be executed only once connSynAck8.len = Min8(sizeof(CONN_SYN_ACK_8)); -strcpy((char*)connSynAck8.type, "CONN_SYN_ACK"); +memcpy(connSynAck8.type, "CONN_SYN_ACK", 12); for (int j = 0; j < DIR_NUM; j++) { - strncpy((char*)connSynAck8.dirName[j], - stgSettings->GetDirName(j).c_str(), - sizeof(string16)); + memcpy(connSynAck8.dirName[j], + stgSettings->GetDirName(j).c_str(), + std::min(stgSettings->GetDirName(j).length(), sizeof(string16))); connSynAck8.dirName[j][sizeof(string16) - 1] = 0; } @@ -1437,8 +1400,10 @@ for (int j = 0; j < DIR_NUM; j++) iaUser->rnd = static_cast(random()); connSynAck8.rnd = iaUser->rnd; -connSynAck8.userTimeOut = iaSettings.GetUserTimeout(); -connSynAck8.aliveDelay = iaSettings.GetUserDelay(); +printfd(__FILE__, "Sending CONN_SYN_ACK with control number %d.\n", iaUser->rnd); + +connSynAck8.userTimeOut = iaSettings.GetUserTimeout().GetSec(); +connSynAck8.aliveDelay = iaSettings.GetUserDelay().GetSec(); #ifdef ARCH_BE SwapBytes(connSynAck8.len); @@ -1447,8 +1412,8 @@ SwapBytes(connSynAck8.userTimeOut); SwapBytes(connSynAck8.aliveDelay); #endif -EncryptString((char*)&connSynAck8, (char*)&connSynAck8, Min8(sizeof(CONN_SYN_ACK_8)), &iaUser->ctx); -return Send(sip, iaUser->port, (char*)&connSynAck8, Min8(sizeof(CONN_SYN_ACK_8))); +EncryptString(&connSynAck8, &connSynAck8, Min8(sizeof(CONN_SYN_ACK_8)), &iaUser->ctx); +return Send(sip, iaUser->port, &connSynAck8, Min8(sizeof(CONN_SYN_ACK_8))); } //----------------------------------------------------------------------------- int AUTH_IA::Send_ALIVE_SYN_6(IA_USER * iaUser, uint32_t sip) @@ -1456,12 +1421,12 @@ int AUTH_IA::Send_ALIVE_SYN_6(IA_USER * iaUser, uint32_t sip) aliveSyn6.len = Min8(sizeof(ALIVE_SYN_6)); aliveSyn6.rnd = iaUser->rnd = static_cast(random()); -strcpy((char*)aliveSyn6.type, "ALIVE_SYN"); +memcpy(aliveSyn6.type, "ALIVE_SYN", 9); for (int i = 0; i < DIR_NUM; i++) { - aliveSyn6.md[i] = iaUser->user->GetProperty().down.Get()[i]; - aliveSyn6.mu[i] = iaUser->user->GetProperty().up.Get()[i]; + aliveSyn6.md[i] = iaUser->user->GetProperties().down.Get()[i]; + aliveSyn6.mu[i] = iaUser->user->GetProperties().up.Get()[i]; aliveSyn6.sd[i] = iaUser->user->GetSessionDownload()[i]; aliveSyn6.su[i] = iaUser->user->GetSessionUpload()[i]; @@ -1469,7 +1434,7 @@ for (int i = 0; i < DIR_NUM; i++) //TODO int dn = iaSettings.GetFreeMbShowType(); -const TARIFF * tf = iaUser->user->GetTariff(); +const auto tf = iaUser->user->GetTariff(); if (dn < DIR_NUM) { @@ -1480,13 +1445,13 @@ if (dn < DIR_NUM) p *= 1024 * 1024; if (std::fabs(p) < 1.0e-3) { - snprintf((char*)aliveSyn6.freeMb, IA_FREEMB_LEN, "---"); + memcpy(aliveSyn6.freeMb, "---", 3); } else { - double fmb = iaUser->user->GetProperty().freeMb; + double fmb = iaUser->user->GetProperties().freeMb; fmb = fmb < 0 ? 0 : fmb; - snprintf((char*)aliveSyn6.freeMb, IA_FREEMB_LEN, "%.3f", fmb / p); + snprintf(reinterpret_cast(aliveSyn6.freeMb), IA_FREEMB_LEN, "%.3f", fmb / p); } } else @@ -1497,9 +1462,9 @@ else } else { - double fmb = iaUser->user->GetProperty().freeMb; + double fmb = iaUser->user->GetProperties().freeMb; fmb = fmb < 0 ? 0 : fmb; - snprintf((char*)aliveSyn6.freeMb, IA_FREEMB_LEN, "C%.3f", fmb); + snprintf(reinterpret_cast(aliveSyn6.freeMb), IA_FREEMB_LEN, "C%.3f", fmb); } } @@ -1511,9 +1476,9 @@ if (iaUser->aliveSent) iaUser->aliveSent = true; #endif -aliveSyn6.cash =(int64_t) (iaUser->user->GetProperty().cash.Get() * 1000.0); +aliveSyn6.cash = static_cast(iaUser->user->GetProperties().cash.Get() * 1000.0); if (!stgSettings->GetShowFeeInCash()) - aliveSyn6.cash -= (int64_t)(tf->GetFee() * 1000.0); + aliveSyn6.cash -= static_cast((tf->GetFee() * 1000.0)); #ifdef ARCH_BE SwapBytes(aliveSyn6.len); @@ -1528,8 +1493,8 @@ for (int i = 0; i < DIR_NUM; ++i) } #endif -EncryptString((char*)&aliveSyn6, (char*)&aliveSyn6, Min8(sizeof(aliveSyn6)), &iaUser->ctx); -return Send(sip, iaSettings.GetUserPort(), (char*)&aliveSyn6, Min8(sizeof(aliveSyn6))); +EncryptString(&aliveSyn6, &aliveSyn6, Min8(sizeof(aliveSyn6)), &iaUser->ctx); +return Send(sip, iaSettings.GetUserPort(), &aliveSyn6, Min8(sizeof(aliveSyn6))); } //----------------------------------------------------------------------------- int AUTH_IA::Send_ALIVE_SYN_7(IA_USER * iaUser, uint32_t sip) @@ -1539,19 +1504,19 @@ return Send_ALIVE_SYN_6(iaUser, sip); //----------------------------------------------------------------------------- int AUTH_IA::Send_ALIVE_SYN_8(IA_USER * iaUser, uint32_t sip) { -strcpy((char*)aliveSyn8.hdr.magic, IA_ID); +memcpy(aliveSyn8.hdr.magic, IA_ID, strlen(IA_ID)); aliveSyn8.hdr.protoVer[0] = 0; aliveSyn8.hdr.protoVer[1] = 8; aliveSyn8.len = Min8(sizeof(ALIVE_SYN_8)); aliveSyn8.rnd = iaUser->rnd = static_cast(random()); -strcpy((char*)aliveSyn8.type, "ALIVE_SYN"); +memcpy(aliveSyn8.type, "ALIVE_SYN", 9); for (int i = 0; i < DIR_NUM; i++) { - aliveSyn8.md[i] = iaUser->user->GetProperty().down.Get()[i]; - aliveSyn8.mu[i] = iaUser->user->GetProperty().up.Get()[i]; + aliveSyn8.md[i] = iaUser->user->GetProperties().down.Get()[i]; + aliveSyn8.mu[i] = iaUser->user->GetProperties().up.Get()[i]; aliveSyn8.sd[i] = iaUser->user->GetSessionDownload()[i]; aliveSyn8.su[i] = iaUser->user->GetSessionUpload()[i]; @@ -1562,7 +1527,7 @@ int dn = iaSettings.GetFreeMbShowType(); if (dn < DIR_NUM) { - const TARIFF * tf = iaUser->user->GetTariff(); + const auto tf = iaUser->user->GetTariff(); double p = tf->GetPriceWithTraffType(aliveSyn8.mu[dn], aliveSyn8.md[dn], dn, @@ -1570,13 +1535,13 @@ if (dn < DIR_NUM) p *= 1024 * 1024; if (std::fabs(p) < 1.0e-3) { - snprintf((char*)aliveSyn8.freeMb, IA_FREEMB_LEN, "---"); + memcpy(aliveSyn8.freeMb, "---", 3); } else { - double fmb = iaUser->user->GetProperty().freeMb; + double fmb = iaUser->user->GetProperties().freeMb; fmb = fmb < 0 ? 0 : fmb; - snprintf((char*)aliveSyn8.freeMb, IA_FREEMB_LEN, "%.3f", fmb / p); + snprintf(reinterpret_cast(aliveSyn8.freeMb), IA_FREEMB_LEN, "%.3f", fmb / p); } } else @@ -1587,9 +1552,9 @@ else } else { - double fmb = iaUser->user->GetProperty().freeMb; + double fmb = iaUser->user->GetProperties().freeMb; fmb = fmb < 0 ? 0 : fmb; - snprintf((char*)aliveSyn8.freeMb, IA_FREEMB_LEN, "C%.3f", fmb); + snprintf(reinterpret_cast(aliveSyn8.freeMb), IA_FREEMB_LEN, "C%.3f", fmb); } } @@ -1601,11 +1566,11 @@ if (iaUser->aliveSent) iaUser->aliveSent = true; #endif -const TARIFF * tf = iaUser->user->GetTariff(); +const auto tf = iaUser->user->GetTariff(); -aliveSyn8.cash =(int64_t) (iaUser->user->GetProperty().cash.Get() * 1000.0); +aliveSyn8.cash = static_cast(iaUser->user->GetProperties().cash.Get() * 1000.0); if (!stgSettings->GetShowFeeInCash()) - aliveSyn8.cash -= (int64_t)(tf->GetFee() * 1000.0); + aliveSyn8.cash -= static_cast(tf->GetFee() * 1000.0); #ifdef ARCH_BE SwapBytes(aliveSyn8.len); @@ -1621,14 +1586,14 @@ for (int i = 0; i < DIR_NUM; ++i) } #endif -EncryptString((char*)&aliveSyn8, (char*)&aliveSyn8, Min8(sizeof(aliveSyn8)), &iaUser->ctx); -return Send(sip, iaUser->port, (char*)&aliveSyn8, Min8(sizeof(aliveSyn8))); +EncryptString(&aliveSyn8, &aliveSyn8, Min8(sizeof(aliveSyn8)), &iaUser->ctx); +return Send(sip, iaUser->port, &aliveSyn8, Min8(sizeof(aliveSyn8))); } //----------------------------------------------------------------------------- int AUTH_IA::Send_DISCONN_SYN_ACK_6(IA_USER * iaUser, uint32_t sip) { disconnSynAck6.len = Min8(sizeof(DISCONN_SYN_ACK_6)); -strcpy((char*)disconnSynAck6.type, "DISCONN_SYN_ACK"); +memcpy(disconnSynAck6.type, "DISCONN_SYN_ACK", 15); disconnSynAck6.rnd = iaUser->rnd = static_cast(random()); #ifdef ARCH_BE @@ -1636,8 +1601,8 @@ SwapBytes(disconnSynAck6.len); SwapBytes(disconnSynAck6.rnd); #endif -EncryptString((char*)&disconnSynAck6, (char*)&disconnSynAck6, Min8(sizeof(disconnSynAck6)), &iaUser->ctx); -return Send(sip, iaSettings.GetUserPort(), (char*)&disconnSynAck6, Min8(sizeof(disconnSynAck6))); +EncryptString(&disconnSynAck6, &disconnSynAck6, Min8(sizeof(disconnSynAck6)), &iaUser->ctx); +return Send(sip, iaSettings.GetUserPort(), &disconnSynAck6, Min8(sizeof(disconnSynAck6))); } //----------------------------------------------------------------------------- int AUTH_IA::Send_DISCONN_SYN_ACK_7(IA_USER * iaUser, uint32_t sip) @@ -1647,12 +1612,12 @@ return Send_DISCONN_SYN_ACK_6(iaUser, sip); //----------------------------------------------------------------------------- int AUTH_IA::Send_DISCONN_SYN_ACK_8(IA_USER * iaUser, uint32_t sip) { -strcpy((char*)disconnSynAck8.hdr.magic, IA_ID); +memcpy(disconnSynAck8.hdr.magic, IA_ID, strlen(IA_ID)); disconnSynAck8.hdr.protoVer[0] = 0; disconnSynAck8.hdr.protoVer[1] = 8; disconnSynAck8.len = Min8(sizeof(DISCONN_SYN_ACK_8)); -strcpy((char*)disconnSynAck8.type, "DISCONN_SYN_ACK"); +memcpy(disconnSynAck8.type, "DISCONN_SYN_ACK", 15); disconnSynAck8.rnd = iaUser->rnd = static_cast(random()); #ifdef ARCH_BE @@ -1660,25 +1625,25 @@ SwapBytes(disconnSynAck8.len); SwapBytes(disconnSynAck8.rnd); #endif -EncryptString((char*)&disconnSynAck8, (char*)&disconnSynAck8, Min8(sizeof(disconnSynAck8)), &iaUser->ctx); -return Send(sip, iaUser->port, (char*)&disconnSynAck8, Min8(sizeof(disconnSynAck8))); +EncryptString(&disconnSynAck8, &disconnSynAck8, Min8(sizeof(disconnSynAck8)), &iaUser->ctx); +return Send(sip, iaUser->port, &disconnSynAck8, Min8(sizeof(disconnSynAck8))); } //----------------------------------------------------------------------------- int AUTH_IA::Send_FIN_6(IA_USER * iaUser, uint32_t sip, std::map::iterator it) { fin6.len = Min8(sizeof(FIN_6)); -strcpy((char*)fin6.type, "FIN"); -strcpy((char*)fin6.ok, "OK"); +memcpy(fin6.type, "FIN", 3); +memcpy(fin6.ok, "OK", 2); #ifdef ARCH_BE SwapBytes(fin6.len); #endif -EncryptString((char*)&fin6, (char*)&fin6, Min8(sizeof(fin6)), &iaUser->ctx); +EncryptString(&fin6, &fin6, Min8(sizeof(fin6)), &iaUser->ctx); users->Unauthorize(iaUser->login, this); -int res = Send(sip, iaSettings.GetUserPort(), (char*)&fin6, Min8(sizeof(fin6))); +int res = Send(sip, iaSettings.GetUserPort(), &fin6, Min8(sizeof(fin6))); ip2user.erase(it); @@ -1692,23 +1657,23 @@ return Send_FIN_6(iaUser, sip, it); //----------------------------------------------------------------------------- int AUTH_IA::Send_FIN_8(IA_USER * iaUser, uint32_t sip, std::map::iterator it) { -strcpy((char*)fin8.hdr.magic, IA_ID); +memcpy(fin8.hdr.magic, IA_ID, strlen(IA_ID)); fin8.hdr.protoVer[0] = 0; fin8.hdr.protoVer[1] = 8; fin8.len = Min8(sizeof(FIN_8)); -strcpy((char*)fin8.type, "FIN"); -strcpy((char*)fin8.ok, "OK"); +memcpy(fin8.type, "FIN", 3); +memcpy(fin8.ok, "OK", 2); #ifdef ARCH_BE SwapBytes(fin8.len); #endif -EncryptString((char*)&fin8, (char*)&fin8, Min8(sizeof(fin8)), &iaUser->ctx); +EncryptString(&fin8, &fin8, Min8(sizeof(fin8)), &iaUser->ctx); users->Unauthorize(iaUser->login, this); -int res = Send(sip, iaUser->port, (char*)&fin8, Min8(sizeof(fin8))); +int res = Send(sip, iaUser->port, &fin8, Min8(sizeof(fin8))); ip2user.erase(it);