Add missing CMakeLists.txt

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

diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp
index 9985615f85d06c58c9d3ba766cb668a224964379..ca8f681fbbebb227a65e9266d4620ffed1a61c12 100644 (file)
--- a/projects/stargazer/users_impl.cpp
+++ b/projects/stargazer/users_impl.cpp
@@ -22,16 +22,6 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 

-/*
- $Revision: 1.61 $
- $Date: 2010/09/13 05:56:42 $
- $Author: faust $
- */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-

 #include <pthread.h>
 
 #include <csignal>
 #include <pthread.h>
 
 #include <csignal>


@@ -43,23 +33,24 @@
 
 #include "stg/settings.h"
 #include "stg/common.h"
 
 #include "stg/settings.h"
 #include "stg/common.h"

+

 #include "users_impl.h"
 #include "stg_timer.h"
 
 extern volatile time_t stgTime;
 
 #include "users_impl.h"
 #include "stg_timer.h"
 
 extern volatile time_t stgTime;
 

-//#define USERS_DEBUG 1
+using STG::UsersImpl;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st,
-                       TARIFFS * t, SERVICES & svcs,
-                       const ADMIN * sa)
+UsersImpl::UsersImpl(SettingsImpl * s, Store * st,
+                    Tariffs * t, Services & svcs,
+                    const Admin& sa)

     : settings(s),
       tariffs(t),
       m_services(svcs),
       store(st),
       sysAdmin(sa),
     : settings(s),
       tariffs(t),
       m_services(svcs),
       store(st),
       sysAdmin(sa),

-      WriteServLog(GetStgLogger()),
+      WriteServLog(Logger::get()),

       nonstop(false),
       isRunning(false),
       handle(0)
       nonstop(false),
       isRunning(false),
       handle(0)


@@ -70,12 +61,12 @@ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
 pthread_mutex_init(&mutex, &attr);
 }
 //-----------------------------------------------------------------------------
 pthread_mutex_init(&mutex, &attr);
 }
 //-----------------------------------------------------------------------------

-USERS_IMPL::~USERS_IMPL()
+UsersImpl::~UsersImpl()

 {
 pthread_mutex_destroy(&mutex);
 }
 //-----------------------------------------------------------------------------
 {
 pthread_mutex_destroy(&mutex);
 }
 //-----------------------------------------------------------------------------

