using STG::UsersImpl;
//-----------------------------------------------------------------------------
-UsersImpl::UsersImpl(SettingsImpl * 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),
+ m_store(store),
+ m_sysAdmin(sysAdmin),
WriteServLog(Logger::get()),
- nonstop(false),
isRunning(false),
handle(0)
{
-pthread_mutexattr_t attr;
-pthread_mutexattr_init(&attr);
-pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-pthread_mutex_init(&mutex, &attr);
}
//-----------------------------------------------------------------------------
-UsersImpl::~UsersImpl()
+bool UsersImpl::FindByNameNonLock(const std::string & login, user_iter * user)
{
-pthread_mutex_destroy(&mutex);
-}
-//-----------------------------------------------------------------------------
-int UsersImpl::FindByNameNonLock(const std::string & login, user_iter * user)
-{
-const std::map<std::string, user_iter>::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 UsersImpl::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<std::string, user_iter>::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 UsersImpl::FindByName(const std::string & login, UserPtr * user)
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
user_iter u;
-if (FindByNameNonLock(login, &u))
+if (!FindByNameNonLock(login, &u))
return -1;
*user = &(*u);
return 0;
//-----------------------------------------------------------------------------
int UsersImpl::FindByName(const std::string & login, ConstUserPtr * user) const
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
const_user_iter u;
-if (FindByNameNonLock(login, &u))
+if (!FindByNameNonLock(login, &u))
return -1;
*user = &(*u);
return 0;
//-----------------------------------------------------------------------------
bool UsersImpl::Exists(const std::string & login) const
{
-STG_LOCKER lock(&mutex);
-const std::map<std::string, user_iter>::const_iterator iter(loginIndex.find(login));
+std::lock_guard<std::mutex> lock(m_mutex);
+const auto iter = loginIndex.find(login);
return iter != loginIndex.end();
}
//-----------------------------------------------------------------------------
bool UsersImpl::TariffInUse(const std::string & tariffName) const
{
-STG_LOCKER lock(&mutex);
-std::list<UserImpl>::const_iterator iter;
-iter = users.begin();
+std::lock_guard<std::mutex> lock(m_mutex);
+auto iter = users.begin();
while (iter != users.end())
{
if (iter->GetProperties().tariffName.Get() == tariffName)
//-----------------------------------------------------------------------------
int UsersImpl::Add(const std::string & login, const Admin * admin)
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> 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->logStr().c_str(), login.c_str());
return -1;
}
-if (store->AddUser(login))
+if (m_store->AddUser(login) != 0)
return -1;
-UserImpl u(settings, store, tariffs, &sysAdmin, this, m_services);
+UserImpl u(settings, m_store, m_tariffs, &m_sysAdmin, this, m_services);
u.SetLogin(login);
{
// Fire all "on add" notifiers
- std::set<NotifierBase<UserPtr> *>::iterator ni = onAddNotifiers.begin();
+ auto ni = onAddNotifiers.begin();
while (ni != onAddNotifiers.end())
{
(*ni)->Notify(&users.front());
{
// Fire all "on add" implementation notifiers
- std::set<NotifierBase<UserImplPtr> *>::iterator ni = onAddNotifiersImpl.begin();
+ auto ni = onAddNotifiersImpl.begin();
while (ni != onAddNotifiersImpl.end())
{
(*ni)->Notify(&users.front());
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->logStr().c_str(), login.c_str());
{
- STG_LOCKER lock(&mutex);
+ std::lock_guard<std::mutex> lock(m_mutex);
- if (FindByNameNonLock(login, &u))
+ if (!FindByNameNonLock(login, &u))
{
WriteServLog("%s tried to delete user \'%s\': not found.",
admin->logStr().c_str(),
}
{
- std::set<NotifierBase<UserPtr> *>::iterator ni = onDelNotifiers.begin();
+ auto ni = onDelNotifiers.begin();
while (ni != onDelNotifiers.end())
{
(*ni)->Notify(&(*u));
}
{
- std::set<NotifierBase<UserImplPtr> *>::iterator ni = onDelNotifiersImpl.begin();
+ auto ni = onDelNotifiersImpl.begin();
while (ni != onDelNotifiersImpl.end())
{
(*ni)->Notify(&(*u));
}
{
- STG_LOCKER lock(&mutex);
+ std::lock_guard<std::mutex> lock(m_mutex);
u->OnDelete();
uint32_t enabledDirs, const Auth * auth)
{
user_iter iter;
-STG_LOCKER lock(&mutex);
-if (FindByNameNonLock(login, &iter))
+std::lock_guard<std::mutex> lock(m_mutex);
+if (!FindByNameNonLock(login, &iter))
{
WriteServLog("Attempt to authorize non-existant user '%s'", login.c_str());
return false;
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);
const std::string & reason)
{
user_iter iter;
-STG_LOCKER lock(&mutex);
-if (FindByNameNonLock(login, &iter))
+std::lock_guard<std::mutex> 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());
iter->Unauthorize(auth, reason);
-if (!iter->GetAuthorized())
+if (iter->GetAuthorized() == 0)
DelFromIPIdx(ip);
return true;
{
std::vector<std::string> 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)
{
- UserImpl 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();
return 0;
}
//-----------------------------------------------------------------------------
-void * UsersImpl::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());
-UsersImpl * us = static_cast<UsersImpl *>(d);
struct tm t;
time_t tt = stgTime;
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(), [](auto& user){ user.Run(); });
+ for_each(users.begin(), users.end(), [](auto& user){ user.Run(); });
tt = stgTime;
localtime_r(&tt, &t);
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)
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;
}
stgUsleep(100000);
- } //while (us->nonstop)
+ }
-std::list<USER_TO_DEL>::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 UsersImpl::NewMinute(const struct tm & t)
//printfd(__FILE__, "USER::WriteInetStat\n");
int usersCnt = 0;
- // ðÉÛÅÍ ÀÚÅÒÏ× ÞÁÓÔÑÍÉ. ÷ ÐÅÒÅÒÙ×ÁÈ ×ÙÚÙ×ÁÅÍ USER::Run
- std::list<UserImpl>::iterator usr = users.begin();
+ auto usr = users.begin();
while (usr != users.end())
{
usersCnt++;
//-----------------------------------------------------------------------------
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)
//-----------------------------------------------------------------------------
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;
}
//-----------------------------------------------------------------------------
{
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};
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(), [](auto& user){ user.Run(); });
-// 'cause bind2st accepts only constant first param
-for (std::list<UserImpl>::iterator it = users.begin();
- it != users.end();
- ++it)
- it->WriteDetailStat(true);
+for (auto& user : users)
+ user.WriteDetailStat(true);
for_each(users.begin(), users.end(), [](auto& user){ user.WriteStat(); });
//for_each(users.begin(), users.end(), mem_fun_ref(&UserImpl::WriteConf));
//-----------------------------------------------------------------------------
void UsersImpl::RealDelUser()
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
printfd(__FILE__, "RealDelUser() users to del: %d\n", usersToDelete.size());
-std::list<USER_TO_DEL>::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());
}
++iter;
}
}
-return;
}
//-----------------------------------------------------------------------------
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<std::mutex> lock(m_mutex);
-const std::map<uint32_t, user_iter>::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");
printfd(__FILE__, "USERS: Del IP Idx\n");
assert(ip && "User has non-null ip");
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
-const std::map<uint32_t, user_iter>::iterator it(
- ipIndex.find(ip)
-);
+const auto it = ipIndex.find(ip);
if (it == ipIndex.end())
return;
//-----------------------------------------------------------------------------
bool UsersImpl::FindByIPIdx(uint32_t ip, user_iter & iter) const
{
-std::map<uint32_t, user_iter>::const_iterator it(ipIndex.find(ip));
+auto it = ipIndex.find(ip);
if (it == ipIndex.end())
return false;
iter = it->second;
return true;
}
//-----------------------------------------------------------------------------
-int UsersImpl::FindByIPIdx(uint32_t ip, UserPtr * usr) const
+int UsersImpl::FindByIPIdx(uint32_t ip, UserPtr * user) const
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
user_iter iter;
if (FindByIPIdx(ip, iter))
{
- *usr = &(*iter);
+ *user = &(*iter);
return 0;
}
return -1;
}
//-----------------------------------------------------------------------------
-int UsersImpl::FindByIPIdx(uint32_t ip, UserImpl ** usr) const
+int UsersImpl::FindByIPIdx(uint32_t ip, UserImpl ** user) const
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
user_iter iter;
if (FindByIPIdx(ip, iter))
{
- *usr = &(*iter);
+ *user = &(*iter);
return 0;
}
//-----------------------------------------------------------------------------
bool UsersImpl::IsIPInIndex(uint32_t ip) const
{
-STG_LOCKER lock(&mutex);
-
-std::map<uint32_t, user_iter>::const_iterator it(ipIndex.find(ip));
+std::lock_guard<std::mutex> lock(m_mutex);
-return it != ipIndex.end();
+return ipIndex.find(ip) != ipIndex.end();
}
//-----------------------------------------------------------------------------
bool UsersImpl::IsIPInUse(uint32_t ip, const std::string & login, ConstUserPtr * user) const
{
-STG_LOCKER lock(&mutex);
-std::list<UserImpl>::const_iterator iter;
-iter = users.begin();
+std::lock_guard<std::mutex> lock(m_mutex);
+auto 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)
+ if (user != nullptr)
*user = &(*iter);
return true;
}
//-----------------------------------------------------------------------------
void UsersImpl::AddNotifierUserAdd(NotifierBase<UserPtr> * n)
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
onAddNotifiers.insert(n);
}
//-----------------------------------------------------------------------------
void UsersImpl::DelNotifierUserAdd(NotifierBase<UserPtr> * n)
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
onAddNotifiers.erase(n);
}
//-----------------------------------------------------------------------------
void UsersImpl::AddNotifierUserDel(NotifierBase<UserPtr> * n)
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
onDelNotifiers.insert(n);
}
//-----------------------------------------------------------------------------
void UsersImpl::DelNotifierUserDel(NotifierBase<UserPtr> * n)
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
onDelNotifiers.erase(n);
}
//-----------------------------------------------------------------------------
void UsersImpl::AddNotifierUserAdd(NotifierBase<UserImplPtr> * n)
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
onAddNotifiersImpl.insert(n);
}
//-----------------------------------------------------------------------------
void UsersImpl::DelNotifierUserAdd(NotifierBase<UserImplPtr> * n)
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
onAddNotifiersImpl.erase(n);
}
//-----------------------------------------------------------------------------
void UsersImpl::AddNotifierUserDel(NotifierBase<UserImplPtr> * n)
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
onDelNotifiersImpl.insert(n);
}
//-----------------------------------------------------------------------------
void UsersImpl::DelNotifierUserDel(NotifierBase<UserImplPtr> * n)
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
onDelNotifiersImpl.erase(n);
}
//-----------------------------------------------------------------------------
-int UsersImpl::OpenSearch()
+unsigned int UsersImpl::OpenSearch()
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
handle++;
searchDescriptors[handle] = users.begin();
return handle;
//-----------------------------------------------------------------------------
int UsersImpl::SearchNext(int h, UserPtr * user)
{
- UserImpl * ptr = NULL;
- if (SearchNext(h, &ptr))
+ UserImpl * ptr = nullptr;
+ if (SearchNext(h, &ptr) != 0)
return -1;
*user = ptr;
return 0;
//-----------------------------------------------------------------------------
int UsersImpl::SearchNext(int h, UserImpl ** user)
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
if (searchDescriptors.find(h) == searchDescriptors.end())
{
//-----------------------------------------------------------------------------
int UsersImpl::CloseSearch(int h)
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
if (searchDescriptors.find(h) != searchDescriptors.end())
{
searchDescriptors.erase(searchDescriptors.find(h));
//-----------------------------------------------------------------------------
void UsersImpl::AddUserIntoIndexes(user_iter user)
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
loginIndex.insert(make_pair(user->GetLogin(), user));
}
//-----------------------------------------------------------------------------
void UsersImpl::DelUserFromIndexes(user_iter user)
{
-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(m_mutex);
loginIndex.erase(user->GetLogin());
}
//-----------------------------------------------------------------------------
bool UsersImpl::TimeToWriteDetailStat(const struct tm & t)
{
-int statTime = settings->GetDetailStatWritePeriod();
+auto statTime = settings->GetDetailStatWritePeriod();
switch (statTime)
{
git.stg.codes / stg.git / blobdiff