X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9cd40c09380f9f681366abd51b4789869cb1dd23..33fec29ae92cd185c013516dc4f29df773c375eb:/stglibs/srvconf.lib/servconf.cpp diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp index f8d737a0..11e755ba 100644 --- a/stglibs/srvconf.lib/servconf.cpp +++ b/stglibs/srvconf.lib/servconf.cpp @@ -22,20 +22,26 @@ #include "netunit.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/add_admin.h" -#include "parsers/del_admin.h"*/ +#include "parsers/chg_admin.h" + +#include "parsers/get_tariffs.h" +#include "parsers/get_tariff.h" +#include "parsers/chg_tariff.h" #include "parsers/auth_by.h" -#include "parsers/check_user.h" #include "parsers/get_users.h" #include "parsers/get_user.h" #include "parsers/chg_user.h" -#include "parsers/send_message.h" + +#include "parsers/get_services.h" +#include "parsers/get_service.h" +#include "parsers/chg_service.h" #include "parsers/base.h" @@ -58,6 +64,8 @@ public: static void Start(void * data, const char * el, const char ** attr); static void End(void * data, const char * el); + int RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data); + template <class P, typename C> int Exec(const std::string & request, C callback, void * data) { @@ -65,17 +73,25 @@ public: return ExecImpl(request, cp); } + template <class P, typename C> + 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 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<SERVCONF::IMPL *>(data); @@ -91,6 +107,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<std::string *>(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)) @@ -107,6 +129,11 @@ int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data) return pImpl->Exec<SERVER_INFO::PARSER>("<GetServerInfo/>", f, data); } +int SERVCONF::RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data) +{ +return pImpl->RawXML(request, f, data); +} + // -- Admins -- int SERVCONF::GetAdmins(GET_ADMINS::CALLBACK f, void * data) @@ -119,23 +146,57 @@ int SERVCONF::GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * return pImpl->Exec<GET_ADMIN::PARSER>("<GetAdmin login=\"" + login + "\"/>", f, data); } -/*int SERVCONF::ChgAdmin(const std::string & login, const ADMIN_CONF_RES & conf, CHG_ADMIN::CALLBACK f, void * data) +int SERVCONF::ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec<SIMPLE::PARSER>("ChgAdmin", "<ChgAdmin" + CHG_ADMIN::Serialize(conf) + "/>", f, data); +} + +int SERVCONF::AddAdmin(const std::string & login, + const ADMIN_CONF_RES & conf, + SIMPLE::CALLBACK f, void * data) +{ +int res = pImpl->Exec<SIMPLE::PARSER>("AddAdmin", "<AddAdmin login=\"" + login + "\"/>", f, data); +if (res != st_ok) + return res; +return pImpl->Exec<SIMPLE::PARSER>("ChgAdmin", "<ChgAdmin" + CHG_ADMIN::Serialize(conf) + "/>", f, data); +} + +int SERVCONF::DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec<SIMPLE::PARSER>("DelAdmin", "<DelAdmin login=\"" + login + "\"/>", f, data); +} + +// -- Tariffs -- + +int SERVCONF::GetTariffs(GET_TARIFFS::CALLBACK f, void * data) +{ +return pImpl->Exec<GET_TARIFFS::PARSER>("<GetTariffs/>", f, data); +} + +int SERVCONF::GetTariff(const std::string & name, GET_TARIFF::CALLBACK f, void * data) { -return pImpl->Exec<CHG_ADMIN::PARSER>("<ChgAdmin login=\"" + login + "\">" + CHG_ADMIN::Serialize(conf) + "</ChgAdmin>", f, data); +return pImpl->Exec<GET_TARIFF::PARSER>("<GetTariff name=\"" + name + "\"/>", f, data); } -int SERVCONF::AddAdmin(const std::string & login, const ADMIN_CONF & conf, ADD_ADMIN::CALLBACK f, void * data) +int SERVCONF::ChgTariff(const TARIFF_DATA_RES & tariffData, SIMPLE::CALLBACK f, void * data) { -int res = pImpl->Exec<ADD_ADMIN::PARSER>("<AddAdmin login=\"" + login + "\"/>", f, data); +return pImpl->Exec<SIMPLE::PARSER>("SetTariff", "<SetTariff name=\"" + tariffData.tariffConf.name.data() + "\">" + CHG_TARIFF::Serialize(tariffData) + "</SetTariff>", f, data); +} + +int SERVCONF::AddTariff(const std::string & name, + const TARIFF_DATA_RES & tariffData, + SIMPLE::CALLBACK f, void * data) +{ +int res = pImpl->Exec<SIMPLE::PARSER>("AddTariff", "<AddTariff name=\"" + name + "\"/>", f, data); if (res != st_ok) return res; -return pImpl->Exec<CHG_ADMIN::PARSER>("<ChgAdmin login=\"" + login + "\">" + CHG_ADMIN::Serialize(conf) + "</ChgAdmin>", f, data); +return pImpl->Exec<SIMPLE::PARSER>("SetTariff", "<SetTariff name=\"" + name + "\">" + CHG_TARIFF::Serialize(tariffData) + "</SetTariff>", f, data); } -int SERVCONF::DelAdmin(const std::string & login, DEL_ADMIN::CALLBACK f, void * data) +int SERVCONF::DelTariff(const std::string & name, SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec<DEL_ADMIN::PARSER>("<DelAdmin login=\"" + login + "\"/>", f, data); -}*/ +return pImpl->Exec<SIMPLE::PARSER>("DelTariff", "<DelTariff name=\"" + name + "\"/>", f, data); +} // -- Users -- @@ -149,9 +210,22 @@ int SERVCONF::GetUser(const std::string & login, GET_USER::CALLBACK f, void * da return pImpl->Exec<GET_USER::PARSER>("<GetUser login=\"" + login + "\"/>", f, data); } -int SERVCONF::ChgUser(const std::string & request, CHG_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) { -return pImpl->Exec<CHG_USER::PARSER>(request, f, data); +return pImpl->Exec<CHG_USER::PARSER>("<SetUser><Login value=\"" + login + "\"/>" + CHG_USER::Serialize(conf, stat) + "</SetUser>", f, data); +} + +int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec<SIMPLE::PARSER>("DelUser", "<DelUser login=\"" + login + "\"/>", f, data); +} + +int SERVCONF::AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec<SIMPLE::PARSER>("AddUser", "<AddUser><Login value=\"" + login + "\"/></AddUser>", f, data); } int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data) @@ -159,14 +233,46 @@ int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data return pImpl->Exec<AUTH_BY::PARSER>("<GetUserAuthBy login=\"" + login + "\"/>", f, data); } -int SERVCONF::SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data) +int SERVCONF::SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec<SIMPLE::PARSER>("SendMessage", "<Message login=\"" + login + "\" msgver=\"1\" msgtype=\"1\" repeat=\"0\" repeatperiod=\"0\" showtime=\"0\" text=\"" + Encode12str(text) + "\"/>", f, data); +} + +int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec<SIMPLE::PARSER>("CheckUser", "<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", f, data); +} + +// -- Services -- + +int SERVCONF::GetServices(GET_SERVICES::CALLBACK f, void * data) +{ +return pImpl->Exec<GET_SERVICES::PARSER>("<GetServices/>", f, data); +} + +int SERVCONF::GetService(const std::string & name, GET_SERVICE::CALLBACK f, void * data) +{ +return pImpl->Exec<GET_SERVICE::PARSER>("<GetService name=\"" + name + "\"/>", f, data); +} + +int SERVCONF::ChgService(const SERVICE_CONF_RES & conf, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec<SIMPLE::PARSER>("SetService", "<SetService name=\"" + conf.name.data() + "\">" + CHG_SERVICE::Serialize(conf) + "</SetService>", f, data); +} + +int SERVCONF::AddService(const std::string & name, + const SERVICE_CONF_RES & conf, + SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec<SEND_MESSAGE::PARSER>(request, f, data); +int res = pImpl->Exec<SIMPLE::PARSER>("AddService", "<AddService name=\"" + name + "\"/>", f, data); +if (res != st_ok) + return res; +return pImpl->Exec<SIMPLE::PARSER>("SetService", "<SetService name=\"" + name + "\">" + CHG_SERVICE::Serialize(conf) + "</SetService>", f, data); } -int SERVCONF::CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data) +int SERVCONF::DelService(const std::string & name, SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec<CHECK_USER::PARSER>("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", f, data); +return pImpl->Exec<SIMPLE::PARSER>("DelService", "<DelService name=\"" + name + "\"/>", f, data); } const std::string & SERVCONF::GetStrError() const @@ -180,7 +286,7 @@ SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port, : nt( server, port, login, password ) { parser = XML_ParserCreate(NULL); -nt.SetRxCallback(this, AnsRecv); +nt.SetRxCallback(this, ParserRecv); } //----------------------------------------------------------------------------- void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr) @@ -225,3 +331,34 @@ if ((ret = nt.Disconnect()) != st_ok) return st_ok; } + +int SERVCONF::IMPL::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; +}