X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/0cfa021cfd1395e2f6146d52f9e5ffa64be17976..040deac4b8ae0728e3ff7635bb16595ec08d5817:/stglibs/srvconf.lib/servconf.cpp?ds=sidebyside

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 78db78c8..2f4afaba 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -16,405 +16,433 @@
 
 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
- *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
-#include "stg/servconf.h"
-
-#include "netunit.h"
-
-#include "parsers/simple.h"
-#include "parsers/get_container.h"
-
-#include "parsers/server_info.h"
-
-#include "parsers/get_admin.h"
-#include "parsers/chg_admin.h"
-
-#include "parsers/get_tariff.h"
-#include "parsers/chg_tariff.h"
-
-#include "parsers/auth_by.h"
-#include "parsers/get_user.h"
-#include "parsers/chg_user.h"
-
-#include "parsers/get_service.h"
-#include "parsers/chg_service.h"
-
-#include "parsers/get_corp.h"
-#include "parsers/chg_corp.h"
-
-#include "parsers/base.h"
-
-#include "stg/common.h"
+ /*
+ $Revision: 1.8 $
+ $Date: 2010/08/04 00:40:38 $
+ $Author: faust $
+ */
 
 #include <cstdio>
 #include <cstring>
-#include <clocale>
 
-#include <expat.h>
-#include <langinfo.h>
+#include "stg/common.h"
+#include "stg/servconf.h"
 
-using namespace STG;
+using namespace std;
 
-class SERVCONF::IMPL
+//-----------------------------------------------------------------------------
+int AnsRecv(void * data, list<string> * list1)
 {
-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);
-    static void End(void * data, const char * el);
-
-    int RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data);
-
-    template <class P, typename C>
-    int Exec(const std::string & request, C callback, void * 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, encoding);
-        return ExecImpl(request, cp);
-    }
+//NODE * node;
+SERVCONF * sc;
+char ans[ENC_MSG_LEN + 1];
+int len, done = 0;
 
-    const std::string & Encoding() const { return encoding; }
+sc = (SERVCONF*)data;
 
-private:
-    NETTRANSACT nt;
+XML_ParserReset(sc->parser, NULL);
+XML_SetElementHandler(sc->parser, Start, End);
+XML_SetUserData(sc->parser, data);
 
-    std::string encoding;
-    std::string errorMsg;
-    XML_Parser parser;
+//loop parsing
+list<string>::iterator node;
+node = list1->begin();
 
-    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(const std::string & chunk, bool final, void * data)
-{
-SERVCONF::IMPL * sc = static_cast<SERVCONF::IMPL *>(data);
-
-if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ERROR)
+if (node == list1->end())
     {
-    strprintf(&sc->errorMsg, "XML parse error at line %d, %d: %s. Is final: %d",
-              static_cast<int>(XML_GetCurrentLineNumber(sc->parser)),
-              static_cast<int>(XML_GetCurrentColumnNumber(sc->parser)),
-              XML_ErrorString(XML_GetErrorCode(sc->parser)), (int)final);
-    printf("%s\n", sc->errorMsg.c_str());
-    return false;
+    return st_ok;
     }
 
-return true;
-}
+while (node != list1->end())
+    {
+    strncpy(ans, node->c_str(), ENC_MSG_LEN);
+    ans[ENC_MSG_LEN] = 0;
+       //printf("---> %s\n", ans);
+    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)));
+        return st_xml_parse_error;
+        }
+    ++node;
 
-bool SERVCONF::IMPL::SimpleRecv(const std::string & chunk, bool /*final*/, void * data)
-{
-*static_cast<std::string *>(data) += chunk;
-return true;
-}
+    }
 
-SERVCONF::SERVCONF(const std::string & server, uint16_t port,
-                   const std::string & login, const std::string & password)
-    : pImpl(new IMPL(server, port, login, password))
-{
+return 0;
 }
-
-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))
+//-----------------------------------------------------------------------------
+void Start(void *data, const char *el, const char **attr)
 {
+SERVCONF * sc;
+sc = (SERVCONF*)data;
+sc->Start(el, attr);
 }
-
-SERVCONF::~SERVCONF()
+//-----------------------------------------------------------------------------
+void End(void *data, const char *el)
 {
-delete pImpl;
+SERVCONF * sc;
+sc = (SERVCONF*)data;
+sc->End(el);
 }
-
-int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+SERVCONF::SERVCONF()
+    : currParser(NULL),
+      error(0),
+      RecvUserDataCb(NULL),
+      RecvGetUserDataCb(NULL),
+      RecvServerInfoDataCb(NULL),
+      RecvChgUserCb(NULL),
+      RecvCheckUserCb(NULL),
+      RecvSendMessageCb(NULL),
+      getUserDataDataCb(NULL),
+      getUserAuthByDataCb(NULL),
+      getUsersDataDataCb(NULL),
+      getServerInfoDataCb(NULL),
+      chgUserDataCb(NULL),
+      checkUserDataCb(NULL),
+      sendMessageDataCb(NULL)
 {
-return pImpl->Exec<SERVER_INFO::PARSER>("<GetServerInfo/>", f, data);
+parser = XML_ParserCreate(NULL);
 }
