X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a0a797f9b859198af09531f6dbeacf6800385392..296c906e2689b9b5dc26d2f2d3e1e2d9e1662d3b:/projects/stargazer/user_impl.cpp?ds=inline diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp index afd70b60..af94d477 100644 --- a/projects/stargazer/user_impl.cpp +++ b/projects/stargazer/user_impl.cpp @@ -41,10 +41,13 @@ #include "stg/scriptexecuter.h" #include "stg/tariff.h" #include "stg/tariffs.h" +#include "stg/services.h" +#include "stg/service_conf.h" #include "stg/admin.h" #include #include +#include #include #include @@ -53,6 +56,8 @@ #include #include // access +using STG::UserImpl; + namespace { @@ -72,92 +77,17 @@ for (size_t i = 0; i < DIR_NUM; i++) } -#ifdef USE_ABSTRACT_SETTINGS -USER_IMPL::USER_IMPL(const SETTINGS * s, - const STORE * st, - const TARIFFS * t, - const ADMIN * a, - const USERS * u, - const SERVICES & svcs) - : users(u), - property(s->GetScriptsDir()), - WriteServLog(GetStgLogger()), - lastScanMessages(0), - id(0), - __connected(0), - connected(__connected), - __currIP(0), - currIP(__currIP), - lastIPForDisconnect(0), - pingTime(0), - sysAdmin(a), - store(st), - tariffs(t), - tariff(NULL), - m_services(svcs), - settings(s), - authorizedModificationTime(0), - deleted(false), - lastWriteStat(0), - lastWriteDetailedStat(0), - cash(property.cash), - up(property.up), - down(property.down), - lastCashAdd(property.lastCashAdd), - passiveTime(property.passiveTime), - lastCashAddTime(property.lastCashAddTime), - freeMb(property.freeMb), - lastActivityTime(property.lastActivityTime), - password(property.password), - passive(property.passive), - disabled(property.disabled), - disabledDetailStat(property.disabledDetailStat), - alwaysOnline(property.alwaysOnline), - tariffName(property.tariffName), - nextTariff(property.nextTariff), - address(property.address), - note(property.note), - group(property.group), - email(property.email), - phone(property.phone), - realName(property.realName), - credit(property.credit), - creditExpire(property.creditExpire), - ips(property.ips), - userdata0(property.userdata0), - userdata1(property.userdata1), - userdata2(property.userdata2), - userdata3(property.userdata3), - userdata4(property.userdata4), - userdata5(property.userdata5), - userdata6(property.userdata6), - userdata7(property.userdata7), - userdata8(property.userdata8), - userdata9(property.userdata9), - passiveNotifier(this), - disabledNotifier(this), - tariffNotifier(this), - cashNotifier(this), - ipNotifier(this) -{ -Init(); -} -#else -USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s, - const STORE * st, - const TARIFFS * t, - const ADMIN * a, - const USERS * u, - const SERVICES & svcs) +UserImpl::UserImpl(const Settings * s, + const Store * st, + const Tariffs * t, + const Admin * a, + const Users * u, + const Services & svcs) : users(u), - property(s->GetScriptsDir()), - WriteServLog(GetStgLogger()), + properties(*s), + WriteServLog(Logger::get()), lastScanMessages(0), id(0), - __connected(0), - connected(__connected), - __currIP(0), - currIP(__currIP), lastIPForDisconnect(0), pingTime(0), sysAdmin(a), @@ -170,83 +100,69 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s, deleted(false), lastWriteStat(0), lastWriteDetailedStat(0), - cash(property.cash), - up(property.up), - down(property.down), - lastCashAdd(property.lastCashAdd), - passiveTime(property.passiveTime), - lastCashAddTime(property.lastCashAddTime), - freeMb(property.freeMb), - lastActivityTime(property.lastActivityTime), - password(property.password), - passive(property.passive), - disabled(property.disabled), - disabledDetailStat(property.disabledDetailStat), - alwaysOnline(property.alwaysOnline), - tariffName(property.tariffName), - nextTariff(property.nextTariff), - address(property.address), - note(property.note), - group(property.group), - email(property.email), - phone(property.phone), - realName(property.realName), - credit(property.credit), - creditExpire(property.creditExpire), - ips(property.ips), - userdata0(property.userdata0), - userdata1(property.userdata1), - userdata2(property.userdata2), - userdata3(property.userdata3), - userdata4(property.userdata4), - userdata5(property.userdata5), - userdata6(property.userdata6), - userdata7(property.userdata7), - userdata8(property.userdata8), - userdata9(property.userdata9), - passiveNotifier(this), - disabledNotifier(this), - tariffNotifier(this), - cashNotifier(this), - ipNotifier(this) + cash(properties.cash), + up(properties.up), + down(properties.down), + lastCashAdd(properties.lastCashAdd), + passiveTime(properties.passiveTime), + lastCashAddTime(properties.lastCashAddTime), + freeMb(properties.freeMb), + lastActivityTime(properties.lastActivityTime), + password(properties.password), + passive(properties.passive), + disabled(properties.disabled), + disabledDetailStat(properties.disabledDetailStat), + alwaysOnline(properties.alwaysOnline), + tariffName(properties.tariffName), + nextTariff(properties.nextTariff), + address(properties.address), + note(properties.note), + group(properties.group), + email(properties.email), + phone(properties.phone), + realName(properties.realName), + credit(properties.credit), + creditExpire(properties.creditExpire), + ips(properties.ips), + userdata0(properties.userdata0), + userdata1(properties.userdata1), + userdata2(properties.userdata2), + userdata3(properties.userdata3), + userdata4(properties.userdata4), + userdata5(properties.userdata5), + userdata6(properties.userdata6), + userdata7(properties.userdata7), + userdata8(properties.userdata8), + userdata9(properties.userdata9), + sessionUploadModTime(stgTime), + sessionDownloadModTime(stgTime) { -Init(); + Init(); } -#endif //----------------------------------------------------------------------------- -void USER_IMPL::Init() +void UserImpl::Init() { password = "*_EMPTY_PASSWORD_*"; tariffName = NO_TARIFF_NAME; -ips = StrToIPS("*"); +tariff = tariffs->FindByName(tariffName); +ips = UserIPs::parse("*"); lastWriteStat = stgTime + random() % settings->GetStatWritePeriod(); lastWriteDetailedStat = stgTime; -property.tariffName.AddBeforeNotifier(&tariffNotifier); -property.passive.AddBeforeNotifier(&passiveNotifier); -property.disabled.AddAfterNotifier(&disabledNotifier); -property.cash.AddBeforeNotifier(&cashNotifier); -ips.AddAfterNotifier(&ipNotifier); - -pthread_mutexattr_t attr; -pthread_mutexattr_init(&attr); -pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); -pthread_mutex_init(&mutex, &attr); +m_beforePassiveConn = properties.passive.beforeChange([this](auto oldVal, auto newVal){ onPassiveChange(oldVal, newVal); }); +m_afterDisabledConn = properties.disabled.afterChange([this](auto oldVal, auto newVal){ onDisabledChange(oldVal, newVal); }); +m_beforeTariffConn = properties.tariffName.beforeChange([this](const auto& oldVal, const auto& newVal){ onTariffChange(oldVal, newVal); }); +m_beforeCashConn = properties.cash.beforeChange([this](auto oldVal, auto newVal){ onCashChange(oldVal, newVal); }); +m_afterIPConn = ips.afterChange([this](const auto& oldVal, const auto& newVal){ onIPChange(oldVal, newVal); }); } //----------------------------------------------------------------------------- -USER_IMPL::USER_IMPL(const USER_IMPL & u) - : USER(), - users(u.users), - property(u.settings->GetScriptsDir()), - WriteServLog(GetStgLogger()), +UserImpl::UserImpl(const UserImpl & u) + : users(u.users), + properties(*u.settings), + WriteServLog(Logger::get()), lastScanMessages(0), login(u.login), id(u.id), - __connected(0), - connected(__connected), - userIDGenerator(u.userIDGenerator), - __currIP(u.__currIP), - currIP(__currIP), lastIPForDisconnect(0), pingTime(u.pingTime), sysAdmin(u.sysAdmin), @@ -262,86 +178,70 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u) deleted(u.deleted), lastWriteStat(u.lastWriteStat), lastWriteDetailedStat(u.lastWriteDetailedStat), - cash(property.cash), - up(property.up), - down(property.down), - lastCashAdd(property.lastCashAdd), - passiveTime(property.passiveTime), - lastCashAddTime(property.lastCashAddTime), - freeMb(property.freeMb), - lastActivityTime(property.lastActivityTime), - password(property.password), - passive(property.passive), - disabled(property.disabled), - disabledDetailStat(property.disabledDetailStat), - alwaysOnline(property.alwaysOnline), - tariffName(property.tariffName), - nextTariff(property.nextTariff), - address(property.address), - note(property.note), - group(property.group), - email(property.email), - phone(property.phone), - realName(property.realName), - credit(property.credit), - creditExpire(property.creditExpire), - ips(property.ips), - userdata0(property.userdata0), - userdata1(property.userdata1), - userdata2(property.userdata2), - userdata3(property.userdata3), - userdata4(property.userdata4), - userdata5(property.userdata5), - userdata6(property.userdata6), - userdata7(property.userdata7), - userdata8(property.userdata8), - userdata9(property.userdata9), + cash(properties.cash), + up(properties.up), + down(properties.down), + lastCashAdd(properties.lastCashAdd), + passiveTime(properties.passiveTime), + lastCashAddTime(properties.lastCashAddTime), + freeMb(properties.freeMb), + lastActivityTime(properties.lastActivityTime), + password(properties.password), + passive(properties.passive), + disabled(properties.disabled), + disabledDetailStat(properties.disabledDetailStat), + alwaysOnline(properties.alwaysOnline), + tariffName(properties.tariffName), + nextTariff(properties.nextTariff), + address(properties.address), + note(properties.note), + group(properties.group), + email(properties.email), + phone(properties.phone), + realName(properties.realName), + credit(properties.credit), + creditExpire(properties.creditExpire), + ips(properties.ips), + userdata0(properties.userdata0), + userdata1(properties.userdata1), + userdata2(properties.userdata2), + userdata3(properties.userdata3), + userdata4(properties.userdata4), + userdata5(properties.userdata5), + userdata6(properties.userdata6), + userdata7(properties.userdata7), + userdata8(properties.userdata8), + userdata9(properties.userdata9), sessionUpload(), sessionDownload(), - passiveNotifier(this), - disabledNotifier(this), - tariffNotifier(this), - cashNotifier(this), - ipNotifier(this) + sessionUploadModTime(stgTime), + sessionDownloadModTime(stgTime) { -if (&u == this) - return; - -property.tariffName.AddBeforeNotifier(&tariffNotifier); -property.passive.AddBeforeNotifier(&passiveNotifier); -property.disabled.AddAfterNotifier(&disabledNotifier); -property.cash.AddBeforeNotifier(&cashNotifier); -ips.AddAfterNotifier(&ipNotifier); + if (&u == this) + return; -property.SetProperties(u.property); + m_beforePassiveConn = properties.passive.beforeChange([this](auto oldVal, auto newVal){ onPassiveChange(oldVal, newVal); }); + m_afterDisabledConn = properties.disabled.afterChange([this](auto oldVal, auto newVal){ onDisabledChange(oldVal, newVal); }); + m_beforeTariffConn = properties.tariffName.beforeChange([this](const auto& oldVal, const auto& newVal){ onTariffChange(oldVal, newVal); }); + m_beforeCashConn = properties.cash.beforeChange([this](auto oldVal, auto newVal){ onCashChange(oldVal, newVal); }); + m_afterIPConn = ips.afterChange([this](const auto& oldVal, const auto& newVal){ onIPChange(oldVal, newVal); }); -pthread_mutexattr_t attr; -pthread_mutexattr_init(&attr); -pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); -pthread_mutex_init(&mutex, &attr); -} -//----------------------------------------------------------------------------- -USER_IMPL::~USER_IMPL() -{ -property.tariffName.DelBeforeNotifier(&tariffNotifier); -property.passive.DelBeforeNotifier(&passiveNotifier); -property.disabled.DelAfterNotifier(&disabledNotifier); -property.cash.DelBeforeNotifier(&cashNotifier); -pthread_mutex_destroy(&mutex); + properties.SetProperties(u.properties); } //----------------------------------------------------------------------------- -void USER_IMPL::SetLogin(const std::string & l) +void UserImpl::SetLogin(const std::string & l) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); +static int idGen = 0; assert(login.empty() && "Login is already set"); login = l; -id = userIDGenerator.GetNextID(); +id = idGen++; } //----------------------------------------------------------------------------- -int USER_IMPL::ReadConf() +int UserImpl::ReadConf() { -STG_LOCKER lock(&mutex); -USER_CONF conf; +std::lock_guard lock(m_mutex); +UserConf conf; if (store->RestoreUserConf(&conf, login)) { @@ -352,17 +252,17 @@ if (store->RestoreUserConf(&conf, login)) return -1; } -property.SetConf(conf); +properties.SetConf(conf); tariff = tariffs->FindByName(tariffName); if (tariff == NULL) { WriteServLog("Cannot read user %s. Tariff %s not exist.", - login.c_str(), property.tariffName.Get().c_str()); + login.c_str(), properties.tariffName.Get().c_str()); return -1; } -std::vector hdrsList; +std::vector hdrsList; if (store->GetMessageHdrs(&hdrsList, login)) { @@ -373,10 +273,10 @@ if (store->GetMessageHdrs(&hdrsList, login)) return -1; } -std::vector::const_iterator it; +std::vector::const_iterator it; for (it = hdrsList.begin(); it != hdrsList.end(); ++it) { - STG_MSG msg; + Message msg; if (store->GetMessage(it->id, &msg, login) == 0) { messages.push_back(msg); @@ -386,10 +286,10 @@ for (it = hdrsList.begin(); it != hdrsList.end(); ++it) return 0; } //----------------------------------------------------------------------------- -int USER_IMPL::ReadStat() +int UserImpl::ReadStat() { -STG_LOCKER lock(&mutex); -USER_STAT stat; +std::lock_guard lock(m_mutex); +UserStat stat; if (store->RestoreUserStat(&stat, login)) { @@ -400,17 +300,17 @@ if (store->RestoreUserStat(&stat, login)) return -1; } -property.SetStat(stat); +properties.SetStat(stat); return 0; } //----------------------------------------------------------------------------- -int USER_IMPL::WriteConf() +int UserImpl::WriteConf() { -STG_LOCKER lock(&mutex); -USER_CONF conf(property.GetConf()); +std::lock_guard lock(m_mutex); +UserConf conf(properties.GetConf()); -printfd(__FILE__, "USER::WriteConf()\n"); +printfd(__FILE__, "UserImpl::WriteConf()\n"); if (store->SaveUserConf(conf, login)) { @@ -424,10 +324,10 @@ if (store->SaveUserConf(conf, login)) return 0; } //----------------------------------------------------------------------------- -int USER_IMPL::WriteStat() +int UserImpl::WriteStat() { -STG_LOCKER lock(&mutex); -USER_STAT stat(property.GetStat()); +std::lock_guard lock(m_mutex); +UserStat stat(properties.GetStat()); if (store->SaveUserStat(stat, login)) { @@ -443,14 +343,14 @@ lastWriteStat = stgTime; return 0; } //----------------------------------------------------------------------------- -int USER_IMPL::WriteMonthStat() +int UserImpl::WriteMonthStat() { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); time_t tt = stgTime - 3600; struct tm t1; localtime_r(&tt, &t1); -USER_STAT stat(property.GetStat()); +UserStat stat(properties.GetStat()); if (store->SaveMonthStat(stat, t1.tm_mon, t1.tm_year, login)) { WriteServLog("Cannot write month stat for user %s.", login.c_str()); @@ -463,9 +363,9 @@ if (store->SaveMonthStat(stat, t1.tm_mon, t1.tm_year, login)) return 0; } //----------------------------------------------------------------------------- -int USER_IMPL::Authorize(uint32_t ip, uint32_t dirs, const AUTH * auth) +int UserImpl::Authorize(uint32_t ip, uint32_t dirs, const Auth * auth) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); /* * Authorize user. It only means that user will be authorized. Nothing more. * User can be connected or disconnected while authorized. @@ -491,14 +391,14 @@ dirsFromBits(enabledDirs, dirs); if (!authorizedBy.empty()) { - if (currIP != ip) + if (m_currIP != ip) { // We are already authorized, but with different IP address errorStr = "User " + login + " already authorized with IP address " + inet_ntostring(ip); return -1; } - USER * u = NULL; + User * u = NULL; if (!users->FindByIPIdx(ip, &u)) { // Address presents in IP-index. @@ -519,14 +419,14 @@ else return -1; } - if (ips.ConstData().IsIPInIPS(ip)) + if (ips.ConstData().find(ip)) { - currIP = ip; - lastIPForDisconnect = currIP; + m_currIP = ip; + lastIPForDisconnect = m_currIP; } else { - printfd(__FILE__, " user %s: ips = %s\n", login.c_str(), ips.ConstData().GetIpStr().c_str()); + printfd(__FILE__, " user %s: ips = %s\n", login.c_str(), ips.ConstData().toString().c_str()); errorStr = "IP address " + inet_ntostring(ip) + " does not belong to user " + login; return -1; } @@ -541,9 +441,9 @@ ScanMessage(); return 0; } //----------------------------------------------------------------------------- -void USER_IMPL::Unauthorize(const AUTH * auth, const std::string & reason) +void UserImpl::Unauthorize(const Auth * auth, const std::string & reason) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); /* * Authorizer tries to unauthorize user, that was not authorized by it */ @@ -555,37 +455,35 @@ authorizedModificationTime = stgTime; if (authorizedBy.empty()) { lastDisconnectReason = reason; - lastIPForDisconnect = currIP; - currIP = 0; // DelUser in traffcounter - if (connected) + lastIPForDisconnect = m_currIP; + m_currIP = 0; // DelUser in traffcounter + if (m_connected) Disconnect(false, "not authorized"); return; } } //----------------------------------------------------------------------------- -bool USER_IMPL::IsAuthorizedBy(const AUTH * auth) const +bool UserImpl::IsAuthorizedBy(const Auth * auth) const { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); // Is this user authorized by specified authorizer? return authorizedBy.find(auth) != authorizedBy.end(); } //----------------------------------------------------------------------------- -std::vector USER_IMPL::GetAuthorizers() const +std::vector UserImpl::GetAuthorizers() const { - STG_LOCKER lock(&mutex); + std::lock_guard lock(m_mutex); std::vector list; - std::transform(authorizedBy.begin(), authorizedBy.end(), std::back_inserter(list), std::mem_fun(&AUTH::GetVersion)); + std::transform(authorizedBy.begin(), authorizedBy.end(), std::back_inserter(list), [](const auto auth){ return auth->GetVersion(); }); return list; } //----------------------------------------------------------------------------- -void USER_IMPL::Connect(bool fakeConnect) +void UserImpl::Connect(bool fakeConnect) { /* * Connect user to Internet. This function is differ from Authorize() !!! */ -STG_LOCKER lock(&mutex); - if (!fakeConnect) { std::string scriptOnConnect = settings->GetScriptsDir() + "/OnConnect"; @@ -599,7 +497,7 @@ if (!fakeConnect) "%s \"%s\" \"%s\" \"%f\" \"%d\" \"%s\"", scriptOnConnect.c_str(), login.c_str(), - inet_ntostring(currIP).c_str(), + inet_ntostring(m_currIP).c_str(), cash.ConstData(), id, dirs.c_str()); @@ -618,27 +516,25 @@ if (!fakeConnect) WriteServLog("Script %s cannot be executed. File not found.", scriptOnConnect.c_str()); } - connected = true; + m_connected = true; } -if (store->WriteUserConnect(login, currIP)) +if (!settings->GetDisableSessionLog() && store->WriteUserConnect(login, m_currIP)) { WriteServLog("Cannot write connect for user %s.", login.c_str()); WriteServLog("%s", store->GetStrError().c_str()); } if (!fakeConnect) - lastIPForDisconnect = currIP; + lastIPForDisconnect = m_currIP; } //----------------------------------------------------------------------------- -void USER_IMPL::Disconnect(bool fakeDisconnect, const std::string & reason) +void UserImpl::Disconnect(bool fakeDisconnect, const std::string & reason) { /* * Disconnect user from Internet. This function is differ from UnAuthorize() !!! */ -STG_LOCKER lock(&mutex); - if (!lastIPForDisconnect) { printfd(__FILE__, "lastIPForDisconnect\n"); @@ -678,15 +574,15 @@ if (!fakeDisconnect) WriteServLog("Script OnDisconnect cannot be executed. File not found."); } - connected = false; + m_connected = false; } std::string reasonMessage(reason); if (!lastDisconnectReason.empty()) reasonMessage += ": " + lastDisconnectReason; -if (store->WriteUserDisconnect(login, up, down, sessionUpload, sessionDownload, - cash, freeMb, reasonMessage)) +if (!settings->GetDisableSessionLog() && store->WriteUserDisconnect(login, up, down, sessionUpload, sessionDownload, + cash, freeMb, reasonMessage)) { WriteServLog("Cannot write disconnect for user %s.", login.c_str()); WriteServLog("%s", store->GetStrError().c_str()); @@ -695,19 +591,19 @@ if (store->WriteUserDisconnect(login, up, down, sessionUpload, sessionDownload, if (!fakeDisconnect) lastIPForDisconnect = 0; -sessionUpload.Reset(); -sessionDownload.Reset(); +sessionUpload.reset(); +sessionDownload.reset(); sessionUploadModTime = stgTime; sessionDownloadModTime = stgTime; } //----------------------------------------------------------------------------- -void USER_IMPL::Run() +void UserImpl::Run() { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); -if (stgTime > static_cast(lastWriteStat + settings->GetStatWritePeriod())) +if (stgTime > lastWriteStat + settings->GetStatWritePeriod()) { - printfd(__FILE__, "USER::WriteStat user=%s\n", GetLogin().c_str()); + printfd(__FILE__, "UserImpl::WriteStat user=%s\n", GetLogin().c_str()); WriteStat(); } if (creditExpire.ConstData() && creditExpire.ConstData() < stgTime) @@ -728,13 +624,13 @@ if (passive.ConstData() if (!authorizedBy.empty()) { - if (connected) - property.Stat().lastActivityTime = stgTime; + if (m_connected) + properties.Stat().lastActivityTime = stgTime; - if (!connected && IsInetable()) + if (!m_connected && IsInetable()) Connect(); - if (connected && !IsInetable()) + if (m_connected && !IsInetable()) { if (disabled) Disconnect(false, "disabled"); @@ -752,22 +648,22 @@ if (!authorizedBy.empty()) } else { - if (connected) + if (m_connected) Disconnect(false, "not authorized"); } } //----------------------------------------------------------------------------- -void USER_IMPL::UpdatePingTime(time_t t) +void UserImpl::UpdatePingTime(time_t t) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); if (t) pingTime = t; else pingTime = stgTime; } //----------------------------------------------------------------------------- -bool USER_IMPL::IsInetable() +bool UserImpl::IsInetable() { if (disabled || passive) return false; @@ -784,24 +680,24 @@ if (settings->GetShowFeeInCash() || tariff == NULL) return (cash - tariff->GetFee() >= -credit); } //----------------------------------------------------------------------------- -std::string USER_IMPL::GetEnabledDirs() const +std::string UserImpl::GetEnabledDirs() const { return dirsToString(enabledDirs); } //----------------------------------------------------------------------------- #ifdef TRAFF_STAT_WITH_PORTS -void USER_IMPL::AddTraffStatU(int dir, uint32_t ip, uint16_t port, uint32_t len) +void UserImpl::AddTraffStatU(int dir, uint32_t ip, uint16_t port, uint32_t len) #else -void USER_IMPL::AddTraffStatU(int dir, uint32_t ip, uint32_t len) +void UserImpl::AddTraffStatU(int dir, uint32_t ip, uint32_t len) #endif { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); -if (!connected || tariff == NULL) +if (!m_connected || tariff == NULL) return; double cost = 0; -DIR_TRAFF dt(up); +DirTraff dt(up); int64_t traff = tariff->GetTraffByType(up.ConstData()[dir], down.ConstData()[dir]); int64_t threshold = tariff->GetThreshold(dir) * 1024 * 1024; @@ -809,10 +705,10 @@ int64_t threshold = tariff->GetThreshold(dir) * 1024 * 1024; dt[dir] += len; int tt = tariff->GetTraffType(); -if (tt == TARIFF::TRAFF_UP || - tt == TARIFF::TRAFF_UP_DOWN || +if (tt == Tariff::TRAFF_UP || + tt == Tariff::TRAFF_UP_DOWN || // Check NEW traff data - (tt == TARIFF::TRAFF_MAX && dt[dir] > down.ConstData()[dir])) + (tt == Tariff::TRAFF_MAX && dt[dir] > down.ConstData()[dir])) { double dc = 0; if (traff < threshold && @@ -845,8 +741,8 @@ if (tt == TARIFF::TRAFF_UP || cost = dc - freeMb.ConstData(); // Direct access to internal data structures via friend-specifier - property.Stat().freeMb -= dc; - property.Stat().cash -= cost; + properties.Stat().freeMb -= dc; + properties.Stat().cash -= cost; cash.ModifyTime(); freeMb.ModifyTime(); } @@ -862,18 +758,18 @@ if (!settings->GetWriteFreeMbTraffCost() && cost = 0; #ifdef TRAFF_STAT_WITH_PORTS -IP_DIR_PAIR idp(ip, dir, port); +IPDirPair idp(ip, dir, port); #else -IP_DIR_PAIR idp(ip, dir); +IPDirPair idp(ip, dir); #endif -std::map::iterator lb; +std::map::iterator lb; lb = traffStat.lower_bound(idp); if (lb == traffStat.end() || lb->first != idp) { traffStat.insert(lb, std::make_pair(idp, - STAT_NODE(len, 0, cost))); + StatNode(len, 0, cost))); } else { @@ -883,18 +779,18 @@ else } //----------------------------------------------------------------------------- #ifdef TRAFF_STAT_WITH_PORTS -void USER_IMPL::AddTraffStatD(int dir, uint32_t ip, uint16_t port, uint32_t len) +void UserImpl::AddTraffStatD(int dir, uint32_t ip, uint16_t port, uint32_t len) #else -void USER_IMPL::AddTraffStatD(int dir, uint32_t ip, uint32_t len) +void UserImpl::AddTraffStatD(int dir, uint32_t ip, uint32_t len) #endif { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); -if (!connected || tariff == NULL) +if (!m_connected || tariff == NULL) return; double cost = 0; -DIR_TRAFF dt(down); +DirTraff dt(down); int64_t traff = tariff->GetTraffByType(up.ConstData()[dir], down.ConstData()[dir]); int64_t threshold = tariff->GetThreshold(dir) * 1024 * 1024; @@ -902,10 +798,10 @@ int64_t threshold = tariff->GetThreshold(dir) * 1024 * 1024; dt[dir] += len; int tt = tariff->GetTraffType(); -if (tt == TARIFF::TRAFF_DOWN || - tt == TARIFF::TRAFF_UP_DOWN || +if (tt == Tariff::TRAFF_DOWN || + tt == Tariff::TRAFF_UP_DOWN || // Check NEW traff data - (tt == TARIFF::TRAFF_MAX && up.ConstData()[dir] <= dt[dir])) + (tt == Tariff::TRAFF_MAX && up.ConstData()[dir] <= dt[dir])) { double dc = 0; if (traff < threshold && @@ -937,8 +833,8 @@ if (tt == TARIFF::TRAFF_DOWN || else if (freeMb.ConstData() < dc) // FreeMb is partially exhausted cost = dc - freeMb.ConstData(); - property.Stat().freeMb -= dc; - property.Stat().cash -= cost; + properties.Stat().freeMb -= dc; + properties.Stat().cash -= cost; cash.ModifyTime(); freeMb.ModifyTime(); } @@ -954,18 +850,18 @@ if (!settings->GetWriteFreeMbTraffCost() && cost = 0; #ifdef TRAFF_STAT_WITH_PORTS -IP_DIR_PAIR idp(ip, dir, port); +IPDirPair idp(ip, dir, port); #else -IP_DIR_PAIR idp(ip, dir); +IPDirPair idp(ip, dir); #endif -std::map::iterator lb; +std::map::iterator lb; lb = traffStat.lower_bound(idp); if (lb == traffStat.end() || lb->first != idp) { traffStat.insert(lb, std::make_pair(idp, - STAT_NODE(0, len, cost))); + StatNode(0, len, cost))); } else { @@ -974,57 +870,9 @@ else } } //----------------------------------------------------------------------------- -void USER_IMPL::AddCurrIPBeforeNotifier(CURR_IP_NOTIFIER * notifier) -{ -STG_LOCKER lock(&mutex); -currIP.AddBeforeNotifier(notifier); -} -//----------------------------------------------------------------------------- -void USER_IMPL::DelCurrIPBeforeNotifier(const CURR_IP_NOTIFIER * notifier) -{ -STG_LOCKER lock(&mutex); -currIP.DelBeforeNotifier(notifier); -} -//----------------------------------------------------------------------------- -void USER_IMPL::AddCurrIPAfterNotifier(CURR_IP_NOTIFIER * notifier) -{ -STG_LOCKER lock(&mutex); -currIP.AddAfterNotifier(notifier); -} -//----------------------------------------------------------------------------- -void USER_IMPL::DelCurrIPAfterNotifier(const CURR_IP_NOTIFIER * notifier) -{ -STG_LOCKER lock(&mutex); -currIP.DelAfterNotifier(notifier); -} -//----------------------------------------------------------------------------- -void USER_IMPL::AddConnectedBeforeNotifier(CONNECTED_NOTIFIER * notifier) +void UserImpl::OnAdd() { -STG_LOCKER lock(&mutex); -connected.AddBeforeNotifier(notifier); -} -//----------------------------------------------------------------------------- -void USER_IMPL::DelConnectedBeforeNotifier(const CONNECTED_NOTIFIER * notifier) -{ -STG_LOCKER lock(&mutex); -connected.DelBeforeNotifier(notifier); -} -//----------------------------------------------------------------------------- -void USER_IMPL::AddConnectedAfterNotifier(CONNECTED_NOTIFIER * notifier) -{ -STG_LOCKER lock(&mutex); -connected.AddAfterNotifier(notifier); -} -//----------------------------------------------------------------------------- -void USER_IMPL::DelConnectedAfterNotifier(const CONNECTED_NOTIFIER * notifier) -{ -STG_LOCKER lock(&mutex); -connected.DelAfterNotifier(notifier); -} -//----------------------------------------------------------------------------- -void USER_IMPL::OnAdd() -{ -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); std::string scriptOnAdd = settings->GetScriptsDir() + "/OnUserAdd"; @@ -1040,9 +888,9 @@ else } } //----------------------------------------------------------------------------- -void USER_IMPL::OnDelete() +void UserImpl::OnDelete() { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); std::string scriptOnDel = settings->GetScriptsDir() + "/OnUserDel"; @@ -1060,15 +908,15 @@ else Run(); } //----------------------------------------------------------------------------- -int USER_IMPL::WriteDetailStat(bool hard) +int UserImpl::WriteDetailStat(bool hard) { -printfd(__FILE__, "USER::WriteDetailedStat() - saved size = %d\n", traffStatSaved.second.size()); +printfd(__FILE__, "UserImpl::WriteDetailedStat() - saved size = %d\n", traffStatSaved.second.size()); if (!traffStatSaved.second.empty()) { if (store->WriteDetailedStat(traffStatSaved.second, traffStatSaved.first, login)) { - printfd(__FILE__, "USER::WriteDetailStat() - failed to write detail stat from queue\n"); + printfd(__FILE__, "UserImpl::WriteDetailStat() - failed to write detail stat from queue\n"); WriteServLog("Cannot write detail stat from queue (of size %d recs) for user %s.", traffStatSaved.second.size(), login.c_str()); WriteServLog("%s", store->GetStrError().c_str()); return -1; @@ -1076,26 +924,26 @@ if (!traffStatSaved.second.empty()) traffStatSaved.second.erase(traffStatSaved.second.begin(), traffStatSaved.second.end()); } -TRAFF_STAT ts; +TraffStat ts; { - STG_LOCKER lock(&mutex); + std::lock_guard lock(m_mutex); ts.swap(traffStat); } -printfd(__FILE__, "USER::WriteDetailedStat() - size = %d\n", ts.size()); +printfd(__FILE__, "UserImpl::WriteDetailedStat() - size = %d\n", ts.size()); if (ts.size() && !disabledDetailStat) { if (store->WriteDetailedStat(ts, lastWriteDetailedStat, login)) { - printfd(__FILE__, "USER::WriteDetailStat() - failed to write current detail stat\n"); + printfd(__FILE__, "UserImpl::WriteDetailStat() - failed to write current detail stat\n"); WriteServLog("Cannot write detail stat for user %s.", login.c_str()); WriteServLog("%s", store->GetStrError().c_str()); if (!hard) { - printfd(__FILE__, "USER::WriteDetailStat() - pushing detail stat to queue\n"); - STG_LOCKER lock(&mutex); + printfd(__FILE__, "UserImpl::WriteDetailStat() - pushing detail stat to queue\n"); + std::lock_guard lock(m_mutex); traffStatSaved.second.swap(ts); traffStatSaved.first = lastWriteDetailedStat; } @@ -1106,12 +954,15 @@ lastWriteDetailedStat = stgTime; return 0; } //----------------------------------------------------------------------------- -double USER_IMPL::GetPassiveTimePart() const +double UserImpl::GetPassiveTimePart() const { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); +return getPassiveTimePart(); +} -static int daysInMonth[12] = -{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; +double UserImpl::getPassiveTimePart() const +{ +static const std::array daysInMonth{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; struct tm tms; time_t t = stgTime; @@ -1133,9 +984,9 @@ if (dt < 0) return static_cast(dt) / secMonth; } //----------------------------------------------------------------------------- -void USER_IMPL::SetPassiveTimeAsNewUser() +void UserImpl::SetPassiveTimeAsNewUser() { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); time_t t = stgTime; struct tm tm; @@ -1147,79 +998,53 @@ pt /= daysCurrMon; passiveTime = static_cast(pt * 24 * 3600 * daysCurrMon); } //----------------------------------------------------------------------------- -void USER_IMPL::MidnightResetSessionStat() +void UserImpl::MidnightResetSessionStat() { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); -if (connected) +if (m_connected) { Disconnect(true, "fake"); Connect(true); } } //----------------------------------------------------------------------------- -void USER_IMPL::ProcessNewMonth() +void UserImpl::ProcessNewMonth() { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); // Reset traff -if (connected) +if (m_connected) Disconnect(true, "fake"); WriteMonthStat(); -property.Stat().monthUp.Reset(); -property.Stat().monthDown.Reset(); +properties.Stat().monthUp.reset(); +properties.Stat().monthDown.reset(); -if (connected) +if (m_connected) Connect(true); // Set new tariff if (nextTariff.ConstData() != "") { - const TARIFF * nt = tariffs->FindByName(nextTariff); + const Tariff * nt = tariffs->FindByName(nextTariff); if (nt == NULL) + { WriteServLog("Cannot change tariff for user %s. Tariff %s not exist.", - login.c_str(), property.tariffName.Get().c_str()); + login.c_str(), properties.tariffName.Get().c_str()); + } else { - switch (tariff->GetChangePolicy()) + std::string message = tariff->TariffChangeIsAllowed(*nt, stgTime); + if (message.empty()) { - case TARIFF::ALLOW: - { - property.tariffName.Set(nextTariff, sysAdmin, login, store); - break; - } - case TARIFF::TO_CHEAP: - { - if (nt->GetFee() < tariff->GetFee()) - property.tariffName.Set(nextTariff, sysAdmin, login, store); - else - WriteServLog("Tariff change is prohibited for user %s due to the policy %s. Current tariff %s is more cheap than new tariff %s.", - login.c_str(), - TARIFF::ChangePolicyToString(tariff->GetChangePolicy()).c_str(), - property.tariffName.Get().c_str(), - property.nextTariff.Get().c_str()); - break; - } - case TARIFF::TO_EXPENSIVE: - { - if (nt->GetFee() > tariff->GetFee()) - property.tariffName.Set(nextTariff, sysAdmin, login, store); - else - WriteServLog("Tariff change is prohibited for user %s due to the policy %s. Current tariff %s is more expensive than new tariff %s.", - login.c_str(), - TARIFF::ChangePolicyToString(tariff->GetChangePolicy()).c_str(), - property.tariffName.Get().c_str(), - property.nextTariff.Get().c_str()); - break; - } - case TARIFF::DENY: - { - WriteServLog("Tariff change is prohibited for user %s. Tariff %s.", - login.c_str(), - property.tariffName.Get().c_str()); - break; - } + properties.tariffName.Set(nextTariff, *sysAdmin, login, *store); + } + else + { + WriteServLog("Tariff change is prohibited for user %s. %s", + login.c_str(), + message.c_str()); } } ResetNextTariff(); @@ -1227,14 +1052,14 @@ if (nextTariff.ConstData() != "") } } //----------------------------------------------------------------------------- -void USER_IMPL::ProcessDayFeeSpread() +void UserImpl::ProcessDayFeeSpread() { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); if (passive.ConstData() || tariff == NULL) return; -if (tariff->GetPeriod() != TARIFF::MONTH) +if (tariff->GetPeriod() != Tariff::MONTH) return; double fee = tariff->GetFee() / DaysInCurrentMonth(); @@ -1246,38 +1071,38 @@ double c = cash; switch (settings->GetFeeChargeType()) { case 0: - property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge"); + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); break; case 1: if (c + credit >= 0) - property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge"); + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); break; case 2: if (c + credit >= fee) - property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge"); + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); break; case 3: if (c >= 0) - property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge"); + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); break; } ResetPassiveTime(); } //----------------------------------------------------------------------------- -void USER_IMPL::ProcessDayFee() +void UserImpl::ProcessDayFee() { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); if (tariff == NULL) return; -if (tariff->GetPeriod() != TARIFF::MONTH) +if (tariff->GetPeriod() != Tariff::MONTH) return; double passiveTimePart = 1.0; if (!settings->GetFullFee()) { - passiveTimePart = GetPassiveTimePart(); + passiveTimePart = getPassiveTimePart(); } else { @@ -1308,41 +1133,41 @@ printfd(__FILE__, "login: %8s Cash=%f Credit=%f Fee=%f PassiveTimePart=%f fee=% switch (settings->GetFeeChargeType()) { case 0: - property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge"); + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); SetPrepaidTraff(); break; case 1: if (c + credit >= 0) { - property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge"); + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); SetPrepaidTraff(); } break; case 2: if (c + credit >= fee) { - property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge"); + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); SetPrepaidTraff(); } break; case 3: if (c >= 0) { - property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge"); + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); SetPrepaidTraff(); } break; } } //----------------------------------------------------------------------------- -void USER_IMPL::ProcessDailyFee() +void UserImpl::ProcessDailyFee() { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); if (passive.ConstData() || tariff == NULL) return; -if (tariff->GetPeriod() != TARIFF::DAY) +if (tariff->GetPeriod() != Tariff::DAY) return; double fee = tariff->GetFee(); @@ -1354,29 +1179,100 @@ double c = cash; switch (settings->GetFeeChargeType()) { case 0: - property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge"); + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); break; case 1: if (c + credit >= 0) - property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge"); + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); break; case 2: if (c + credit >= fee) - property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge"); + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); break; } ResetPassiveTime(); } //----------------------------------------------------------------------------- -void USER_IMPL::SetPrepaidTraff() +void UserImpl::ProcessServices() +{ +struct tm tms; +time_t t = stgTime; +localtime_r(&t, &tms); + +std::lock_guard lock(m_mutex); + +double passiveTimePart = 1.0; +if (!settings->GetFullFee()) + { + passiveTimePart = getPassiveTimePart(); + } +else + { + if (passive.ConstData()) + { + printfd(__FILE__, "Don't charge fee `cause we are passive\n"); + return; + } + } + +for (size_t i = 0; i < properties.Conf().services.size(); ++i) + { + ServiceConf conf; + if (m_services.Find(properties.Conf().services[i], &conf)) + continue; + if (conf.payDay == tms.tm_mday || + (conf.payDay == 0 && tms.tm_mday == DaysInCurrentMonth())) + { + double c = cash; + double fee = conf.cost * passiveTimePart; + printfd(__FILE__, "Service fee. login: %8s Cash=%f Credit=%f Fee=%f PassiveTimePart=%f fee=%f\n", + login.c_str(), + cash.ConstData(), + credit.ConstData(), + tariff->GetFee(), + passiveTimePart, + fee); + switch (settings->GetFeeChargeType()) + { + case 0: + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); + SetPrepaidTraff(); + break; + case 1: + if (c + credit >= 0) + { + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); + SetPrepaidTraff(); + } + break; + case 2: + if (c + credit >= fee) + { + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); + SetPrepaidTraff(); + } + break; + case 3: + if (c >= 0) + { + properties.cash.Set(c - fee, *sysAdmin, login, *store, "Subscriber fee charge"); + SetPrepaidTraff(); + } + break; + } + } + } +} +//----------------------------------------------------------------------------- +void UserImpl::SetPrepaidTraff() { if (tariff != NULL) - property.freeMb.Set(tariff->GetFree(), sysAdmin, login, store, "Prepaid traffic"); + properties.freeMb.Set(tariff->GetFree(), *sysAdmin, login, *store, "Prepaid traffic"); } //----------------------------------------------------------------------------- -int USER_IMPL::AddMessage(STG_MSG * msg) +int UserImpl::AddMessage(Message * msg) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); if (SendMessage(*msg)) { @@ -1413,14 +1309,14 @@ else return 0; } //----------------------------------------------------------------------------- -int USER_IMPL::SendMessage(STG_MSG & msg) const +int UserImpl::SendMessage(Message & msg) const { // No lock `cause we are already locked from caller int ret = -1; -std::set::iterator it(authorizedBy.begin()); +std::set::iterator it(authorizedBy.begin()); while (it != authorizedBy.end()) { - if (!(*it++)->SendMessage(msg, currIP)) + if (!(*it++)->SendMessage(msg, m_currIP)) ret = 0; } if (!ret) @@ -1436,12 +1332,12 @@ if (!ret) return ret; } //----------------------------------------------------------------------------- -void USER_IMPL::ScanMessage() +void UserImpl::ScanMessage() { // No lock `cause we are already locked from caller // We need not check for the authorizedBy `cause it has already checked by caller -std::list::iterator it(messages.begin()); +auto it = messages.begin(); while (it != messages.end()) { if (settings->GetMessageTimeout() > 0 && @@ -1490,7 +1386,7 @@ while (it != messages.end()) } } //----------------------------------------------------------------------------- -std::string USER_IMPL::GetParamValue(const std::string & name) const +std::string UserImpl::GetParamValue(const std::string & name) const { std::string lowerName = ToLower(name); if (lowerName == "id") @@ -1500,11 +1396,11 @@ std::string USER_IMPL::GetParamValue(const std::string & name) const return stream.str(); } if (lowerName == "login") return login; - if (lowerName == "currip") return currIP.ToString(); + if (lowerName == "currip") return m_currIP.ToString(); if (lowerName == "enableddirs") return GetEnabledDirs(); - if (lowerName == "tariff") return property.tariffName; - if (property.Exists(lowerName)) - return property.GetPropertyValue(lowerName); + if (lowerName == "tariff") return properties.tariffName; + if (properties.Exists(lowerName)) + return properties.GetPropertyValue(lowerName); else { WriteServLog("User’s parameter '%s' does not exist.", name.c_str()); @@ -1514,46 +1410,55 @@ std::string USER_IMPL::GetParamValue(const std::string & name) const //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -void CHG_PASSIVE_NOTIFIER::Notify(const int & oldPassive, const int & newPassive) +void UserImpl::onPassiveChange(int oldVal, int newVal) { -if (newPassive && !oldPassive && user->tariff != NULL) - user->property.cash.Set(user->cash - user->tariff->GetPassiveCost(), - user->sysAdmin, - user->login, - user->store, + std::lock_guard lock(m_mutex); + if (newVal && !oldVal && tariff != NULL) + properties.cash.Set(cash - tariff->GetPassiveCost(), + *sysAdmin, + login, + *store, "Freeze"); } //----------------------------------------------------------------------------- -void CHG_DISABLED_NOTIFIER::Notify(const int & oldValue, const int & newValue) +void UserImpl::onDisabledChange(int oldVal, int newVal) { -if (oldValue && !newValue && user->GetConnected()) - user->Disconnect(false, "disabled"); -else if (!oldValue && newValue && user->IsInetable()) - user->Connect(false); + std::lock_guard lock(m_mutex); + if (oldVal && !newVal && GetConnected()) + Disconnect(false, "disabled"); + else if (!oldVal && newVal && IsInetable()) + Connect(false); } //----------------------------------------------------------------------------- -void CHG_TARIFF_NOTIFIER::Notify(const std::string &, const std::string & newTariff) +void UserImpl::onTariffChange(const std::string& /*oldVal*/, const std::string& newVal) { -if (user->settings->GetReconnectOnTariffChange() && user->connected) - user->Disconnect(false, "Change tariff"); -user->tariff = user->tariffs->FindByName(newTariff); -if (user->settings->GetReconnectOnTariffChange() && - !user->authorizedBy.empty() && - user->IsInetable()) - user->Connect(false); + std::lock_guard lock(m_mutex); + if (settings->GetReconnectOnTariffChange() && m_connected) + Disconnect(false, "Change tariff"); + tariff = tariffs->FindByName(newVal); + if (settings->GetReconnectOnTariffChange() && + !authorizedBy.empty() && + IsInetable()) + { + // This notifier gets called *before* changing the tariff, and in Connect we want to see new tariff name. + properties.Conf().tariffName = newVal; + Connect(false); + } } //----------------------------------------------------------------------------- -void CHG_CASH_NOTIFIER::Notify(const double & oldCash, const double & newCash) +void UserImpl::onCashChange(double oldVal, double newVal) { -user->lastCashAddTime = *const_cast(&stgTime); -user->lastCashAdd = newCash - oldCash; + time_t now = stgTime; + lastCashAddTime = now; + lastCashAdd = newVal - oldVal; } //----------------------------------------------------------------------------- -void CHG_IPS_NOTIFIER::Notify(const USER_IPS & from, const USER_IPS & to) +void UserImpl::onIPChange(const UserIPs& oldVal, const UserIPs& newVal) { -printfd(__FILE__, "Change IP from '%s' to '%s'\n", from.GetIpStr().c_str(), to.GetIpStr().c_str()); -if (user->connected) - user->Disconnect(false, "Change IP"); -if (!user->authorizedBy.empty() && user->IsInetable()) - user->Connect(false); + std::lock_guard lock(m_mutex); + printfd(__FILE__, "Change IP from '%s' to '%s'\n", oldVal.toString().c_str(), newVal.toString().c_str()); + if (m_connected) + Disconnect(false, "Change IP"); + if (!authorizedBy.empty() && IsInetable()) + Connect(false); }