X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/6bd4918f85f22955197b200d79972d22159e89d8..359e4b28458d352dc55ac39db7e4b5bb308eb361:/stglibs/srvconf.lib/servconf.cpp

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 906277c3..45d60f66 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -20,190 +20,209 @@
 
 #include "stg/servconf.h"
 
+#include "stg/netunit.h"
+#include "stg/servconf_types.h"
+
 #include "stg/common.h"
 
 #include <cstdio>
 #include <cstring>
 
-namespace
+#include <expat.h>
+
+class SERVCONF::IMPL
 {
+public:
+    IMPL(const std::string & server, uint16_t port,
+         const std::string & login, const std::string & password);
 
-//-----------------------------------------------------------------------------
-void Start(void *data, const char *el, const char **attr)
+    int GetUsers(PARSER_GET_USERS::CALLBACK f, void * data);
+    int GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data);
+    int ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data);
+    int AuthBy(const std::string & login, PARSER_AUTH_BY::CALLBACK f, void * data);
+    int SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data);
+    int ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data);
+    int CheckUser(const std::string & login, const std::string & password, PARSER_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:
+    PARSER_GET_USERS parserGetUsers;
+    PARSER_GET_USER parserGetUser;
+    PARSER_AUTH_BY parserAuthBy;
+    PARSER_SERVER_INFO  parserServerInfo;
+    PARSER_CHG_USER parserChgUser;
+    PARSER_CHECK_USER parserCheckUser;
+    PARSER_SEND_MESSAGE parserSendMessage;
+
+    NETTRANSACT nt;
+
+    std::string errorMsg;
+    XML_Parser parser;
+
+    int Exec(const std::string & request, PARSER & cp);
+
+    static bool AnsRecv(void * data, const std::string & chunk, bool final);
+};
+
+/*namespace
+{
+
+void ElementStart(void * data, const char * el, const char ** attr)
 {
-SERVCONF * sc = static_cast<SERVCONF *>(data);
-sc->Start(el, attr);
+static_cast<SERVCONF::IMPL *>(data)->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);
+static_cast<SERVCONF::IMPL *>(data)->End(el);
 }
 
 } // namespace anonymous
+*/
 
-int AnsRecv(void * data, std::list<std::string> * list1)
+bool SERVCONF::IMPL::AnsRecv(void * data, const std::string & chunk, bool final)
 {
-SERVCONF * sc = static_cast<SERVCONF *>(data);
+SERVCONF::IMPL * sc = static_cast<SERVCONF::IMPL *>(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;
 }
 
-//-----------------------------------------------------------------------------
 SERVCONF::SERVCONF(const std::string & server, uint16_t port,
                    const std::string & login, const std::string & password)
-    : currParser(NULL),
-      nt( server, port, login, password )
+    : pImpl(new IMPL(server, port, login, password))
 {
-parser = XML_ParserCreate(NULL);
-nt.SetRxCallback(this, AnsRecv);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::GetUser(const char * l)
-{
-char request[255];
-snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
 
-currParser = &parserGetUser;
-
-return Exec(request);
-}
-//-----------------------------------------------------------------------------
-int SERVCONF::AuthBy(const char * l)
+SERVCONF::~SERVCONF()
 {
-char request[255];
-snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);
-
-currParser = &parserAuthBy;
-
-return Exec(request);
+    delete pImpl;
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::GetUsers()
-{
-char request[] = "<GetUsers/>";
-
-currParser = &parserGetUsers;
 
-return Exec(request);
+int SERVCONF::GetUsers(PARSER_GET_USERS::CALLBACK f, void * data)
+{
+    return pImpl->GetUsers( f, data );
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::ServerInfo()
+
+int SERVCONF::GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data)
 {
-char request[] = "<GetServerInfo/>";
+    return pImpl->GetUser(login, f, data);
+}
 
-currParser = &parserServerInfo;
+int SERVCONF::ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data)
+{
+    return pImpl->ChgUser(request, f, data);
+}
 
-return Exec(request);
+int SERVCONF::AuthBy(const std::string & login, PARSER_AUTH_BY::CALLBACK f, void * data)
+{
+    return pImpl->AuthBy(login, f, data);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::ChgUser(const char * request)
+
+int SERVCONF::SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data)
 {
-currParser = &parserChgUser;
+    return pImpl->SendMessage(request, f, data);
+}
 
-return Exec(request);
+int SERVCONF::ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data)
+{
+    return pImpl->ServerInfo(f, data);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::SendMessage(const char * request)
+
+int SERVCONF::CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data)
 {
-currParser = &parserSendMessage;
+    return pImpl->CheckUser(login, password, f, data);
+}
 
-return Exec(request);
+const std::string & SERVCONF::GetStrError() const
+{
+    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, "<CheckUser login=\"%s\" password=\"%s\"/>", 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, PARSER_GET_USER::CALLBACK f, void * data)
 {
-currParser->ParseStart(el, attr);
-return 0;
+parserGetUser.SetCallback(f, data);
+return Exec("<GetUser login=\"" + login + "\"/>", parserGetUser);
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::End(const char * el)
+int SERVCONF::IMPL::AuthBy(const std::string & login, PARSER_AUTH_BY::CALLBACK f, void * data)
 {
-currParser->ParseEnd(el);
+parserAuthBy.SetCallback(f, data);
+return Exec("<GetUserAuthBy login=\"" + login + "\"/>", parserAuthBy);
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data)
+int SERVCONF::IMPL::GetUsers(PARSER_GET_USERS::CALLBACK f, void * data)
 {
 parserGetUsers.SetCallback(f, data);
+return Exec("<GetUsers/>", parserGetUsers);
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetGetUserCallback(PARSER_GET_USER::CALLBACK f, void * data)
+int SERVCONF::IMPL::ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data)
 {
-parserGetUser.SetCallback(f, data);
+parserServerInfo.SetCallback(f, data);
+return Exec("<GetServerInfo/>", parserServerInfo);
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data)
+int SERVCONF::IMPL::ChgUser(const std::string & request, PARSER_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, PARSER_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, PARSER_CHECK_USER::CALLBACK f, void * data)
 {
-parserChgUser.SetCallback(f, data);
+parserCheckUser.SetCallback(f, data);
+return Exec("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", 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<PARSER *>(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<PARSER *>(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)
@@ -211,7 +230,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;