X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/4d38b4974e27dded1c8d542da3f9ec9e5295fbaf..97f1f905311bcb76c3b500e3e49c1b9f49dff491:/stglibs/srvconf.lib/servconf.cpp diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp index f2498ef5..3684dd54 100644 --- a/stglibs/srvconf.lib/servconf.cpp +++ b/stglibs/srvconf.lib/servconf.cpp @@ -20,202 +20,201 @@ #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 "stg/common.h" #include #include -//----------------------------------------------------------------------------- -int AnsRecv(void * data, std::list * list1) +#include + +using namespace STG; + +class SERVCONF::IMPL { -SERVCONF * sc = static_cast(data); +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; + + NETTRANSACT nt; + + std::string errorMsg; + XML_Parser parser; -XML_ParserReset(sc->parser, NULL); -XML_SetElementHandler(sc->parser, Start, End); -XML_SetUserData(sc->parser, data); + int Exec(const std::string & request, PARSER & cp); -char ans[ENC_MSG_LEN + 1]; -int len, done = 0; + static bool AnsRecv(void * data, const std::string & chunk, bool final); +}; -//loop parsing -std::list::iterator node; -node = list1->begin(); +bool SERVCONF::IMPL::AnsRecv(void * data, const std::string & chunk, bool final) +{ +SERVCONF::IMPL * sc = static_cast(data); -while (node != list1->end()) +if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ERROR) { - strncpy(ans, node->c_str(), ENC_MSG_LEN); - ans[ENC_MSG_LEN] = 0; - len = strlen(ans); - - if (XML_Parse(sc->parser, ans, len, done) == 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 st_xml_parse_error; - } - ++node; + 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 st_ok; +return true; } -//----------------------------------------------------------------------------- -void Start(void *data, const char *el, const char **attr) + +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 = static_cast(data); -sc->Start(el, attr); } -//----------------------------------------------------------------------------- -void End(void * data, const char * el) + +SERVCONF::~SERVCONF() { -SERVCONF * sc = static_cast(data); -sc->End(el); + delete pImpl; } -//----------------------------------------------------------------------------- -SERVCONF::SERVCONF() - : currParser(NULL) + +int SERVCONF::GetUsers(GET_USERS::CALLBACK f, void * data) { -parser = XML_ParserCreate(NULL); -nt.SetRxCallback(this, AnsRecv); + return pImpl->GetUsers( f, data ); } -//----------------------------------------------------------------------------- -void SERVCONF::SetServer(const char * server) + +int SERVCONF::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data) { -nt.SetServer(server); + return pImpl->GetUser(login, f, data); } -//----------------------------------------------------------------------------- -void SERVCONF::SetPort(uint16_t port) + +int SERVCONF::ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data) { -nt.SetServerPort(port); + return pImpl->ChgUser(request, f, data); } -//----------------------------------------------------------------------------- -void SERVCONF::SetAdmLogin(const char * login) + +int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data) { -nt.SetLogin(login); + return pImpl->AuthBy(login, f, data); } -//----------------------------------------------------------------------------- -void SERVCONF::SetAdmPassword(const char * password) + +int SERVCONF::SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data) { -nt.SetPassword(password); + return pImpl->SendMessage(request, f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::GetUser(const char * l) -{ -char request[255]; -snprintf(request, 255, "", l); -currParser = &parserGetUser; - -return Exec(request); -} -//----------------------------------------------------------------------------- -int SERVCONF::AuthBy(const char * l) +int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data) { -char request[255]; -snprintf(request, 255, "", l); - -currParser = &parserAuthBy; - -return Exec(request); + return pImpl->ServerInfo(f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::GetUsers() -{ -char request[] = ""; - -currParser = &parserGetUsers; -return Exec(request); -} -//----------------------------------------------------------------------------- -int SERVCONF::ServerInfo() +int SERVCONF::CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data) { -char request[] = ""; - -currParser = &parserServerInfo; - -return Exec(request); + return pImpl->CheckUser(login, password, f, data); } -//----------------------------------------------------------------------------- -int SERVCONF::ChgUser(const char * request) -{ -currParser = &parserChgUser; -return Exec(request); -} -//----------------------------------------------------------------------------- -int SERVCONF::SendMessage(const char * request) +const std::string & SERVCONF::GetStrError() const { -currParser = &parserSendMessage; - -return Exec(request); + return pImpl->GetStrError(); } + //----------------------------------------------------------------------------- -int SERVCONF::CheckUser(const char * login, const char * password) +SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port, + const std::string & login, const std::string & password) + : nt( server, port, login, password ) { -char request[255]; -snprintf(request, 255, "", login, password); - -currParser = &parserCheckUser; - -return Exec(request); +parser = XML_ParserCreate(NULL); +nt.SetRxCallback(this, AnsRecv); } //----------------------------------------------------------------------------- -int SERVCONF::Start(const char * el, const char ** attr) +int SERVCONF::IMPL::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data) { -currParser->ParseStart(el, attr); -return 0; +parserGetUser.SetCallback(f, data); +return Exec("", parserGetUser); } //----------------------------------------------------------------------------- -void SERVCONF::End(const char * el) +int SERVCONF::IMPL::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data) { -currParser->ParseEnd(el); +parserAuthBy.SetCallback(f, data); +return Exec("", parserAuthBy); } //----------------------------------------------------------------------------- -void SERVCONF::SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data) +int SERVCONF::IMPL::GetUsers(GET_USERS::CALLBACK f, void * data) { parserGetUsers.SetCallback(f, data); +return Exec("", parserGetUsers); } //----------------------------------------------------------------------------- -void SERVCONF::SetGetUserCallback(PARSER_GET_USER::CALLBACK f, void * data) +int SERVCONF::IMPL::ServerInfo(SERVER_INFO::CALLBACK f, void * data) { -parserGetUser.SetCallback(f, data); +parserServerInfo.SetCallback(f, data); +return Exec("", parserServerInfo); } //----------------------------------------------------------------------------- -void SERVCONF::SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data) +int SERVCONF::IMPL::ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data) { -parserAuthBy.SetCallback(f, data); +parserChgUser.SetCallback(f, data); +return Exec(request, parserChgUser); } //----------------------------------------------------------------------------- -void SERVCONF::SetServerInfoCallback(PARSER_SERVER_INFO::CALLBACK f, void * data) +int SERVCONF::IMPL::SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data) { -parserServerInfo.SetCallback(f, data); +parserSendMessage.SetCallback(f, data); +return Exec(request, parserSendMessage); } //----------------------------------------------------------------------------- -void SERVCONF::SetChgUserCallback(PARSER_CHG_USER::CALLBACK f, void * data) +int SERVCONF::IMPL::CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data) { -parserChgUser.SetCallback(f, data); +parserCheckUser.SetCallback(f, data); +return Exec("", parserCheckUser); } //----------------------------------------------------------------------------- -void SERVCONF::SetCheckUserCallback(PARSER_CHECK_USER::CALLBACK f, void * data) +void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr) { -parserCheckUser.SetCallback(f, data); +PARSER * currParser = static_cast(data); +currParser->ParseStart(el, attr); } //----------------------------------------------------------------------------- -void SERVCONF::SetSendMessageCallback(PARSER_SEND_MESSAGE::CALLBACK f, void * data) +void SERVCONF::IMPL::End(void * data, const char * el) { -parserSendMessage.SetCallback(f, data); +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 char * request) +int SERVCONF::IMPL::Exec(const std::string & request, PARSER & cp) { -nt.Reset(); +XML_ParserReset(parser, NULL); +XML_SetElementHandler(parser, Start, End); +XML_SetUserData(parser, &cp); int ret = 0; if ((ret = nt.Connect()) != st_ok) @@ -223,7 +222,7 @@ if ((ret = nt.Connect()) != st_ok) errorMsg = nt.GetError(); return ret; } -if ((ret = nt.Transact(request)) != st_ok) +if ((ret = nt.Transact(request.c_str())) != st_ok) { errorMsg = nt.GetError(); return ret;