X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..99090ca5351c98fd9ce9773456a8a3c3936e8c60:/stglibs/srvconf.lib/servconf.cpp diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp index be6fa279..11e755ba 100644 --- a/stglibs/srvconf.lib/servconf.cpp +++ b/stglibs/srvconf.lib/servconf.cpp @@ -18,381 +18,347 @@ * Author : Boris Mikhailenko */ - /* - $Revision: 1.8 $ - $Date: 2010/08/04 00:40:38 $ - $Author: faust $ - */ +#include "stg/servconf.h" -#include -#include +#include "netunit.h" -#include "servconf.h" +#include "parsers/simple.h" -using namespace std; +#include "parsers/server_info.h" -//----------------------------------------------------------------------------- -int AnsRecv(void * data, list * list1) -{ -//NODE * node; -SERVCONF * sc; -char ans[ENC_MSG_LEN + 1]; -int len, done = 0; +#include "parsers/get_admins.h" +#include "parsers/get_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/get_users.h" +#include "parsers/get_user.h" +#include "parsers/chg_user.h" + +#include "parsers/get_services.h" +#include "parsers/get_service.h" +#include "parsers/chg_service.h" + +#include "parsers/base.h" -sc = (SERVCONF*)data; +#include "stg/common.h" -XML_ParserReset(sc->parser, NULL); -XML_SetElementHandler(sc->parser, Start, End); -XML_SetUserData(sc->parser, data); +#include +#include -//loop parsing -list::iterator node; -node = list1->begin(); +#include -if (node == list1->end()) +using namespace STG; + +class SERVCONF::IMPL +{ +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); + + int RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data); + + template + int Exec(const std::string & request, C callback, void * data) { - return st_ok; + P cp(callback, data); + return ExecImpl(request, cp); } -while (node != list1->end()) + template + int Exec(const std::string & tag, const std::string & request, C callback, void * data) { - strncpy(ans, node->c_str(), ENC_MSG_LEN); - ans[ENC_MSG_LEN] = 0; - //printf("---> %s\n", ans); - len = strlen(ans); - - if (XML_Parse(sc->parser, ans, len, done) == XML_STATUS_ERROR) - { - snprintf(sc->errorMsg, MAX_ERR_STR_LEN, "XML parse error at line %d: %s", - static_cast(XML_GetCurrentLineNumber(sc->parser)), - XML_ErrorString(XML_GetErrorCode(sc->parser))); - printf(sc->errorMsg, "XML parse error at line %d: %s", - XML_GetCurrentLineNumber(sc->parser), - XML_ErrorString(XML_GetErrorCode(sc->parser))); - return st_xml_parse_error; - } - ++node; + P cp(tag, callback, data); + return ExecImpl(request, cp); + } +private: + NETTRANSACT nt; + + std::string errorMsg; + XML_Parser parser; + + 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::ParserRecv(void * data, const std::string & chunk, bool final) +{ +SERVCONF::IMPL * sc = static_cast(data); + +if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ERROR) + { + strprintf(&sc->errorMsg, "XML parse error at line %d: %s", + static_cast(XML_GetCurrentLineNumber(sc->parser)), + XML_ErrorString(XML_GetErrorCode(sc->parser))); + printf("%s\n", sc->errorMsg.c_str()); + return false; } -return 0; +return true; } -//----------------------------------------------------------------------------- -void Start(void *data, const char *el, const char **attr) + +bool SERVCONF::IMPL::SimpleRecv(void * data, const std::string & chunk, bool /*final*/) { -SERVCONF * sc; -sc = (SERVCONF*)data; -sc->Start(el, attr); +*static_cast(data) += chunk; +return true; } -//----------------------------------------------------------------------------- -void End(void *data, const char *el) + +SERVCONF::SERVCONF(const std::string & server, uint16_t port, + const std::string & login, const std::string & password) + : pImpl(new IMPL(server, port, login, password)) { -SERVCONF * sc; -sc = (SERVCONF*)data; -sc->End(el); } -//----------------------------------------------------------------------------- -SERVCONF::SERVCONF() + +SERVCONF::~SERVCONF() { -parser = XML_ParserCreate(NULL); -parseDepth = 0; +delete pImpl; } -//----------------------------------------------------------------------------- -void SERVCONF::SetServer(const char * server) + +int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data) { -nt.SetServer(server); +return pImpl->Exec("", f, data); } -//----------------------------------------------------------------------------- -void SERVCONF::SetPort(uint16_t port) + +int SERVCONF::RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data) { -nt.SetServerPort(port); +return pImpl->RawXML(request, f, data); } -//----------------------------------------------------------------------------- -void SERVCONF::SetAdmLogin(const char * login) + +// -- Admins -- + +int SERVCONF::GetAdmins(GET_ADMINS::CALLBACK f, void * data) { -nt.SetLogin(login); +return pImpl->Exec("", f, data); } -//----------------------------------------------------------------------------- -void SERVCONF::SetAdmPassword(const char * password) + +int SERVCONF::GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data) { -nt.SetPassword(password); +return pImpl->Exec("", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::GetUser(const char * l) + +int SERVCONF::ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data) { -char request[255]; -snprintf(request, 255, "", l); -int ret; +return pImpl->Exec("ChgAdmin", "", f, data); +} -currParser = &parserGetUser; -((PARSER_GET_USER*)currParser)->SetUserDataRecvCb(RecvGetUserDataCb, getUserDataDataCb); +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); +} -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); +int SERVCONF::DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("DelAdmin", "", f, data); +} -if ((ret = nt.Connect()) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - return ret; - } -if ((ret = nt.Transact(request)) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - return ret; - } +// -- Tariffs -- -return st_ok; +int SERVCONF::GetTariffs(GET_TARIFFS::CALLBACK f, void * data) +{ +return pImpl->Exec("", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::GetUsers() + +int SERVCONF::GetTariff(const std::string & name, GET_TARIFF::CALLBACK f, void * data) { -char request[] = ""; -int ret; +return pImpl->Exec("", f, data); +} -currParser = &parserGetUsers; -((PARSER_GET_USERS*)currParser)->SetUserDataRecvCb(RecvUserDataCb, getUsersDataDataCb); +int SERVCONF::ChgTariff(const TARIFF_DATA_RES & tariffData, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("SetTariff", "" + CHG_TARIFF::Serialize(tariffData) + "", f, data); +} -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); +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); +} -if ((ret = nt.Connect()) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - return ret; - } -if ((ret = nt.Transact(request)) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - return ret; - } +int SERVCONF::DelTariff(const std::string & name, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("DelTariff", "", f, data); +} -return st_ok; +// -- Users -- + +int SERVCONF::GetUsers(GET_USERS::CALLBACK f, void * data) +{ +return pImpl->Exec("", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::SendMessage(const char * login, const char * message, int prio) + +int SERVCONF::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data) { -char request[1000]; -char msg[500]; -Encode12(msg, message, strlen(message)); -snprintf(request, 1000, "", login, prio, msg); -int ret; +return pImpl->Exec("", f, data); +} -currParser = &parserSendMessage; -parserSendMessage.SetSendMessageRecvCb(RecvSendMessageCb, sendMessageDataCb); +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); +} -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); +int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("DelUser", "", f, data); +} -if ((ret = nt.Connect()) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - return ret; - } -if ((ret = nt.Transact(request)) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - return ret; - } +int SERVCONF::AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("AddUser", "", f, data); +} -return st_ok; +int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data) +{ +return pImpl->Exec("", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::GetServerInfo() + +int SERVCONF::SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data) { -char request[] = ""; -int ret; +return pImpl->Exec("SendMessage", "", f, data); +} -currParser = &parserServerInfo; -((PARSER_GET_SERVER_INFO*)currParser)->SetServerInfoRecvCb(RecvServerInfoDataCb, getServerInfoDataCb); +int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("CheckUser", "", f, data); +} -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); +// -- Services -- -if ((ret = nt.Connect()) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - return ret; - } -if ((ret = nt.Transact(request)) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - return ret; - } +int SERVCONF::GetServices(GET_SERVICES::CALLBACK f, void * data) +{ +return pImpl->Exec("", f, data); +} -return st_ok; +int SERVCONF::GetService(const std::string & name, GET_SERVICE::CALLBACK f, void * data) +{ +return pImpl->Exec("", f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::ChgUser(const char * request) + +int SERVCONF::ChgService(const SERVICE_CONF_RES & conf, SIMPLE::CALLBACK f, void * data) { -int ret; +return pImpl->Exec("SetService", "" + CHG_SERVICE::Serialize(conf) + "", f, data); +} -currParser = &parserChgUser; -((PARSER_CHG_USER*)currParser)->SetChgUserRecvCb(RecvChgUserCb, chgUserDataCb); +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); +} -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); +int SERVCONF::DelService(const std::string & name, SIMPLE::CALLBACK f, void * data) +{ +return pImpl->Exec("DelService", "", f, data); +} -if ((ret = nt.Connect()) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - printfd(__FILE__, "Error on connect: '%s'\n", errorMsg); - return ret; - } -if ((ret = nt.Transact(request)) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - printfd(__FILE__, "Error on transact: '%s'\n", errorMsg); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) - { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); - printfd(__FILE__, "Error on disconnect: '%s'\n", errorMsg); - return ret; - } +const std::string & SERVCONF::GetStrError() const +{ +return pImpl->GetStrError(); +} -return st_ok; +//----------------------------------------------------------------------------- +SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port, + const std::string & login, const std::string & password) + : nt( server, port, login, password ) +{ +parser = XML_ParserCreate(NULL); +nt.SetRxCallback(this, ParserRecv); } //----------------------------------------------------------------------------- -// TODO: remove this shit! +void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr) +{ +PARSER * currParser = static_cast(data); +currParser->ParseStart(el, attr); +} //----------------------------------------------------------------------------- -int SERVCONF::MsgUser(const char * request) +void SERVCONF::IMPL::End(void * data, const char * el) { -int ret; - -currParser = &parserSendMessage; -parserSendMessage.SetSendMessageRecvCb(RecvSendMessageCb, sendMessageDataCb); - -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); +PARSER * currParser = static_cast(data); +currParser->ParseEnd(el); +} +//----------------------------------------------------------------------------- +const std::string & SERVCONF::IMPL::GetStrError() const +{ +return errorMsg; +} +//----------------------------------------------------------------------------- +int SERVCONF::IMPL::ExecImpl(const std::string & request, PARSER & cp) +{ +XML_ParserReset(parser, NULL); +XML_SetElementHandler(parser, Start, End); +XML_SetUserData(parser, &cp); +int ret = 0; if ((ret = nt.Connect()) != st_ok) { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); + errorMsg = nt.GetError(); return ret; } -if ((ret = nt.Transact(request)) != st_ok) +if ((ret = nt.Transact(request.c_str())) != st_ok) { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); + errorMsg = nt.GetError(); return ret; } if ((ret = nt.Disconnect()) != st_ok) { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); + errorMsg = nt.GetError(); return ret; } return st_ok; } -//----------------------------------------------------------------------------- -int SERVCONF::CheckUser(const char * login, const char * password) -{ -char request[255]; -snprintf(request, 255, "", login, password); -int ret; - -currParser = &parserCheckUser; -((PARSER_CHECK_USER*)currParser)->SetCheckUserRecvCb(RecvCheckUserCb, checkUserDataCb); - -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); +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) { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); + nt.SetRxCallback(this, ParserRecv); + errorMsg = nt.GetError(); + f(false, errorMsg, "", data); return ret; } -if ((ret = nt.Transact(request)) != st_ok) +if ((ret = nt.Transact(request.c_str())) != st_ok) { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); + nt.SetRxCallback(this, ParserRecv); + errorMsg = nt.GetError(); + f(false, errorMsg, "", data); return ret; } if ((ret = nt.Disconnect()) != st_ok) { - strncpy(errorMsg, nt.GetError(), MAX_ERR_STR_LEN); + nt.SetRxCallback(this, ParserRecv); + errorMsg = nt.GetError(); + f(false, errorMsg, "", data); return ret; } - +nt.SetRxCallback(this, ParserRecv); +f(true, "", response, data); return st_ok; } -//----------------------------------------------------------------------------- -int SERVCONF::Start(const char *el, const char **attr) -{ -currParser->ParseStart(el, attr); -return 0; -} -//----------------------------------------------------------------------------- -void SERVCONF::End(const char *el) -{ -currParser->ParseEnd(el); -} -//----------------------------------------------------------------------------- -void SERVCONF::SetUserDataRecvCb(RecvUserDataCb_t f, void * data) -{ -RecvUserDataCb = f; -getUsersDataDataCb = data; -} -//----------------------------------------------------------------------------- -void SERVCONF::SetGetUserDataRecvCb(RecvUserDataCb_t f, void * data) -{ -RecvGetUserDataCb = f; //GET_USER -getUserDataDataCb = data; -} -//----------------------------------------------------------------------------- -void SERVCONF::SetServerInfoRecvCb(RecvServerInfoDataCb_t f, void * data) -{ -RecvServerInfoDataCb = f; -getServerInfoDataCb = data; -} -//----------------------------------------------------------------------------- -void SERVCONF::SetChgUserCb(RecvChgUserCb_t f, void * data) -{ -RecvChgUserCb = f; -chgUserDataCb = data; -} -//----------------------------------------------------------------------------- -void SERVCONF::SetCheckUserCb(RecvCheckUserCb_t f, void * data) -{ -RecvCheckUserCb = f; -checkUserDataCb = data; -} -//----------------------------------------------------------------------------- -void SERVCONF::SetSendMessageCb(RecvSendMessageCb_t f, void * data) -{ -RecvSendMessageCb = f; -sendMessageDataCb = data; -} -//----------------------------------------------------------------------------- -char * SERVCONF::GetStrError() -{ -return errorMsg; -} -//----------------------------------------------------------------------------- -int SERVCONF::GetError() -{ -int e = error; -error = 0; -return e; -} -//----------------------------------------------------------------------------- -