X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/2d0dedb8abc45c661e35e729b5ff71724d4d749a..908dee0db9288bb455e9f1b68dd81ab50897a677:/stglibs/srvconf.lib/servconf.cpp

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index a9881f05..e0c2e58b 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -60,6 +60,10 @@ class SERVCONF::IMPL
 public:
     IMPL(const std::string & server, uint16_t port,
          const std::string & login, const std::string & password);
+    IMPL(const std::string & server, uint16_t port,
+         const std::string & localAddress, uint16_t localPort,
+         const std::string & login, const std::string & password);
+    ~IMPL() { XML_ParserFree(parser); }
 
     const std::string & GetStrError() const;
     static void Start(void * data, const char * el, const char ** attr);
@@ -70,29 +74,30 @@ public:
     template <class P, typename C>
     int Exec(const std::string & request, C callback, void * data)
     {
-        P cp(callback, data);
+        P cp(callback, data, encoding);
         return ExecImpl(request, cp);
     }
 
     template <class P, typename C>
     int Exec(const std::string & tag, const std::string & request, C callback, void * data)
     {
-        P cp(tag, callback, data);
+        P cp(tag, callback, data, encoding);
         return ExecImpl(request, cp);
     }
 
 private:
     NETTRANSACT nt;
 
+    std::string encoding;
     std::string errorMsg;
     XML_Parser parser;
 
-    static bool ParserRecv(void * data, const std::string & chunk, bool final);
-    static bool SimpleRecv(void * data, const std::string & chunk, bool final);
+    static bool ParserRecv(const std::string & chunk, bool final, void * data);
+    static bool SimpleRecv(const std::string & chunk, bool final, void * data);
     int ExecImpl(const std::string & request, PARSER & cp);
 };
 
-bool SERVCONF::IMPL::ParserRecv(void * data, const std::string & chunk, bool final)
+bool SERVCONF::IMPL::ParserRecv(const std::string & chunk, bool final, void * data)
 {
 SERVCONF::IMPL * sc = static_cast<SERVCONF::IMPL *>(data);
 
@@ -108,7 +113,7 @@ if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ER
 return true;
 }
 