-
-int SERVCONF::RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+SERVCONF::~SERVCONF()
 {
-return pImpl->RawXML(request, f, data);
+XML_ParserFree(parser);
 }
-
-// -- Admins --
-
-int SERVCONF::GetAdmins(GET_CONTAINER::CALLBACK<GET_ADMIN::INFO>::TYPE f, void * data)
+//-----------------------------------------------------------------------------
+void SERVCONF::SetServer(const char * server)
 {
-return pImpl->Exec<GET_CONTAINER::PARSER<GET_ADMIN::PARSER> >("admins", "<GetAdmins/>", f, data);
+nt.SetServer(server);
 }
-
-int SERVCONF::GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+void SERVCONF::SetPort(uint16_t port)
 {
-return pImpl->Exec<GET_ADMIN::PARSER>("<GetAdmin login=\"" + login + "\"/>", f, data);
+nt.SetServerPort(port);
 }
-
-int SERVCONF::ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+void SERVCONF::SetAdmLogin(const char * login)
 {
-return pImpl->Exec<SIMPLE::PARSER>("ChgAdmin", "<ChgAdmin" + CHG_ADMIN::Serialize(conf, pImpl->Encoding()) + "/>", f, data);
+nt.SetLogin(login);
 }
-
-int SERVCONF::AddAdmin(const std::string & login,
-                       const ADMIN_CONF_RES & conf,
-                       SIMPLE::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+void SERVCONF::SetAdmPassword(const char * password)
 {
-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, pImpl->Encoding()) + "/>", f, data);
+nt.SetPassword(password);
 }
-
-int SERVCONF::DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+int SERVCONF::GetUser(const char * l)
 {
-return pImpl->Exec<SIMPLE::PARSER>("DelAdmin", "<DelAdmin login=\"" + login + "\"/>", f, data);
-}
+char request[255];
+snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
+int ret;
 
-// -- Tariffs --
+currParser = &parserGetUser;
+((PARSER_GET_USER*)currParser)->SetUserDataRecvCb(RecvGetUserDataCb, getUserDataDataCb);
 
-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);
-}
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
 
-int SERVCONF::GetTariff(const std::string & name, GET_TARIFF::CALLBACK f, void * data)
-{
-return pImpl->Exec<GET_TARIFF::PARSER>("<GetTariff name=\"" + name + "\"/>", f, data);
-}
+if ((ret = nt.Connect()) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
+if ((ret = nt.Transact(request)) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
+if ((ret = nt.Disconnect()) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
 
-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, pImpl->Encoding()) + "</SetTariff>", f, data);
+return st_ok;
 }
-
-int SERVCONF::AddTariff(const std::string & name,
-                       const TARIFF_DATA_RES & tariffData,
-                       SIMPLE::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+int SERVCONF::GetUserAuthBy(const char * l)
 {
-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, pImpl->Encoding()) + "</SetTariff>", f, data);
-}
+char request[255];
+snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);
+int ret;
 
-int SERVCONF::DelTariff(const std::string & name, SIMPLE::CALLBACK f, void * data)
-{
-return pImpl->Exec<SIMPLE::PARSER>("DelTariff", "<DelTariff name=\"" + name + "\"/>", f, data);
-}
+currParser = &parserAuthBy;
+((PARSER_AUTH_BY*)currParser)->SetRecvCb(RecvAuthByCb, getUserAuthByDataCb);
 
-// -- Users --
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
 
-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);
-}
+if ((ret = nt.Connect()) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
+if ((ret = nt.Transact(request)) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
+if ((ret = nt.Disconnect()) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
 
-int SERVCONF::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data)
-{
-return pImpl->Exec<GET_USER::PARSER>("<GetUser login=\"" + login + "\"/>", f, data);
+return st_ok;
 }
-
-int SERVCONF::ChgUser(const std::string & login,
-                      const USER_CONF_RES & conf,
-                      const USER_STAT_RES & stat,
-                      SIMPLE::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+int SERVCONF::GetUsers()
 {
-return pImpl->Exec<CHG_USER::PARSER>("<SetUser><Login value=\"" + login + "\"/>" + CHG_USER::Serialize(conf, stat, pImpl->Encoding()) + "</SetUser>", f, data);
-}
+char request[] = "<GetUsers/>";
+int ret;
 
-int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data)
-{
-return pImpl->Exec<SIMPLE::PARSER>("DelUser", "<DelUser login=\"" + login + "\"/>", f, data);
-}
+currParser = &parserGetUsers;
+((PARSER_GET_USERS*)currParser)->SetUserDataRecvCb(RecvUserDataCb, getUsersDataDataCb);
 
-int SERVCONF::AddUser(const std::string & login,
-                      const USER_CONF_RES & conf,
-                      const USER_STAT_RES & stat,
-                      SIMPLE::CALLBACK f, void * 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, pImpl->Encoding()) + "</SetUser>", f, data);
-}
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
 
