X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/abe068d00ecc304c855886f5e511b563b352dd0a..d8ed3c9a80357e890fe4a927b92437e8f88b6b7c:/stglibs/srvconf.lib/servconf.cpp?ds=inline diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp index 325ee5f2..01f21790 100644 --- a/stglibs/srvconf.lib/servconf.cpp +++ b/stglibs/srvconf.lib/servconf.cpp @@ -21,13 +21,20 @@ #include "stg/servconf.h" #include "netunit.h" -#include "parsers/auth_by.h" + +#include "parsers/simple.h" + #include "parsers/server_info.h" -#include "parsers/check_user.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/send_message.h" + #include "parsers/base.h" #include "stg/common.h" @@ -45,38 +52,38 @@ 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; + int RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data); + + 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); + static bool ParserRecv(void * data, const std::string & chunk, bool final); + static bool SimpleRecv(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) +bool SERVCONF::IMPL::ParserRecv(void * data, const std::string & chunk, bool final) { SERVCONF::IMPL * sc = static_cast(data); @@ -92,6 +99,12 @@ if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ER return true; } +bool SERVCONF::IMPL::SimpleRecv(void * data, const std::string & chunk, bool final) +{ +*static_cast(data) += chunk; +return true; +} + SERVCONF::SERVCONF(const std::string & server, uint16_t port, const std::string & login, const std::string & password) : pImpl(new IMPL(server, port, login, password)) @@ -100,98 +113,107 @@ 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) +int SERVCONF::RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data) { - return pImpl->GetUser(login, f, data); } -int SERVCONF::ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data) +// -- Admins -- + +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("ChgAdmin", "", f, data); } -int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data) +int SERVCONF::AddAdmin(const std::string & login, + const ADMIN_CONF_RES & 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("ChgAdmin", "", 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 +// -- Users -- + +int SERVCONF::GetUsers(GET_USERS::CALLBACK f, void * data) { - return pImpl->GetStrError(); +return pImpl->Exec("", f, data); } -//----------------------------------------------------------------------------- -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::GetUser(const std::string & login, GET_USER::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::ChgUser(const std::string & login, + const USER_CONF_RES & conf, + const USER_STAT_RES & stat, + SIMPLE::CALLBACK f, void * data) { -parserGetUser.SetCallback(f, data); -return Exec("", parserGetUser); +return pImpl->Exec("" + CHG_USER::Serialize(conf, stat) + "", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::IMPL::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data) + +int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data) { -parserAuthBy.SetCallback(f, data); -return Exec("", parserAuthBy); +return pImpl->Exec("DelUser", "", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::IMPL::GetUsers(GET_USERS::CALLBACK f, void * data) + +int SERVCONF::AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data) { -parserGetUsers.SetCallback(f, data); -return Exec("", parserGetUsers); +return pImpl->Exec("AddUser", "", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::IMPL::ServerInfo(SERVER_INFO::CALLBACK f, void * data) + +int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data) { -parserServerInfo.SetCallback(f, data); -return Exec("", parserServerInfo); +return pImpl->Exec("", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::IMPL::ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data) + +int SERVCONF::SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data) { -parserChgUser.SetCallback(f, data); -return Exec(request, parserChgUser); +return pImpl->Exec("SendMessage", "", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::IMPL::SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data) + +int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data) { -parserSendMessage.SetCallback(f, data); -return Exec(request, parserSendMessage); +return pImpl->Exec("CheckUser", "", f, data); } + +const std::string & SERVCONF::GetStrError() const +{ +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, ParserRecv); } //----------------------------------------------------------------------------- void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr) @@ -211,7 +233,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); @@ -236,3 +258,34 @@ if ((ret = nt.Disconnect()) != st_ok) return st_ok; } + +int SERVCONF::RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data) +{ +std::string response; +nt.SetRxCallback(&response, SimpleRecv); +int ret = 0; +if ((ret = nt.Connect()) != st_ok) + { + nt.SetRxCallback(this, ParserRecv); + errorMsg = nt.GetError(); + f(false, errorMsg, "", data); + return ret; + } +if ((ret = nt.Transact(request.c_str())) != st_ok) + { + nt.SetRxCallback(this, ParserRecv); + errorMsg = nt.GetError(); + f(false, errorMsg, "", data); + return ret; + } +if ((ret = nt.Disconnect()) != st_ok) + { + nt.SetRxCallback(this, ParserRecv); + errorMsg = nt.GetError(); + f(false, errorMsg, "", data); + return ret; + } +nt.SetRxCallback(this, ParserRecv); +f(true, "", response, data); +return st_ok; +}