-bool SERVCONF::IMPL::SimpleRecv(void * data, const std::string & chunk, bool /*final*/)
+bool SERVCONF::IMPL::SimpleRecv(const std::string & chunk, bool /*final*/, void * data)
 {
 *static_cast<std::string *>(data) += chunk;
 return true;
@@ -120,6 +125,13 @@ SERVCONF::SERVCONF(const std::string & server, uint16_t port,
 {
 }
 
+SERVCONF::SERVCONF(const std::string & server, uint16_t port,
+                   const std::string & localAddress, uint16_t localPort,
+                   const std::string & login, const std::string & password)
+    : pImpl(new IMPL(server, port, localAddress, localPort, login, password))
+{
+}
+
 SERVCONF::~SERVCONF()
 {
 delete pImpl;
@@ -137,7 +149,7 @@ return pImpl->RawXML(request, f, data);
 
 // -- Admins --
 
-int SERVCONF::GetAdmins(GET_ADMINS::CALLBACK f, void * data)
+int SERVCONF::GetAdmins(GET_CONTAINER::CALLBACK<GET_ADMIN::INFO>::TYPE f, void * data)
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_ADMIN::PARSER> >("admins", "<GetAdmins/>", f, data);
 }
@@ -149,7 +161,7 @@ return pImpl->Exec<GET_ADMIN::PARSER>("<GetAdmin login=\"" + login + "\"/>", f,
 
 int SERVCONF::ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data)
 {
-return pImpl->Exec<SIMPLE::PARSER>("ChgAdmin", "<ChgAdmin" + CHG_ADMIN::Serialize(conf) + "/>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("ChgAdmin", "<ChgAdmin" + CHG_ADMIN::Serialize(conf, encoding) + "/>", f, data);
 }
 
 int SERVCONF::AddAdmin(const std::string & login,
@@ -159,7 +171,7 @@ int SERVCONF::AddAdmin(const std::string & login,
 int res = pImpl->Exec<SIMPLE::PARSER>("AddAdmin", "<AddAdmin login=\"" + login + "\"/>", f, data);
 if (res != st_ok)
     return res;
-return pImpl->Exec<SIMPLE::PARSER>("ChgAdmin", "<ChgAdmin" + CHG_ADMIN::Serialize(conf) + "/>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("ChgAdmin", "<ChgAdmin" + CHG_ADMIN::Serialize(conf, encoding) + "/>", f, data);
 }
 
 int SERVCONF::DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data)
@@ -169,7 +181,7 @@ return pImpl->Exec<SIMPLE::PARSER>("DelAdmin", "<DelAdmin login=\"" + login + "\
 
 // -- Tariffs --
 
-int SERVCONF::GetTariffs(GET_TARIFFS::CALLBACK f, void * data)
+int SERVCONF::GetTariffs(GET_CONTAINER::CALLBACK<GET_TARIFF::INFO>::TYPE f, void * data)
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_TARIFF::PARSER> >("tariffs", "<GetTariffs/>", f, data);
 }
@@ -181,7 +193,7 @@ return pImpl->Exec<GET_TARIFF::PARSER>("<GetTariff name=\"" + name + "\"/>", f,
 
 int SERVCONF::ChgTariff(const TARIFF_DATA_RES & tariffData, SIMPLE::CALLBACK f, void * data)
 {
-return pImpl->Exec<SIMPLE::PARSER>("SetTariff", "<SetTariff name=\"" + tariffData.tariffConf.name.data() + "\">" + CHG_TARIFF::Serialize(tariffData) + "</SetTariff>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("SetTariff", "<SetTariff name=\"" + tariffData.tariffConf.name.data() + "\">" + CHG_TARIFF::Serialize(tariffData, encoding) + "</SetTariff>", f, data);
 }
 
 int SERVCONF::AddTariff(const std::string & name,
@@ -191,7 +203,7 @@ int SERVCONF::AddTariff(const std::string & name,
 int res = pImpl->Exec<SIMPLE::PARSER>("AddTariff", "<AddTariff name=\"" + name + "\"/>", f, data);
 if (res != st_ok)
     return res;
-return pImpl->Exec<SIMPLE::PARSER>("SetTariff", "<SetTariff name=\"" + name + "\">" + CHG_TARIFF::Serialize(tariffData) + "</SetTariff>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("SetTariff", "<SetTariff name=\"" + name + "\">" + CHG_TARIFF::Serialize(tariffData, encoding) + "</SetTariff>", f, data);
 }
 
 int SERVCONF::DelTariff(const std::string & name, SIMPLE::CALLBACK f, void * data)
@@ -201,7 +213,7 @@ return pImpl->Exec<SIMPLE::PARSER>("DelTariff", "<DelTariff name=\"" + name + "\
 
 // -- Users --
 
-int SERVCONF::GetUsers(GET_USERS::CALLBACK f, void * data)
+int SERVCONF::GetUsers(GET_CONTAINER::CALLBACK<GET_USER::INFO>::TYPE f, void * data)
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_USER::PARSER> >("users", "<GetUsers/>", f, data);
 }
@@ -216,7 +228,7 @@ int SERVCONF::ChgUser(const std::string & login,
                       const USER_STAT_RES & stat,
                       SIMPLE::CALLBACK f, void * data)
 {
-return pImpl->Exec<CHG_USER::PARSER>("<SetUser><Login value=\"" + login + "\"/>" + CHG_USER::Serialize(conf, stat) + "</SetUser>", f, data);
+return pImpl->Exec<CHG_USER::PARSER>("<SetUser><Login value=\"" + login + "\"/>" + CHG_USER::Serialize(conf, stat, encoding) + "</SetUser>", f, data);
 }
 
 int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data)
@@ -224,9 +236,15 @@ int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data
 return pImpl->Exec<SIMPLE::PARSER>("DelUser", "<DelUser login=\"" + login + "\"/>", f, data);
 }
 
-int SERVCONF::AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data)
+int SERVCONF::AddUser(const std::string & login,
+                      const USER_CONF_RES & conf,
+                      const USER_STAT_RES & stat,
+                      SIMPLE::CALLBACK f, void * data)
 {
-return pImpl->Exec<SIMPLE::PARSER>("AddUser", "<AddUser><Login value=\"" + login + "\"/></AddUser>", f, data);
+int res = pImpl->Exec<SIMPLE::PARSER>("AddUser", "<AddUser><Login value=\"" + login + "\"/></AddUser>", f, data);
+if (res != st_ok)
+    return res;
+return pImpl->Exec<CHG_USER::PARSER>("<SetUser><Login value=\"" + login + "\"/>" + CHG_USER::Serialize(conf, stat, encoding) + "</SetUser>", f, data);
 }
 
 int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)
@@ -236,7 +254,7 @@ return pImpl->Exec<AUTH_BY::PARSER>("<GetUserAuthBy login=\"" + login + "\"/>",
 
 int SERVCONF::SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data)
 {
-return pImpl->Exec<SIMPLE::PARSER>("SendMessage", "<Message login=\"" + login + "\" msgver=\"1\" msgtype=\"1\" repeat=\"0\" repeatperiod=\"0\" showtime=\"0\" text=\"" + Encode12str(text) + "\"/>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("SendMessageResult", "<Message login=\"" + login + "\" msgver=\"1\" msgtype=\"1\" repeat=\"0\" repeatperiod=\"0\" showtime=\"0\" text=\"" + Encode12str(text) + "\"/>", f, data);
 }
 
 int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data)
@@ -246,7 +264,7 @@ return pImpl->Exec<SIMPLE::PARSER>("CheckUser", "<CheckUser login=\"" + login +
 
 // -- Services --
 
-int SERVCONF::GetServices(GET_SERVICES::CALLBACK f, void * data)
+int SERVCONF::GetServices(GET_CONTAINER::CALLBACK<GET_SERVICE::INFO>::TYPE f, void * data)
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_SERVICE::PARSER> >("services", "<GetServices/>", f, data);
 }
@@ -258,7 +276,7 @@ return pImpl->Exec<GET_SERVICE::PARSER>("<GetService name=\"" + name + "\"/>", f
 
 int SERVCONF::ChgService(const SERVICE_CONF_RES & conf, SIMPLE::CALLBACK f, void * data)
 {
-return pImpl->Exec<SIMPLE::PARSER>("SetService", "<SetService name=\"" + conf.name.data() + "\">" + CHG_SERVICE::Serialize(conf) + "</SetService>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("SetService", "<SetService name=\"" + conf.name.data() + "\">" + CHG_SERVICE::Serialize(conf, encoding) + "</SetService>", f, data);
 }
 
 int SERVCONF::AddService(const std::string & name,
@@ -268,7 +286,7 @@ int SERVCONF::AddService(const std::string & name,
 int res = pImpl->Exec<SIMPLE::PARSER>("AddService", "<AddService name=\"" + name + "\"/>", f, data);
 if (res != st_ok)
     return res;
-return pImpl->Exec<SIMPLE::PARSER>("SetService", "<SetService name=\"" + name + "\">" + CHG_SERVICE::Serialize(conf) + "</SetService>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("SetService", "<SetService name=\"" + name + "\">" + CHG_SERVICE::Serialize(conf, encoding) + "</SetService>", f, data);
 }
 
 int SERVCONF::DelService(const std::string & name, SIMPLE::CALLBACK f, void * data)
@@ -278,7 +296,7 @@ return pImpl->Exec<SIMPLE::PARSER>("DelService", "<DelService name=\"" + name +
 
 // -- Corporations --
 
-int SERVCONF::GetCorporations(GET_CORPORATIONS::CALLBACK f, void * data)
+int SERVCONF::GetCorporations(GET_CONTAINER::CALLBACK<GET_CORP::INFO>::TYPE f, void * data)
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_CORP::PARSER> >("corporations", "<GetCorporations/>", f, data);
 }
@@ -290,7 +308,7 @@ return pImpl->Exec<GET_CORP::PARSER>("<GetCorp name=\"" + name + "\"/>", f, data
 
 int SERVCONF::ChgCorp(const CORP_CONF_RES & conf, SIMPLE::CALLBACK f, void * data)
 {
-return pImpl->Exec<SIMPLE::PARSER>("SetCorp", "<SetCorp name=\"" + conf.name.data() + "\">" + CHG_CORP::Serialize(conf) + "</SetCorp>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("SetCorp", "<SetCorp name=\"" + conf.name.data() + "\">" + CHG_CORP::Serialize(conf, encoding) + "</SetCorp>", f, data);
 }
 
 int SERVCONF::AddCorp(const std::string & name,
@@ -300,7 +318,7 @@ int SERVCONF::AddCorp(const std::string & name,
 int res = pImpl->Exec<SIMPLE::PARSER>("AddCorp", "<AddCorp name=\"" + name + "\"/>", f, data);
 if (res != st_ok)
     return res;
-return pImpl->Exec<SIMPLE::PARSER>("SetCorp", "<SetCorp name=\"" + name + "\">" + CHG_CORP::Serialize(conf) + "</SetCorp>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("SetCorp", "<SetCorp name=\"" + name + "\">" + CHG_CORP::Serialize(conf, encoding) + "</SetCorp>", f, data);
 }
 
 int SERVCONF::DelCorp(const std::string & name, SIMPLE::CALLBACK f, void * data)
@@ -316,10 +334,21 @@ return pImpl->GetStrError();
 //-----------------------------------------------------------------------------
 SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port,
                      const std::string & login, const std::string & password)
-    : nt( server, port, login, password )
+    : nt(server, port, login, password)
 {
+setlocale(LC_ALL, "");
+encoding = nl_langinfo(CODESET);
+parser = XML_ParserCreate(NULL);
+}
+//-----------------------------------------------------------------------------
+SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port,
+                     const std::string & localAddress, uint16_t localPort,
+                     const std::string & login, const std::string & password)
+    : nt(server, port, localAddress, localPort, login, password)
+{
+setlocale(LC_ALL, "");
+encoding = nl_langinfo(CODESET);
 parser = XML_ParserCreate(NULL);
-nt.SetRxCallback(this, ParserRecv);
 }
 //-----------------------------------------------------------------------------
 void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr)
@@ -349,49 +378,38 @@ int ret = 0;
 if ((ret = nt.Connect()) != st_ok)
     {
     errorMsg = nt.GetError();
+    cp.Failure(errorMsg);
     return ret;
     }
-if ((ret = nt.Transact(request.c_str())) != st_ok)
-    {
-    errorMsg = nt.GetError();
-    return ret;
-    }
-if ((ret = nt.Disconnect()) != st_ok)
+if ((ret = nt.Transact(request, ParserRecv, this)) != st_ok)
     {
     errorMsg = nt.GetError();
+    cp.Failure(errorMsg);
     return ret;
     }
 
+nt.Disconnect();
 return st_ok;
 }
 
-int SERVCONF::IMPL::RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data)
+int SERVCONF::IMPL::RawXML(const std::string & request, RAW_XML::CALLBACK callback, void * data)
 {
-std::string response;
-nt.SetRxCallback(&response, SimpleRecv);
 int ret = 0;
 if ((ret = nt.Connect()) != st_ok)
     {
-    nt.SetRxCallback(this, ParserRecv);
     errorMsg = nt.GetError();
-    f(false, errorMsg, "", data);
+    callback(false, errorMsg, "", data);
     return ret;
     }
-if ((ret = nt.Transact(request.c_str())) != st_ok)
-    {
-    nt.SetRxCallback(this, ParserRecv);
-    errorMsg = nt.GetError();
-    f(false, errorMsg, "", data);
-    return ret;
-    }
-if ((ret = nt.Disconnect()) != st_ok)
+std::string response;
+if ((ret = nt.Transact(request, SimpleRecv, &response)) != st_ok)
     {
-    nt.SetRxCallback(this, ParserRecv);
     errorMsg = nt.GetError();
-    f(false, errorMsg, "", data);
+    callback(false, errorMsg, "", data);
     return ret;
     }
-nt.SetRxCallback(this, ParserRecv);
-f(true, "", response, data);
+
+nt.Disconnect();
+callback(true, "", response, data);
 return st_ok;
 }