-int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)
-{
-return pImpl->Exec<AUTH_BY::PARSER>("<GetUserAuthBy login=\"" + login + "\"/>", f, data);
-}
+if ((ret = nt.Connect()) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
+if ((ret = nt.Transact(request)) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
+if ((ret = nt.Disconnect()) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
 
-int SERVCONF::SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * 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);
+return st_ok;
 }
-
-int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+int SERVCONF::SendMessage(const char * login, const char * message, int prio)
 {
-return pImpl->Exec<SIMPLE::PARSER>("CheckUser", "<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", f, data);
-}
+char request[1000];
+char msg[500];
+Encode12(msg, message, strlen(message));
+snprintf(request, 1000, "<Message login=\"%s\" priority=\"%d\" text=\"%s\"/>", login, prio, msg);
+int ret;
 
-// -- Services --
+currParser = &parserSendMessage;
+parserSendMessage.SetSendMessageRecvCb(RecvSendMessageCb, sendMessageDataCb);
 
-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);
-}
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
 
-int SERVCONF::GetService(const std::string & name, GET_SERVICE::CALLBACK f, void * data)
-{
-return pImpl->Exec<GET_SERVICE::PARSER>("<GetService name=\"" + name + "\"/>", f, data);
-}
+if ((ret = nt.Connect()) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
+if ((ret = nt.Transact(request)) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
+if ((ret = nt.Disconnect()) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
 
-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, pImpl->Encoding()) + "</SetService>", f, data);
+return st_ok;
 }
-
-int SERVCONF::AddService(const std::string & name,
-                         const SERVICE_CONF_RES & conf,
-                         SIMPLE::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+int SERVCONF::GetServerInfo()
 {
-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, pImpl->Encoding()) + "</SetService>", f, data);
-}
+char request[] = "<GetServerInfo/>";
+int ret;
 
-int SERVCONF::DelService(const std::string & name, SIMPLE::CALLBACK f, void * data)
-{
-return pImpl->Exec<SIMPLE::PARSER>("DelService", "<DelService name=\"" + name + "\"/>", f, data);
-}
+currParser = &parserServerInfo;
+((PARSER_GET_SERVER_INFO*)currParser)->SetServerInfoRecvCb(RecvServerInfoDataCb, getServerInfoDataCb);
 
-// -- Corporations --
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
 
