X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/01ee16d4dc8527fce90f353b60d3df9c313f54ce..6b29e16ef9b86fea7d629b23fc55eab3b58a297b:/stglibs/srvconf.lib/servconf.cpp

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 621cced0..330ba8b1 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -20,31 +20,50 @@
 
 #include "stg/servconf.h"
 
+#include "netunit.h"
+#include "parsers/auth_by.h"
+#include "parsers/server_info.h"
+#include "parsers/check_user.h"
+#include "parsers/get_users.h"
+#include "parsers/get_user.h"
+#include "parsers/chg_user.h"
+#include "parsers/send_message.h"
+#include "parsers/base.h"
+
 #include "stg/common.h"
 
 #include <cstdio>
 #include <cstring>
 
-namespace
-{
+#include <expat.h>
 
-void ElementStart(void * data, const char * el, const char ** attr)
-{
-SERVCONF * sc = static_cast<SERVCONF *>(data);
-sc->Start(el, attr);
-}
+using namespace STG;
 
-void ElementEnd(void * data, const char * el)
+class SERVCONF::IMPL
 {
-SERVCONF * sc = static_cast<SERVCONF *>(data);
-sc->End(el);
-}
+public:
+    IMPL(const std::string & server, uint16_t port,
+         const std::string & login, const std::string & password);
+
+    const std::string & GetStrError() const;
+    static void Start(void * data, const char * el, const char ** attr);
+    static void End(void * data, const char * el);
+
+    template <class P, typename C>
+    int Exec(const std::string & request, C callback, void * data);
 
-} // namespace anonymous
+private:
+    NETTRANSACT nt;
 
-bool AnsRecv(void * data, const std::string & chunk, bool final)
+    std::string errorMsg;
+    XML_Parser parser;
+
+    static bool AnsRecv(void * data, const std::string & chunk, bool final);
+};
+
+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);
 
 if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ERROR)
     {
@@ -58,122 +77,90 @@ if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ER
 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 )
-{
-parser = XML_ParserCreate(NULL);
-nt.SetRxCallback(this, AnsRecv);
-}
-//-----------------------------------------------------------------------------
-int SERVCONF::GetUser(const char * l)
+    : pImpl(new IMPL(server, port, login, password))
 {
-char request[255];
-snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
-
-return Exec(request, parserGetUser);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::AuthBy(const char * l)
-{
-char request[255];
-snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);
 
-return Exec(request, parserAuthBy);
-}
-//-----------------------------------------------------------------------------
-int SERVCONF::GetUsers()
+SERVCONF::~SERVCONF()
 {
-char request[] = "<GetUsers/>";
-
-return Exec(request, parserGetUsers);
+delete pImpl;
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::ServerInfo()
-{
-char request[] = "<GetServerInfo/>";
 
-return Exec(request, parserServerInfo);
-}
-//-----------------------------------------------------------------------------
-int SERVCONF::ChgUser(const char * request)
+int SERVCONF::GetUsers(GET_USERS::CALLBACK f, void * data)
 {
-return Exec(request, parserChgUser);
+return pImpl->Exec<GET_USERS::PARSER>("<GetUsers/>", f, data);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::SendMessage(const char * request)
+
+int SERVCONF::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data)
 {
-return Exec(request, parserSendMessage);
+return pImpl->Exec<GET_USER::PARSER>("<GetUser login=\"" + login + "\"/>", f, data);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::CheckUser(const char * login, const char * password)
-{
-char request[255];
-snprintf(request, 255, "<CheckUser login=\"%s\" password=\"%s\"/>", login, password);
 
-return Exec(request, parserCheckUser);
-}
-//-----------------------------------------------------------------------------
-int SERVCONF::Start(const char * el, const char ** attr)
+int SERVCONF::ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data)
 {
-currParser->ParseStart(el, attr);
-return 0;
+return pImpl->Exec<CHG_USER::PARSER>(request, f, data);
 }
-//-----------------------------------------------------------------------------
-void SERVCONF::End(const char * el)
+
+int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)
 {
-currParser->ParseEnd(el);
+return pImpl->Exec<AUTH_BY::PARSER>("<GetUserAuthBy login=\"" + login + "\"/>", f, data);
 }
-//-----------------------------------------------------------------------------
-void SERVCONF::SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data)
+
+int SERVCONF::SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data)
 {
-parserGetUsers.SetCallback(f, data);
+return pImpl->Exec<SEND_MESSAGE::PARSER>(request, f, data);
 }
-//-----------------------------------------------------------------------------
-void SERVCONF::SetGetUserCallback(PARSER_GET_USER::CALLBACK f, void * data)
+
+int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data)
 {
-parserGetUser.SetCallback(f, data);
+return pImpl->Exec<SERVER_INFO::PARSER>("<GetServerInfo/>", f, data);
 }
-//-----------------------------------------------------------------------------
-void SERVCONF::SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data)
+
+int SERVCONF::CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data)
 {
-parserAuthBy.SetCallback(f, data);
+return pImpl->Exec<CHECK_USER::PARSER>("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", f, data);
 }
-//-----------------------------------------------------------------------------
-void SERVCONF::SetServerInfoCallback(PARSER_SERVER_INFO::CALLBACK f, void * data)
+
+const std::string & SERVCONF::GetStrError() const
 {
-parserServerInfo.SetCallback(f, data);
+    return pImpl->GetStrError();
 }
+
 //-----------------------------------------------------------------------------
-void SERVCONF::SetChgUserCallback(PARSER_CHG_USER::CALLBACK f, void * data)
+SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port,
+                     const std::string & login, const std::string & password)
+    : nt( server, port, login, password )
 {
-parserChgUser.SetCallback(f, data);
+parser = XML_ParserCreate(NULL);
+nt.SetRxCallback(this, AnsRecv);
 }
 //-----------------------------------------------------------------------------
-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, PARSER & cp)
+template <class P, typename C>
+int SERVCONF::IMPL::Exec(const std::string & request, C callback, void * data)
 {
-currParser = &cp;
-
+P cp(callback, data);
 XML_ParserReset(parser, NULL);
-XML_SetElementHandler(parser, ElementStart, ElementEnd);
-XML_SetUserData(parser, this);
+XML_SetElementHandler(parser, Start, End);
+XML_SetUserData(parser, &cp);
 
 int ret = 0;
 if ((ret = nt.Connect()) != st_ok)
@@ -181,7 +168,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;