Explicit shell specification removed

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

diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp
index 84a10227887215d3789df479d2eedad3a43ea6e2..61ee90ff7e0ad6379f2f9faed6a3d1c7c4c10d74 100644 (file)
--- a/projects/stargazer/users_impl.cpp
+++ b/projects/stargazer/users_impl.cpp
@@ -33,6 +33,7 @@
 #endif
 
 #include <pthread.h>
 #endif
 
 #include <pthread.h>

+

 #include <csignal>
 #include <cassert>
 #include <algorithm>
 #include <csignal>
 #include <cassert>
 #include <algorithm>


@@ -40,10 +41,9 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

-#include "settings.h"
-#include "users.h"
-#include "user.h"
-#include "common.h"
+#include "stg/settings.h"
+#include "stg/common.h"
+#include "users_impl.h"

 #include "stg_timer.h"
 
 using namespace std;
 #include "stg_timer.h"
 
 using namespace std;


@@ -53,11 +53,12 @@ extern const volatile time_t stgTime;
 //#define USERS_DEBUG 1
 
 //-----------------------------------------------------------------------------
 //#define USERS_DEBUG 1
 
 //-----------------------------------------------------------------------------

-USERS::USERS(SETTINGS * s, BASE_STORE * st, TARIFFS * t, const ADMIN & sa)
-    : users(),
+USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st, TARIFFS * t, const ADMIN * sa)
+    : USERS(),
+      users(),

       usersToDelete(),
       usersToDelete(),

-      userIPNotifiersBefore(),
-      userIPNotifiersAfter(),
+      /*userIPNotifiersBefore(),
+      userIPNotifiersAfter(),*/

       ipIndex(),
       loginIndex(),
       settings(s),
       ipIndex(),
       loginIndex(),
       settings(s),


@@ -72,7 +73,9 @@ USERS::USERS(SETTINGS * s, BASE_STORE * st, TARIFFS * t, const ADMIN & sa)
       handle(0),
       searchDescriptors(),
       onAddNotifiers(),
       handle(0),
       searchDescriptors(),
       onAddNotifiers(),

-      onDelNotifiers()
+      onDelNotifiers(),
+      onAddNotifiersImpl(),
+      onDelNotifiersImpl()

 {
 pthread_mutexattr_t attr;
 pthread_mutexattr_init(&attr);
 {
 pthread_mutexattr_t attr;
 pthread_mutexattr_init(&attr);


@@ -80,14 +83,14 @@ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
 pthread_mutex_init(&mutex, &attr);
 }
 //-----------------------------------------------------------------------------
 pthread_mutex_init(&mutex, &attr);
 }
 //-----------------------------------------------------------------------------