-int USERS_IMPL::FindByNameNonLock(const std::string & login, user_iter * user)
+int UsersImpl::FindByNameNonLock(const std::string & login, user_iter * user)

 {
 const std::map<std::string, user_iter>::const_iterator iter(loginIndex.find(login));
 if (iter == loginIndex.end())
 {
 const std::map<std::string, user_iter>::const_iterator iter(loginIndex.find(login));
 if (iter == loginIndex.end())


@@ -85,7 +76,7 @@ if (user)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int USERS_IMPL::FindByNameNonLock(const std::string & login, const_user_iter * user) const
+int UsersImpl::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())
 {
 const std::map<std::string, user_iter>::const_iterator iter(loginIndex.find(login));
 if (iter == loginIndex.end())


@@ -95,7 +86,7 @@ if (user)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int USERS_IMPL::FindByName(const std::string & login, USER_PTR * user)
+int UsersImpl::FindByName(const std::string & login, UserPtr * user)

 {
 STG_LOCKER lock(&mutex);
 user_iter u;
 {
 STG_LOCKER lock(&mutex);
 user_iter u;


@@ -105,7 +96,7 @@ if (FindByNameNonLock(login, &u))
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int USERS_IMPL::FindByName(const std::string & login, CONST_USER_PTR * user) const
+int UsersImpl::FindByName(const std::string & login, ConstUserPtr * user) const

 {
 STG_LOCKER lock(&mutex);
 const_user_iter u;
 {
 STG_LOCKER lock(&mutex);
 const_user_iter u;


@@ -115,66 +106,43 @@ if (FindByNameNonLock(login, &u))
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-bool USERS_IMPL::Exists(const std::string & login) const
+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));
 return iter != loginIndex.end();
 }
 //-----------------------------------------------------------------------------
 {
 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 UsersImpl::TariffInUse(const std::string & tariffName) const

 {
 STG_LOCKER lock(&mutex);
 {
 STG_LOCKER lock(&mutex);

-std::list<USER_IMPL>::const_iterator iter;
+std::list<UserImpl>::const_iterator iter;

 iter = users.begin();
 while (iter != users.end())
     {
 iter = users.begin();
 while (iter != users.end())
     {

-    if (iter->GetProperty().tariffName.Get() == tariffName)
+    if (iter->GetProperties().tariffName.Get() == tariffName)

         return true;
     ++iter;
     }
 return false;
 }
 //-----------------------------------------------------------------------------
         return true;
     ++iter;
     }
 return false;
 }
 //-----------------------------------------------------------------------------

-int USERS_IMPL::Add(const std::string & login, const ADMIN * admin)
+int UsersImpl::Add(const std::string & login, const Admin * admin)

 {
 STG_LOCKER lock(&mutex);
 {
 STG_LOCKER lock(&mutex);

-const PRIV * priv = admin->GetPriv();
+const auto& priv = admin->priv();

 
 

-if (!priv->userAddDel)
+if (!priv.userAddDel)

     {
     WriteServLog("%s tried to add user \'%s\'. Access denied.",
     {
     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;
     }
 
     return -1;
     }
 

-//////

 if (store->AddUser(login))
 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;
     return -1;

-    }
-//////
-
-USER_IMPL u(settings, store, tariffs, sysAdmin, this, m_services);
-
-/*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);
 
 
 u.SetLogin(login);
 


@@ -184,7 +152,7 @@ u.WriteConf();
 u.WriteStat();
 
 WriteServLog("%s User \'%s\' added.",
 u.WriteStat();
 
 WriteServLog("%s User \'%s\' added.",

-         admin->GetLogStr().c_str(), login.c_str());
+             admin->logStr().c_str(), login.c_str());

 
 u.OnAdd();
 
 
 u.OnAdd();
 


@@ -194,7 +162,7 @@ AddUserIntoIndexes(users.begin());
 
     {
     // Fire all "on add" notifiers
 
     {
     // Fire all "on add" notifiers

-    std::set<NOTIFIER_BASE<USER_PTR> *>::iterator ni = onAddNotifiers.begin();
+    std::set<NotifierBase<UserPtr> *>::iterator ni = onAddNotifiers.begin();

     while (ni != onAddNotifiers.end())
         {
         (*ni)->Notify(&users.front());
     while (ni != onAddNotifiers.end())
         {
         (*ni)->Notify(&users.front());


@@ -204,7 +172,7 @@ AddUserIntoIndexes(users.begin());
 
     {
     // Fire all "on add" implementation notifiers
 
     {
     // Fire all "on add" implementation notifiers

-    std::set<NOTIFIER_BASE<USER_IMPL_PTR> *>::iterator ni = onAddNotifiersImpl.begin();
+    std::set<NotifierBase<UserImplPtr> *>::iterator ni = onAddNotifiersImpl.begin();

     while (ni != onAddNotifiersImpl.end())
         {
         (*ni)->Notify(&users.front());
     while (ni != onAddNotifiersImpl.end())
         {
         (*ni)->Notify(&users.front());


@@ -215,15 +183,15 @@ AddUserIntoIndexes(users.begin());
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-void USERS_IMPL::Del(const std::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;
 
 user_iter u;
 

-if (!priv->userAddDel)
+if (!priv.userAddDel)

     {
     WriteServLog("%s tried to remove user \'%s\'. Access denied.",
     {
     WriteServLog("%s tried to remove user \'%s\'. Access denied.",

-         admin->GetLogStr().c_str(), login.c_str());
+                 admin->logStr().c_str(), login.c_str());

     return;
     }
 
     return;
     }
 


@@ -234,7 +202,7 @@ if (!priv->userAddDel)
     if (FindByNameNonLock(login, &u))
         {
         WriteServLog("%s tried to delete user \'%s\': not found.",
     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;
         }
                      login.c_str());
         return;
         }


@@ -243,7 +211,7 @@ if (!priv->userAddDel)
     }
 
     {
     }
 
     {

-    std::set<NOTIFIER_BASE<USER_PTR> *>::iterator ni = onDelNotifiers.begin();
+    std::set<NotifierBase<UserPtr> *>::iterator ni = onDelNotifiers.begin();

     while (ni != onDelNotifiers.end())
         {
         (*ni)->Notify(&(*u));
     while (ni != onDelNotifiers.end())
         {
         (*ni)->Notify(&(*u));


@@ -252,7 +220,7 @@ if (!priv->userAddDel)
     }
 
     {
     }
 
     {

-    std::set<NOTIFIER_BASE<USER_IMPL_PTR> *>::iterator ni = onDelNotifiersImpl.begin();
+    std::set<NotifierBase<UserImplPtr> *>::iterator ni = onDelNotifiersImpl.begin();

     while (ni != onDelNotifiersImpl.end())
         {
         (*ni)->Notify(&(*u));
     while (ni != onDelNotifiersImpl.end())
         {
         (*ni)->Notify(&(*u));


@@ -273,13 +241,13 @@ if (!priv->userAddDel)
     DelUserFromIndexes(u);
 
     WriteServLog("%s User \'%s\' deleted.",
     DelUserFromIndexes(u);
 
     WriteServLog("%s User \'%s\' deleted.",

-             admin->GetLogStr().c_str(), login.c_str());
+                 admin->logStr().c_str(), login.c_str());

 
     }
 }
 //-----------------------------------------------------------------------------
 
     }
 }
 //-----------------------------------------------------------------------------

-bool USERS_IMPL::Authorize(const std::string & login, uint32_t ip,
-                           uint32_t enabledDirs, const AUTH * auth)
+bool UsersImpl::Authorize(const std::string & login, uint32_t ip,
+                           uint32_t enabledDirs, const Auth * auth)

 {
 user_iter iter;
 STG_LOCKER lock(&mutex);
 {
 user_iter iter;
 STG_LOCKER lock(&mutex);


@@ -310,8 +278,8 @@ AddToIPIdx(iter);
 return true;
 }
 //-----------------------------------------------------------------------------
 return true;
 }
 //-----------------------------------------------------------------------------

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

                              const std::string & reason)
 {
 user_iter iter;
                              const std::string & reason)
 {
 user_iter iter;


@@ -333,7 +301,7 @@ if (!iter->GetAuthorized())
 return true;
 }
 //-----------------------------------------------------------------------------
 return true;
 }
 //-----------------------------------------------------------------------------

-int USERS_IMPL::ReadUsers()
+int UsersImpl::ReadUsers()

 {
 std::vector<std::string> usersList;
 usersList.clear();
 {
 std::vector<std::string> usersList;
 usersList.clear();


@@ -348,7 +316,7 @@ user_iter ui;
 unsigned errors = 0;
 for (unsigned int i = 0; i < usersList.size(); i++)
     {
 unsigned errors = 0;
 for (unsigned int i = 0; i < usersList.size(); i++)
     {

-    USER_IMPL u(settings, store, tariffs, sysAdmin, this, m_services);
+    UserImpl u(settings, store, tariffs, &sysAdmin, this, m_services);

 
     u.SetLogin(usersList[i]);
     users.push_front(u);
 
     u.SetLogin(usersList[i]);
     users.push_front(u);


@@ -379,14 +347,14 @@ if (errors > 0)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-void * USERS_IMPL::Run(void * d)
+void * UsersImpl::Run(void * d)

 {
 sigset_t signalSet;
 sigfillset(&signalSet);
 pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
 
 printfd(__FILE__, "=====================| pid: %d |===================== \n", getpid());
 {
 sigset_t signalSet;
 sigfillset(&signalSet);
 pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
 
 printfd(__FILE__, "=====================| pid: %d |===================== \n", getpid());

-USERS_IMPL * us = static_cast<USERS_IMPL *>(d);
+UsersImpl * us = static_cast<UsersImpl *>(d);

 
 struct tm t;
 time_t tt = stgTime;
 
 struct tm t;
 time_t tt = stgTime;


@@ -407,7 +375,7 @@ while (us->nonstop)
     //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);
 
     //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(), std::mem_fun_ref(&USER_IMPL::Run));
+    for_each(us->users.begin(), us->users.end(), [](auto& user){ user.Run(); });

 
     tt = stgTime;
     localtime_r(&tt, &t);
 
     tt = stgTime;
     localtime_r(&tt, &t);


@@ -433,7 +401,7 @@ while (us->nonstop)
         {
         //printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", tc->monitoring, monFile.c_str());
         touchTime = stgTime;
         {
         //printfd(__FILE__, "Monitor=%d file TRAFFCOUNTER %s\n", tc->monitoring, monFile.c_str());
         touchTime = stgTime;

-        TouchFile(monFile.c_str());
+        TouchFile(monFile);

         }
 
     stgUsleep(100000);
         }
 
     stgUsleep(100000);


@@ -452,13 +420,13 @@ us->isRunning = false;
 return NULL;
 }
 //-----------------------------------------------------------------------------
 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");
 {
 //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(), std::mem_fun_ref(&USER_IMPL::MidnightResetSessionStat));
+    for_each(users.begin(), users.end(), [](auto& user){ user.MidnightResetSessionStat(); });

     }
 
 if (TimeToWriteDetailStat(t))
     }
 
 if (TimeToWriteDetailStat(t))


@@ -467,21 +435,21 @@ if (TimeToWriteDetailStat(t))
     int usersCnt = 0;
 
     // ðÉÛÅÍ ÀÚÅÒÏ× ÞÁÓÔÑÍÉ. ÷ ÐÅÒÅÒÙ×ÁÈ ×ÙÚÙ×ÁÅÍ USER::Run
     int usersCnt = 0;
 
     // ðÉÛÅÍ ÀÚÅÒÏ× ÞÁÓÔÑÍÉ. ÷ ÐÅÒÅÒÙ×ÁÈ ×ÙÚÙ×ÁÅÍ USER::Run

-    std::list<USER_IMPL>::iterator usr = users.begin();
+    std::list<UserImpl>::iterator usr = users.begin();

     while (usr != users.end())
         {
         usersCnt++;
         usr->WriteDetailStat();
         ++usr;
         if (usersCnt % 10 == 0)
     while (usr != users.end())
         {
         usersCnt++;
         usr->WriteDetailStat();
         ++usr;
         if (usersCnt % 10 == 0)

-            for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::Run));
+            for_each(users.begin(), users.end(), [](auto& user){ user.Run(); });

         }
     }
 
 RealDelUser();
 }
 //-----------------------------------------------------------------------------
         }
     }
 
 RealDelUser();
 }
 //-----------------------------------------------------------------------------

-void USERS_IMPL::NewDay(const struct tm & t)
+void UsersImpl::NewDay(const struct tm & t)

 {
 struct tm t1;
 time_t tt = stgTime;
 {
 struct tm t1;
 time_t tt = stgTime;


@@ -505,19 +473,19 @@ if (!settings->GetDayFeeIsLastDay())
 if (settings->GetSpreadFee())
     {
     printfd(__FILE__, "Spread DayFee\n");
 if (settings->GetSpreadFee())
     {
     printfd(__FILE__, "Spread DayFee\n");

-    for_each(users.begin(), users.end(), std::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");
     }
 else
     {
     if (t.tm_mday == dayFee)
         {
         printfd(__FILE__, "DayFee\n");

-        for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::ProcessDayFee));
+        for_each(users.begin(), users.end(), [](auto& user){ user.ProcessDayFee(); });

         }
     }
 
         }
     }
 

-std::for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::ProcessDailyFee));
-std::for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::ProcessServices));
+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())
     {
 
 if (settings->GetDayFeeIsLastDay())
     {


@@ -526,7 +494,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)
 {
 int dayResetTraff = settings->GetDayResetTraff();
 if (dayResetTraff == 0)


@@ -534,12 +502,12 @@ if (dayResetTraff == 0)
 if (t1.tm_mday == dayResetTraff)
     {
     printfd(__FILE__, "ResetTraff\n");
 if (t1.tm_mday == dayResetTraff)
     {
     printfd(__FILE__, "ResetTraff\n");

-    for_each(users.begin(), users.end(), std::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())
     {
 {
 if (ReadUsers())
     {


@@ -556,7 +524,7 @@ if (pthread_create(&thread, NULL, Run, this))
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int USERS_IMPL::Stop()
+int UsersImpl::Stop()

 {
 printfd(__FILE__, "USERS::Stop()\n");
 
 {
 printfd(__FILE__, "USERS::Stop()\n");
 


@@ -593,22 +561,22 @@ if (isRunning)
     }
 
 printfd(__FILE__, "Before USERS::Run()\n");
     }
 
 printfd(__FILE__, "Before USERS::Run()\n");

-for_each(users.begin(), users.end(), std::mem_fun_ref(&USER_IMPL::Run));
+for_each(users.begin(), users.end(), [](auto& user){ user.Run(); });

 
 // 'cause bind2st accepts only constant first param
 
 // 'cause bind2st accepts only constant first param

-for (std::list<USER_IMPL>::iterator it = users.begin();
+for (std::list<UserImpl>::iterator it = users.begin();

      it != users.end();
      ++it)
     it->WriteDetailStat(true);
 
      it != users.end();
      ++it)
     it->WriteDetailStat(true);
 

-for_each(users.begin(), users.end(), std::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;
 }
 //-----------------------------------------------------------------------------
 
 printfd(__FILE__, "USERS::Stop()\n");
 return 0;
 }
 //-----------------------------------------------------------------------------

-void USERS_IMPL::RealDelUser()
+void UsersImpl::RealDelUser()

 {
 STG_LOCKER lock(&mutex);
 
 {
 STG_LOCKER lock(&mutex);
 


@@ -637,7 +605,7 @@ while (iter != usersToDelete.end())
 return;
 }
 //-----------------------------------------------------------------------------
 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();
 {
 printfd(__FILE__, "USERS: Add IP Idx\n");
 uint32_t ip = user->GetCurrIP();


@@ -656,7 +624,7 @@ assert((it == ipIndex.end() || it->first != ip) && "User is not in index");
 ipIndex.insert(it, std::make_pair(ip, user));
 }
 //-----------------------------------------------------------------------------
 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");
 {
 printfd(__FILE__, "USERS: Del IP Idx\n");
 assert(ip && "User has non-null ip");


@@ -673,7 +641,7 @@ if (it == ipIndex.end())
 ipIndex.erase(it);
 }
 //-----------------------------------------------------------------------------
 ipIndex.erase(it);
 }
 //-----------------------------------------------------------------------------

-bool USERS_IMPL::FindByIPIdx(uint32_t ip, user_iter & iter) const
+bool UsersImpl::FindByIPIdx(uint32_t ip, user_iter & iter) const

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


@@ -682,7 +650,7 @@ iter = it->second;
 return true;
 }
 //-----------------------------------------------------------------------------
 return true;
 }
 //-----------------------------------------------------------------------------

-int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_PTR * usr) const
+int UsersImpl::FindByIPIdx(uint32_t ip, UserPtr * usr) const

 {
 STG_LOCKER lock(&mutex);
 
 {
 STG_LOCKER lock(&mutex);
 


@@ -696,7 +664,7 @@ if (FindByIPIdx(ip, iter))
 return -1;
 }
 //-----------------------------------------------------------------------------
 return -1;
 }
 //-----------------------------------------------------------------------------

-int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_IMPL ** usr) const
+int UsersImpl::FindByIPIdx(uint32_t ip, UserImpl ** usr) const

 {
 STG_LOCKER lock(&mutex);
 
 {
 STG_LOCKER lock(&mutex);
 


@@ -710,7 +678,7 @@ if (FindByIPIdx(ip, iter))
 return -1;
 }
 //-----------------------------------------------------------------------------
 return -1;
 }
 //-----------------------------------------------------------------------------

-bool USERS_IMPL::IsIPInIndex(uint32_t ip) const
+bool UsersImpl::IsIPInIndex(uint32_t ip) const

 {
 STG_LOCKER lock(&mutex);
 
 {
 STG_LOCKER lock(&mutex);
 


@@ -719,16 +687,16 @@ std::map<uint32_t, user_iter>::const_iterator it(ipIndex.find(ip));
 return it != ipIndex.end();
 }
 //-----------------------------------------------------------------------------
 return it != ipIndex.end();
 }
 //-----------------------------------------------------------------------------

-bool USERS_IMPL::IsIPInUse(uint32_t ip, const std::string & login, CONST_USER_PTR * user) const
+bool UsersImpl::IsIPInUse(uint32_t ip, const std::string & login, ConstUserPtr * user) const

 {
 STG_LOCKER lock(&mutex);
 {
 STG_LOCKER lock(&mutex);

-std::list<USER_IMPL>::const_iterator iter;
+std::list<UserImpl>::const_iterator iter;

 iter = users.begin();
 while (iter != users.end())
     {
     if (iter->GetLogin() != login &&
 iter = users.begin();
 while (iter != users.end())
     {
     if (iter->GetLogin() != login &&

-        !iter->GetProperty().ips.Get().IsAnyIP() &&
-        iter->GetProperty().ips.Get().IsIPInIPS(ip))
+        !iter->GetProperties().ips.Get().isAnyIP() &&
+        iter->GetProperties().ips.Get().find(ip))

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


@@ -739,55 +707,55 @@ while (iter != users.end())
 return false;
 }
 //-----------------------------------------------------------------------------
 return false;
 }
 //-----------------------------------------------------------------------------

-void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * n)
+void UsersImpl::AddNotifierUserAdd(NotifierBase<UserPtr> * n)

 {
 STG_LOCKER lock(&mutex);
 onAddNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------
 {
 STG_LOCKER lock(&mutex);
 onAddNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------

-void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * n)
+void UsersImpl::DelNotifierUserAdd(NotifierBase<UserPtr> * n)

 {
 STG_LOCKER lock(&mutex);
 onAddNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------
 {
 STG_LOCKER lock(&mutex);
 onAddNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------

-void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE<USER_PTR> * n)
+void UsersImpl::AddNotifierUserDel(NotifierBase<UserPtr> * n)

 {
 STG_LOCKER lock(&mutex);
 onDelNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------
 {
 STG_LOCKER lock(&mutex);
 onDelNotifiers.insert(n);
 }
 //-----------------------------------------------------------------------------

-void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE<USER_PTR> * n)
+void UsersImpl::DelNotifierUserDel(NotifierBase<UserPtr> * n)

 {
 STG_LOCKER lock(&mutex);
 onDelNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------
 {
 STG_LOCKER lock(&mutex);
 onDelNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------

-void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+void UsersImpl::AddNotifierUserAdd(NotifierBase<UserImplPtr> * n)

 {
 STG_LOCKER lock(&mutex);
 onAddNotifiersImpl.insert(n);
 }
 //-----------------------------------------------------------------------------
 {
 STG_LOCKER lock(&mutex);
 onAddNotifiersImpl.insert(n);
 }
 //-----------------------------------------------------------------------------

-void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+void UsersImpl::DelNotifierUserAdd(NotifierBase<UserImplPtr> * n)

 {
 STG_LOCKER lock(&mutex);
 onAddNotifiersImpl.erase(n);
 }
 //-----------------------------------------------------------------------------
 {
 STG_LOCKER lock(&mutex);
 onAddNotifiersImpl.erase(n);
 }
 //-----------------------------------------------------------------------------

-void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+void UsersImpl::AddNotifierUserDel(NotifierBase<UserImplPtr> * n)

 {
 STG_LOCKER lock(&mutex);
 onDelNotifiersImpl.insert(n);
 }
 //-----------------------------------------------------------------------------
 {
 STG_LOCKER lock(&mutex);
 onDelNotifiersImpl.insert(n);
 }
 //-----------------------------------------------------------------------------

-void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+void UsersImpl::DelNotifierUserDel(NotifierBase<UserImplPtr> * n)

 {
 STG_LOCKER lock(&mutex);
 onDelNotifiersImpl.erase(n);
 }
 //-----------------------------------------------------------------------------
 {
 STG_LOCKER lock(&mutex);
 onDelNotifiersImpl.erase(n);
 }
 //-----------------------------------------------------------------------------

-int USERS_IMPL::OpenSearch()
+int UsersImpl::OpenSearch()

 {
 STG_LOCKER lock(&mutex);
 handle++;
 {
 STG_LOCKER lock(&mutex);
 handle++;


@@ -795,16 +763,16 @@ searchDescriptors[handle] = users.begin();
 return handle;
 }
 //-----------------------------------------------------------------------------
 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;
 }
 //-----------------------------------------------------------------------------
     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);
 
 {
 STG_LOCKER lock(&mutex);
 


@@ -833,7 +801,7 @@ while (searchDescriptors[h]->GetDeleted())
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int USERS_IMPL::CloseSearch(int h)
+int UsersImpl::CloseSearch(int h)

 {
 STG_LOCKER lock(&mutex);
 if (searchDescriptors.find(h) != searchDescriptors.end())
 {
 STG_LOCKER lock(&mutex);
 if (searchDescriptors.find(h) != searchDescriptors.end())


@@ -846,19 +814,19 @@ WriteServLog("USERS. Incorrect search handle.");
 return -1;
 }
 //-----------------------------------------------------------------------------
 return -1;
 }
 //-----------------------------------------------------------------------------

-void USERS_IMPL::AddUserIntoIndexes(user_iter user)
+void UsersImpl::AddUserIntoIndexes(user_iter user)

 {
 STG_LOCKER lock(&mutex);
 loginIndex.insert(make_pair(user->GetLogin(), user));
 }
 //-----------------------------------------------------------------------------
 {
 STG_LOCKER lock(&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);
 loginIndex.erase(user->GetLogin());
 }
 //-----------------------------------------------------------------------------
 {
 STG_LOCKER lock(&mutex);
 loginIndex.erase(user->GetLogin());
 }
 //-----------------------------------------------------------------------------

-bool USERS_IMPL::TimeToWriteDetailStat(const struct tm & t)
+bool UsersImpl::TimeToWriteDetailStat(const struct tm & t)

 {
 int statTime = settings->GetDetailStatWritePeriod();
 
 {
 int statTime = settings->GetDetailStatWritePeriod();