Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / projects / stargazer / plugins / other / radius / conn.h

diff --git a/projects/stargazer/plugins/other/radius/conn.h b/projects/stargazer/plugins/other/radius/conn.h
index 31ebe1dd06322d1a1bf0041fa77eb0df3b077378..96e74300f2f7f8b413570f0b362f3a970415792e 100644 (file)
--- a/projects/stargazer/plugins/other/radius/conn.h
+++ b/projects/stargazer/plugins/other/radius/conn.h
@@ -21,35 +21,36 @@
 #ifndef __STG_SGCONFIG_CONN_H__
 #define __STG_SGCONFIG_CONN_H__
 
 #ifndef __STG_SGCONFIG_CONN_H__
 #define __STG_SGCONFIG_CONN_H__
 

-#include "stg/os_int.h"
+#include <boost/scoped_ptr.hpp>

 
 

-#include <stdexcept>

 #include <string>
 
 #include <string>
 

+class USER;

 class USERS;
 class USERS;

+class PLUGIN_LOGGER;
+class RADIUS;

 
 namespace STG
 {
 
 
 namespace STG
 {
 

+struct Config;
+

 class Conn
 {
     public:
 class Conn
 {
     public:

-        struct Error : public std::runtime_error
-        {
-            Error(const std::string& message) : runtime_error(message.c_str()) {}
-        };
-
-        Conn(USERS& users, PLUGIN_LOGGER& logger, const Config& config);
+        Conn(USERS& users, PLUGIN_LOGGER& logger, RADIUS& plugin, const Config& config, int fd, const std::string& remote);

         ~Conn();
 
         ~Conn();
 

-        int sock() const { return m_sock; }
+        int sock() const;

 
         bool read();
 
         bool read();

+        bool tick();
+
+        bool isOk() const;

 
     private:
 
     private:

-        USERS& m_users;
-        PLUGIN_LOGGER& m_logger;
-        const Config& m_config;
+        class Impl;
+        boost::scoped_ptr<Impl> m_impl;

 };
 
 }
 };
 
 }