Fix compilation and linkage issues

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

diff --git a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h
index 1b2a0f8a36186a5ade95f4bd7fc436f70354bb86..fe55649590990306bbeeee1a87d326b9def40a49 100644 (file)
--- a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h
+++ b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h
@@ -38,17 +38,17 @@
 #include <functional>
 #include <utility>
 
 #include <functional>
 #include <utility>
 

-#include "os_int.h"
-#include "auth.h"
-#include "store.h"
-#include "notifer.h"
-#include "user_ips.h"
-#include "user.h"
-#include "users.h"
-#include "ia_packets.h"
-#include "blowfish.h"
-#include "stg_logger.h"
-#include "utime.h"
+#include "stg/os_int.h"
+#include "stg/auth.h"
+#include "stg/store.h"
+#include "stg/notifer.h"
+#include "stg/user_ips.h"
+#include "stg/user.h"
+#include "stg/users.h"
+#include "stg/ia_packets.h"
+#include "stg/blowfish.h"
+#include "stg/logger.h"
+#include "stg/utime.h"

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


@@ -118,7 +118,8 @@ private:
 //-----------------------------------------------------------------------------
 struct IA_USER {
     IA_USER()
 //-----------------------------------------------------------------------------
 struct IA_USER {
     IA_USER()

-        : lastSendAlive(0),
+        : user(NULL),
+          lastSendAlive(0),

           rnd(random()),
           port(0),
           protoVer(0),
           rnd(random()),
           port(0),
           protoVer(0),


@@ -177,7 +178,6 @@ public:
     FREEMB          GetFreeMbShowType() const { return freeMbShowType; };
 
 private:
     FREEMB          GetFreeMbShowType() const { return freeMbShowType; };
 
 private:

-    int             ParseIntInRange(const std::string & str, int min, int max, int * val);

     int             userDelay;
     int             userTimeout;
     uint16_t        port;
     int             userDelay;
     int             userTimeout;
     uint16_t        port;


@@ -185,7 +185,20 @@ private:
     FREEMB          freeMbShowType;
 };
 //-----------------------------------------------------------------------------
     FREEMB          freeMbShowType;
 };
 //-----------------------------------------------------------------------------

-class AUTH_IA :public BASE_AUTH {
+class AUTH_IA;
+//-----------------------------------------------------------------------------
+class DEL_USER_NOTIFIER: public NOTIFIER_BASE<USER_PTR> {
+public:
+    DEL_USER_NOTIFIER(AUTH_IA & a) : auth(a) {}
+    virtual ~DEL_USER_NOTIFIER() {}
+
+    void Notify(const USER_PTR & user);
+private:
+    AUTH_IA & auth;
+};
+//-----------------------------------------------------------------------------
+class AUTH_IA :public AUTH {
+friend class DEL_USER_NOTIFIER;

 public:
                         AUTH_IA();
     virtual             ~AUTH_IA();
 public:
                         AUTH_IA();
     virtual             ~AUTH_IA();


@@ -315,19 +328,7 @@ private:
 
     uint32_t            enabledDirs;
 
 
     uint32_t            enabledDirs;
 

-    class DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
-    public:
-        DEL_USER_NONIFIER(AUTH_IA & a) : auth(a) {}
-        virtual ~DEL_USER_NONIFIER() {}
-
-        void Notify(const USER_PTR & user)
-            {
-            auth.DelUser(user);
-            }
-
-    private:
-        AUTH_IA & auth;
-    } onDelUserNotifier;
+    DEL_USER_NOTIFIER   onDelUserNotifier;

 
     class UnauthorizeUser : std::unary_function<const std::pair<uint32_t, IA_USER> &, void> {
         public:
 
     class UnauthorizeUser : std::unary_function<const std::pair<uint32_t, IA_USER> &, void> {
         public:


@@ -342,5 +343,10 @@ private:
 
 };
 //-----------------------------------------------------------------------------
 
 };
 //-----------------------------------------------------------------------------

+inline
+void DEL_USER_NOTIFIER::Notify(const USER_PTR & user)
+{
+    auth.DelUser(user);
+}

 
 #endif
 
 #endif