X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c963a109219ed101fa42f501b16f90d7b7b4f3f2..5fe92b1aa3db79e666be4b9d264f4b636fc54214:/projects/stargazer/users_impl.cpp?ds=sidebyside diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp index 9faadeb3..d0e53644 100644 --- a/projects/stargazer/users_impl.cpp +++ b/projects/stargazer/users_impl.cpp @@ -40,9 +40,9 @@ #include #include -#include "settings.h" +#include "stg/settings.h" +#include "stg/common.h" #include "users_impl.h" -#include "common.h" #include "stg_timer.h" using namespace std; @@ -52,7 +52,7 @@ extern const volatile time_t stgTime; //#define USERS_DEBUG 1 //----------------------------------------------------------------------------- -USERS_IMPL::USERS_IMPL(SETTINGS * s, STORE * st, TARIFFS * t, const ADMIN & sa) +USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st, TARIFFS * t, const ADMIN * sa) : users(), usersToDelete(), userIPNotifiersBefore(), @@ -71,7 +71,9 @@ USERS_IMPL::USERS_IMPL(SETTINGS * s, STORE * st, TARIFFS * t, const ADMIN & sa) handle(0), searchDescriptors(), onAddNotifiers(), - onDelNotifiers() + onDelNotifiers(), + onAddNotifiersImpl(), + onDelNotifiersImpl() { pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); @@ -122,16 +124,16 @@ while (iter != users.end()) return false; } //----------------------------------------------------------------------------- -int USERS_IMPL::Add(const string & login, const ADMIN & admin) +int USERS_IMPL::Add(const string & login, const ADMIN * admin) { STG_LOCKER lock(&mutex, __FILE__, __LINE__); -const PRIV * priv = admin.GetPriv(); +const PRIV * priv = admin->GetPriv(); if (!priv->userAddDel) { WriteServLog("%s tried to add user \'%s\'. Access denied.", - admin.GetLogStr().c_str(), login.c_str()); - /*errorStr = "Admin \'" + admin.GetLogin() + + admin->GetLogStr().c_str(), login.c_str()); + /*errorStr = "Admin \'" + admin->GetLogin() + "\': tried to add user \'" + ud->login + "\'. Access denied.";*/ return -1; } @@ -141,7 +143,7 @@ if (store->AddUser(login)) { //TODO //WriteServLog("Admin \'%s\': tried to add user \'%s\'. Access denied.", - // admin.GetLogin().c_str(), ud->login.c_str()); + // admin->GetLogin().c_str(), ud->login.c_str()); return -1; } ////// @@ -170,7 +172,7 @@ u.WriteConf(); u.WriteStat(); WriteServLog("%s User \'%s\' added.", - admin.GetLogStr().c_str(), login.c_str()); + admin->GetLogStr().c_str(), login.c_str()); u.OnAdd(); @@ -179,26 +181,38 @@ users.push_front(u); AddUserIntoIndexes(users.begin()); SetUserNotifiers(users.begin()); -// õ×ÅÄÏÍÌÑÅÍ ×ÓÅÈ ÖÅÌÁÀÝÉÈ, ÞÔÏ ÄÏÂÁ×ÌÅÎ ÎÏ×ÙÊ ÐÏÌØÚÏ×ÁÔÅÌØ -set *>::iterator ni = onAddNotifiers.begin(); -while (ni != onAddNotifiers.end()) { - (*ni)->Notify(&users.front()); - ++ni; + // Fire all "on add" notifiers + set *>::iterator ni = onAddNotifiers.begin(); + while (ni != onAddNotifiers.end()) + { + (*ni)->Notify(&users.front()); + ++ni; + } + } + + { + // Fire all "on add" implementation notifiers + set *>::iterator ni = onAddNotifiersImpl.begin(); + while (ni != onAddNotifiersImpl.end()) + { + (*ni)->Notify(&users.front()); + ++ni; + } } return 0; } //----------------------------------------------------------------------------- -void USERS_IMPL::Del(const string & login, const ADMIN & admin) +void USERS_IMPL::Del(const string & login, const ADMIN * admin) { -const PRIV * priv = admin.GetPriv(); +const PRIV * priv = admin->GetPriv(); user_iter u; if (!priv->userAddDel) { WriteServLog("%s tried to remove user \'%s\'. Access denied.", - admin.GetLogStr().c_str(), login.c_str()); + admin->GetLogStr().c_str(), login.c_str()); return; } @@ -209,17 +223,28 @@ if (!priv->userAddDel) if (FindByNameNonLock(login, &u)) { WriteServLog("%s tried to delete user \'%s\': not found.", - admin.GetLogStr().c_str(), + admin->GetLogStr().c_str(), login.c_str()); return; } } -set *>::iterator ni = onDelNotifiers.begin(); -while (ni != onDelNotifiers.end()) { - (*ni)->Notify(&(*u)); - ++ni; + set *>::iterator ni = onDelNotifiers.begin(); + while (ni != onDelNotifiers.end()) + { + (*ni)->Notify(&(*u)); + ++ni; + } + } + + { + set *>::iterator ni = onDelNotifiersImpl.begin(); + while (ni != onDelNotifiersImpl.end()) + { + (*ni)->Notify(&(*u)); + ++ni; + } } { @@ -237,7 +262,7 @@ while (ni != onDelNotifiers.end()) DelUserFromIndexes(u); WriteServLog("%s User \'%s\' deleted.", - admin.GetLogStr().c_str(), login.c_str()); + admin->GetLogStr().c_str(), login.c_str()); } } @@ -336,7 +361,7 @@ while (ui != us->users.end()) { us->UnSetUserNotifiers(ui); us->DelUserFromIndexes(ui); - ui++; + ++ui; } list::iterator iter; @@ -373,7 +398,7 @@ if (TimeToWriteDetailStat(t)) { usersCnt++; usr->WriteDetailStat(); - usr++; + ++usr; if (usersCnt % 10 == 0) for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::Run)); } @@ -433,7 +458,7 @@ 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(), mem_fun_ref(&USER_IMPL::SetPrepaidTraff)); } } //----------------------------------------------------------------------------- @@ -467,13 +492,13 @@ if (!isRunning) nonstop = false; //5 seconds to thread stops itself -unsigned i; -for (i = 0; i < 25 * (users.size() / 50 + 1); i++) +struct timespec ts = {0, 200000000}; +for (size_t i = 0; i < 25 * (users.size() / 50 + 1); i++) { if (!isRunning) break; - usleep(200000); + nanosleep(&ts, NULL); } //after 5 seconds waiting thread still running. now kill it @@ -500,7 +525,7 @@ for (list::iterator it = users.begin(); 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(), mem_fun_ref(&USER_IMPL::WriteConf)); printfd(__FILE__, "USERS::Stop()\n"); return 0; @@ -578,6 +603,15 @@ ipIndex.erase(it); } //----------------------------------------------------------------------------- int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_PTR * usr) const +{ + USER_IMPL * ptr = NULL; + if (FindByIPIdx(ip, &ptr)) + return -1; + *usr = ptr; + return 0; +} +//----------------------------------------------------------------------------- +int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_IMPL ** usr) const { STG_LOCKER lock(&mutex, __FILE__, __LINE__); @@ -613,7 +647,6 @@ onAddNotifiers.insert(n); void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE * n) { STG_LOCKER lock(&mutex, __FILE__, __LINE__); -//printfd(__FILE__, "DelNotifierUserAdd\n"); onAddNotifiers.erase(n); } //----------------------------------------------------------------------------- @@ -629,6 +662,30 @@ STG_LOCKER lock(&mutex, __FILE__, __LINE__); onDelNotifiers.erase(n); } //----------------------------------------------------------------------------- +void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE * n) +{ +STG_LOCKER lock(&mutex, __FILE__, __LINE__); +onAddNotifiersImpl.insert(n); +} +//----------------------------------------------------------------------------- +void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE * n) +{ +STG_LOCKER lock(&mutex, __FILE__, __LINE__); +onAddNotifiersImpl.erase(n); +} +//----------------------------------------------------------------------------- +void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE * n) +{ +STG_LOCKER lock(&mutex, __FILE__, __LINE__); +onDelNotifiersImpl.insert(n); +} +//----------------------------------------------------------------------------- +void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE * n) +{ +STG_LOCKER lock(&mutex, __FILE__, __LINE__); +onDelNotifiersImpl.erase(n); +} +//----------------------------------------------------------------------------- int USERS_IMPL::OpenSearch() { STG_LOCKER lock(&mutex, __FILE__, __LINE__); @@ -638,6 +695,15 @@ return handle; } //----------------------------------------------------------------------------- int USERS_IMPL::SearchNext(int h, USER_PTR * user) +{ + USER_IMPL * ptr = NULL; + if (SearchNext(h, &ptr)) + return -1; + *user = ptr; + return 0; +} +//----------------------------------------------------------------------------- +int USERS_IMPL::SearchNext(int h, USER_IMPL ** user) { STG_LOCKER lock(&mutex, __FILE__, __LINE__); @@ -710,7 +776,7 @@ while (bi != userIPNotifiersBefore.end()) //printfd(__FILE__, "Notifier Before removed. User %s\n", bi->GetUser()->GetLogin().c_str()); break; } - bi++; + ++bi; } ai = userIPNotifiersAfter.begin(); @@ -723,7 +789,7 @@ while (ai != userIPNotifiersAfter.end()) //printfd(__FILE__, "Notifier After removed. User %s\n", ai->GetUser()->GetLogin().c_str()); break; } - ai++; + ++ai; } } //-----------------------------------------------------------------------------