X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/0093be0eb4dbe201a7d63da1de47f98c68987b1d..1d13a44b88121ddf9f64b6dd60ac2e7b39832be6:/stglibs/srvconf.lib/servconf.cpp?ds=sidebyside

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 268749a3..85d19d48 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -20,29 +20,64 @@
 
 #include "stg/servconf.h"
 
+#include "netunit.h"
+
+#include "parsers/server_info.h"
+
+#include "parsers/get_admins.h"
+#include "parsers/get_admin.h"
+#include "parsers/chg_admin.h"
+#include "parsers/add_admin.h"
+#include "parsers/del_admin.h"
+
+#include "parsers/auth_by.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)
-{
-static_cast<SERVCONF *>(data)->Start(el, attr);
-}
+using namespace STG;
 
-void ElementEnd(void * data, const char * el)
+class SERVCONF::IMPL
 {
-static_cast<SERVCONF *>(data)->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)
+    {
+        P cp(callback, data);
+        return ExecImpl(request, cp);
+    }
+
+private:
+    NETTRANSACT nt;
 
-} // namespace anonymous
+    std::string errorMsg;
+    XML_Parser parser;
 
-bool AnsRecv(void * data, const std::string & chunk, bool final)
+    static bool AnsRecv(void * data, const std::string & chunk, bool final);
+    int ExecImpl(const std::string & request, PARSER & cp);
+};
+
+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)
     {
@@ -56,80 +91,120 @@ 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 )
+    : pImpl(new IMPL(server, port, login, password))
 {
-parser = XML_ParserCreate(NULL);
-nt.SetRxCallback(this, AnsRecv);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data)
+
+SERVCONF::~SERVCONF()
 {
-parserGetUser.SetCallback(f, data);
-return Exec("<GetUser login=\"" + login + "\"/>", parserGetUser);
+delete pImpl;
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::AuthBy(const std::string & login, PARSER_AUTH_BY::CALLBACK f, void * data)
+
+int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data)
 {
-parserAuthBy.SetCallback(f, data);
-return Exec("<GetUserAuthBy login=\"" + login + "\"/>", parserAuthBy);
+return pImpl->Exec<SERVER_INFO::PARSER>("<GetServerInfo/>", f, data);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::GetUsers(PARSER_GET_USERS::CALLBACK f, void * data)
+
+// -- Admins --
+
+int SERVCONF::GetAdmins(GET_ADMINS::CALLBACK f, void * data)
 {
-parserGetUsers.SetCallback(f, data);
-return Exec("<GetUsers/>", parserGetUsers);
+return pImpl->Exec<GET_ADMINS::PARSER>("<GetAdmins/>", f, data);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data)
+
+int SERVCONF::GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data)
 {
-parserServerInfo.SetCallback(f, data);
-return Exec("<GetServerInfo/>", parserServerInfo);
+return pImpl->Exec<GET_ADMIN::PARSER>("<GetAdmin login=\"" + login + "\"/>", f, data);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data)
+
+int SERVCONF::ChgAdmin(const std::string & login, const ADMIN_CONF_RES & conf, CHG_ADMIN::CALLBACK f, void * data)
 {
-parserChgUser.SetCallback(f, data);
-return Exec(request, parserChgUser);
+return pImpl->Exec<CHG_ADMIN::PARSER>("<ChgAdmin login=\"" + login + "\">" + CHG_ADMIN::Serialize(conf) + "</ChgAdmin>", f, data);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data)
+
+int SERVCONF::AddAdmin(const std::string & login, const ADMIN_CONF & conf, ADD_ADMIN::CALLBACK f, void * data)
 {
-parserSendMessage.SetCallback(f, data);
-return Exec(request, parserSendMessage);
+int res = pImpl->Exec<ADD_ADMIN::PARSER>("<AddAdmin login=\"" + login + "\"/>", f, data);
+if (res != st_ok)
+    return res;
+return pImpl->Exec<CHG_ADMIN::PARSER>("<ChgAdmin login=\"" + login + "\">" + CHG_ADMIN::Serialize(conf) + "</ChgAdmin>", f, data);
 }
+
+int SERVCONF::DelAdmin(const std::string & login, DEL_ADMIN::CALLBACK f, void * data)
+{
+return pImpl->Exec<DEL_ADMIN::PARSER>("<DelAdmin login=\"" + login + "\"/>", f, data);
+}
+
+// -- Users --
+
+int SERVCONF::GetUsers(GET_USERS::CALLBACK f, void * data)
+{
+return pImpl->Exec<GET_USERS::PARSER>("<GetUsers/>", f, data);
+}
+
+int SERVCONF::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data)
+{
+return pImpl->Exec<GET_USER::PARSER>("<GetUser login=\"" + login + "\"/>", f, data);
+}
+
+int SERVCONF::ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data)
+{
+return pImpl->Exec<CHG_USER::PARSER>(request, f, data);
+}
+
+int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)
+{
+return pImpl->Exec<AUTH_BY::PARSER>("<GetUserAuthBy login=\"" + login + "\"/>", f, data);
+}
+
+int SERVCONF::SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data)
+{
+return pImpl->Exec<SEND_MESSAGE::PARSER>(request, f, data);
+}
+
+int SERVCONF::CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data)
+{
+return pImpl->Exec<CHECK_USER::PARSER>("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", f, data);
+}
+
+const std::string & SERVCONF::GetStrError() const
+{
+return pImpl->GetStrError();
+}
+
 //-----------------------------------------------------------------------------
-int SERVCONF::CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_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 )
 {
-parserCheckUser.SetCallback(f, data);
-return Exec("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", parserCheckUser);
+parser = XML_ParserCreate(NULL);
+nt.SetRxCallback(this, AnsRecv);
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::Start(const char * el, const char ** attr)
+void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr)
 {
+PARSER * currParser = static_cast<PARSER *>(data);
 currParser->ParseStart(el, attr);
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::End(const char * el)
+void SERVCONF::IMPL::End(void * data, const char * el)
 {
+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 std::string & request, PARSER & cp)
+int SERVCONF::IMPL::ExecImpl(const std::string & request, PARSER & cp)
 {
-currParser = &cp;
-
 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)