X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a8689998a9b2cfc17dc260b423cce8ff2e407adb..61b5cf35c82a5850ceb07fca5232a409e249444c:/stglibs/srvconf.lib/servconf.cpp diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp index 83f087b3..f2498ef5 100644 --- a/stglibs/srvconf.lib/servconf.cpp +++ b/stglibs/srvconf.lib/servconf.cpp @@ -18,48 +18,33 @@ * Author : Boris Mikhailenko */ - /* - $Revision: 1.8 $ - $Date: 2010/08/04 00:40:38 $ - $Author: faust $ - */ - -#include -#include +#include "stg/servconf.h" #include "stg/common.h" -#include "stg/servconf.h" -using namespace std; +#include +#include //----------------------------------------------------------------------------- -int AnsRecv(void * data, list * list1) +int AnsRecv(void * data, std::list * list1) { -//NODE * node; -SERVCONF * sc; -char ans[ENC_MSG_LEN + 1]; -int len, done = 0; - -sc = (SERVCONF*)data; +SERVCONF * sc = static_cast(data); XML_ParserReset(sc->parser, NULL); XML_SetElementHandler(sc->parser, Start, End); XML_SetUserData(sc->parser, data); +char ans[ENC_MSG_LEN + 1]; +int len, done = 0; + //loop parsing -list::iterator node; +std::list::iterator node; node = list1->begin(); -if (node == list1->end()) - { - return st_ok; - } - while (node != list1->end()) { 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) @@ -67,49 +52,32 @@ while (node != list1->end()) 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; - } -return 0; +return st_ok; } //----------------------------------------------------------------------------- void Start(void *data, const char *el, const char **attr) { -SERVCONF * sc; -sc = (SERVCONF*)data; +SERVCONF * sc = static_cast(data); sc->Start(el, attr); } //----------------------------------------------------------------------------- -void End(void *data, const char *el) +void End(void * data, const char * el) { -SERVCONF * sc; -sc = (SERVCONF*)data; +SERVCONF * sc = static_cast(data); sc->End(el); } //----------------------------------------------------------------------------- SERVCONF::SERVCONF() - : currParser(NULL), - parseDepth(0), - error(0), - RecvUserDataCb(NULL), - RecvGetUserDataCb(NULL), - authByCallback(NULL), - serverInfoCallback(NULL), - RecvChgUserCb(NULL), - checkUserCallback(NULL), - RecvSendMessageCb(NULL), - getUserDataDataCb(NULL), - authByData(NULL), - getUsersDataDataCb(NULL), - serverInfoData(NULL), - chgUserDataCb(NULL), - checkUserData(NULL), - sendMessageDataCb(NULL) + : currParser(NULL) { parser = XML_ParserCreate(NULL); +nt.SetRxCallback(this, AnsRecv); } //----------------------------------------------------------------------------- void SERVCONF::SetServer(const char * server) @@ -136,31 +104,10 @@ int SERVCONF::GetUser(const char * l) { char request[255]; snprintf(request, 255, "", l); -int ret; currParser = &parserGetUser; -((PARSER_GET_USER*)currParser)->SetUserDataRecvCb(RecvGetUserDataCb, getUserDataDataCb); -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); - -if ((ret = nt.Connect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Transact(request)) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } - -return st_ok; +return Exec(request); } //----------------------------------------------------------------------------- int SERVCONF::AuthBy(const char * l) @@ -169,266 +116,96 @@ char request[255]; snprintf(request, 255, "", l); currParser = &parserAuthBy; -((PARSER_AUTH_BY*)currParser)->SetCallback(authByCallback, authByData); - -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); -int ret; -if ((ret = nt.Connect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Transact(request)) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } - -return st_ok; +return Exec(request); } //----------------------------------------------------------------------------- int SERVCONF::GetUsers() { char request[] = ""; -int ret; currParser = &parserGetUsers; -((PARSER_GET_USERS*)currParser)->SetUserDataRecvCb(RecvUserDataCb, getUsersDataDataCb); - -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); - -if ((ret = nt.Connect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Transact(request)) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } - -return st_ok; -} -//----------------------------------------------------------------------------- -int SERVCONF::SendMessage(const char * login, const char * message, int prio) -{ -char request[1000]; -char msg[500]; -Encode12(msg, message, strlen(message)); -snprintf(request, 1000, "", login, prio, msg); -int ret; - -currParser = &parserSendMessage; -parserSendMessage.SetSendMessageRecvCb(RecvSendMessageCb, sendMessageDataCb); - -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); - -if ((ret = nt.Connect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Transact(request)) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -return st_ok; +return Exec(request); } //----------------------------------------------------------------------------- int SERVCONF::ServerInfo() { char request[] = ""; -int ret; currParser = &parserServerInfo; -((PARSER_SERVER_INFO*)currParser)->SetCallback(serverInfoCallback, serverInfoData); -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); - -if ((ret = nt.Connect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Transact(request)) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } - -return st_ok; +return Exec(request); } //----------------------------------------------------------------------------- int SERVCONF::ChgUser(const char * request) { -int ret; - currParser = &parserChgUser; -((PARSER_CHG_USER*)currParser)->SetChgUserRecvCb(RecvChgUserCb, chgUserDataCb); - -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); -if ((ret = nt.Connect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Transact(request)) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } - -return st_ok; +return Exec(request); } //----------------------------------------------------------------------------- -// TODO: remove this shit! -//----------------------------------------------------------------------------- -int SERVCONF::MsgUser(const char * request) +int SERVCONF::SendMessage(const char * request) { -int ret; - currParser = &parserSendMessage; -parserSendMessage.SetSendMessageRecvCb(RecvSendMessageCb, sendMessageDataCb); -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); - -if ((ret = nt.Connect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Transact(request)) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } - -return st_ok; +return Exec(request); } //----------------------------------------------------------------------------- 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)->SetCallback(checkUserCallback, checkUserData); - -nt.Reset(); -nt.SetRxCallback(this, AnsRecv); - -if ((ret = nt.Connect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Transact(request)) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -return st_ok; +return Exec(request); } //----------------------------------------------------------------------------- -int SERVCONF::Start(const char *el, const char **attr) +int SERVCONF::Start(const char * el, const char ** attr) { currParser->ParseStart(el, attr); return 0; } //----------------------------------------------------------------------------- -void SERVCONF::End(const char *el) +void SERVCONF::End(const char * el) { currParser->ParseEnd(el); } //----------------------------------------------------------------------------- -void SERVCONF::SetUserDataRecvCb(RecvUserDataCb_t f, void * data) +void SERVCONF::SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data) { -RecvUserDataCb = f; -getUsersDataDataCb = data; +parserGetUsers.SetCallback(f, data); } //----------------------------------------------------------------------------- void SERVCONF::SetGetUserCallback(PARSER_GET_USER::CALLBACK f, void * data) { -getUserCallback = f; -getUserData = data; +parserGetUser.SetCallback(f, data); } //----------------------------------------------------------------------------- void SERVCONF::SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data) { -authByCallback = f; -authByData = data; +parserAuthBy.SetCallback(f, data); } //----------------------------------------------------------------------------- void SERVCONF::SetServerInfoCallback(PARSER_SERVER_INFO::CALLBACK f, void * data) { -serverInfoCallback = f; -serverInfoData = data; +parserServerInfo.SetCallback(f, data); } //----------------------------------------------------------------------------- -void SERVCONF::SetChgUserCb(RecvChgUserCb_t f, void * data) +void SERVCONF::SetChgUserCallback(PARSER_CHG_USER::CALLBACK f, void * data) { -RecvChgUserCb = f; -chgUserDataCb = data; +parserChgUser.SetCallback(f, data); } //----------------------------------------------------------------------------- void SERVCONF::SetCheckUserCallback(PARSER_CHECK_USER::CALLBACK f, void * data) { -checkUserCallback = f; -checkUserData = data; +parserCheckUser.SetCallback(f, data); } //----------------------------------------------------------------------------- -void SERVCONF::SetSendMessageCb(RecvSendMessageCb_t f, void * data) +void SERVCONF::SetSendMessageCallback(PARSER_SEND_MESSAGE::CALLBACK f, void * data) { -RecvSendMessageCb = f; -sendMessageDataCb = data; +parserSendMessage.SetCallback(f, data); } //----------------------------------------------------------------------------- const std::string & SERVCONF::GetStrError() const @@ -436,10 +213,26 @@ const std::string & SERVCONF::GetStrError() const return errorMsg; } //----------------------------------------------------------------------------- -int SERVCONF::GetError() +int SERVCONF::Exec(const char * request) { -int e = error; -error = 0; -return e; +nt.Reset(); + +int ret = 0; +if ((ret = nt.Connect()) != st_ok) + { + errorMsg = nt.GetError(); + return ret; + } +if ((ret = nt.Transact(request)) != st_ok) + { + errorMsg = nt.GetError(); + return ret; + } +if ((ret = nt.Disconnect()) != st_ok) + { + errorMsg = nt.GetError(); + return ret; + } + +return st_ok; } -//-----------------------------------------------------------------------------