X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/6bd4918f85f22955197b200d79972d22159e89d8..01ee16d4dc8527fce90f353b60d3df9c313f54ce:/stglibs/srvconf.lib/servconf.cpp?ds=sidebyside

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 906277c3..621cced0 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -28,14 +28,13 @@
 namespace
 {
 
-//-----------------------------------------------------------------------------
-void Start(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);
 }
-//-----------------------------------------------------------------------------
-void End(void * data, const char * el)
+
+void ElementEnd(void * data, const char * el)
 {
 SERVCONF * sc = static_cast<SERVCONF *>(data);
 sc->End(el);
@@ -43,39 +42,20 @@ sc->End(el);
 
 } // namespace anonymous
 
-int AnsRecv(void * data, std::list<std::string> * list1)
+bool AnsRecv(void * data, const std::string & chunk, bool final)
 {
 SERVCONF * sc = static_cast<SERVCONF *>(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
-std::list<std::string>::iterator node;
-node = list1->begin();
-
-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<int>(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<int>(XML_GetCurrentLineNumber(sc->parser)),
+              XML_ErrorString(XML_GetErrorCode(sc->parser)));
+    printf("%s\n", sc->errorMsg.c_str());
+    return false;
     }
 
-return st_ok;
+return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -93,9 +73,7 @@ int SERVCONF::GetUser(const char * l)
 char request[255];
 snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
 
-currParser = &parserGetUser;
-
-return Exec(request);
+return Exec(request, parserGetUser);
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::AuthBy(const char * l)
@@ -103,41 +81,31 @@ int SERVCONF::AuthBy(const char * l)
 char request[255];
 snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);
 
-currParser = &parserAuthBy;
-
-return Exec(request);
+return Exec(request, parserAuthBy);
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::GetUsers()
 {
 char request[] = "<GetUsers/>";
 
-currParser = &parserGetUsers;
-
-return Exec(request);
+return Exec(request, parserGetUsers);
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::ServerInfo()
 {
 char request[] = "<GetServerInfo/>";
 
-currParser = &parserServerInfo;
-
-return Exec(request);
+return Exec(request, parserServerInfo);
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::ChgUser(const char * request)
 {
-currParser = &parserChgUser;
-
-return Exec(request);
+return Exec(request, parserChgUser);
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::SendMessage(const char * request)
 {
-currParser = &parserSendMessage;
-
-return Exec(request);
+return Exec(request, parserSendMessage);
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::CheckUser(const char * login, const char * password)
@@ -145,9 +113,7 @@ int SERVCONF::CheckUser(const char * login, const char * password)
 char request[255];
 snprintf(request, 255, "<CheckUser login=\"%s\" password=\"%s\"/>", login, password);
 
-currParser = &parserCheckUser;
-
-return Exec(request);
+return Exec(request, parserCheckUser);
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::Start(const char * el, const char ** attr)
@@ -201,9 +167,13 @@ const std::string & SERVCONF::GetStrError() const
 return errorMsg;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::Exec(const char * request)
+int SERVCONF::Exec(const char * request, PARSER & cp)
 {
-nt.Reset();
+currParser = &cp;
+
+XML_ParserReset(parser, NULL);
+XML_SetElementHandler(parser, ElementStart, ElementEnd);
+XML_SetUserData(parser, this);
 
 int ret = 0;
 if ((ret = nt.Connect()) != st_ok)