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

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

diff --git a/projects/stargazer/plugins/other/radius/radius.h b/projects/stargazer/plugins/other/radius/radius.h
index ff8ecf5e08410839cf5ab08fad3396bf5110afd7..742923f0f4fa86840be797a04a16b55a5e3cbac2 100644 (file)
--- a/projects/stargazer/plugins/other/radius/radius.h
+++ b/projects/stargazer/plugins/other/radius/radius.h
@@ -26,7 +26,12 @@
 #include "stg/module_settings.h"
 #include "stg/logger.h"
 
 #include "stg/module_settings.h"
 #include "stg/logger.h"
 

+#include "config.h"
+#include "conn.h"
+

 #include <string>
 #include <string>

+#include <deque>
+#include <set>

 
 #include <pthread.h>
 #include <unistd.h>
 
 #include <pthread.h>
 #include <unistd.h>


@@ -43,10 +48,10 @@ public:
     RADIUS();
     virtual ~RADIUS() {}
 
     RADIUS();
     virtual ~RADIUS() {}
 

-    void SetUsers(USERS* u) { users = u; }
-    void SetStore(STORE* s) { store = s; }
+    void SetUsers(USERS* u) { m_users = u; }
+    void SetStore(STORE* s) { m_store = s; }

     void SetStgSettings(const SETTINGS*) {}
     void SetStgSettings(const SETTINGS*) {}

-    void SetSettings(const MODULE_SETTINGS& s) { settings = s; }
+    void SetSettings(const MODULE_SETTINGS& s) { m_settings = s; }

     int ParseSettings();
 
     int Start();
     int ParseSettings();
 
     int Start();


@@ -55,24 +60,32 @@ public:
     bool IsRunning() { return m_running; }
 
     const std::string& GetStrError() const { return m_error; }
     bool IsRunning() { return m_running; }
 
     const std::string& GetStrError() const { return m_error; }

-    std::string GetVersion() const { return "RADIUS data access plugin v 1.0"; }
+    std::string GetVersion() const { return "RADIUS data access plugin v. 2.0"; }

     uint16_t GetStartPosition() const { return 30; }
     uint16_t GetStopPosition() const { return 30; }
 
     int SendMessage(const STG_MSG&, uint32_t) const { return 0; }
 
     uint16_t GetStartPosition() const { return 30; }
     uint16_t GetStopPosition() const { return 30; }
 
     int SendMessage(const STG_MSG&, uint32_t) const { return 0; }
 

+    void authorize(const USER& user);
+    void unauthorize(const std::string& login, const std::string& reason);
+

 private:
     RADIUS(const RADIUS & rvalue);
     RADIUS & operator=(const RADIUS & rvalue);
 
     static void* run(void*);
 
 private:
     RADIUS(const RADIUS & rvalue);
     RADIUS & operator=(const RADIUS & rvalue);
 
     static void* run(void*);
 

-    void rumImpl();
+    bool reconnect();
+    int createUNIX() const;
+    int createTCP() const;
+    void runImpl();

     int maxFD() const;
     void buildFDSet(fd_set & fds) const;
     void cleanupConns();
     void handleEvents(const fd_set & fds);
     void acceptConnection();
     int maxFD() const;
     void buildFDSet(fd_set & fds) const;
     void cleanupConns();
     void handleEvents(const fd_set & fds);
     void acceptConnection();

+    void acceptUNIX();
+    void acceptTCP();

 
     mutable std::string m_error;
     STG::Config m_config;
 
     mutable std::string m_error;
     STG::Config m_config;


@@ -85,8 +98,11 @@ private:
     USERS* m_users;
     const STORE* m_store;
 
     USERS* m_users;
     const STORE* m_store;
 

+    int m_listenSocket;
+    std::deque<STG::Conn*> m_conns;
+    std::set<std::string> m_logins;
+

     pthread_t m_thread;
     pthread_t m_thread;

-    pthread_mutex_t m_mutex;

 
     PLUGIN_LOGGER m_logger;
 };
 
     PLUGIN_LOGGER m_logger;
 };