X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/913b7a4ab586482c853b679fcd8415cf88524c31..2085e9c166c0521254a62aaebbbb7e432834f74d:/projects/stargazer/plugins/other/radius/radius.h?ds=inline diff --git a/projects/stargazer/plugins/other/radius/radius.h b/projects/stargazer/plugins/other/radius/radius.h index 8d37ab14..0f1c95fc 100644 --- a/projects/stargazer/plugins/other/radius/radius.h +++ b/projects/stargazer/plugins/other/radius/radius.h @@ -29,94 +29,94 @@ #ifndef RADIUS_H #define RADIUS_H -#include -#include #include -#include -#include - -#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" - -using namespace std; -extern "C" BASE_PLUGIN * GetPlugin(); +#include +#include +#include +#include +#include +#include + +#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(); #define RAD_DEBUG (1) class RADIUS; //----------------------------------------------------------------------------- -class RAD_SETTINGS -{ +class RAD_SETTINGS { public: - virtual ~RAD_SETTINGS(){}; - const string& GetStrError() const { return errorStr; }; - int ParseSettings(const MODULE_SETTINGS & s); - uint16_t GetPort() const; - int GetPassword(string * password) const; - int GetAuthServices(list * svcs) const; - int GetAcctServices(list * svcs) const; + RAD_SETTINGS() + : port(0), errorStr(), password(), + authServices(), acctServices() + {} + virtual ~RAD_SETTINGS() {} + 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 & GetAuthServices() const { return authServices; } + const std::list & GetAcctServices() const { return acctServices; } private: - int ParseIntInRange(const string & str, int min, int max, int * val); - int ParseIP(const string & str, uint32_t * routerIP); - int ParseServices(const vector & str, list * lst); - - uint16_t port; - string errorStr; - string password; - list authServices; - list acctServices; + int ParseServices(const std::vector & str, std::list * lst); + + uint16_t port; + std::string errorStr; + std::string password; + std::list authServices; + std::list acctServices; }; //----------------------------------------------------------------------------- struct RAD_SESSION { + RAD_SESSION() : userName(), serviceType() {} std::string userName; std::string serviceType; }; //----------------------------------------------------------------------------- -class RADIUS :public BASE_AUTH -{ +class RADIUS :public AUTH { 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 Reload() { return 0; }; - bool IsRunning(); + int Reload(const MODULE_SETTINGS & /*ms*/) { 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; } + 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; }; + 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(); - 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); + 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); @@ -128,48 +128,34 @@ private: 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; - void SetUserNotifier(user_iter u); - void UnSetUserNotifier(user_iter u); - - bool WaitPackets(int sd) const; - - void PrintServices(const std::list & svcs); - - struct Printer : public unary_function - { - void operator()(const std::string & line) - { - printfd("radius.cpp", "'%s'\n", line.c_str()); - }; - }; - struct SPrinter : public unary_function, void> - { + struct SPrinter : public std::unary_function, void> + { void operator()(const std::pair & 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; - mutable string errorStr; + mutable std::string errorStr; RAD_SETTINGS radSettings; MODULE_SETTINGS settings; - list authServices; - list acctServices; - map sessions; + std::list authServices; + std::list acctServices; + std::map sessions; bool nonstop; bool isRunning; USERS * users; const SETTINGS * stgSettings; - const BASE_STORE * store; + const STORE * store; pthread_t thread; pthread_mutex_t mutex; @@ -178,6 +164,7 @@ private: RAD_PACKET packet; + PLUGIN_LOGGER logger; }; //-----------------------------------------------------------------------------