X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/ad7b95181d5d66817aac46801cd80adbc4f2fac7..c3b507d1eb8a82f9eda3a5e7f7b2dd2f2e9bb4c0:/stglibs/srvconf.lib/servconf.cpp

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 06a31a81..268749a3 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -28,17 +28,14 @@
 namespace
 {
 
-//-----------------------------------------------------------------------------
-void ElementStart(void *data, const char *el, const char **attr)
+void ElementStart(void * data, const char * el, const char ** attr)
 {
-SERVCONF * sc = static_cast<SERVCONF *>(data);
-sc->Start(el, attr);
+static_cast<SERVCONF *>(data)->Start(el, attr);
 }
-//-----------------------------------------------------------------------------
+
 void ElementEnd(void * data, const char * el)
 {
-SERVCONF * sc = static_cast<SERVCONF *>(data);
-sc->End(el);
+static_cast<SERVCONF *>(data)->End(el);
 }
 
 } // namespace anonymous
@@ -46,7 +43,6 @@ sc->End(el);
 bool AnsRecv(void * data, const std::string & chunk, bool final)
 {
 SERVCONF * sc = static_cast<SERVCONF *>(data);
-printf("Chunk: '%s', length: %d, final: %d\n", chunk.c_str(), chunk.length(), final);
 
 if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ERROR)
     {
@@ -70,72 +66,51 @@ parser = XML_ParserCreate(NULL);
 nt.SetRxCallback(this, AnsRecv);
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::GetUser(const char * l)
+int SERVCONF::GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data)
 {
-char request[255];
-snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
-
-currParser = &parserGetUser;
-
-return Exec(request);
+parserGetUser.SetCallback(f, data);
+return Exec("<GetUser login=\"" + login + "\"/>", parserGetUser);
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::AuthBy(const char * l)
+int SERVCONF::AuthBy(const std::string & login, PARSER_AUTH_BY::CALLBACK f, void * data)
 {
-char request[255];
-snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);
-
-currParser = &parserAuthBy;
-
-return Exec(request);
+parserAuthBy.SetCallback(f, data);
+return Exec("<GetUserAuthBy login=\"" + login + "\"/>", parserAuthBy);
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::GetUsers()
+int SERVCONF::GetUsers(PARSER_GET_USERS::CALLBACK f, void * data)
 {
-char request[] = "<GetUsers/>";
-
-currParser = &parserGetUsers;
-
-return Exec(request);
+parserGetUsers.SetCallback(f, data);
+return Exec("<GetUsers/>", parserGetUsers);
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::ServerInfo()
+int SERVCONF::ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data)
 {
-char request[] = "<GetServerInfo/>";
-
-currParser = &parserServerInfo;
-
-return Exec(request);
+parserServerInfo.SetCallback(f, data);
+return Exec("<GetServerInfo/>", parserServerInfo);
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::ChgUser(const char * request)
+int SERVCONF::ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data)
 {
-currParser = &parserChgUser;
-
-return Exec(request);
+parserChgUser.SetCallback(f, data);
+return Exec(request, parserChgUser);
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::SendMessage(const char * request)
+int SERVCONF::SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data)
 {
-currParser = &parserSendMessage;
-
-return Exec(request);
+parserSendMessage.SetCallback(f, data);
+return Exec(request, parserSendMessage);
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::CheckUser(const char * login, const char * password)
+int SERVCONF::CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data)
 {
-char request[255];
-snprintf(request, 255, "<CheckUser login=\"%s\" password=\"%s\"/>", login, password);
-
-currParser = &parserCheckUser;
-
-return Exec(request);
+parserCheckUser.SetCallback(f, data);
+return Exec("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", parserCheckUser);
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::Start(const char * el, const char ** attr)
+void SERVCONF::Start(const char * el, const char ** attr)
 {
 currParser->ParseStart(el, attr);
-return 0;
 }
 //-----------------------------------------------------------------------------
 void SERVCONF::End(const char * el)
@@ -143,48 +118,15 @@ void SERVCONF::End(const char * el)
 currParser->ParseEnd(el);
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data)
-{
-parserGetUsers.SetCallback(f, data);
-}
-//-----------------------------------------------------------------------------
-void SERVCONF::SetGetUserCallback(PARSER_GET_USER::CALLBACK f, void * data)
-{
-parserGetUser.SetCallback(f, data);
-}
-//-----------------------------------------------------------------------------
-void SERVCONF::SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data)
-{
-parserAuthBy.SetCallback(f, data);
-}
-//-----------------------------------------------------------------------------
-void SERVCONF::SetServerInfoCallback(PARSER_SERVER_INFO::CALLBACK f, void * data)
-{
-parserServerInfo.SetCallback(f, data);
-}
-//-----------------------------------------------------------------------------
-void SERVCONF::SetChgUserCallback(PARSER_CHG_USER::CALLBACK f, void * data)
-{
-parserChgUser.SetCallback(f, data);
-}
-//-----------------------------------------------------------------------------
-void SERVCONF::SetCheckUserCallback(PARSER_CHECK_USER::CALLBACK f, void * data)
-{
-parserCheckUser.SetCallback(f, data);
-}
-//-----------------------------------------------------------------------------
-void SERVCONF::SetSendMessageCallback(PARSER_SEND_MESSAGE::CALLBACK f, void * data)
-{
-parserSendMessage.SetCallback(f, data);
-}
-//-----------------------------------------------------------------------------
 const std::string & SERVCONF::GetStrError() const
 {
 return errorMsg;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::Exec(const char * request)
+int SERVCONF::Exec(const std::string & request, PARSER & cp)
 {
+currParser = &cp;
+
 XML_ParserReset(parser, NULL);
 XML_SetElementHandler(parser, ElementStart, ElementEnd);
 XML_SetUserData(parser, this);
@@ -195,7 +137,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;