Light inetaccess plugin refactoring

[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..434849076bd3c099f8c0cc8f3c6a55fe10777b61 100644 (file)
--- a/projects/stargazer/plugins/other/radius/radius.h
+++ b/projects/stargazer/plugins/other/radius/radius.h
@@ -38,15 +38,15 @@
 #include <map>
 #include <vector>
 
 #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"

 
 extern "C" PLUGIN * GetPlugin();
 
 
 extern "C" PLUGIN * GetPlugin();
 


@@ -66,7 +66,6 @@ public:
     const std::list<string> & GetAcctServices() const { return acctServices; }
 
 private:
     const std::list<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;
     int ParseServices(const std::vector<std::string> & str, std::list<std::string> * lst);
 
     uint16_t port;


@@ -87,9 +86,6 @@ public:
     virtual             ~RADIUS() {};
 
     void                SetUsers(USERS * u);
     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);
     void                SetStore(STORE * );
     void                SetStgSettings(const SETTINGS * s);
     void                SetSettings(const MODULE_SETTINGS & s);


@@ -129,8 +125,6 @@ private:
     bool                CanAcctService(const std::string & svc) const;
     bool                IsAllowedService(const std::string & svc) const;
 
     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                PrintServices(const std::list<std::string> & svcs);
 
     struct Printer : public unary_function<std::string, void>