Ticket 37. The RESETABLE<TARIFF::CHANGE_POLICY> changePolicy declared in

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

diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp
index 3dd7638b9b2ecf392685ccd2f68d19b9fd17edde..18d1abaf163dd4758d3113fa068c7d0fd723326a 100644 (file)
--- a/projects/stargazer/users_impl.cpp
+++ b/projects/stargazer/users_impl.cpp
@@ -51,29 +51,18 @@ extern volatile time_t stgTime;
 //#define USERS_DEBUG 1
 
 //-----------------------------------------------------------------------------
 //#define USERS_DEBUG 1
 
 //-----------------------------------------------------------------------------

-USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st, TARIFFS * t, const ADMIN * sa)
-    : USERS(),
-      users(),
-      usersToDelete(),
-      /*userIPNotifiersBefore(),
-      userIPNotifiersAfter(),*/
-      ipIndex(),
-      loginIndex(),
-      settings(s),
+USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st,
+                       TARIFFS * t, SERVICES & svcs,
+                       const ADMIN * sa)
+    : settings(s),

       tariffs(t),
       tariffs(t),

+      m_services(svcs),

       store(st),
       sysAdmin(sa),
       WriteServLog(GetStgLogger()),
       nonstop(false),
       isRunning(false),
       store(st),
       sysAdmin(sa),
       WriteServLog(GetStgLogger()),
       nonstop(false),
       isRunning(false),

-      mutex(),
-      thread(),
-      handle(0),
-      searchDescriptors(),
-      onAddNotifiers(),
-      onDelNotifiers(),
-      onAddNotifiersImpl(),
-      onDelNotifiersImpl()
+      handle(0)

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


@@ -171,7 +160,7 @@ if (store->AddUser(login))
     }
 //////
 
     }
 //////
 

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

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


@@ -330,6 +319,7 @@ 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());

+    printfd(__FILE__, "Attempt to unauthorize non-existant user '%s'", login.c_str());

     return false;
     }
 
     return false;
     }
 


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

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

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


@@ -435,15 +425,7 @@ while (us->nonstop)
     stgUsleep(100000);
     } //while (us->nonstop)
 
     stgUsleep(100000);
     } //while (us->nonstop)
 

-user_iter ui = us->users.begin();
-while (ui != us->users.end())
-    {
-    us->DelUserFromIndexes(ui);
-    ++ui;
-    }
-
-std::list<USER_TO_DEL>::iterator iter;
-iter = us->usersToDelete.begin();
+std::list<USER_TO_DEL>::iterator iter(us->usersToDelete.begin());

 while (iter != us->usersToDelete.end())
     {
     iter->delTime -= 2 * userDeleteDelayTime;
 while (iter != us->usersToDelete.end())
     {
     iter->delTime -= 2 * userDeleteDelayTime;