Merge remote-tracking branch 'origin/ticket26' into stg-2.409

[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 26f70aa45a369cdc6a15745126ea195227b324bd..77dde0d55e99e18d566a4a9c63dcc95d1d3a35aa 100644 (file)
--- a/projects/stargazer/plugins/other/radius/radius.h
+++ b/projects/stargazer/plugins/other/radius/radius.h
@@ -38,15 +38,16 @@
 #include <map>
 #include <vector>
 
-#include "os_int.h"
-#include "auth.h"
-#include "module_settings.h"
-#include "notifer.h"
-#include "user_ips.h"
-#include "user.h"
-#include "users.h"
-#include "blowfish.h"
-#include "rad_packets.h"
+#include "stg/os_int.h"
+#include "stg/auth.h"
+#include "stg/module_settings.h"
+#include "stg/notifer.h"
+#include "stg/user_ips.h"
+#include "stg/user.h"
+#include "stg/users.h"
+#include "stg/blowfish.h"
+#include "stg/rad_packets.h"
+#include "stg/logger.h"
 
 extern "C" PLUGIN * GetPlugin();
 
@@ -56,17 +57,19 @@ class RADIUS;
 //-----------------------------------------------------------------------------
 class RAD_SETTINGS {
 public:
-    RAD_SETTINGS() : port(0) {}
+    RAD_SETTINGS()
+        : port(0), errorStr(), password(),
+          authServices(), acctServices()
+    {}
     virtual ~RAD_SETTINGS() {}
-    const string & GetStrError() const { return errorStr; }
+    const std::string & GetStrError() const { return errorStr; }
     int ParseSettings(const MODULE_SETTINGS & s);
     uint16_t GetPort() const { return port; }
     const std::string & GetPassword() const { return password; }
-    const std::list<string> & GetAuthServices() const { return authServices; }
-    const std::list<string> & GetAcctServices() const { return acctServices; }
+    const std::list<std::string> & GetAuthServices() const { return authServices; }
+    const std::list<std::string> & GetAcctServices() const { return acctServices; }
 
 private:
-    int ParseIntInRange(const std::string & str, int min, int max, int * val);
     int ParseServices(const std::vector<std::string> & str, std::list<std::string> * lst);
 
     uint16_t port;
@@ -77,6 +80,7 @@ private:
 };
 //-----------------------------------------------------------------------------
 struct RAD_SESSION {
+    RAD_SESSION() : userName(), serviceType() {}
     std::string userName;
     std::string serviceType;
 };
@@ -84,35 +88,35 @@ struct RAD_SESSION {
 class RADIUS :public AUTH {
 public:
                         RADIUS();
-    virtual             ~RADIUS() {};
-
-    void                SetUsers(USERS * u);
-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
-    void                SetStore(STORE * );
-    void                SetStgSettings(const SETTINGS * s);
-    void                SetSettings(const MODULE_SETTINGS & s);
+    virtual             ~RADIUS() {}
+
+    void                SetUsers(USERS * u) { users = u; }
+    void                SetStore(STORE * s) { store = s; }
+    void                SetStgSettings(const SETTINGS *) {}
+    void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();
 
     int                 Start();
     int                 Stop();
-    int                 Reload() { return 0; }
-    bool                IsRunning();
+    int                 Reload(const MODULE_SETTINGS & ms) { return 0; }
+    bool                IsRunning() { return isRunning; }
 
     const std::string & GetStrError() const { return errorStr; }
-    const std::string   GetVersion() const;
-    uint16_t            GetStartPosition() const;
-    uint16_t            GetStopPosition() const;
+    std::string         GetVersion() const { return "RADIUS data access plugin v 0.6"; }
+    uint16_t            GetStartPosition() const { return 30; }
+    uint16_t            GetStopPosition() const { return 30; }
 
     int SendMessage(const STG_MSG &, uint32_t) const { return 0; }
 
 private:
+    RADIUS(const RADIUS & rvalue);
+    RADIUS & operator=(const RADIUS & rvalue);
+
     static void *       Run(void *);
     int                 PrepareNet();
     int                 FinalizeNet();
 
-    int                 Send(const RAD_PACKET & packet, struct sockaddr_in * outerAddr);
+    ssize_t             Send(const RAD_PACKET & packet, struct sockaddr_in * outerAddr);
     int                 RecvData(RAD_PACKET * packet, struct sockaddr_in * outerAddr);
     int                 ProcessData(RAD_PACKET * packet);
 
@@ -129,23 +133,12 @@ private:
     bool                CanAcctService(const std::string & svc) const;
     bool                IsAllowedService(const std::string & svc) const;
 
-    bool                WaitPackets(int sd) const;
-
-    void                PrintServices(const std::list<std::string> & svcs);
-
-    struct Printer : public unary_function<std::string, void>
-    { 
-        void operator()(const std::string & line)
-        { 
-            printfd("radius.cpp", "'%s'\n", line.c_str()); 
-        }; 
-    };
-    struct SPrinter : public unary_function<std::pair<std::string, RAD_SESSION>, void>
-    { 
+    struct SPrinter : public std::unary_function<std::pair<std::string, RAD_SESSION>, void>
+    {
         void operator()(const std::pair<std::string, RAD_SESSION> & it)
-        { 
-            printfd("radius.cpp", "%s - ('%s', '%s')\n", it.first.c_str(), it.second.userName.c_str(), it.second.serviceType.c_str()); 
-        }; 
+        {
+            printfd("radius.cpp", "%s - ('%s', '%s')\n", it.first.c_str(), it.second.userName.c_str(), it.second.serviceType.c_str());
+        }
     };
 
     BLOWFISH_CTX        ctx;
@@ -171,6 +164,7 @@ private:
 
     RAD_PACKET          packet;
 
+    PLUGIN_LOGGER       logger;
 };
 //-----------------------------------------------------------------------------