X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/ab1d6ad7b6563c4c7a8841abae32aad79711f351..a500fb72810060e52d87ad2c2e4691531f0bcc5a:/projects/stargazer/users_impl.cpp diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp index fa726560..2e40f03e 100644 --- a/projects/stargazer/users_impl.cpp +++ b/projects/stargazer/users_impl.cpp @@ -22,17 +22,8 @@ * Author : Boris Mikhailenko */ -/* - $Revision: 1.61 $ - $Date: 2010/09/13 05:56:42 $ - $Author: faust $ - */ - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif - #include + #include #include #include @@ -42,128 +33,110 @@ #include "stg/settings.h" #include "stg/common.h" + #include "users_impl.h" #include "stg_timer.h" -using namespace std; - -extern const volatile time_t stgTime; +extern volatile time_t stgTime; -//#define USERS_DEBUG 1 +using STG::UsersImpl; //----------------------------------------------------------------------------- -USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st, TARIFFS * t, const ADMIN * sa) - : USERS(), - users(), - usersToDelete(), - userIPNotifiersBefore(), - userIPNotifiersAfter(), - ipIndex(), - loginIndex(), - settings(s), +UsersImpl::UsersImpl(SettingsImpl * s, Store * st, + Tariffs * t, Services & svcs, + const Admin& sa) + : settings(s), tariffs(t), + m_services(svcs), store(st), sysAdmin(sa), - WriteServLog(GetStgLogger()), - nonstop(false), + WriteServLog(Logger::get()), isRunning(false), - mutex(), - thread(), - handle(0), - searchDescriptors(), - onAddNotifiers(), - onDelNotifiers(), - onAddNotifiersImpl(), - onDelNotifiersImpl() + 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() +UsersImpl::~UsersImpl() { -pthread_mutex_destroy(&mutex); } //----------------------------------------------------------------------------- -int USERS_IMPL::FindByNameNonLock(const string & login, user_iter * user) +int UsersImpl::FindByNameNonLock(const std::string & login, user_iter * user) { -map::iterator iter; -iter = loginIndex.find(login); -if (iter != loginIndex.end()) - { - if (user) - *user = iter->second; - return 0; - } -return -1; +const std::map::const_iterator iter(loginIndex.find(login)); +if (iter == loginIndex.end()) + return -1; +if (user) + *user = iter->second; +return 0; } //----------------------------------------------------------------------------- -int USERS_IMPL::FindByName(const string & login, USER_PTR * user) +int UsersImpl::FindByNameNonLock(const std::string & login, const_user_iter * user) const { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +const std::map::const_iterator iter(loginIndex.find(login)); +if (iter == loginIndex.end()) + return -1; +if (user) + *user = iter->second; +return 0; +} +//----------------------------------------------------------------------------- +int UsersImpl::FindByName(const std::string & login, UserPtr * user) +{ +std::lock_guard lock(m_mutex); user_iter u; -int res = FindByNameNonLock(login, &u); -if (res) +if (FindByNameNonLock(login, &u)) + return -1; +*user = &(*u); +return 0; +} +//----------------------------------------------------------------------------- +int UsersImpl::FindByName(const std::string & login, ConstUserPtr * user) const +{ +std::lock_guard lock(m_mutex); +const_user_iter u; +if (FindByNameNonLock(login, &u)) return -1; *user = &(*u); return 0; } //----------------------------------------------------------------------------- -bool USERS_IMPL::TariffInUse(const string & tariffName) const +bool UsersImpl::Exists(const std::string & login) const +{ +std::lock_guard lock(m_mutex); +const std::map::const_iterator iter(loginIndex.find(login)); +return iter != loginIndex.end(); +} +//----------------------------------------------------------------------------- +bool UsersImpl::TariffInUse(const std::string & tariffName) const { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); -list::const_iterator iter; +std::lock_guard lock(m_mutex); +std::list::const_iterator iter; 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 string & login, const ADMIN * admin) +int UsersImpl::Add(const std::string & login, const Admin * admin) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); -const PRIV * priv = admin->GetPriv(); +std::lock_guard lock(m_mutex); +const auto& priv = admin->priv(); -if (!priv->userAddDel) +if (!priv.userAddDel) { 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()); return -1; - } -////// - -USER_IMPL u(settings, store, tariffs, sysAdmin, this); - -/*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, store, tariffs, &sysAdmin, this, m_services); u.SetLogin(login); @@ -173,18 +146,17 @@ 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(); users.push_front(u); AddUserIntoIndexes(users.begin()); -SetUserNotifiers(users.begin()); { // Fire all "on add" notifiers - set *>::iterator ni = onAddNotifiers.begin(); + std::set *>::iterator ni = onAddNotifiers.begin(); while (ni != onAddNotifiers.end()) { (*ni)->Notify(&users.front()); @@ -194,7 +166,7 @@ SetUserNotifiers(users.begin()); { // Fire all "on add" implementation notifiers - set *>::iterator ni = onAddNotifiersImpl.begin(); + std::set *>::iterator ni = onAddNotifiersImpl.begin(); while (ni != onAddNotifiersImpl.end()) { (*ni)->Notify(&users.front()); @@ -205,26 +177,26 @@ SetUserNotifiers(users.begin()); return 0; } //----------------------------------------------------------------------------- -void USERS_IMPL::Del(const 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) { 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, __FILE__, __LINE__); + std::lock_guard lock(m_mutex); 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; } @@ -233,7 +205,7 @@ if (!priv->userAddDel) } { - set *>::iterator ni = onDelNotifiers.begin(); + std::set *>::iterator ni = onDelNotifiers.begin(); while (ni != onDelNotifiers.end()) { (*ni)->Notify(&(*u)); @@ -242,7 +214,7 @@ if (!priv->userAddDel) } { - set *>::iterator ni = onDelNotifiersImpl.begin(); + std::set *>::iterator ni = onDelNotifiersImpl.begin(); while (ni != onDelNotifiersImpl.end()) { (*ni)->Notify(&(*u)); @@ -251,7 +223,7 @@ if (!priv->userAddDel) } { - STG_LOCKER lock(&mutex, __FILE__, __LINE__); + std::lock_guard lock(m_mutex); u->OnDelete(); @@ -260,18 +232,72 @@ if (!priv->userAddDel) utd.delTime = stgTime; usersToDelete.push_back(utd); - UnSetUserNotifiers(u); DelUserFromIndexes(u); WriteServLog("%s User \'%s\' deleted.", - admin->GetLogStr().c_str(), login.c_str()); + admin->logStr().c_str(), login.c_str()); } } //----------------------------------------------------------------------------- -int USERS_IMPL::ReadUsers() +bool UsersImpl::Authorize(const std::string & login, uint32_t ip, + uint32_t enabledDirs, const Auth * auth) { -vector usersList; +user_iter iter; +std::lock_guard lock(m_mutex); +if (FindByNameNonLock(login, &iter)) + { + WriteServLog("Attempt to authorize non-existant user '%s'", login.c_str()); + return false; + } + +if (FindByIPIdx(ip, iter)) + { + if (iter->GetLogin() != login) + { + WriteServLog("Attempt to authorize user '%s' from ip %s which already occupied by '%s'", + login.c_str(), inet_ntostring(ip).c_str(), + iter->GetLogin().c_str()); + return false; + } + if (iter->Authorize(ip, enabledDirs, auth)) + return false; + return true; + } + +if (iter->Authorize(ip, enabledDirs, auth)) + return false; + +AddToIPIdx(iter); +return true; +} +//----------------------------------------------------------------------------- +bool UsersImpl::Unauthorize(const std::string & login, + const Auth * auth, + const std::string & reason) +{ +user_iter 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()); + return false; + } + +uint32_t ip = iter->GetCurrIP(); + +iter->Unauthorize(auth, reason); + +if (!iter->GetAuthorized()) + DelFromIPIdx(ip); + +return true; +} +//----------------------------------------------------------------------------- +int UsersImpl::ReadUsers() +{ +std::vector usersList; usersList.clear(); if (store->GetUsersList(&usersList) < 0) { @@ -281,31 +307,47 @@ if (store->GetUsersList(&usersList) < 0) user_iter ui; +unsigned errors = 0; for (unsigned int i = 0; i < usersList.size(); i++) { - USER_IMPL u(settings, store, tariffs, sysAdmin, this); + UserImpl u(settings, store, tariffs, &sysAdmin, this, m_services); u.SetLogin(usersList[i]); users.push_front(u); ui = users.begin(); AddUserIntoIndexes(ui); - SetUserNotifiers(ui); - if (ui->ReadConf() < 0) - return -1; + if (settings->GetStopOnError()) + { + if (ui->ReadConf() < 0) + return -1; - if (ui->ReadStat() < 0) - return -1; + if (ui->ReadStat() < 0) + return -1; + } + else + { + if (ui->ReadConf() < 0) + errors++; + + if (ui->ReadStat() < 0) + errors++; + } } +if (errors > 0) + return -1; 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); + printfd(__FILE__, "=====================| pid: %d |===================== \n", getpid()); -USERS_IMPL * us = (USERS_IMPL*) d; struct tm t; time_t tt = stgTime; @@ -317,16 +359,16 @@ int day = t.tm_mday; printfd(__FILE__,"Day = %d Min = %d\n", day, min); time_t touchTime = stgTime - MONITOR_TIME_DELAY_SEC; -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(), mem_fun_ref(&USER_IMPL::Run)); + for_each(users.begin(), users.end(), [](auto& user){ user.Run(); }); tt = stgTime; localtime_r(&tt, &t); @@ -337,7 +379,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) @@ -345,48 +387,38 @@ 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; - TouchFile(monFile.c_str()); + TouchFile(monFile); } stgUsleep(100000); - } //while (us->nonstop) - -user_iter ui = us->users.begin(); -while (ui != us->users.end()) - { - us->UnSetUserNotifiers(ui); - us->DelUserFromIndexes(ui); - ++ui; } -list::iterator iter; -iter = us->usersToDelete.begin(); -while (iter != us->usersToDelete.end()) +std::list::iterator 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(), mem_fun_ref(&USER_IMPL::MidnightResetSessionStat)); + for_each(users.begin(), users.end(), [](auto& user){ user.MidnightResetSessionStat(); }); } if (TimeToWriteDetailStat(t)) @@ -395,21 +427,21 @@ if (TimeToWriteDetailStat(t)) int usersCnt = 0; // ðÉÛÅÍ ÀÚÅÒÏ× ÞÁÓÔÑÍÉ. ÷ ÐÅÒÅÒÙ×ÁÈ ×ÙÚÙ×ÁÅÍ USER::Run - list::iterator usr = users.begin(); + std::list::iterator usr = users.begin(); while (usr != users.end()) { usersCnt++; usr->WriteDetailStat(); ++usr; if (usersCnt % 10 == 0) - for_each(users.begin(), users.end(), 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; @@ -433,17 +465,20 @@ if (!settings->GetDayFeeIsLastDay()) if (settings->GetSpreadFee()) { printfd(__FILE__, "Spread DayFee\n"); - for_each(users.begin(), users.end(), 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(), mem_fun_ref(&USER_IMPL::ProcessDayFee)); + for_each(users.begin(), users.end(), [](auto& user){ user.ProcessDayFee(); }); } } +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()) { printfd(__FILE__, "DayResetTraff - 2 -\n"); @@ -451,7 +486,7 @@ if (settings->GetDayFeeIsLastDay()) } } //----------------------------------------------------------------------------- -void USERS_IMPL::DayResetTraff(const struct tm & t1) +void UsersImpl::DayResetTraff(const struct tm & t1) { int dayResetTraff = settings->GetDayResetTraff(); if (dayResetTraff == 0) @@ -459,12 +494,12 @@ if (dayResetTraff == 0) if (t1.tm_mday == dayResetTraff) { printfd(__FILE__, "ResetTraff\n"); - for_each(users.begin(), users.end(), 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()) { @@ -472,26 +507,15 @@ if (ReadUsers()) 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(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}; @@ -506,40 +530,34 @@ for (size_t i = 0; i < 25 * (users.size() / 50 + 1); i++) //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(); } printfd(__FILE__, "Before USERS::Run()\n"); -for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::Run)); +for_each(users.begin(), users.end(), [](auto& user){ user.Run(); }); // 'cause bind2st accepts only constant first param -for (list::iterator it = users.begin(); +for (std::list::iterator it = users.begin(); it != users.end(); ++it) it->WriteDetailStat(true); -for_each(users.begin(), users.end(), 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, __FILE__, __LINE__); +std::lock_guard lock(m_mutex); printfd(__FILE__, "RealDelUser() users to del: %d\n", usersToDelete.size()); -list::iterator iter; +std::list::iterator iter; iter = usersToDelete.begin(); while (iter != usersToDelete.end()) { @@ -562,7 +580,7 @@ while (iter != usersToDelete.end()) 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(); @@ -570,9 +588,9 @@ uint32_t ip = user->GetCurrIP(); if (!ip) return; // User has disconnected -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +std::lock_guard lock(m_mutex); -const map::iterator it( +const std::map::iterator it( ipIndex.lower_bound(ip) ); @@ -581,128 +599,157 @@ 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, __FILE__, __LINE__); +std::lock_guard lock(m_mutex); -const map::iterator it( +const std::map::iterator it( ipIndex.find(ip) ); -//assert(it != ipIndex.end() && "User is in index"); if (it == ipIndex.end()) - return; // User has not been added + return; ipIndex.erase(it); } //----------------------------------------------------------------------------- -int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_PTR * usr) const +bool UsersImpl::FindByIPIdx(uint32_t ip, user_iter & iter) const { - USER_IMPL * ptr = NULL; - if (FindByIPIdx(ip, &ptr)) - return -1; - *usr = ptr; - return 0; +std::map::const_iterator it(ipIndex.find(ip)); +if (it == ipIndex.end()) + return false; +iter = it->second; +return true; } //----------------------------------------------------------------------------- -int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_IMPL ** usr) const +int UsersImpl::FindByIPIdx(uint32_t ip, UserPtr * usr) const { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +std::lock_guard lock(m_mutex); -map::const_iterator it; -it = ipIndex.find(ip); +user_iter iter; +if (FindByIPIdx(ip, iter)) + { + *usr = &(*iter); + return 0; + } -if (it == ipIndex.end()) +return -1; +} +//----------------------------------------------------------------------------- +int UsersImpl::FindByIPIdx(uint32_t ip, UserImpl ** usr) const +{ +std::lock_guard lock(m_mutex); + +user_iter iter; +if (FindByIPIdx(ip, iter)) { - //printfd(__FILE__, "User NOT found in IP_Index!!!\n"); - return -1; + *usr = &(*iter); + return 0; } -*usr = &(*it->second); -//printfd(__FILE__, "User found in IP_Index\n"); -return 0; + +return -1; } //----------------------------------------------------------------------------- -bool USERS_IMPL::IsIPInIndex(uint32_t ip) const +bool UsersImpl::IsIPInIndex(uint32_t ip) const { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +std::lock_guard lock(m_mutex); -map::const_iterator it; -it = ipIndex.find(ip); +std::map::const_iterator it(ipIndex.find(ip)); return it != ipIndex.end(); } //----------------------------------------------------------------------------- -void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE * n) +bool UsersImpl::IsIPInUse(uint32_t ip, const std::string & login, ConstUserPtr * user) const { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +std::lock_guard lock(m_mutex); +std::list::const_iterator iter; +iter = users.begin(); +while (iter != users.end()) + { + if (iter->GetLogin() != login && + !iter->GetProperties().ips.Get().isAnyIP() && + iter->GetProperties().ips.Get().find(ip)) + { + if (user != NULL) + *user = &(*iter); + return true; + } + ++iter; + } +return false; +} +//----------------------------------------------------------------------------- +void UsersImpl::AddNotifierUserAdd(NotifierBase * n) +{ +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, __FILE__, __LINE__); +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, __FILE__, __LINE__); +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, __FILE__, __LINE__); +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, __FILE__, __LINE__); +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, __FILE__, __LINE__); +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, __FILE__, __LINE__); +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, __FILE__, __LINE__); +std::lock_guard lock(m_mutex); onDelNotifiersImpl.erase(n); } //----------------------------------------------------------------------------- -int USERS_IMPL::OpenSearch() +int UsersImpl::OpenSearch() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +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; + UserImpl * ptr = NULL; if (SearchNext(h, &ptr)) 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, __FILE__, __LINE__); +std::lock_guard lock(m_mutex); if (searchDescriptors.find(h) == searchDescriptors.end()) { @@ -729,9 +776,9 @@ while (searchDescriptors[h]->GetDeleted()) return 0; } //----------------------------------------------------------------------------- -int USERS_IMPL::CloseSearch(int h) +int UsersImpl::CloseSearch(int h) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +std::lock_guard lock(m_mutex); if (searchDescriptors.find(h) != searchDescriptors.end()) { searchDescriptors.erase(searchDescriptors.find(h)); @@ -742,67 +789,19 @@ WriteServLog("USERS. Incorrect search handle."); return -1; } //----------------------------------------------------------------------------- -void USERS_IMPL::SetUserNotifiers(user_iter user) -{ -STG_LOCKER lock(&mutex, __FILE__, __LINE__); - -PROPERTY_NOTIFER_IP_BEFORE nb(*this, user); -PROPERTY_NOTIFER_IP_AFTER na(*this, user); - -userIPNotifiersBefore.push_front(nb); -userIPNotifiersAfter.push_front(na); - -user->AddCurrIPBeforeNotifier(&(*userIPNotifiersBefore.begin())); -user->AddCurrIPAfterNotifier(&(*userIPNotifiersAfter.begin())); -} -//----------------------------------------------------------------------------- -void USERS_IMPL::UnSetUserNotifiers(user_iter user) -{ -STG_LOCKER lock(&mutex, __FILE__, __LINE__); - -list::iterator bi; -list::iterator ai; - -bi = userIPNotifiersBefore.begin(); -while (bi != userIPNotifiersBefore.end()) - { - if (bi->GetUser() == user) - { - bi->GetUser()->DelCurrIPBeforeNotifier(&(*bi)); - userIPNotifiersBefore.erase(bi); - //printfd(__FILE__, "Notifier Before removed. User %s\n", bi->GetUser()->GetLogin().c_str()); - break; - } - ++bi; - } - -ai = userIPNotifiersAfter.begin(); -while (ai != userIPNotifiersAfter.end()) - { - if (ai->GetUser() == user) - { - ai->GetUser()->DelCurrIPAfterNotifier(&(*ai)); - userIPNotifiersAfter.erase(ai); - //printfd(__FILE__, "Notifier After removed. User %s\n", ai->GetUser()->GetLogin().c_str()); - break; - } - ++ai; - } -} -//----------------------------------------------------------------------------- -void USERS_IMPL::AddUserIntoIndexes(user_iter user) +void UsersImpl::AddUserIntoIndexes(user_iter user) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +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, __FILE__, __LINE__); +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();