X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/90e389f6ec12e60a62c362296ffcf314feb5b03d..258b7ce79dba0c01b378e73bd6b8ee9fb1ae695d:/projects/stargazer/plugins/configuration/sgconfig/configproto.h?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.h b/projects/stargazer/plugins/configuration/sgconfig/configproto.h index efecd121..ccb8a4d7 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.h +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.h @@ -41,6 +41,8 @@ #include "stg/logger.h" #include "parser.h" +#include "parser_auth_by.h" + #define STG_HEADER "SG04" #define OK_HEADER "OKHD" #define ERR_HEADER "ERHD" @@ -52,7 +54,7 @@ //----------------------------------------------------------------------------- class CONFIGPROTO { public: - CONFIGPROTO(); + CONFIGPROTO(PLUGIN_LOGGER & l); ~CONFIGPROTO(); void SetPort(uint16_t port); @@ -61,16 +63,19 @@ public: void SetTariffs(TARIFFS * t); void SetStore(STORE * s); void SetStgSettings(const SETTINGS * s); - uint32_t GetAdminIP() const; + uint32_t GetAdminIP() const { return adminIP; } int Prepare(); int Stop(); - const std::string & GetStrError() const; - static void * Run(void * a); + const std::string & GetStrError() const { return errorStr; } + void Run(); private: + CONFIGPROTO(const CONFIGPROTO & rvalue); + CONFIGPROTO & operator=(const CONFIGPROTO & rvalue); + int RecvHdr(int sock); int RecvLogin(int sock); - int SendLoginAnswer(int sock, int err); + int SendLoginAnswer(int sock); int SendHdrAnswer(int sock, int err); int RecvLoginS(int sock); int SendLoginSAnswer(int sock, int err); @@ -85,12 +90,13 @@ private: std::list requestList; uint32_t adminIP; std::string adminLogin; + std::string adminPassword; uint16_t port; pthread_t thrReciveSendConf; bool nonstop; int state; ADMIN * currAdmin; - STG_LOGGER & WriteServLog; + PLUGIN_LOGGER & logger; int listenSocket; @@ -103,6 +109,7 @@ private: PARSER_DEL_USER parserDelUser; PARSER_CHECK_USER parserCheckUser; PARSER_SEND_MESSAGE parserSendMessage; + PARSER_AUTH_BY parserAuthBy; PARSER_GET_ADMINS parserGetAdmins; PARSER_ADD_ADMIN parserAddAdmin; @@ -117,7 +124,7 @@ private: ADMINS * admins; BASE_PARSER * currParser; - vector dataParser; + std::vector dataParser; XML_Parser xmlParser;