X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/0093be0eb4dbe201a7d63da1de47f98c68987b1d..a5e0ee99821e8c52858667608f11a51f916a3df6:/stglibs/srvconf.lib/servconf.cpp?ds=sidebyside diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp index 268749a3..430de3c1 100644 --- a/stglibs/srvconf.lib/servconf.cpp +++ b/stglibs/srvconf.lib/servconf.cpp @@ -16,33 +16,85 @@ /* * Author : Boris Mikhailenko + * Author : Maxim Mamontov */ #include "stg/servconf.h" +#include "netunit.h" + +#include "parsers/simple.h" +#include "parsers/get_container.h" + +#include "parsers/server_info.h" + +#include "parsers/get_admin.h" +#include "parsers/chg_admin.h" + +#include "parsers/get_tariff.h" +#include "parsers/chg_tariff.h" + +#include "parsers/auth_by.h" +#include "parsers/get_user.h" +#include "parsers/chg_user.h" + +#include "parsers/get_service.h" +#include "parsers/chg_service.h" + +#include "parsers/get_corp.h" +#include "parsers/chg_corp.h" + +#include "parsers/base.h" + #include "stg/common.h" #include #include -namespace -{ +#include -void ElementStart(void * data, const char * el, const char ** attr) -{ -static_cast(data)->Start(el, attr); -} +using namespace STG; -void ElementEnd(void * data, const char * el) +class SERVCONF::IMPL { -static_cast(data)->End(el); -} +public: + IMPL(const std::string & server, uint16_t port, + const std::string & login, const std::string & password); + + const std::string & GetStrError() const; + static void Start(void * data, const char * el, const char ** attr); + static void End(void * data, const char * el); -} // namespace anonymous + int RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data); -bool AnsRecv(void * data, const std::string & chunk, bool final) + 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; + + static bool ParserRecv(const std::string & chunk, bool final, void * data); + static bool SimpleRecv(const std::string & chunk, bool final, void * data); + int ExecImpl(const std::string & request, PARSER & cp); +}; + +bool SERVCONF::IMPL::ParserRecv(const std::string & chunk, bool final, void * data) { -SERVCONF * sc = static_cast(data); +SERVCONF::IMPL * sc = static_cast(data); if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ERROR) { @@ -56,80 +108,241 @@ if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ER return true; } -//----------------------------------------------------------------------------- +bool SERVCONF::IMPL::SimpleRecv(const std::string & chunk, bool /*final*/, void * data) +{ +*static_cast(data) += chunk; +return true; +} + SERVCONF::SERVCONF(const std::string & server, uint16_t port, const std::string & login, const std::string & password) - : currParser(NULL), - nt( server, port, login, password ) + : pImpl(new IMPL(server, port, login, password)) { -parser = XML_ParserCreate(NULL); -nt.SetRxCallback(this, AnsRecv); } -//----------------------------------------------------------------------------- -int SERVCONF::GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data) + +SERVCONF::~SERVCONF() { -parserGetUser.SetCallback(f, data); -return Exec("", parserGetUser); +delete pImpl; } -//----------------------------------------------------------------------------- -int SERVCONF::AuthBy(const std::string & login, PARSER_AUTH_BY::CALLBACK f, void * data) + +int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data) { -parserAuthBy.SetCallback(f, data); -return Exec("", parserAuthBy); +return pImpl->Exec("", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::GetUsers(PARSER_GET_USERS::CALLBACK f, void * data) + +int SERVCONF::RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data) { -parserGetUsers.SetCallback(f, data); -return Exec("", parserGetUsers); +return pImpl->RawXML(request, f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data) + +// -- Admins -- + +int SERVCONF::GetAdmins(GET_CONTAINER::CALLBACK::TYPE f, void * data) { -parserServerInfo.SetCallback(f, data); -return Exec("", parserServerInfo); +return pImpl->Exec >("admins", "", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data) + +int SERVCONF::GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data) { -parserChgUser.SetCallback(f, data); -return Exec(request, parserChgUser); +return pImpl->Exec("", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data) + +int SERVCONF::ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("ChgAdmin", "", f, data); +} + +int SERVCONF::AddAdmin(const std::string & login, + const ADMIN_CONF_RES & conf, + SIMPLE::CALLBACK f, void * data) +{ +int res = pImpl->Exec("AddAdmin", "", f, data); +if (res != st_ok) + return res; +return pImpl->Exec("ChgAdmin", "", f, data); +} + +int SERVCONF::DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("DelAdmin", "", f, data); +} + +// -- Tariffs -- + +int SERVCONF::GetTariffs(GET_CONTAINER::CALLBACK::TYPE f, void * data) +{ +return pImpl->Exec >("tariffs", "", f, data); +} + +int SERVCONF::GetTariff(const std::string & name, GET_TARIFF::CALLBACK f, void * data) +{ +return pImpl->Exec("", f, data); +} + +int SERVCONF::ChgTariff(const TARIFF_DATA_RES & tariffData, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("SetTariff", "" + CHG_TARIFF::Serialize(tariffData) + "", f, data); +} + +int SERVCONF::AddTariff(const std::string & name, + const TARIFF_DATA_RES & tariffData, + SIMPLE::CALLBACK f, void * data) +{ +int res = pImpl->Exec("AddTariff", "", f, data); +if (res != st_ok) + return res; +return pImpl->Exec("SetTariff", "" + CHG_TARIFF::Serialize(tariffData) + "", f, data); +} + +int SERVCONF::DelTariff(const std::string & name, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("DelTariff", "", f, data); +} + +// -- Users -- + +int SERVCONF::GetUsers(GET_CONTAINER::CALLBACK::TYPE f, void * data) +{ +return pImpl->Exec >("users", "", f, data); +} + +int SERVCONF::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data) +{ +return pImpl->Exec("", f, data); +} + +int SERVCONF::ChgUser(const std::string & login, + const USER_CONF_RES & conf, + const USER_STAT_RES & stat, + SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("" + CHG_USER::Serialize(conf, stat) + "", f, data); +} + +int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("DelUser", "", f, data); +} + +int SERVCONF::AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("AddUser", "", f, data); +} + +int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data) +{ +return pImpl->Exec("", f, data); +} + +int SERVCONF::SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("SendMessage", "", f, data); +} + +int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("CheckUser", "", f, data); +} + +// -- Services -- + +int SERVCONF::GetServices(GET_CONTAINER::CALLBACK::TYPE f, void * data) +{ +return pImpl->Exec >("services", "", f, data); +} + +int SERVCONF::GetService(const std::string & name, GET_SERVICE::CALLBACK f, void * data) +{ +return pImpl->Exec("", f, data); +} + +int SERVCONF::ChgService(const SERVICE_CONF_RES & conf, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("SetService", "" + CHG_SERVICE::Serialize(conf) + "", f, data); +} + +int SERVCONF::AddService(const std::string & name, + const SERVICE_CONF_RES & conf, + SIMPLE::CALLBACK f, void * data) +{ +int res = pImpl->Exec("AddService", "", f, data); +if (res != st_ok) + return res; +return pImpl->Exec("SetService", "" + CHG_SERVICE::Serialize(conf) + "", f, data); +} + +int SERVCONF::DelService(const std::string & name, SIMPLE::CALLBACK f, void * data) { -parserSendMessage.SetCallback(f, data); -return Exec(request, parserSendMessage); +return pImpl->Exec("DelService", "", f, data); } + +// -- Corporations -- + +int SERVCONF::GetCorporations(GET_CONTAINER::CALLBACK::TYPE f, void * data) +{ +return pImpl->Exec >("corporations", "", f, data); +} + +int SERVCONF::GetCorp(const std::string & name, GET_CORP::CALLBACK f, void * data) +{ +return pImpl->Exec("", f, data); +} + +int SERVCONF::ChgCorp(const CORP_CONF_RES & conf, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("SetCorp", "" + CHG_CORP::Serialize(conf) + "", f, data); +} + +int SERVCONF::AddCorp(const std::string & name, + const CORP_CONF_RES & conf, + SIMPLE::CALLBACK f, void * data) +{ +int res = pImpl->Exec("AddCorp", "", f, data); +if (res != st_ok) + return res; +return pImpl->Exec("SetCorp", "" + CHG_CORP::Serialize(conf) + "", f, data); +} + +int SERVCONF::DelCorp(const std::string & name, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("DelCorp", "", f, data); +} + +const std::string & SERVCONF::GetStrError() const +{ +return pImpl->GetStrError(); +} + //----------------------------------------------------------------------------- -int SERVCONF::CheckUser(const std::string & login, const std::string & password, PARSER_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); } //----------------------------------------------------------------------------- -void SERVCONF::Start(const char * el, const char ** attr) +void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr) { +PARSER * currParser = static_cast(data); currParser->ParseStart(el, attr); } //----------------------------------------------------------------------------- -void SERVCONF::End(const char * el) +void SERVCONF::IMPL::End(void * data, const char * el) { +PARSER * currParser = static_cast(data); currParser->ParseEnd(el); } //----------------------------------------------------------------------------- -const std::string & SERVCONF::GetStrError() const +const std::string & SERVCONF::IMPL::GetStrError() const { return errorMsg; } //----------------------------------------------------------------------------- -int SERVCONF::Exec(const std::string & request, PARSER & cp) +int SERVCONF::IMPL::ExecImpl(const std::string & request, PARSER & cp) { -currParser = &cp; - XML_ParserReset(parser, NULL); -XML_SetElementHandler(parser, ElementStart, ElementEnd); -XML_SetUserData(parser, this); +XML_SetElementHandler(parser, Start, End); +XML_SetUserData(parser, &cp); int ret = 0; if ((ret = nt.Connect()) != st_ok) @@ -137,16 +350,34 @@ if ((ret = nt.Connect()) != st_ok) errorMsg = nt.GetError(); return ret; } -if ((ret = nt.Transact(request.c_str())) != st_ok) +if ((ret = nt.Transact(request, ParserRecv, this)) != st_ok) + { + errorMsg = nt.GetError(); + return ret; + } + +nt.Disconnect(); +return st_ok; +} + +int SERVCONF::IMPL::RawXML(const std::string & request, RAW_XML::CALLBACK callback, void * data) +{ +int ret = 0; +if ((ret = nt.Connect()) != st_ok) { errorMsg = nt.GetError(); + callback(false, errorMsg, "", data); return ret; } -if ((ret = nt.Disconnect()) != st_ok) +std::string response; +if ((ret = nt.Transact(request, SimpleRecv, &response)) != st_ok) { errorMsg = nt.GetError(); + callback(false, errorMsg, "", data); return ret; } +nt.Disconnect(); +callback(true, "", response, data); return st_ok; }