Fixed processing of coma-separated lists.

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

diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp
index dfdc86342e4e35c2dfa92527d64fc9ec380f795e..f4b4dea0b800420259afb1caef46753936398332 100644 (file)
--- a/projects/stargazer/users_impl.cpp
+++ b/projects/stargazer/users_impl.cpp
@@ -88,23 +88,39 @@ pthread_mutex_destroy(&mutex);
 //-----------------------------------------------------------------------------
 int USERS_IMPL::FindByNameNonLock(const std::string & login, user_iter * user)
 {
 //-----------------------------------------------------------------------------
 int USERS_IMPL::FindByNameNonLock(const std::string & login, user_iter * user)
 {

-std::map<std::string, user_iter>::iterator iter;
-iter = loginIndex.find(login);
-if (iter != loginIndex.end())
-    {
-    if (user)
-        *user = iter->second;
-    return 0;
-    }
-return -1;
+const std::map<std::string, user_iter>::const_iterator iter(loginIndex.find(login));
+if (iter == loginIndex.end())
+    return -1;
+if (user)
+    *user = iter->second;
+return 0;
+}
+//-----------------------------------------------------------------------------
+int USERS_IMPL::FindByNameNonLock(const std::string & login, const_user_iter * user) const
+{
+const std::map<std::string, user_iter>::const_iterator iter(loginIndex.find(login));
+if (iter == loginIndex.end())
+    return -1;
+if (user)
+    *user = iter->second;
+return 0;

 }
 //-----------------------------------------------------------------------------
 int USERS_IMPL::FindByName(const std::string & login, USER_PTR * user)
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 user_iter u;
 }
 //-----------------------------------------------------------------------------
 int USERS_IMPL::FindByName(const std::string & login, USER_PTR * user)
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 user_iter u;

-int res = FindByNameNonLock(login, &u);
-if (res)
+if (FindByNameNonLock(login, &u))
+    return -1;
+*user = &(*u);
+return 0;
+}
+//-----------------------------------------------------------------------------
+int USERS_IMPL::FindByName(const std::string & login, CONST_USER_PTR * user) const
+{
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+const_user_iter u;
+if (FindByNameNonLock(login, &u))

     return -1;
 *user = &(*u);
 return 0;
     return -1;
 *user = &(*u);
 return 0;


@@ -298,7 +314,9 @@ AddToIPIdx(iter);
 return true;
 }
 //-----------------------------------------------------------------------------
 return true;
 }
 //-----------------------------------------------------------------------------

-bool USERS_IMPL::Unauthorize(const std::string & login, const AUTH * auth)
+bool USERS_IMPL::Unauthorize(const std::string & login,
+                             const AUTH * auth,
+                             const std::string & reason)

 {
 user_iter iter;
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 {
 user_iter iter;
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);


@@ -310,7 +328,7 @@ if (FindByNameNonLock(login, &iter))
 
 uint32_t ip = iter->GetCurrIP();
 
 
 uint32_t ip = iter->GetCurrIP();
 

-iter->Unauthorize(auth);
+iter->Unauthorize(auth, reason);

 
 if (!iter->GetAuthorized())
     DelFromIPIdx(ip);
 
 if (!iter->GetAuthorized())
     DelFromIPIdx(ip);


@@ -495,6 +513,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");


@@ -702,7 +722,9 @@ std::list<USER_IMPL>::const_iterator iter;
 iter = users.begin();
 while (iter != users.end())
     {
 iter = users.begin();
 while (iter != users.end())
     {

-    if (iter->GetLogin() != login && iter->GetProperty().ips.Get().IsIPInIPS(ip))
+    if (iter->GetLogin() != login &&
+        !iter->GetProperty().ips.Get().IsAnyIP() &&
+        iter->GetProperty().ips.Get().IsIPInIPS(ip))

         {
         if (user != NULL)
             *user = &(*iter);
         {
         if (user != NULL)
             *user = &(*iter);