X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a6680ce3d763763a6010c81c8a5a8f7a1ce052db..8bfc0bdce2bf4f53ac2c072e7a44e9a7d3b3cca8:/projects/stargazer/users_impl.cpp?ds=sidebyside diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp index ef5e98ca..8cb9bee5 100644 --- a/projects/stargazer/users_impl.cpp +++ b/projects/stargazer/users_impl.cpp @@ -22,16 +22,6 @@ * Author : Boris Mikhailenko */ -/* - $Revision: 1.61 $ - $Date: 2010/09/13 05:56:42 $ - $Author: faust $ - */ - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif - #include #include @@ -43,138 +33,105 @@ #include "stg/settings.h" #include "stg/common.h" + #include "users_impl.h" #include "stg_timer.h" extern volatile time_t stgTime; -//#define USERS_DEBUG 1 +using STG::UsersImpl; //----------------------------------------------------------------------------- -USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st, - TARIFFS * t, SERVICES & svcs, - const ADMIN * sa) +UsersImpl::UsersImpl(SettingsImpl * s, Store * store, + Tariffs * tariffs, Services & svcs, + const Admin& sysAdmin) : settings(s), - tariffs(t), + m_tariffs(tariffs), m_services(svcs), - store(st), - sysAdmin(sa), - WriteServLog(GetStgLogger()), - nonstop(false), + m_store(store), + m_sysAdmin(sysAdmin), + WriteServLog(Logger::get()), isRunning(false), handle(0) { -pthread_mutexattr_t attr; -pthread_mutexattr_init(&attr); -pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); -pthread_mutex_init(&mutex, &attr); } //----------------------------------------------------------------------------- -USERS_IMPL::~USERS_IMPL() +bool UsersImpl::FindByNameNonLock(const std::string & login, user_iter * user) { -pthread_mutex_destroy(&mutex); -} -//----------------------------------------------------------------------------- -int USERS_IMPL::FindByNameNonLock(const std::string & login, user_iter * user) -{ -const std::map::const_iterator iter(loginIndex.find(login)); +const auto iter = loginIndex.find(login); if (iter == loginIndex.end()) - return -1; -if (user) + return false; +if (user != nullptr) *user = iter->second; -return 0; +return true; } //----------------------------------------------------------------------------- -int USERS_IMPL::FindByNameNonLock(const std::string & login, const_user_iter * user) const +bool UsersImpl::FindByNameNonLock(const std::string & login, const_user_iter * user) const { -const std::map::const_iterator iter(loginIndex.find(login)); +const auto iter = loginIndex.find(login); if (iter == loginIndex.end()) - return -1; -if (user) + return false; +if (user != nullptr) *user = iter->second; -return 0; +return true; } //----------------------------------------------------------------------------- -int USERS_IMPL::FindByName(const std::string & login, USER_PTR * user) +int UsersImpl::FindByName(const std::string & login, UserPtr * user) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); user_iter u; -if (FindByNameNonLock(login, &u)) +if (!FindByNameNonLock(login, &u)) return -1; *user = &(*u); return 0; } //----------------------------------------------------------------------------- -int USERS_IMPL::FindByName(const std::string & login, CONST_USER_PTR * user) const +int UsersImpl::FindByName(const std::string & login, ConstUserPtr * user) const { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); const_user_iter u; -if (FindByNameNonLock(login, &u)) +if (!FindByNameNonLock(login, &u)) return -1; *user = &(*u); return 0; } //----------------------------------------------------------------------------- -bool USERS_IMPL::Exists(const std::string & login) const +bool UsersImpl::Exists(const std::string & login) const { -STG_LOCKER lock(&mutex); -const std::map::const_iterator iter(loginIndex.find(login)); +std::lock_guard lock(m_mutex); +const auto iter = loginIndex.find(login); return iter != loginIndex.end(); } //----------------------------------------------------------------------------- -bool USERS_IMPL::TariffInUse(const std::string & tariffName) const +bool UsersImpl::TariffInUse(const std::string & tariffName) const { -STG_LOCKER lock(&mutex); -std::list::const_iterator iter; -iter = users.begin(); +std::lock_guard lock(m_mutex); +auto iter = users.begin(); while (iter != users.end()) { - if (iter->GetProperty().tariffName.Get() == tariffName) + if (iter->GetProperties().tariffName.Get() == tariffName) return true; ++iter; } return false; } //----------------------------------------------------------------------------- -int USERS_IMPL::Add(const std::string & login, const ADMIN * admin) +int UsersImpl::Add(const std::string & login, const Admin * admin) { -STG_LOCKER lock(&mutex); -const PRIV * priv = admin->GetPriv(); +std::lock_guard lock(m_mutex); +const auto& priv = admin->priv(); -if (!priv->userAddDel) +if (priv.userAddDel == 0) { WriteServLog("%s tried to add user \'%s\'. Access denied.", - admin->GetLogStr().c_str(), login.c_str()); - /*errorStr = "Admin \'" + admin->GetLogin() + - "\': tried to add user \'" + ud->login + "\'. Access denied.";*/ + admin->logStr().c_str(), login.c_str()); return -1; } -////// -if (store->AddUser(login)) - { - //TODO - //WriteServLog("Admin \'%s\': tried to add user \'%s\'. Access denied.", - // admin->GetLogin().c_str(), ud->login.c_str()); +if (m_store->AddUser(login) != 0) return -1; - } -////// - -USER_IMPL u(settings, store, tariffs, sysAdmin, this, m_services); -/*struct tm * tms; -time_t t = stgTime; - -tms = localtime(&t); - -tms->tm_hour = 0; -tms->tm_min = 0; -tms->tm_sec = 0; - -if (settings->GetDayResetTraff() > tms->tm_mday) - tms->tm_mon -= 1; - -tms->tm_mday = settings->GetDayResetTraff();*/ +UserImpl u(settings, m_store, m_tariffs, &m_sysAdmin, this, m_services); u.SetLogin(login); @@ -184,7 +141,7 @@ u.WriteConf(); u.WriteStat(); WriteServLog("%s User \'%s\' added.", - admin->GetLogStr().c_str(), login.c_str()); + admin->logStr().c_str(), login.c_str()); u.OnAdd(); @@ -194,7 +151,7 @@ AddUserIntoIndexes(users.begin()); { // Fire all "on add" notifiers - std::set *>::iterator ni = onAddNotifiers.begin(); + auto ni = onAddNotifiers.begin(); while (ni != onAddNotifiers.end()) { (*ni)->Notify(&users.front()); @@ -204,7 +161,7 @@ AddUserIntoIndexes(users.begin()); { // Fire all "on add" implementation notifiers - std::set *>::iterator ni = onAddNotifiersImpl.begin(); + auto ni = onAddNotifiersImpl.begin(); while (ni != onAddNotifiersImpl.end()) { (*ni)->Notify(&users.front()); @@ -215,26 +172,26 @@ AddUserIntoIndexes(users.begin()); return 0; } //----------------------------------------------------------------------------- -void USERS_IMPL::Del(const std::string & login, const ADMIN * admin) +void UsersImpl::Del(const std::string & login, const Admin * admin) { -const PRIV * priv = admin->GetPriv(); +const auto& priv = admin->priv(); user_iter u; -if (!priv->userAddDel) +if (priv.userAddDel == 0) { WriteServLog("%s tried to remove user \'%s\'. Access denied.", - admin->GetLogStr().c_str(), login.c_str()); + admin->logStr().c_str(), login.c_str()); return; } { - STG_LOCKER lock(&mutex); + std::lock_guard lock(m_mutex); - if (FindByNameNonLock(login, &u)) + if (!FindByNameNonLock(login, &u)) { WriteServLog("%s tried to delete user \'%s\': not found.", - admin->GetLogStr().c_str(), + admin->logStr().c_str(), login.c_str()); return; } @@ -243,7 +200,7 @@ if (!priv->userAddDel) } { - std::set *>::iterator ni = onDelNotifiers.begin(); + auto ni = onDelNotifiers.begin(); while (ni != onDelNotifiers.end()) { (*ni)->Notify(&(*u)); @@ -252,7 +209,7 @@ if (!priv->userAddDel) } { - std::set *>::iterator ni = onDelNotifiersImpl.begin(); + auto ni = onDelNotifiersImpl.begin(); while (ni != onDelNotifiersImpl.end()) { (*ni)->Notify(&(*u)); @@ -261,7 +218,7 @@ if (!priv->userAddDel) } { - STG_LOCKER lock(&mutex); + std::lock_guard lock(m_mutex); u->OnDelete(); @@ -273,17 +230,17 @@ if (!priv->userAddDel) DelUserFromIndexes(u); WriteServLog("%s User \'%s\' deleted.", - admin->GetLogStr().c_str(), login.c_str()); + admin->logStr().c_str(), login.c_str()); } } //----------------------------------------------------------------------------- -bool USERS_IMPL::Authorize(const std::string & login, uint32_t ip, - uint32_t enabledDirs, const AUTH * auth) +bool UsersImpl::Authorize(const std::string & login, uint32_t ip, + uint32_t enabledDirs, const Auth * auth) { user_iter iter; -STG_LOCKER lock(&mutex); -if (FindByNameNonLock(login, &iter)) +std::lock_guard lock(m_mutex); +if (!FindByNameNonLock(login, &iter)) { WriteServLog("Attempt to authorize non-existant user '%s'", login.c_str()); return false; @@ -298,25 +255,23 @@ if (FindByIPIdx(ip, iter)) iter->GetLogin().c_str()); return false; } - if (iter->Authorize(ip, enabledDirs, auth)) - return false; - return true; + return iter->Authorize(ip, enabledDirs, auth) == 0; } -if (iter->Authorize(ip, enabledDirs, auth)) +if (iter->Authorize(ip, enabledDirs, auth) != 0) return false; AddToIPIdx(iter); return true; } //----------------------------------------------------------------------------- -bool USERS_IMPL::Unauthorize(const std::string & login, - const AUTH * auth, +bool UsersImpl::Unauthorize(const std::string & login, + const Auth * auth, const std::string & reason) { user_iter iter; -STG_LOCKER lock(&mutex); -if (FindByNameNonLock(login, &iter)) +std::lock_guard lock(m_mutex); +if (!FindByNameNonLock(login, &iter)) { WriteServLog("Attempt to unauthorize non-existant user '%s'", login.c_str()); printfd(__FILE__, "Attempt to unauthorize non-existant user '%s'", login.c_str()); @@ -327,30 +282,30 @@ uint32_t ip = iter->GetCurrIP(); iter->Unauthorize(auth, reason); -if (!iter->GetAuthorized()) +if (iter->GetAuthorized() == 0) DelFromIPIdx(ip); return true; } //----------------------------------------------------------------------------- -int USERS_IMPL::ReadUsers() +int UsersImpl::ReadUsers() { std::vector usersList; usersList.clear(); -if (store->GetUsersList(&usersList) < 0) +if (m_store->GetUsersList(&usersList) < 0) { - WriteServLog(store->GetStrError().c_str()); + WriteServLog(m_store->GetStrError().c_str()); return -1; } user_iter ui; unsigned errors = 0; -for (unsigned int i = 0; i < usersList.size(); i++) +for (const auto& user : usersList) { - USER_IMPL u(settings, store, tariffs, sysAdmin, this, m_services); + UserImpl u(settings, m_store, m_tariffs, &m_sysAdmin, this, m_services); - u.SetLogin(usersList[i]); + u.SetLogin(user); users.push_front(u); ui = users.begin(); @@ -379,14 +334,13 @@ if (errors > 0) return 0; } //----------------------------------------------------------------------------- -void * USERS_IMPL::Run(void * d) +void UsersImpl::Run(std::stop_token token) { sigset_t signalSet; sigfillset(&signalSet); -pthread_sigmask(SIG_BLOCK, &signalSet, NULL); +pthread_sigmask(SIG_BLOCK, &signalSet, nullptr); printfd(__FILE__, "=====================| pid: %d |===================== \n", getpid()); -USERS_IMPL * us = static_cast(d); struct tm t; time_t tt = stgTime; @@ -398,16 +352,16 @@ int day = t.tm_mday; printfd(__FILE__,"Day = %d Min = %d\n", day, min); time_t touchTime = stgTime - MONITOR_TIME_DELAY_SEC; -std::string monFile = us->settings->GetMonitorDir() + "/users_r"; -printfd(__FILE__, "Monitor=%d file USERS %s\n", us->settings->GetMonitoring(), monFile.c_str()); +std::string monFile = settings->GetMonitorDir() + "/users_r"; +printfd(__FILE__, "Monitor=%d file USERS %s\n", settings->GetMonitoring(), monFile.c_str()); -us->isRunning = true; -while (us->nonstop) +isRunning = true; +while (!token.stop_requested()) { //printfd(__FILE__,"New Minute. old = %02d current = %02d\n", min, t->tm_min); //printfd(__FILE__,"New Day. old = %2d current = %2d\n", day, t->tm_mday); - for_each(us->users.begin(), us->users.end(), std::mem_fun_ref(&USER_IMPL::Run)); + for_each(users.begin(), users.end(), [](auto& user){ user.Run(); }); tt = stgTime; localtime_r(&tt, &t); @@ -418,7 +372,7 @@ while (us->nonstop) printfd(__FILE__,"New Minute. old = %d current = %d\n", min, t.tm_min); min = t.tm_min; - us->NewMinute(t); + NewMinute(t); } if (day != t.tm_mday) @@ -426,10 +380,10 @@ while (us->nonstop) printfd(__FILE__,"Sec = %d\n", stgTime); printfd(__FILE__,"New Day. old = %d current = %d\n", day, t.tm_mday); day = t.tm_mday; - us->NewDay(t); + NewDay(t); } - if (us->settings->GetMonitoring() && (touchTime + MONITOR_TIME_DELAY_SEC <= stgTime)) + if (settings->GetMonitoring() && (touchTime + MONITOR_TIME_DELAY_SEC <= stgTime)) { //printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", tc->monitoring, monFile.c_str()); touchTime = stgTime; @@ -437,28 +391,27 @@ while (us->nonstop) } stgUsleep(100000); - } //while (us->nonstop) + } -std::list::iterator iter(us->usersToDelete.begin()); -while (iter != us->usersToDelete.end()) +auto iter = usersToDelete.begin(); +while (iter != usersToDelete.end()) { iter->delTime -= 2 * userDeleteDelayTime; ++iter; } -us->RealDelUser(); +RealDelUser(); -us->isRunning = false; +isRunning = false; -return NULL; } //----------------------------------------------------------------------------- -void USERS_IMPL::NewMinute(const struct tm & t) +void UsersImpl::NewMinute(const struct tm & t) { //Write traff, reset session traff. Fake disconnect-connect if (t.tm_hour == 23 && t.tm_min == 59) { printfd(__FILE__,"MidnightResetSessionStat\n"); - for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::MidnightResetSessionStat)); + for_each(users.begin(), users.end(), [](auto& user){ user.MidnightResetSessionStat(); }); } if (TimeToWriteDetailStat(t)) @@ -466,22 +419,21 @@ if (TimeToWriteDetailStat(t)) //printfd(__FILE__, "USER::WriteInetStat\n"); int usersCnt = 0; - // ðÉÛÅÍ ÀÚÅÒÏ× ÞÁÓÔÑÍÉ. ÷ ÐÅÒÅÒÙ×ÁÈ ×ÙÚÙ×ÁÅÍ USER::Run - std::list::iterator usr = users.begin(); + auto usr = users.begin(); while (usr != users.end()) { usersCnt++; usr->WriteDetailStat(); ++usr; if (usersCnt % 10 == 0) - for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::Run)); + for_each(users.begin(), users.end(), [](auto& user){ user.Run(); }); } } RealDelUser(); } //----------------------------------------------------------------------------- -void USERS_IMPL::NewDay(const struct tm & t) +void UsersImpl::NewDay(const struct tm & t) { struct tm t1; time_t tt = stgTime; @@ -505,19 +457,19 @@ if (!settings->GetDayFeeIsLastDay()) if (settings->GetSpreadFee()) { printfd(__FILE__, "Spread DayFee\n"); - for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::ProcessDayFeeSpread)); + for_each(users.begin(), users.end(), [](auto& user){ user.ProcessDayFeeSpread(); }); } else { if (t.tm_mday == dayFee) { printfd(__FILE__, "DayFee\n"); - for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::ProcessDayFee)); + for_each(users.begin(), users.end(), [](auto& user){ user.ProcessDayFee(); }); } } -std::for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::ProcessDailyFee)); -std::for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::ProcessServices)); +std::for_each(users.begin(), users.end(), [](auto& user){ user.ProcessDailyFee(); }); +std::for_each(users.begin(), users.end(), [](auto& user){ user.ProcessServices(); }); if (settings->GetDayFeeIsLastDay()) { @@ -526,47 +478,36 @@ if (settings->GetDayFeeIsLastDay()) } } //----------------------------------------------------------------------------- -void USERS_IMPL::DayResetTraff(const struct tm & t1) +void UsersImpl::DayResetTraff(const struct tm & t1) { -int dayResetTraff = settings->GetDayResetTraff(); +auto dayResetTraff = settings->GetDayResetTraff(); if (dayResetTraff == 0) dayResetTraff = DaysInCurrentMonth(); if (t1.tm_mday == dayResetTraff) { printfd(__FILE__, "ResetTraff\n"); - for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::ProcessNewMonth)); - //for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::SetPrepaidTraff)); + for_each(users.begin(), users.end(), [](auto& user){ user.ProcessNewMonth(); }); + //for_each(users.begin(), users.end(), mem_fun_ref(&UserImpl::SetPrepaidTraff)); } } //----------------------------------------------------------------------------- -int USERS_IMPL::Start() +int UsersImpl::Start() { -if (ReadUsers()) +if (ReadUsers() != 0) { WriteServLog("USERS: Error: Cannot read users!"); return -1; } -nonstop = true; -if (pthread_create(&thread, NULL, Run, this)) - { - WriteServLog("USERS: Error: Cannot start thread!"); - return -1; - } +m_thread = std::jthread([this](auto token){ Run(std::move(token)); }); return 0; } //----------------------------------------------------------------------------- -int USERS_IMPL::Stop() +int UsersImpl::Stop() { printfd(__FILE__, "USERS::Stop()\n"); -if (!isRunning) - { - //printfd(__FILE__, "Alredy stopped\n"); - return 0; - } - -nonstop = false; +m_thread.request_stop(); //5 seconds to thread stops itself struct timespec ts = {0, 200000000}; @@ -575,54 +516,46 @@ for (size_t i = 0; i < 25 * (users.size() / 50 + 1); i++) if (!isRunning) break; - nanosleep(&ts, NULL); + nanosleep(&ts, nullptr); } //after 5 seconds waiting thread still running. now kill it if (isRunning) { - printfd(__FILE__, "kill USERS thread.\n"); + printfd(__FILE__, "Detach USERS thread.\n"); //TODO pthread_cancel() - if (pthread_kill(thread, SIGINT)) - { - //errorStr = "Cannot kill USERS thread."; - //printfd(__FILE__, "Cannot kill USERS thread.\n"); - //return 0; - } - printfd(__FILE__, "USERS killed\n"); + m_thread.detach(); } +else + m_thread.join(); printfd(__FILE__, "Before USERS::Run()\n"); -for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::Run)); +for_each(users.begin(), users.end(), [](auto& user){ user.Run(); }); -// 'cause bind2st accepts only constant first param -for (std::list::iterator it = users.begin(); - it != users.end(); - ++it) - it->WriteDetailStat(true); +for (auto& user : users) + user.WriteDetailStat(true); -for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::WriteStat)); -//for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::WriteConf)); +for_each(users.begin(), users.end(), [](auto& user){ user.WriteStat(); }); +//for_each(users.begin(), users.end(), mem_fun_ref(&UserImpl::WriteConf)); printfd(__FILE__, "USERS::Stop()\n"); return 0; } //----------------------------------------------------------------------------- -void USERS_IMPL::RealDelUser() +void UsersImpl::RealDelUser() { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); printfd(__FILE__, "RealDelUser() users to del: %d\n", usersToDelete.size()); -std::list::iterator iter; -iter = usersToDelete.begin(); +auto iter = usersToDelete.begin(); while (iter != usersToDelete.end()) { printfd(__FILE__, "RealDelUser() user=%s\n", iter->iter->GetLogin().c_str()); if (iter->delTime + userDeleteDelayTime < stgTime) { printfd(__FILE__, "RealDelUser() user=%s removed from DB\n", iter->iter->GetLogin().c_str()); - if (store->DelUser(iter->iter->GetLogin())) + if (m_store->DelUser(iter->iter->GetLogin()) != 0) { WriteServLog("Error removing user \'%s\' from database.", iter->iter->GetLogin().c_str()); } @@ -634,38 +567,33 @@ while (iter != usersToDelete.end()) ++iter; } } -return; } //----------------------------------------------------------------------------- -void USERS_IMPL::AddToIPIdx(user_iter user) +void UsersImpl::AddToIPIdx(user_iter user) { printfd(__FILE__, "USERS: Add IP Idx\n"); uint32_t ip = user->GetCurrIP(); //assert(ip && "User has non-null ip"); -if (!ip) +if (ip == 0) return; // User has disconnected -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); -const std::map::iterator it( - ipIndex.lower_bound(ip) -); +const auto it = ipIndex.lower_bound(ip); assert((it == ipIndex.end() || it->first != ip) && "User is not in index"); ipIndex.insert(it, std::make_pair(ip, user)); } //----------------------------------------------------------------------------- -void USERS_IMPL::DelFromIPIdx(uint32_t ip) +void UsersImpl::DelFromIPIdx(uint32_t ip) { printfd(__FILE__, "USERS: Del IP Idx\n"); assert(ip && "User has non-null ip"); -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); -const std::map::iterator it( - ipIndex.find(ip) -); +const auto it = ipIndex.find(ip); if (it == ipIndex.end()) return; @@ -673,64 +601,61 @@ if (it == ipIndex.end()) ipIndex.erase(it); } //----------------------------------------------------------------------------- -bool USERS_IMPL::FindByIPIdx(uint32_t ip, user_iter & iter) const +bool UsersImpl::FindByIPIdx(uint32_t ip, user_iter & iter) const { -std::map::const_iterator it(ipIndex.find(ip)); +auto it = ipIndex.find(ip); if (it == ipIndex.end()) return false; iter = it->second; return true; } //----------------------------------------------------------------------------- -int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_PTR * usr) const +int UsersImpl::FindByIPIdx(uint32_t ip, UserPtr * user) const { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); user_iter iter; if (FindByIPIdx(ip, iter)) { - *usr = &(*iter); + *user = &(*iter); return 0; } return -1; } //----------------------------------------------------------------------------- -int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_IMPL ** usr) const +int UsersImpl::FindByIPIdx(uint32_t ip, UserImpl ** user) const { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); user_iter iter; if (FindByIPIdx(ip, iter)) { - *usr = &(*iter); + *user = &(*iter); return 0; } return -1; } //----------------------------------------------------------------------------- -bool USERS_IMPL::IsIPInIndex(uint32_t ip) const +bool UsersImpl::IsIPInIndex(uint32_t ip) const { -STG_LOCKER lock(&mutex); - -std::map::const_iterator it(ipIndex.find(ip)); +std::lock_guard lock(m_mutex); -return it != ipIndex.end(); +return ipIndex.find(ip) != ipIndex.end(); } //----------------------------------------------------------------------------- -bool USERS_IMPL::IsIPInUse(uint32_t ip, const std::string & login, CONST_USER_PTR * user) const +bool UsersImpl::IsIPInUse(uint32_t ip, const std::string & login, ConstUserPtr * user) const { -STG_LOCKER lock(&mutex); -std::list::const_iterator iter; -iter = users.begin(); +std::lock_guard lock(m_mutex); +auto iter = users.begin(); while (iter != users.end()) { if (iter->GetLogin() != login && - !iter->GetProperty().ips.Get().IsAnyIP() && - iter->GetProperty().ips.Get().IsIPInIPS(ip)) + !iter->GetProperties().ips.Get().isAnyIP() && + iter->GetProperties().ips.Get().find(ip)) { - if (user != NULL) + if (user != nullptr) *user = &(*iter); return true; } @@ -739,74 +664,74 @@ while (iter != users.end()) return false; } //----------------------------------------------------------------------------- -void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE * n) +void UsersImpl::AddNotifierUserAdd(NotifierBase * n) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); onAddNotifiers.insert(n); } //----------------------------------------------------------------------------- -void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE * n) +void UsersImpl::DelNotifierUserAdd(NotifierBase * n) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); onAddNotifiers.erase(n); } //----------------------------------------------------------------------------- -void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE * n) +void UsersImpl::AddNotifierUserDel(NotifierBase * n) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); onDelNotifiers.insert(n); } //----------------------------------------------------------------------------- -void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE * n) +void UsersImpl::DelNotifierUserDel(NotifierBase * n) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); onDelNotifiers.erase(n); } //----------------------------------------------------------------------------- -void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE * n) +void UsersImpl::AddNotifierUserAdd(NotifierBase * n) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); onAddNotifiersImpl.insert(n); } //----------------------------------------------------------------------------- -void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE * n) +void UsersImpl::DelNotifierUserAdd(NotifierBase * n) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); onAddNotifiersImpl.erase(n); } //----------------------------------------------------------------------------- -void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE * n) +void UsersImpl::AddNotifierUserDel(NotifierBase * n) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); onDelNotifiersImpl.insert(n); } //----------------------------------------------------------------------------- -void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE * n) +void UsersImpl::DelNotifierUserDel(NotifierBase * n) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); onDelNotifiersImpl.erase(n); } //----------------------------------------------------------------------------- -int USERS_IMPL::OpenSearch() +unsigned int UsersImpl::OpenSearch() { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); handle++; searchDescriptors[handle] = users.begin(); return handle; } //----------------------------------------------------------------------------- -int USERS_IMPL::SearchNext(int h, USER_PTR * user) +int UsersImpl::SearchNext(int h, UserPtr * user) { - USER_IMPL * ptr = NULL; - if (SearchNext(h, &ptr)) + UserImpl * ptr = nullptr; + if (SearchNext(h, &ptr) != 0) return -1; *user = ptr; return 0; } //----------------------------------------------------------------------------- -int USERS_IMPL::SearchNext(int h, USER_IMPL ** user) +int UsersImpl::SearchNext(int h, UserImpl ** user) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); if (searchDescriptors.find(h) == searchDescriptors.end()) { @@ -833,9 +758,9 @@ while (searchDescriptors[h]->GetDeleted()) return 0; } //----------------------------------------------------------------------------- -int USERS_IMPL::CloseSearch(int h) +int UsersImpl::CloseSearch(int h) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); if (searchDescriptors.find(h) != searchDescriptors.end()) { searchDescriptors.erase(searchDescriptors.find(h)); @@ -846,21 +771,21 @@ WriteServLog("USERS. Incorrect search handle."); return -1; } //----------------------------------------------------------------------------- -void USERS_IMPL::AddUserIntoIndexes(user_iter user) +void UsersImpl::AddUserIntoIndexes(user_iter user) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); loginIndex.insert(make_pair(user->GetLogin(), user)); } //----------------------------------------------------------------------------- -void USERS_IMPL::DelUserFromIndexes(user_iter user) +void UsersImpl::DelUserFromIndexes(user_iter user) { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); loginIndex.erase(user->GetLogin()); } //----------------------------------------------------------------------------- -bool USERS_IMPL::TimeToWriteDetailStat(const struct tm & t) +bool UsersImpl::TimeToWriteDetailStat(const struct tm & t) { -int statTime = settings->GetDetailStatWritePeriod(); +auto statTime = settings->GetDetailStatWritePeriod(); switch (statTime) {