-USERS::~USERS()
+USERS_IMPL::~USERS_IMPL()

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

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

 {
 {

-map<string, user_iter>::const_iterator iter;
+map<string, user_iter>::iterator iter;

 iter = loginIndex.find(login);
 if (iter != loginIndex.end())
     {
 iter = loginIndex.find(login);
 if (iter != loginIndex.end())
     {


@@ -98,36 +101,41 @@ if (iter != loginIndex.end())
 return -1;
 }
 //-----------------------------------------------------------------------------
 return -1;
 }
 //-----------------------------------------------------------------------------

-int USERS::FindByName(const string & login, user_iter * user) const
+int USERS_IMPL::FindByName(const string & login, USER_PTR * user)

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

-return FindByNameNonLock(login, user);
+user_iter u;
+int res = FindByNameNonLock(login, &u);
+if (res)
+    return -1;
+*user = &(*u);
+return 0;

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

-bool USERS::TariffInUse(const string & tariffName)
+bool USERS_IMPL::TariffInUse(const string & tariffName) const

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

-list<USER>::iterator iter;
+list<USER_IMPL>::const_iterator iter;

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

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

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

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

 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 {
 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.",
 
 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;
     }
                "\': tried to add user \'" + ud->login + "\'. Access denied.";*/
     return -1;
     }


@@ -137,12 +145,12 @@ if (store->AddUser(login))
     {
     //TODO
     //WriteServLog("Admin \'%s\': tried to add user \'%s\'. Access denied.",
     {
     //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;
     }
 //////
 
     return -1;
     }
 //////
 

-USER u(settings, store, tariffs, sysAdmin, &ipIndex);
+USER_IMPL u(settings, store, tariffs, sysAdmin, this);

 
 /*struct tm * tms;
 time_t t = stgTime;
 
 /*struct tm * tms;
 time_t t = stgTime;


@@ -166,35 +174,46 @@ u.WriteConf();
 u.WriteStat();
 
 WriteServLog("%s User \'%s\' added.",
 u.WriteStat();
 
 WriteServLog("%s User \'%s\' added.",

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

 
 u.OnAdd();
 
 users.push_front(u);
 
 AddUserIntoIndexes(users.begin());
 
 u.OnAdd();
 
 users.push_front(u);
 
 AddUserIntoIndexes(users.begin());

-SetUserNotifiers(users.begin());

 
 

-// õ×ÅÄÏÍÌÑÅÍ ×ÓÅÈ ÖÅÌÁÀÝÉÈ, ÞÔÏ ÄÏÂÁ×ÌÅÎ ÎÏ×ÙÊ ÐÏÌØÚÏ×ÁÔÅÌØ
-set<NOTIFIER_BASE<user_iter> *>::iterator ni = onAddNotifiers.begin();
-while (ni != onAddNotifiers.end())

     {
     {

-    (*ni)->Notify(users.begin());
-    ++ni;
+    // Fire all "on add" notifiers
+    set<NOTIFIER_BASE<USER_PTR> *>::iterator ni = onAddNotifiers.begin();
+    while (ni != onAddNotifiers.end())
+        {
+        (*ni)->Notify(&users.front());
+        ++ni;
+        }
+    }
+
+    {
+    // Fire all "on add" implementation notifiers
+    set<NOTIFIER_BASE<USER_IMPL_PTR> *>::iterator ni = onAddNotifiersImpl.begin();
+    while (ni != onAddNotifiersImpl.end())
+        {
+        (*ni)->Notify(&users.front());
+        ++ni;
+        }

     }
 
 return 0;
 }
 //-----------------------------------------------------------------------------
     }
 
 return 0;
 }
 //-----------------------------------------------------------------------------

-void USERS::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.",
 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;
     }
 
     return;
     }
 


@@ -205,61 +224,123 @@ 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->GetLogStr().c_str(),

                      login.c_str());
         return;
         }
                      login.c_str());
         return;
         }

+
+    u->SetDeleted();

     }
 
     }
 

-set<NOTIFIER_BASE<user_iter> *>::iterator ni = onDelNotifiers.begin();
-while (ni != onDelNotifiers.end())

     {
     {

-    (*ni)->Notify(u);
-    ++ni;
+    set<NOTIFIER_BASE<USER_PTR> *>::iterator ni = onDelNotifiers.begin();
+    while (ni != onDelNotifiers.end())
+        {
+        (*ni)->Notify(&(*u));
+        ++ni;
+        }
+    }
+
+    {
+    set<NOTIFIER_BASE<USER_IMPL_PTR> *>::iterator ni = onDelNotifiersImpl.begin();
+    while (ni != onDelNotifiersImpl.end())
+        {
+        (*ni)->Notify(&(*u));
+        ++ni;
+        }

     }
 
     {
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
     u->OnDelete();
     }
 
     {
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
     u->OnDelete();

-    u->SetDeleted();

 
     USER_TO_DEL utd;
     utd.iter = u;
     utd.delTime = stgTime;
     usersToDelete.push_back(utd);
 
 
     USER_TO_DEL utd;
     utd.iter = u;
     utd.delTime = stgTime;
     usersToDelete.push_back(utd);
 

-    UnSetUserNotifiers(u);

     DelUserFromIndexes(u);
 
     WriteServLog("%s User \'%s\' deleted.",
     DelUserFromIndexes(u);
 
     WriteServLog("%s User \'%s\' deleted.",

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

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

-int USERS::ReadUsers()
+bool USERS_IMPL::Authorize(const std::string & login, uint32_t ip,
+                           uint32_t enabledDirs, const AUTH * auth)
+{
+user_iter iter;
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+if (FindByNameNonLock(login, &iter))
+    {
+    WriteServLog("Attempt to authorize non-existant user '%s'", login.c_str());
+    return false;
+    }
+
+if (FindByIPIdx(ip, iter))
+    {
+    if (iter->GetLogin() != login)
+        {
+        WriteServLog("Attempt to authorize user '%s' from ip %s which already occupied by '%s'",
+                     login.c_str(), inet_ntostring(ip).c_str(),
+                     iter->GetLogin().c_str());
+        return false;
+        }
+    if (iter->Authorize(ip, enabledDirs, auth))
+        return false;
+    return true;
+    }
+
+if (iter->Authorize(ip, enabledDirs, auth))
+    return false;
+
+AddToIPIdx(iter);
+return true;
+}
+//-----------------------------------------------------------------------------
+bool USERS_IMPL::Unauthorize(const std::string & login, const AUTH * auth)
+{
+user_iter iter;
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+if (FindByNameNonLock(login, &iter))
+    {
+    WriteServLog("Attempt to unauthorize non-existant user '%s'", login.c_str());
+    return false;
+    }
+
+uint32_t ip = iter->GetCurrIP();
+
+iter->Unauthorize(auth);
+
+if (!iter->GetAuthorized())
+    DelFromIPIdx(ip);
+
+return true;
+}
+//-----------------------------------------------------------------------------
+int USERS_IMPL::ReadUsers()

 {
 vector<string> usersList;
 usersList.clear();
 if (store->GetUsersList(&usersList) < 0)
     {
     WriteServLog(store->GetStrError().c_str());
 {
 vector<string> usersList;
 usersList.clear();
 if (store->GetUsersList(&usersList) < 0)
     {
     WriteServLog(store->GetStrError().c_str());

-    exit(1);
+    return -1;

     }
 
 user_iter ui;
 
 for (unsigned int i = 0; i < usersList.size(); i++)
     {
     }
 
 user_iter ui;
 
 for (unsigned int i = 0; i < usersList.size(); i++)
     {

-    USER u(settings, store, tariffs, sysAdmin, &ipIndex);
+    USER_IMPL u(settings, store, tariffs, sysAdmin, this);

 
     u.SetLogin(usersList[i]);
     users.push_front(u);
     ui = users.begin();
 
     AddUserIntoIndexes(ui);
 
     u.SetLogin(usersList[i]);
     users.push_front(u);
     ui = users.begin();
 
     AddUserIntoIndexes(ui);

-    SetUserNotifiers(ui);

 
     if (ui->ReadConf() < 0)
         return -1;
 
     if (ui->ReadConf() < 0)
         return -1;


@@ -271,10 +352,14 @@ for (unsigned int i = 0; i < usersList.size(); i++)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

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

 {
 {

+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+

 printfd(__FILE__, "=====================| pid: %d |===================== \n", getpid());
 printfd(__FILE__, "=====================| pid: %d |===================== \n", getpid());

-USERS * us = (USERS*) d;
+USERS_IMPL * us = (USERS_IMPL*) d;

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


@@ -295,7 +380,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(), mem_fun_ref(&USER::Run));
+    for_each(us->users.begin(), us->users.end(), mem_fun_ref(&USER_IMPL::Run));

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


@@ -330,9 +415,8 @@ while (us->nonstop)
 user_iter ui = us->users.begin();
 while (ui != us->users.end())
     {
 user_iter ui = us->users.begin();
 while (ui != us->users.end())
     {

-    us->UnSetUserNotifiers(ui);

     us->DelUserFromIndexes(ui);
     us->DelUserFromIndexes(ui);

-    ui++;
+    ++ui;

     }
 
 list<USER_TO_DEL>::iterator iter;
     }
 
 list<USER_TO_DEL>::iterator iter;


@@ -349,13 +433,13 @@ us->isRunning = false;
 return NULL;
 }
 //-----------------------------------------------------------------------------
 return NULL;
 }
 //-----------------------------------------------------------------------------

-void USERS::NewMinute(const struct tm & t)
+void USERS_IMPL::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(), mem_fun_ref(&USER::MidnightResetSessionStat));
+    for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::MidnightResetSessionStat));

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


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

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

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

-        usr++;
+        ++usr;

         if (usersCnt % 10 == 0)
         if (usersCnt % 10 == 0)

-            for_each(users.begin(), users.end(), mem_fun_ref(&USER::Run));
+            for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::Run));

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

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

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


@@ -402,14 +486,14 @@ 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(), mem_fun_ref(&USER::ProcessDayFeeSpread));
+    for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::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(), mem_fun_ref(&USER::ProcessDayFee));
+        for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::ProcessDayFee));

         }
     }
 
         }
     }
 


@@ -420,7 +504,7 @@ if (settings->GetDayFeeIsLastDay())
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

-void USERS::DayResetTraff(const struct tm & t1)
+void USERS_IMPL::DayResetTraff(const struct tm & t1)

 {
 int dayResetTraff = settings->GetDayResetTraff();
 if (dayResetTraff == 0)
 {
 int dayResetTraff = settings->GetDayResetTraff();
 if (dayResetTraff == 0)


@@ -428,12 +512,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(), mem_fun_ref(&USER::ProcessNewMonth));
-    for_each(users.begin(), users.end(), mem_fun_ref(&USER::SetPrepaidTraff));
+    for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::ProcessNewMonth));
+    //for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::SetPrepaidTraff));

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

-int USERS::Start()
+int USERS_IMPL::Start()

 {
 if (ReadUsers())
     {
 {
 if (ReadUsers())
     {


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

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

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


@@ -463,13 +547,13 @@ if (!isRunning)
 nonstop = false;
 
 //5 seconds to thread stops itself
 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;
 
     {
     if (!isRunning)
         break;
 

-    usleep(200000);
+    nanosleep(&ts, NULL);

     }
 
 //after 5 seconds waiting thread still running. now kill it
     }
 
 //after 5 seconds waiting thread still running. now kill it


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

-for_each(users.begin(), users.end(), mem_fun_ref(&USER::Run));
+for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::Run));

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

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

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

-for_each(users.begin(), users.end(), mem_fun_ref(&USER::WriteStat));
-for_each(users.begin(), users.end(), mem_fun_ref(&USER::WriteConf));
+for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::WriteStat));
+//for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::WriteConf));

 
 printfd(__FILE__, "USERS::Stop()\n");
 return 0;
 }
 //-----------------------------------------------------------------------------
 
 printfd(__FILE__, "USERS::Stop()\n");
 return 0;
 }
 //-----------------------------------------------------------------------------

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

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


@@ -531,13 +615,7 @@ while (iter != usersToDelete.end())
 return;
 }
 //-----------------------------------------------------------------------------
 return;
 }
 //-----------------------------------------------------------------------------

-int USERS::GetUserNum()
-{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-return users.size();
-}
-//-----------------------------------------------------------------------------
-void USERS::AddToIPIdx(user_iter user)
+void USERS_IMPL::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();


@@ -556,7 +634,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::DelFromIPIdx(uint32_t ip)
+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");


@@ -567,56 +645,107 @@ const map<uint32_t, user_iter>::iterator it(
         ipIndex.find(ip)
 );
 
         ipIndex.find(ip)
 );
 

-//assert(it != ipIndex.end() && "User is in index");

 if (it == ipIndex.end())
 if (it == ipIndex.end())

-    return; // User has not been added
+    return;

 
 ipIndex.erase(it);
 }
 //-----------------------------------------------------------------------------
 
 ipIndex.erase(it);
 }
 //-----------------------------------------------------------------------------

-int USERS::FindByIPIdx(uint32_t ip, user_iter * usr)
+bool USERS_IMPL::FindByIPIdx(uint32_t ip, user_iter & iter) const
+{
+map<uint32_t, user_iter>::const_iterator it(ipIndex.find(ip));
+if (it == ipIndex.end())
+    return false;
+iter = it->second;
+return true;
+}
+//-----------------------------------------------------------------------------
+int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_PTR * usr) const

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

-map<uint32_t, user_iter>::iterator it;
-it = ipIndex.find(ip);
+user_iter iter;
+if (FindByIPIdx(ip, iter))
+    {
+    *usr = &(*iter);
+    return 0;
+    }

 
 

-if (it == ipIndex.end())
+return -1;
+}
+//-----------------------------------------------------------------------------
+int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_IMPL ** usr) const
+{
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+
+user_iter iter;
+if (FindByIPIdx(ip, iter))

     {
     {

-    //printfd(__FILE__, "User NOT found in IP_Index!!!\n");
-    return -1;
+    *usr = &(*iter);
+    return 0;

     }
     }

-*usr = it->second;
-//printfd(__FILE__, "User found in IP_Index\n");
-return 0;
+
+return -1;
+}
+//-----------------------------------------------------------------------------
+bool USERS_IMPL::IsIPInIndex(uint32_t ip) const
+{
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+
+map<uint32_t, user_iter>::const_iterator it(ipIndex.find(ip));
+
+return it != ipIndex.end();

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

-void USERS::AddNotifierUserAdd(NOTIFIER_BASE<user_iter> * n)
+void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * n)

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

-void USERS::DelNotifierUserAdd(NOTIFIER_BASE<user_iter> * n)
+void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * n)

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

-//printfd(__FILE__, "DelNotifierUserAdd\n");

 onAddNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------
 onAddNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------

-void USERS::AddNotifierUserDel(NOTIFIER_BASE<user_iter> * n)
+void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE<USER_PTR> * n)

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

-void USERS::DelNotifierUserDel(NOTIFIER_BASE<user_iter> * n)
+void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE<USER_PTR> * n)

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

-int USERS::OpenSearch()
+void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+{
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+onAddNotifiersImpl.insert(n);
+}
+//-----------------------------------------------------------------------------
+void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+{
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+onAddNotifiersImpl.erase(n);
+}
+//-----------------------------------------------------------------------------
+void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+{
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+onDelNotifiersImpl.insert(n);
+}
+//-----------------------------------------------------------------------------
+void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+{
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+onDelNotifiersImpl.erase(n);
+}
+//-----------------------------------------------------------------------------
+int USERS_IMPL::OpenSearch()

 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 handle++;
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 handle++;


@@ -624,7 +753,16 @@ searchDescriptors[handle] = users.begin();
 return handle;
 }
 //-----------------------------------------------------------------------------
 return handle;
 }
 //-----------------------------------------------------------------------------

-int USERS::SearchNext(int h, user_iter * u)
+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__);
 
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 


@@ -646,14 +784,14 @@ while (searchDescriptors[h]->GetDeleted())
         }
     }
 
         }
     }
 

-*u = searchDescriptors[h];
+*user = &(*searchDescriptors[h]);

 
 ++searchDescriptors[h];
 
 return 0;
 }
 //-----------------------------------------------------------------------------
 
 ++searchDescriptors[h];
 
 return 0;
 }
 //-----------------------------------------------------------------------------

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

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


@@ -666,67 +804,19 @@ WriteServLog("USERS. Incorrect search handle.");
 return -1;
 }
 //-----------------------------------------------------------------------------
 return -1;
 }
 //-----------------------------------------------------------------------------

-void USERS::SetUserNotifiers(user_iter user)
-{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-
-PROPERTY_NOTIFER_IP_BEFORE nb(*this, user);
-PROPERTY_NOTIFER_IP_AFTER  na(*this, user);
-
-userIPNotifiersBefore.push_front(nb);
-userIPNotifiersAfter.push_front(na);
-
-user->AddCurrIPBeforeNotifier(&(*userIPNotifiersBefore.begin()));
-user->AddCurrIPAfterNotifier(&(*userIPNotifiersAfter.begin()));
-}
-//-----------------------------------------------------------------------------
-void USERS::UnSetUserNotifiers(user_iter user)
-{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-
-list<PROPERTY_NOTIFER_IP_BEFORE>::iterator  bi;
-list<PROPERTY_NOTIFER_IP_AFTER>::iterator   ai;
-
-bi = userIPNotifiersBefore.begin();
-while (bi != userIPNotifiersBefore.end())
-    {
-    if (bi->GetUser() == user)
-        {
-        bi->GetUser()->DelCurrIPBeforeNotifier(&(*bi));
-        userIPNotifiersBefore.erase(bi);
-        //printfd(__FILE__, "Notifier Before removed. User %s\n", bi->GetUser()->GetLogin().c_str());
-        break;
-        }
-    bi++;
-    }
-
-ai = userIPNotifiersAfter.begin();
-while (ai != userIPNotifiersAfter.end())
-    {
-    if (ai->GetUser() == user)
-        {
-        ai->GetUser()->DelCurrIPAfterNotifier(&(*ai));
-        userIPNotifiersAfter.erase(ai);
-        //printfd(__FILE__, "Notifier After removed. User %s\n", ai->GetUser()->GetLogin().c_str());
-        break;
-        }
-    ai++;
-    }
-}
-//-----------------------------------------------------------------------------
-void USERS::AddUserIntoIndexes(user_iter user)
+void USERS_IMPL::AddUserIntoIndexes(user_iter user)

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

-loginIndex.insert(pair<string, user_iter>(user->GetLogin(), user));
+loginIndex.insert(make_pair(user->GetLogin(), user));

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

-void USERS::DelUserFromIndexes(user_iter user)
+void USERS_IMPL::DelUserFromIndexes(user_iter user)

 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 loginIndex.erase(user->GetLogin());
 }
 //-----------------------------------------------------------------------------
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 loginIndex.erase(user->GetLogin());
 }
 //-----------------------------------------------------------------------------

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

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