Help book chapter 1 complete

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

diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h
index 37edef7a22483ef0a3d78bb878a6562cdfbcdca2..46b171399affe45d7f4cfccc0026bfb5f865ed79 100644 (file)
--- a/projects/stargazer/users_impl.h
+++ b/projects/stargazer/users_impl.h
@@ -41,7 +41,7 @@ $Author: faust $
 #include "stg/users.h"
 #include "stg/user.h"
 #include "stg/tariffs.h"
 #include "stg/users.h"
 #include "stg/user.h"
 #include "stg/tariffs.h"

-#include "stg/stg_logger.h"
+#include "stg/logger.h"

 #include "stg/notifer.h"
 #include "stg/noncopyable.h"
 #include "actions.h"
 #include "stg/notifer.h"
 #include "stg/noncopyable.h"
 #include "actions.h"


@@ -104,6 +104,12 @@ public:
     void            AddNotifierUserDel(NOTIFIER_BASE<USER_PTR> *);
     void            DelNotifierUserDel(NOTIFIER_BASE<USER_PTR> *);
 
     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);
 
     int             Add(const std::string & login, const ADMIN * admin);
     void            Del(const std::string & login, const ADMIN * admin);
 


@@ -111,10 +117,12 @@ public:
     int             GetUserNum() const;
 
     int             FindByIPIdx(uint32_t ip, USER_PTR * user) const;
     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);
     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();
     int             CloseSearch(int handler);
 
     int             Start();


@@ -167,6 +175,8 @@ private:
 
     std::set<NOTIFIER_BASE<USER_PTR>*> onAddNotifiers;
     std::set<NOTIFIER_BASE<USER_PTR>*> onDelNotifiers;
 
     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
 };
 //-----------------------------------------------------------------------------
 inline