X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/97f1f905311bcb76c3b500e3e49c1b9f49dff491..84c7cad404a6073453edcb2045a57642d5744811:/stglibs/srvconf.lib/servconf.cpp diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp index 3684dd54..e8e07e10 100644 --- a/stglibs/srvconf.lib/servconf.cpp +++ b/stglibs/srvconf.lib/servconf.cpp @@ -21,13 +21,21 @@ #include "stg/servconf.h" #include "netunit.h" -#include "parser_auth_by.h" -#include "parser_server_info.h" -#include "parser_check_user.h" -#include "parser_get_users.h" -#include "parser_get_user.h" -#include "parser_chg_user.h" -#include "parser_send_message.h" + +#include "parsers/simple.h" + +#include "parsers/server_info.h" + +#include "parsers/get_admins.h" +#include "parsers/get_admin.h" +#include "parsers/chg_admin.h" + +#include "parsers/auth_by.h" +#include "parsers/get_users.h" +#include "parsers/get_user.h" +#include "parsers/chg_user.h" + +#include "parsers/base.h" #include "stg/common.h" @@ -44,35 +52,32 @@ public: IMPL(const std::string & server, uint16_t port, const std::string & login, const std::string & password); - int GetUsers(GET_USERS::CALLBACK f, void * data); - int GetUser(const std::string & login, GET_USER::CALLBACK f, void * data); - int ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data); - int AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data); - int SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data); - int ServerInfo(SERVER_INFO::CALLBACK f, void * data); - int CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data); - const std::string & GetStrError() const; static void Start(void * data, const char * el, const char ** attr); static void End(void * data, const char * el); -private: - GET_USERS::PARSER parserGetUsers; - GET_USER::PARSER parserGetUser; - AUTH_BY::PARSER parserAuthBy; - SERVER_INFO::PARSER parserServerInfo; - CHG_USER::PARSER parserChgUser; - CHECK_USER::PARSER parserCheckUser; - SEND_MESSAGE::PARSER parserSendMessage; + template + int Exec(const std::string & request, C callback, void * data) + { + P cp(callback, data); + return ExecImpl(request, cp); + } + + template + int Exec(const std::string & tag, const std::string & request, C callback, void * data) + { + P cp(tag, callback, data); + return ExecImpl(request, cp); + } +private: NETTRANSACT nt; std::string errorMsg; XML_Parser parser; - int Exec(const std::string & request, PARSER & cp); - static bool AnsRecv(void * data, const std::string & chunk, bool final); + int ExecImpl(const std::string & request, PARSER & cp); }; bool SERVCONF::IMPL::AnsRecv(void * data, const std::string & chunk, bool final) @@ -99,98 +104,88 @@ SERVCONF::SERVCONF(const std::string & server, uint16_t port, SERVCONF::~SERVCONF() { - delete pImpl; +delete pImpl; } -int SERVCONF::GetUsers(GET_USERS::CALLBACK f, void * data) +int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data) { - return pImpl->GetUsers( f, data ); +return pImpl->Exec("", f, data); } -int SERVCONF::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data) -{ - return pImpl->GetUser(login, f, data); -} +// -- Admins -- -int SERVCONF::ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data) +int SERVCONF::GetAdmins(GET_ADMINS::CALLBACK f, void * data) { - return pImpl->ChgUser(request, f, data); +return pImpl->Exec("", f, data); } -int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data) +int SERVCONF::GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data) { - return pImpl->AuthBy(login, f, data); +return pImpl->Exec("", f, data); } -int SERVCONF::SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data) +int SERVCONF::ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data) { - return pImpl->SendMessage(request, f, data); +return pImpl->Exec("", f, data); } -int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data) +int SERVCONF::AddAdmin(const std::string & login, const ADMIN_CONF & conf, SIMPLE::CALLBACK f, void * data) { - return pImpl->ServerInfo(f, data); +int res = pImpl->Exec("AddAdmin", "", f, data); +if (res != st_ok) + return res; +return pImpl->Exec("", f, data); } -int SERVCONF::CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data) +int SERVCONF::DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data) { - return pImpl->CheckUser(login, password, f, data); +return pImpl->Exec("DelAdmin", "", f, data); } -const std::string & SERVCONF::GetStrError() const -{ - return pImpl->GetStrError(); -} +// -- Users -- -//----------------------------------------------------------------------------- -SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port, - const std::string & login, const std::string & password) - : nt( server, port, login, password ) +int SERVCONF::GetUsers(GET_USERS::CALLBACK f, void * data) { -parser = XML_ParserCreate(NULL); -nt.SetRxCallback(this, AnsRecv); +return pImpl->Exec("", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::IMPL::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data) + +int SERVCONF::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data) { -parserGetUser.SetCallback(f, data); -return Exec("", parserGetUser); +return pImpl->Exec("", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::IMPL::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data) + +int SERVCONF::ChgUser(const std::string & request, SIMPLE::CALLBACK f, void * data) { -parserAuthBy.SetCallback(f, data); -return Exec("", parserAuthBy); +return pImpl->Exec(request, f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::IMPL::GetUsers(GET_USERS::CALLBACK f, void * data) + +int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data) { -parserGetUsers.SetCallback(f, data); -return Exec("", parserGetUsers); +return pImpl->Exec("", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::IMPL::ServerInfo(SERVER_INFO::CALLBACK f, void * data) + +int SERVCONF::SendMessage(const std::string & request, SIMPLE::CALLBACK f, void * data) { -parserServerInfo.SetCallback(f, data); -return Exec("", parserServerInfo); +return pImpl->Exec("SendMessage", request, f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::IMPL::ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data) + +int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data) { -parserChgUser.SetCallback(f, data); -return Exec(request, parserChgUser); +return pImpl->Exec("CheckUser", "", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::IMPL::SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data) + +const std::string & SERVCONF::GetStrError() const { -parserSendMessage.SetCallback(f, data); -return Exec(request, parserSendMessage); +return pImpl->GetStrError(); } + //----------------------------------------------------------------------------- -int SERVCONF::IMPL::CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data) +SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port, + const std::string & login, const std::string & password) + : nt( server, port, login, password ) { -parserCheckUser.SetCallback(f, data); -return Exec("", parserCheckUser); +parser = XML_ParserCreate(NULL); +nt.SetRxCallback(this, AnsRecv); } //----------------------------------------------------------------------------- void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr) @@ -210,7 +205,7 @@ const std::string & SERVCONF::IMPL::GetStrError() const return errorMsg; } //----------------------------------------------------------------------------- -int SERVCONF::IMPL::Exec(const std::string & request, PARSER & cp) +int SERVCONF::IMPL::ExecImpl(const std::string & request, PARSER & cp) { XML_ParserReset(parser, NULL); XML_SetElementHandler(parser, Start, End);