Parse admins list.

[stg.git] / projects / stargazer / users_impl.cpp

diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp
index 4c4d4ce03e4c0dcb9f9c360ea0676f492f49a357..3dd7638b9b2ecf392685ccd2f68d19b9fd17edde 100644 (file)
--- a/projects/stargazer/users_impl.cpp
+++ b/projects/stargazer/users_impl.cpp
@@ -108,7 +108,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int USERS_IMPL::FindByName(const std::string & login, USER_PTR * user)
 {
 //-----------------------------------------------------------------------------
 int USERS_IMPL::FindByName(const std::string & login, USER_PTR * user)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 user_iter u;
 if (FindByNameNonLock(login, &u))
     return -1;
 user_iter u;
 if (FindByNameNonLock(login, &u))
     return -1;


@@ -118,7 +118,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int USERS_IMPL::FindByName(const std::string & login, CONST_USER_PTR * user) const
 {
 //-----------------------------------------------------------------------------
 int USERS_IMPL::FindByName(const std::string & login, CONST_USER_PTR * user) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 const_user_iter u;
 if (FindByNameNonLock(login, &u))
     return -1;
 const_user_iter u;
 if (FindByNameNonLock(login, &u))
     return -1;


@@ -126,9 +126,16 @@ if (FindByNameNonLock(login, &u))
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

+bool USERS_IMPL::Exists(const std::string & login) const
+{
+STG_LOCKER lock(&mutex);
+const std::map<std::string, user_iter>::const_iterator iter(loginIndex.find(login));
+return iter != loginIndex.end();
+}
+//-----------------------------------------------------------------------------

 bool USERS_IMPL::TariffInUse(const std::string & tariffName) const
 {
 bool USERS_IMPL::TariffInUse(const std::string & tariffName) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 std::list<USER_IMPL>::const_iterator iter;
 iter = users.begin();
 while (iter != users.end())
 std::list<USER_IMPL>::const_iterator iter;
 iter = users.begin();
 while (iter != users.end())


@@ -142,7 +149,7 @@ return false;
 //-----------------------------------------------------------------------------
 int USERS_IMPL::Add(const std::string & login, const ADMIN * admin)
 {
 //-----------------------------------------------------------------------------
 int USERS_IMPL::Add(const std::string & login, const ADMIN * admin)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 const PRIV * priv = admin->GetPriv();
 
 if (!priv->userAddDel)
 const PRIV * priv = admin->GetPriv();
 
 if (!priv->userAddDel)


@@ -233,7 +240,7 @@ if (!priv->userAddDel)
 
 
     {
 
 
     {

-    STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+    STG_LOCKER lock(&mutex);

 
     if (FindByNameNonLock(login, &u))
         {
 
     if (FindByNameNonLock(login, &u))
         {


@@ -265,7 +272,7 @@ if (!priv->userAddDel)
     }
 
     {
     }
 
     {

-    STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+    STG_LOCKER lock(&mutex);

 
     u->OnDelete();
 
 
     u->OnDelete();
 


@@ -286,7 +293,7 @@ bool USERS_IMPL::Authorize(const std::string & login, uint32_t ip,
                            uint32_t enabledDirs, const AUTH * auth)
 {
 user_iter iter;
                            uint32_t enabledDirs, const AUTH * auth)
 {
 user_iter iter;

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (FindByNameNonLock(login, &iter))
     {
     WriteServLog("Attempt to authorize non-existant user '%s'", login.c_str());
 if (FindByNameNonLock(login, &iter))
     {
     WriteServLog("Attempt to authorize non-existant user '%s'", login.c_str());


@@ -319,7 +326,7 @@ bool USERS_IMPL::Unauthorize(const std::string & login,
                              const std::string & reason)
 {
 user_iter iter;
                              const std::string & reason)
 {
 user_iter iter;

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (FindByNameNonLock(login, &iter))
     {
     WriteServLog("Attempt to unauthorize non-existant user '%s'", login.c_str());
 if (FindByNameNonLock(login, &iter))
     {
     WriteServLog("Attempt to unauthorize non-existant user '%s'", login.c_str());


@@ -513,6 +520,8 @@ else
         }
     }
 
         }
     }
 

+std::for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::ProcessDailyFee));
+

 if (settings->GetDayFeeIsLastDay())
     {
     printfd(__FILE__, "DayResetTraff - 2 -\n");
 if (settings->GetDayFeeIsLastDay())
     {
     printfd(__FILE__, "DayResetTraff - 2 -\n");


@@ -604,7 +613,7 @@ return 0;
 //-----------------------------------------------------------------------------
 void USERS_IMPL::RealDelUser()
 {
 //-----------------------------------------------------------------------------
 void USERS_IMPL::RealDelUser()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 printfd(__FILE__, "RealDelUser() users to del: %d\n", usersToDelete.size());
 
 
 printfd(__FILE__, "RealDelUser() users to del: %d\n", usersToDelete.size());
 


@@ -639,7 +648,7 @@ uint32_t ip = user->GetCurrIP();
 if (!ip)
     return; // User has disconnected
 
 if (!ip)
     return; // User has disconnected
 

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 const std::map<uint32_t, user_iter>::iterator it(
         ipIndex.lower_bound(ip)
 
 const std::map<uint32_t, user_iter>::iterator it(
         ipIndex.lower_bound(ip)


@@ -655,7 +664,7 @@ void USERS_IMPL::DelFromIPIdx(uint32_t ip)
 printfd(__FILE__, "USERS: Del IP Idx\n");
 assert(ip && "User has non-null ip");
 
 printfd(__FILE__, "USERS: Del IP Idx\n");
 assert(ip && "User has non-null ip");
 

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 const std::map<uint32_t, user_iter>::iterator it(
         ipIndex.find(ip)
 
 const std::map<uint32_t, user_iter>::iterator it(
         ipIndex.find(ip)


@@ -678,7 +687,7 @@ return true;
 //-----------------------------------------------------------------------------
 int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_PTR * usr) const
 {
 //-----------------------------------------------------------------------------
 int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_PTR * usr) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 user_iter iter;
 if (FindByIPIdx(ip, iter))
 
 user_iter iter;
 if (FindByIPIdx(ip, iter))


@@ -692,7 +701,7 @@ return -1;
 //-----------------------------------------------------------------------------
 int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_IMPL ** usr) const
 {
 //-----------------------------------------------------------------------------
 int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_IMPL ** usr) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 user_iter iter;
 if (FindByIPIdx(ip, iter))
 
 user_iter iter;
 if (FindByIPIdx(ip, iter))


@@ -706,7 +715,7 @@ return -1;
 //-----------------------------------------------------------------------------
 bool USERS_IMPL::IsIPInIndex(uint32_t ip) const
 {
 //-----------------------------------------------------------------------------
 bool USERS_IMPL::IsIPInIndex(uint32_t ip) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 std::map<uint32_t, user_iter>::const_iterator it(ipIndex.find(ip));
 
 
 std::map<uint32_t, user_iter>::const_iterator it(ipIndex.find(ip));
 


@@ -715,7 +724,7 @@ return it != ipIndex.end();
 //-----------------------------------------------------------------------------
 bool USERS_IMPL::IsIPInUse(uint32_t ip, const std::string & login, CONST_USER_PTR * user) const
 {
 //-----------------------------------------------------------------------------
 bool USERS_IMPL::IsIPInUse(uint32_t ip, const std::string & login, CONST_USER_PTR * user) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 std::list<USER_IMPL>::const_iterator iter;
 iter = users.begin();
 while (iter != users.end())
 std::list<USER_IMPL>::const_iterator iter;
 iter = users.begin();
 while (iter != users.end())


@@ -735,55 +744,55 @@ return false;
 //-----------------------------------------------------------------------------
 void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * n)
 {
 //-----------------------------------------------------------------------------
 void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * n)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 onAddNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * n)
 {
 onAddNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * n)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 onAddNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE<USER_PTR> * n)
 {
 onAddNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE<USER_PTR> * n)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 onDelNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE<USER_PTR> * n)
 {
 onDelNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE<USER_PTR> * n)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 onDelNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> * n)
 {
 onDelNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> * n)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 onAddNotifiersImpl.insert(n);
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> * n)
 {
 onAddNotifiersImpl.insert(n);
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> * n)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 onAddNotifiersImpl.erase(n);
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> * n)
 {
 onAddNotifiersImpl.erase(n);
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> * n)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 onDelNotifiersImpl.insert(n);
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> * n)
 {
 onDelNotifiersImpl.insert(n);
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> * n)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 onDelNotifiersImpl.erase(n);
 }
 //-----------------------------------------------------------------------------
 int USERS_IMPL::OpenSearch()
 {
 onDelNotifiersImpl.erase(n);
 }
 //-----------------------------------------------------------------------------
 int USERS_IMPL::OpenSearch()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 handle++;
 searchDescriptors[handle] = users.begin();
 return handle;
 handle++;
 searchDescriptors[handle] = users.begin();
 return handle;


@@ -800,7 +809,7 @@ int USERS_IMPL::SearchNext(int h, USER_PTR * user)
 //-----------------------------------------------------------------------------
 int USERS_IMPL::SearchNext(int h, USER_IMPL ** user)
 {
 //-----------------------------------------------------------------------------
 int USERS_IMPL::SearchNext(int h, USER_IMPL ** user)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 if (searchDescriptors.find(h) == searchDescriptors.end())
     {
 
 if (searchDescriptors.find(h) == searchDescriptors.end())
     {


@@ -829,7 +838,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int USERS_IMPL::CloseSearch(int h)
 {
 //-----------------------------------------------------------------------------
 int USERS_IMPL::CloseSearch(int h)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (searchDescriptors.find(h) != searchDescriptors.end())
     {
     searchDescriptors.erase(searchDescriptors.find(h));
 if (searchDescriptors.find(h) != searchDescriptors.end())
     {
     searchDescriptors.erase(searchDescriptors.find(h));


@@ -842,13 +851,13 @@ return -1;
 //-----------------------------------------------------------------------------
 void USERS_IMPL::AddUserIntoIndexes(user_iter user)
 {
 //-----------------------------------------------------------------------------
 void USERS_IMPL::AddUserIntoIndexes(user_iter user)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 loginIndex.insert(make_pair(user->GetLogin(), user));
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::DelUserFromIndexes(user_iter user)
 {
 loginIndex.insert(make_pair(user->GetLogin(), user));
 }
 //-----------------------------------------------------------------------------
 void USERS_IMPL::DelUserFromIndexes(user_iter user)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 loginIndex.erase(user->GetLogin());
 }
 //-----------------------------------------------------------------------------
 loginIndex.erase(user->GetLogin());
 }
 //-----------------------------------------------------------------------------