-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);
-}
+if ((ret = nt.Connect()) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
+if ((ret = nt.Transact(request)) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
+if ((ret = nt.Disconnect()) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
 
-int SERVCONF::GetCorp(const std::string & name, GET_CORP::CALLBACK f, void * data)
-{
-return pImpl->Exec<GET_CORP::PARSER>("<GetCorp name=\"" + name + "\"/>", f, data);
+return st_ok;
 }
-
-int SERVCONF::ChgCorp(const CORP_CONF_RES & conf, SIMPLE::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+int SERVCONF::ChgUser(const char * request)
 {
-return pImpl->Exec<SIMPLE::PARSER>("SetCorp", "<SetCorp name=\"" + conf.name.data() + "\">" + CHG_CORP::Serialize(conf, pImpl->Encoding()) + "</SetCorp>", f, data);
-}
+int ret;
 
-int SERVCONF::AddCorp(const std::string & name,
-                      const CORP_CONF_RES & conf,
-                      SIMPLE::CALLBACK f, void * data)
-{
-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, pImpl->Encoding()) + "</SetCorp>", f, data);
-}
+currParser = &parserChgUser;
+((PARSER_CHG_USER*)currParser)->SetChgUserRecvCb(RecvChgUserCb, chgUserDataCb);
 
-int SERVCONF::DelCorp(const std::string & name, SIMPLE::CALLBACK f, void * data)
-{
-return pImpl->Exec<SIMPLE::PARSER>("DelCorp", "<DelCorp name=\"" + name + "\"/>", f, data);
-}
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
 
-const std::string & SERVCONF::GetStrError() const
-{
-return pImpl->GetStrError();
-}
+if ((ret = nt.Connect()) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
+if ((ret = nt.Transact(request)) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
+if ((ret = nt.Disconnect()) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
 
-//-----------------------------------------------------------------------------
-SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port,
-                     const std::string & login, const std::string & 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);
-}
-//-----------------------------------------------------------------------------
-void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr)
-{
-PARSER * currParser = static_cast<PARSER *>(data);
-currParser->ParseStart(el, attr);
-}
-//-----------------------------------------------------------------------------
-void SERVCONF::IMPL::End(void * data, const char * el)
-{
-PARSER * currParser = static_cast<PARSER *>(data);
-currParser->ParseEnd(el);
+return st_ok;
 }
 //-----------------------------------------------------------------------------
-const std::string & SERVCONF::IMPL::GetStrError() const
-{
-return errorMsg;
-}
+//  TODO: remove this shit!
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::ExecImpl(const std::string & request, PARSER & cp)
+int SERVCONF::MsgUser(const char * request)
 {
-XML_ParserReset(parser, NULL);
-XML_SetElementHandler(parser, Start, End);
-XML_SetUserData(parser, &cp);
+int ret;
+
+currParser = &parserSendMessage;
+parserSendMessage.SetSendMessageRecvCb(RecvSendMessageCb, sendMessageDataCb);
+
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
 
-int ret = 0;
 if ((ret = nt.Connect()) != st_ok)
     {
     errorMsg = nt.GetError();
-    cp.Failure(errorMsg);
     return ret;
     }
-if ((ret = nt.Transact(request, ParserRecv, this)) != st_ok)
+if ((ret = nt.Transact(request)) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
+if ((ret = nt.Disconnect()) != 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 callback, void * data)
+//-----------------------------------------------------------------------------
+int SERVCONF::CheckUser(const char * login, const char * password)
 {
-int ret = 0;
+char request[255];
+snprintf(request, 255, "<CheckUser login=\"%s\" password=\"%s\"/>", login, password);
+int ret;
+
+currParser = &parserCheckUser;
+((PARSER_CHECK_USER*)currParser)->SetCheckUserRecvCb(RecvCheckUserCb, checkUserDataCb);
+
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
+
 if ((ret = nt.Connect()) != st_ok)
     {
     errorMsg = nt.GetError();
-    callback(false, errorMsg, "", data);
     return ret;
     }
-std::string response;
-if ((ret = nt.Transact(request, SimpleRecv, &response)) != st_ok)
+if ((ret = nt.Transact(request)) != st_ok)
+    {
+    errorMsg = nt.GetError();
+    return ret;
+    }
+if ((ret = nt.Disconnect()) != st_ok)
     {
     errorMsg = nt.GetError();
-    callback(false, errorMsg, "", data);
     return ret;
     }
 
-nt.Disconnect();
-callback(true, "", response, data);
 return st_ok;
 }
+//-----------------------------------------------------------------------------
+int SERVCONF::Start(const char *el, const char **attr)
+{
+currParser->ParseStart(el, attr);
+return 0;
+}
+//-----------------------------------------------------------------------------
+void SERVCONF::End(const char *el)
+{
+currParser->ParseEnd(el);
+}
+//-----------------------------------------------------------------------------
+void SERVCONF::SetUserDataRecvCb(RecvUserDataCb_t f, void * data)
+{
+RecvUserDataCb = f;
+getUsersDataDataCb = data;
+}
+//-----------------------------------------------------------------------------
+void SERVCONF::SetGetUserDataRecvCb(RecvUserDataCb_t f, void * data)
+{
+RecvGetUserDataCb = f;            //GET_USER
+getUserDataDataCb = data;
+}
+//-----------------------------------------------------------------------------
+void SERVCONF::SetGetUserAuthByRecvCb(RecvAuthByDataCb_t f, void * data)
+{
+RecvAuthByCb = f;
+getUserAuthByDataCb = data;
+}
+//-----------------------------------------------------------------------------
+void SERVCONF::SetServerInfoRecvCb(RecvServerInfoDataCb_t f, void * data)
+{
+RecvServerInfoDataCb = f;
+getServerInfoDataCb = data;
+}
+//-----------------------------------------------------------------------------
+void SERVCONF::SetChgUserCb(RecvChgUserCb_t f, void * data)
+{
+RecvChgUserCb = f;
+chgUserDataCb = data;
+}
+//-----------------------------------------------------------------------------
+void SERVCONF::SetCheckUserCb(RecvCheckUserCb_t f, void * data)
+{
+RecvCheckUserCb = f;
+checkUserDataCb = data;
+}
+//-----------------------------------------------------------------------------
+void SERVCONF::SetSendMessageCb(RecvSendMessageCb_t f, void * data)
+{
+RecvSendMessageCb = f;
+sendMessageDataCb = data;
+}
+//-----------------------------------------------------------------------------
+const std::string & SERVCONF::GetStrError() const
+{
+return errorMsg;
+}
+//-----------------------------------------------------------------------------
+int SERVCONF::GetError()
+{
+int e = error;
+error = 0;
+return e;
+}
+//-----------------------------------------------------------------------------