X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/ede91934442fd804d7b818971a44e3ad795cb01f..9f01f72d7b1da24b97bcfed87a41f37fd88e7d10:/projects/stargazer/users_impl.h?ds=inline

diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h
index 966487df..46b17139 100644
--- 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.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;
 
@@ -92,7 +91,7 @@ class USERS_IMPL : private NONCOPYABLE, public USERS {
     friend class PROPERTY_NOTIFER_IP_AFTER;
 
 public:
-    USERS_IMPL(SETTINGS * s, STORE * store, TARIFFS * tariffs, const ADMIN & sysAdmin);
+    USERS_IMPL(SETTINGS_IMPL * s, STORE * store, TARIFFS * tariffs, const ADMIN * sysAdmin);
     virtual ~USERS_IMPL();
 
     int             FindByName(const std::string & login, USER_PTR * user);
@@ -105,17 +104,25 @@ public:
     void            AddNotifierUserDel(NOTIFIER_BASE<USER_PTR> *);
     void            DelNotifierUserDel(NOTIFIER_BASE<USER_PTR> *);
 
-    int             Add(const std::string & login, const ADMIN & admin);
-    void            Del(const std::string & login, const ADMIN & admin);
+    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);
 
     int             ReadUsers();
     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();
@@ -151,10 +158,10 @@ private:
     std::map<uint32_t, user_iter>         ipIndex;
     std::map<std::string, user_iter>      loginIndex;
 
-    SETTINGS *          settings;
+    SETTINGS_IMPL *     settings;
     TARIFFS *           tariffs;
     STORE *             store;
-    const ADMIN &       sysAdmin;
+    const ADMIN *       sysAdmin;
     STG_LOGGER &        WriteServLog;
 
     bool                nonstop;
@@ -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