Initializing constructor added for IA_USER

[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 b26a3bb30ad7f674900f8dc8b4c99a431025fa4e..434849076bd3c099f8c0cc8f3c6a55fe10777b61 100644 (file)
--- a/projects/stargazer/plugins/other/radius/radius.h
+++ b/projects/stargazer/plugins/other/radius/radius.h
@@ -29,52 +29,50 @@
 #ifndef RADIUS_H
 #define RADIUS_H
 
 #ifndef RADIUS_H
 #define RADIUS_H
 

-#include <string>
-#include <list>

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

-#include <string.h>
-#include <stdlib.h>

 
 

-#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 <cstring>
+#include <cstdlib>
+#include <string>
+#include <list>
+#include <map>
+#include <vector>

 
 

-using namespace std;
+#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"

 
 

-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:

-    virtual         ~RAD_SETTINGS(){};
-    const string&   GetStrError() const { return errorStr; };
-    int             ParseSettings(const MODULE_SETTINGS & s);
-    uint16_t        GetPort() const;
-    uint32_t        GetServerIP() const;
-    int             GetPassword(string * password) const;
-    int             GetAuthServices(list<string> * svcs) const;
-    int             GetAcctServices(list<string> * svcs) const;
+    RAD_SETTINGS() : port(0) {}
+    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 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             ParseIP(const string & str, uint32_t * routerIP);
-    int             ParseServices(const vector<string> & str, list<string> * lst);
-
-    uint16_t            port;
-    string              errorStr;
-    string              password;
-    uint32_t            serverIP;
-    list<string>        authServices;
-    list<string>        acctServices;
+    int ParseServices(const std::vector<std::string> & str, std::list<std::string> * lst);
+
+    uint16_t port;
+    std::string errorStr;
+    std::string password;
+    std::list<std::string> authServices;
+    std::list<std::string> acctServices;

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


@@ -82,44 +80,36 @@ struct RAD_SESSION {
     std::string serviceType;
 };
 //-----------------------------------------------------------------------------
     std::string serviceType;
 };
 //-----------------------------------------------------------------------------

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

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

-    virtual             ~RADIUS(){};
+    virtual             ~RADIUS() {};

 
     void                SetUsers(USERS * u);
 
     void                SetUsers(USERS * u);

-    void                SetTariffs(TARIFFS *){};
-    void                SetAdmins(ADMINS *){};
-    void                SetTraffcounter(TRAFFCOUNTER *){};
-    void                SetStore(BASE_STORE * );
+    void                SetStore(STORE * );

     void                SetStgSettings(const SETTINGS * s);
     void                SetSettings(const MODULE_SETTINGS & s);
     int                 ParseSettings();
 
     int                 Start();
     int                 Stop();
     void                SetStgSettings(const SETTINGS * s);
     void                SetSettings(const MODULE_SETTINGS & s);
     int                 ParseSettings();
 
     int                 Start();
     int                 Stop();

-    int                 Reload() { return 0; };
+    int                 Reload() { return 0; }

     bool                IsRunning();
 
     bool                IsRunning();
 

-    const string      & GetStrError() const { return errorStr; };
-    const string        GetVersion() const;
+    const std::string & GetStrError() const { return errorStr; }
+    const std::string   GetVersion() const;

     uint16_t            GetStartPosition() const;
     uint16_t            GetStopPosition() const;
 
     uint16_t            GetStartPosition() const;
     uint16_t            GetStopPosition() const;
 

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

 
 private:
     static void *       Run(void *);
     int                 PrepareNet();
     int                 FinalizeNet();
 
 
 private:
     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);
-    int                 RecvData(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);
 
     int                 ProcessAutzPacket(RAD_PACKET * packet);
     int                 ProcessData(RAD_PACKET * packet);
 
     int                 ProcessAutzPacket(RAD_PACKET * packet);


@@ -130,16 +120,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>


@@ -159,31 +144,24 @@ 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                nonstop;

-

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

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

 
     pthread_t           thread;
     pthread_mutex_t     mutex;
 
     int                 sock;
 
     pthread_t           thread;
     pthread_mutex_t     mutex;
 
     int                 sock;

-    struct sockaddr_in  inAddr;
-    socklen_t           inAddrLen;
-    uint16_t            port;
-    uint32_t            serverIP;
-    struct sockaddr_in  outerAddr;
-    socklen_t           outerAddrLen;

 
     RAD_PACKET          packet;
 
 
     RAD_PACKET          packet;
 


@@ -191,4 +169,3 @@ private:
 //-----------------------------------------------------------------------------
 
 #endif
 //-----------------------------------------------------------------------------
 
 #endif

-