Replace updating lastActivityTime via property with pure assignement

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

diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h
index 7a2fc0f920af4f114932b4106205a1068c5f3728..46b171399affe45d7f4cfccc0026bfb5f865ed79 100644 (file)
--- a/projects/stargazer/users_impl.h
+++ b/projects/stargazer/users_impl.h
@@ -36,19 +36,18 @@ $Author: faust $
 #include <list>
 #include <set>
 
-#include "os_int.h"
-
-#include "store.h"
-#include "settings_impl.h"
-#include "users.h"
-#include "user.h"
-#include "user_impl.h"
-#include "tariffs.h"
-#include "stg_logger.h"
-#include "notifer.h"
+#include "stg/os_int.h"
+#include "stg/store.h"
+#include "stg/users.h"
+#include "stg/user.h"
+#include "stg/tariffs.h"
+#include "stg/logger.h"
+#include "stg/notifer.h"
+#include "stg/noncopyable.h"
 #include "actions.h"
-#include "noncopyable.h"
 #include "eventloop.h"
+#include "settings_impl.h"
+#include "user_impl.h"
 
 const int userDeleteDelayTime = 120;
 
@@ -105,6 +104,12 @@ public:
     void            AddNotifierUserDel(NOTIFIER_BASE<USER_PTR> *);
     void            DelNotifierUserDel(NOTIFIER_BASE<USER_PTR> *);
 
+    void            AddNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> *);
+    void            DelNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> *);
+
+    void            AddNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> *);
+    void            DelNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> *);
+
     int             Add(const std::string & login, const ADMIN * admin);
     void            Del(const std::string & login, const ADMIN * admin);
 
@@ -112,10 +117,12 @@ public:
     int             GetUserNum() const;
 
     int             FindByIPIdx(uint32_t ip, USER_PTR * user) const;
+    int             FindByIPIdx(uint32_t ip, USER_IMPL ** user) const;
     bool            IsIPInIndex(uint32_t ip) const;
 
     int             OpenSearch();
     int             SearchNext(int handler, USER_PTR * user);
+    int             SearchNext(int handler, USER_IMPL ** user);
     int             CloseSearch(int handler);
 
     int             Start();
@@ -168,6 +175,8 @@ private:
 
     std::set<NOTIFIER_BASE<USER_PTR>*> onAddNotifiers;
     std::set<NOTIFIER_BASE<USER_PTR>*> onDelNotifiers;
+    std::set<NOTIFIER_BASE<USER_IMPL_PTR>*> onAddNotifiersImpl;
+    std::set<NOTIFIER_BASE<USER_IMPL_PTR>*> onDelNotifiersImpl;
 };
 //-----------------------------------------------------------------------------
 inline