Add name to anonymous union

[stg.git] / projects / stargazer / plugins / authorization / ao / ao.h

diff --git a/projects/stargazer/plugins/authorization/ao/ao.h b/projects/stargazer/plugins/authorization/ao/ao.h
index 05aa27a29e92677b48b874d7542bbcb55136091d..df21803b25b754aa5821fe8e2c4d9411e6d06758 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.h
+++ b/projects/stargazer/plugins/authorization/ao/ao.h
@@ -32,11 +32,11 @@
 #include <string>
 #include <list>
 
 #include <string>
 #include <list>
 

-#include "auth.h"
-#include "store.h"
-#include "notifer.h"
-#include "user_ips.h"
-#include "user.h"
+#include "stg/auth.h"
+#include "stg/store.h"
+#include "stg/notifer.h"
+#include "stg/user_ips.h"
+#include "stg/user.h"

 
 extern "C" PLUGIN * GetPlugin();
 
 
 extern "C" PLUGIN * GetPlugin();
 


@@ -44,46 +44,35 @@ class AUTH_AO;
 class USERS;
 //-----------------------------------------------------------------------------
 template <typename varParamType>
 class USERS;
 //-----------------------------------------------------------------------------
 template <typename varParamType>

-class CHG_BEFORE_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType> {
+class CHG_BEFORE_NOTIFIER : public PROPERTY_NOTIFIER_BASE<varParamType> {

 public:
                 CHG_BEFORE_NOTIFIER(AUTH_AO & a, USER_PTR u) : user(u), auth(a) {}
     void        Notify(const varParamType & oldValue, const varParamType & newValue);
 public:
                 CHG_BEFORE_NOTIFIER(AUTH_AO & a, USER_PTR u) : user(u), auth(a) {}
     void        Notify(const varParamType & oldValue, const varParamType & newValue);

-    USER_PTR      GetUser() const { return user; }
+    USER_PTR    GetUser() const { return user; }

 
 private:
 
 private:

-    USER_PTR      user;
-    const       AUTH_AO & auth;
+    USER_PTR        user;
+    const AUTH_AO & auth;

 };
 //-----------------------------------------------------------------------------
 template <typename varParamType>
 };
 //-----------------------------------------------------------------------------
 template <typename varParamType>

-class CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType> {
+class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE<varParamType> {

 public:
                 CHG_AFTER_NOTIFIER(AUTH_AO & a, USER_PTR u) : user(u), auth(a) {}
     void        Notify(const varParamType & oldValue, const varParamType & newValue);
 public:
                 CHG_AFTER_NOTIFIER(AUTH_AO & a, USER_PTR u) : user(u), auth(a) {}
     void        Notify(const varParamType & oldValue, const varParamType & newValue);

-    USER_PTR      GetUser() const { return user; }
+    USER_PTR    GetUser() const { return user; }

 
 private:
 
 private:

-    USER_PTR          user;
+    USER_PTR        user;

     const AUTH_AO & auth;
 };
 //-----------------------------------------------------------------------------
     const AUTH_AO & auth;
 };
 //-----------------------------------------------------------------------------

-class AUTH_AO_SETTINGS {
-public:
-    const std::string & GetStrError() const { static std::string s; return s; }
-    int ParseSettings(const MODULE_SETTINGS &) { return 0; }
-};
-//-----------------------------------------------------------------------------
-class AUTH_AO :public AUTH {
+class AUTH_AO : public AUTH {

 public:
     AUTH_AO();
     virtual ~AUTH_AO(){};
 
     void                SetUsers(USERS * u) { users = u; }
 public:
     AUTH_AO();
     virtual ~AUTH_AO(){};
 
     void                SetUsers(USERS * u) { users = u; }

-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
-    void                SetStore(STORE *) {}
-    void                SetStgSettings(const SETTINGS *) {}

 
     int                 Start();
     int                 Stop();
 
     int                 Start();
     int                 Stop();


@@ -99,18 +88,15 @@ public:
     void                AddUser(USER_PTR u);
     void                DelUser(USER_PTR u);
 
     void                AddUser(USER_PTR u);
     void                DelUser(USER_PTR u);
 

-    void                UpdateUserAuthorization(USER_PTR u) const;
-    void                Unauthorize(USER_PTR u) const;
-

     int                 SendMessage(const STG_MSG & msg, uint32_t ip) const;
 
 private:
     void                GetUsers();
     void                SetUserNotifiers(USER_PTR u);
     void                UnSetUserNotifiers(USER_PTR u);
     int                 SendMessage(const STG_MSG & msg, uint32_t ip) const;
 
 private:
     void                GetUsers();
     void                SetUserNotifiers(USER_PTR u);
     void                UnSetUserNotifiers(USER_PTR u);

+    void                UpdateUserAuthorization(CONST_USER_PTR u) const;

 
     mutable std::string errorStr;
 
     mutable std::string errorStr;

-    AUTH_AO_SETTINGS    aoSettings;

     USERS *             users;
     std::list<USER_PTR> usersList;
     bool                isRunning;
     USERS *             users;
     std::list<USER_PTR> usersList;
     bool                isRunning;


@@ -150,6 +136,11 @@ private:
         AUTH_AO & auth;
     } onDelUserNotifier;
 
         AUTH_AO & auth;
     } onDelUserNotifier;
 

+    friend class CHG_BEFORE_NOTIFIER<int>;
+    friend class CHG_AFTER_NOTIFIER<int>;
+    friend class CHG_BEFORE_NOTIFIER<USER_IPS>;
+    friend class CHG_AFTER_NOTIFIER<USER_IPS>;
+

 };
 //-----------------------------------------------------------------------------
 
 };
 //-----------------------------------------------------------------------------