Merge branch 'master' into full-month-stats

[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 e13a7a7f26b1bd7c77389fe5468dc9c309449342..731753a01596a9b0582e905ab1f7196d4757176f 100644 (file)
--- a/projects/stargazer/plugins/other/radius/radius.h
+++ b/projects/stargazer/plugins/other/radius/radius.h
@@ -35,88 +35,86 @@
 #include <cstdlib>
 #include <string>
 #include <list>
 #include <cstdlib>
 #include <string>
 #include <list>

+#include <map>
+#include <vector>

 
 

-#include "os_int.h"
-#include "base_auth.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"

 
 

-using namespace std;
-
-extern "C" BASE_PLUGIN * GetPlugin();
+extern "C" PLUGIN * GetPlugin();

 
 #define RAD_DEBUG (1)
 
 class RADIUS;
 //-----------------------------------------------------------------------------
 
 #define RAD_DEBUG (1)
 
 class RADIUS;
 //-----------------------------------------------------------------------------

-class RAD_SETTINGS
-{
+class RAD_SETTINGS {

 public:
 public:

-    RAD_SETTINGS() : port(0) {}
+    RAD_SETTINGS()
+        : port(0), errorStr(), password(),
+          authServices(), acctServices()
+    {}

     virtual ~RAD_SETTINGS() {}
     const string & GetStrError() const { return errorStr; }
     int ParseSettings(const MODULE_SETTINGS & s);
     uint16_t GetPort() const { return port; }
     const std::string & GetPassword() const { return password; }
     virtual ~RAD_SETTINGS() {}
     const 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 list<string> & GetAuthServices() const { return authServices; }
-    const list<string> & GetAcctServices() const { return acctServices; }
+    const std::list<string> & GetAuthServices() const { return authServices; }
+    const std::list<string> & GetAcctServices() const { return acctServices; }

 
 private:
 
 private:

-    int ParseIntInRange(const string & str, int min, int max, int * val);
-    int ParseServices(const vector<string> & str, list<string> * lst);
+    int ParseServices(const std::vector<std::string> & str, std::list<std::string> * lst);

 
     uint16_t port;
 
     uint16_t port;

-    string errorStr;
-    string password;
-    list<string> authServices;
-    list<string> acctServices;
+    std::string errorStr;
+    std::string password;
+    std::list<std::string> authServices;
+    std::list<std::string> acctServices;

 };
 //-----------------------------------------------------------------------------
 struct RAD_SESSION {
 };
 //-----------------------------------------------------------------------------
 struct RAD_SESSION {

+    RAD_SESSION() : userName(), serviceType() {}

     std::string userName;
     std::string serviceType;
 };
 //-----------------------------------------------------------------------------
     std::string userName;
     std::string serviceType;
 };
 //-----------------------------------------------------------------------------

-class RADIUS :public BASE_AUTH
-{
+class RADIUS :public AUTH {

 public:
                         RADIUS();
 public:
                         RADIUS();

-    virtual             ~RADIUS(){};
-
-    void                SetUsers(USERS * u);
-    void                SetTariffs(TARIFFS *){};
-    void                SetAdmins(ADMINS *){};
-    void                SetTraffcounter(TRAFFCOUNTER *){};
-    void                SetStore(BASE_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                 ParseSettings();
 
     int                 Start();
     int                 Stop();

-    int                 Reload() { return 0; };
-    bool                IsRunning();
+    int                 Reload() { return 0; }
+    bool                IsRunning() { return isRunning; }

 
 

-    const string      & GetStrError() const { return errorStr; };
-    const string        GetVersion() const;
-    uint16_t            GetStartPosition() const;
-    uint16_t            GetStopPosition() const;
+    const std::string & GetStrError() const { return errorStr; }
+    const std::string   GetVersion() const { return "RADIUS data access plugin v 0.6"; }
+    uint16_t            GetStartPosition() const { return 20; }
+    uint16_t            GetStopPosition() const { return 20; }

 
 

-    int SendMessage(const STG_MSG &, uint32_t) const { return 0; };
+    int SendMessage(const STG_MSG &, uint32_t) const { return 0; }

 
 private:
 
 private:

+    RADIUS(const RADIUS & rvalue);
+    RADIUS & operator=(const RADIUS & rvalue);
+

     static void *       Run(void *);
     int                 PrepareNet();
     int                 FinalizeNet();
 
     static void *       Run(void *);
     int                 PrepareNet();
     int                 FinalizeNet();
 

-    void                InitEncrypt(BLOWFISH_CTX * ctx, const string & password);
-    void                Decrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, int len8);
-    void                Encrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, int len8);
-

     int                 Send(const RAD_PACKET & packet, struct sockaddr_in * outerAddr);
     int                 RecvData(RAD_PACKET * packet, struct sockaddr_in * outerAddr);
     int                 ProcessData(RAD_PACKET * packet);
     int                 Send(const RAD_PACKET & packet, struct sockaddr_in * outerAddr);
     int                 RecvData(RAD_PACKET * packet, struct sockaddr_in * outerAddr);
     int                 ProcessData(RAD_PACKET * packet);


@@ -129,16 +127,11 @@ private:
     int                 ProcessAcctUpdatePacket(RAD_PACKET * packet);
     int                 ProcessAcctOtherPacket(RAD_PACKET * packet);
 
     int                 ProcessAcctUpdatePacket(RAD_PACKET * packet);
     int                 ProcessAcctOtherPacket(RAD_PACKET * packet);
 

-    bool                FindUser(user_iter * ui, const std::string & login) const;
+    bool                FindUser(USER_PTR * ui, const std::string & login) const;

     bool                CanAuthService(const std::string & svc) const;
     bool                CanAcctService(const std::string & svc) const;
     bool                IsAllowedService(const std::string & svc) const;
 
     bool                CanAuthService(const std::string & svc) const;
     bool                CanAcctService(const std::string & svc) const;
     bool                IsAllowedService(const std::string & svc) const;
 

-    void                SetUserNotifier(user_iter u);
-    void                UnSetUserNotifier(user_iter u);
-
-    bool                WaitPackets(int sd) const;
-

     void                PrintServices(const std::list<std::string> & svcs);
 
     struct Printer : public unary_function<std::string, void>
     void                PrintServices(const std::list<std::string> & svcs);
 
     struct Printer : public unary_function<std::string, void>


@@ -158,19 +151,19 @@ private:
 
     BLOWFISH_CTX        ctx;
 
 
     BLOWFISH_CTX        ctx;
 

-    mutable string      errorStr;
+    mutable std::string errorStr;

     RAD_SETTINGS        radSettings;
     MODULE_SETTINGS     settings;
     RAD_SETTINGS        radSettings;
     MODULE_SETTINGS     settings;

-    list<string>        authServices;
-    list<string>        acctServices;
-    map<string, RAD_SESSION> sessions;
+    std::list<std::string> authServices;
+    std::list<std::string> acctServices;
+    std::map<std::string, RAD_SESSION> sessions;

 
     bool                nonstop;
     bool                isRunning;
 
     USERS *             users;
     const SETTINGS *    stgSettings;
 
     bool                nonstop;
     bool                isRunning;
 
     USERS *             users;
     const SETTINGS *    stgSettings;

-    const BASE_STORE *  store;
+    const STORE *       store;

 
     pthread_t           thread;
     pthread_mutex_t     mutex;
 
     pthread_t           thread;
     pthread_mutex_t     mutex;