X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/113c3cef204f3380a266483ec9120f673640c673..e3703f791ff52f6d7a9d6f9e8dca37a506967c2b:/stglibs/srvconf.lib/servconf.cpp?ds=sidebyside

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index c45dfb9b..2f4afaba 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -18,228 +18,431 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
-#include "stg/servconf.h"
-
-#include "netunit.h"
-#include "stg/servconf_types.h"
-
-#include "stg/common.h"
+ /*
+ $Revision: 1.8 $
+ $Date: 2010/08/04 00:40:38 $
+ $Author: faust $
+ */
 
 #include <cstdio>
 #include <cstring>
 
-#include <expat.h>
-
-class SERVCONF::IMPL
-{
-public:
-    IMPL(const std::string & server, uint16_t port,
-         const std::string & login, const std::string & password);
+#include "stg/common.h"
+#include "stg/servconf.h"
 
-    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);
+using namespace std;
 
-    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 AnsRecv(void * data, list<string> * list1)
+{
+//NODE * node;
+SERVCONF * sc;
+char ans[ENC_MSG_LEN + 1];
+int len, done = 0;
 
-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;
+sc = (SERVCONF*)data;
 
-    NETTRANSACT nt;
+XML_ParserReset(sc->parser, NULL);
+XML_SetElementHandler(sc->parser, Start, End);
+XML_SetUserData(sc->parser, data);
 
-    std::string errorMsg;
-    XML_Parser parser;
+//loop parsing
+list<string>::iterator node;
+node = list1->begin();
 
-    int Exec(const std::string & request, PARSER & cp);
+if (node == list1->end())
+    {
+    return st_ok;
+    }
 
-    static bool AnsRecv(void * data, const std::string & chunk, bool final);
-};
+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;
 
-/*namespace
-{
+    }
 
-void ElementStart(void * data, const char * el, const char ** attr)
-{
-static_cast<SERVCONF::IMPL *>(data)->Start(el, attr);
+return 0;
 }
-
-void ElementEnd(void * data, const char * el)
+//-----------------------------------------------------------------------------
+void Start(void *data, const char *el, const char **attr)
 {
-static_cast<SERVCONF::IMPL *>(data)->End(el);
+SERVCONF * sc;
+sc = (SERVCONF*)data;
+sc->Start(el, attr);
 }
-
-} // namespace anonymous
-*/
-
-bool SERVCONF::IMPL::AnsRecv(void * data, const std::string & chunk, bool final)
+//-----------------------------------------------------------------------------
+void End(void *data, const char *el)
 {
-SERVCONF::IMPL * sc = static_cast<SERVCONF::IMPL *>(data);
-
-if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == 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 false;
-    }
-
-return true;
+SERVCONF * sc;
+sc = (SERVCONF*)data;
+sc->End(el);
 }
-
-SERVCONF::SERVCONF(const std::string & server, uint16_t port,
-                   const std::string & login, const std::string & password)
-    : pImpl(new IMPL(server, port, login, password))
+//-----------------------------------------------------------------------------
+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)
 {
+parser = XML_ParserCreate(NULL);
 }
-
+//-----------------------------------------------------------------------------
 SERVCONF::~SERVCONF()
 {
-    delete pImpl;
+XML_ParserFree(parser);
 }
-
-int SERVCONF::GetUsers(PARSER_GET_USERS::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+void SERVCONF::SetServer(const char * server)
 {
-    return pImpl->GetUsers( f, data );
+nt.SetServer(server);
 }
-
-int SERVCONF::GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+void SERVCONF::SetPort(uint16_t port)
 {
-    return pImpl->GetUser(login, f, data);
+nt.SetServerPort(port);
 }
-
-int SERVCONF::ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+void SERVCONF::SetAdmLogin(const char * login)
 {
-    return pImpl->ChgUser(request, f, data);
+nt.SetLogin(login);
 }
-
-int SERVCONF::AuthBy(const std::string & login, PARSER_AUTH_BY::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+void SERVCONF::SetAdmPassword(const char * password)
 {
-    return pImpl->AuthBy(login, f, data);
+nt.SetPassword(password);
 }
-
-int SERVCONF::SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data)
+//-----------------------------------------------------------------------------
+int SERVCONF::GetUser(const char * l)
 {
-    return pImpl->SendMessage(request, f, data);
-}
+char request[255];
+snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
+int ret;
+
+currParser = &parserGetUser;
+((PARSER_GET_USER*)currParser)->SetUserDataRecvCb(RecvGetUserDataCb, getUserDataDataCb);
+
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
+
+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::ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data)
+return st_ok;
+}
+//-----------------------------------------------------------------------------
+int SERVCONF::GetUserAuthBy(const char * l)
 {
-    return pImpl->ServerInfo(f, data);
+char request[255];
+snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);
+int ret;
+
+currParser = &parserAuthBy;
+((PARSER_AUTH_BY*)currParser)->SetRecvCb(RecvAuthByCb, getUserAuthByDataCb);
+
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
+
+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;
+    }
+
+return st_ok;
 }
+//-----------------------------------------------------------------------------
+int SERVCONF::GetUsers()
+{
+char request[] = "<GetUsers/>";
+int ret;
+
+currParser = &parserGetUsers;
+((PARSER_GET_USERS*)currParser)->SetUserDataRecvCb(RecvUserDataCb, getUsersDataDataCb);
 
-int SERVCONF::CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data)
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
+
+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;
+    }
+
+return st_ok;
+}
+//-----------------------------------------------------------------------------
+int SERVCONF::SendMessage(const char * login, const char * message, int prio)
 {
-    return pImpl->CheckUser(login, 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;
+
+currParser = &parserSendMessage;
+parserSendMessage.SetSendMessageRecvCb(RecvSendMessageCb, sendMessageDataCb);
+
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
+
+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;
+    }
+
+return st_ok;
 }
+//-----------------------------------------------------------------------------
+int SERVCONF::GetServerInfo()
+{
+char request[] = "<GetServerInfo/>";
+int ret;
 
-const std::string & SERVCONF::GetStrError() const
+currParser = &parserServerInfo;
+((PARSER_GET_SERVER_INFO*)currParser)->SetServerInfoRecvCb(RecvServerInfoDataCb, getServerInfoDataCb);
+
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
+
+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;
+    }
+
+return st_ok;
+}
+//-----------------------------------------------------------------------------
+int SERVCONF::ChgUser(const char * request)
 {
-    return pImpl->GetStrError();
+int ret;
+
+currParser = &parserChgUser;
+((PARSER_CHG_USER*)currParser)->SetChgUserRecvCb(RecvChgUserCb, chgUserDataCb);
+
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
+
+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;
+    }
+
+return st_ok;
 }
+//-----------------------------------------------------------------------------
+//  TODO: remove this shit!
+//-----------------------------------------------------------------------------
+int SERVCONF::MsgUser(const char * request)
+{
+int ret;
+
+currParser = &parserSendMessage;
+parserSendMessage.SetSendMessageRecvCb(RecvSendMessageCb, sendMessageDataCb);
+
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
+
+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;
+    }
 
+return st_ok;
+}
 //-----------------------------------------------------------------------------
-SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port,
-                     const std::string & login, const std::string & password)
-    : nt( server, port, login, password )
+int SERVCONF::CheckUser(const char * login, const char * password)
 {
-parser = XML_ParserCreate(NULL);
+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();
+    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;
+    }
+
+return st_ok;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data)
+int SERVCONF::Start(const char *el, const char **attr)
 {
-parserGetUser.SetCallback(f, data);
-return Exec("<GetUser login=\"" + login + "\"/>", parserGetUser);
+currParser->ParseStart(el, attr);
+return 0;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::AuthBy(const std::string & login, PARSER_AUTH_BY::CALLBACK f, void * data)
+void SERVCONF::End(const char *el)
 {
-parserAuthBy.SetCallback(f, data);
-return Exec("<GetUserAuthBy login=\"" + login + "\"/>", parserAuthBy);
+currParser->ParseEnd(el);
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::GetUsers(PARSER_GET_USERS::CALLBACK f, void * data)
+void SERVCONF::SetUserDataRecvCb(RecvUserDataCb_t f, void * data)
 {
-parserGetUsers.SetCallback(f, data);
-return Exec("<GetUsers/>", parserGetUsers);
+RecvUserDataCb = f;
+getUsersDataDataCb = data;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data)
+void SERVCONF::SetGetUserDataRecvCb(RecvUserDataCb_t f, void * data)
 {
-parserServerInfo.SetCallback(f, data);
-return Exec("<GetServerInfo/>", parserServerInfo);
+RecvGetUserDataCb = f;            //GET_USER
+getUserDataDataCb = data;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data)
+void SERVCONF::SetGetUserAuthByRecvCb(RecvAuthByDataCb_t f, void * data)
 {
-parserChgUser.SetCallback(f, data);
-return Exec(request, parserChgUser);
+RecvAuthByCb = f;
+getUserAuthByDataCb = data;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data)
+void SERVCONF::SetServerInfoRecvCb(RecvServerInfoDataCb_t f, void * data)
 {
-parserSendMessage.SetCallback(f, data);
-return Exec(request, parserSendMessage);
+RecvServerInfoDataCb = f;
+getServerInfoDataCb = data;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data)
+void SERVCONF::SetChgUserCb(RecvChgUserCb_t f, void * data)
 {
-parserCheckUser.SetCallback(f, data);
-return Exec("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", parserCheckUser);
+RecvChgUserCb = f;
+chgUserDataCb = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr)
+void SERVCONF::SetCheckUserCb(RecvCheckUserCb_t f, void * data)
 {
-PARSER * currParser = static_cast<PARSER *>(data);
-currParser->ParseStart(el, attr);
+RecvCheckUserCb = f;
+checkUserDataCb = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::IMPL::End(void * data, const char * el)
+void SERVCONF::SetSendMessageCb(RecvSendMessageCb_t f, void * data)
 {
-PARSER * currParser = static_cast<PARSER *>(data);
-currParser->ParseEnd(el);
+RecvSendMessageCb = f;
+sendMessageDataCb = data;
 }
 //-----------------------------------------------------------------------------
-const std::string & SERVCONF::IMPL::GetStrError() const
+const std::string & SERVCONF::GetStrError() const
 {
 return errorMsg;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::Exec(const std::string & request, PARSER & cp)
+int SERVCONF::GetError()
 {
-XML_ParserReset(parser, NULL);
-XML_SetElementHandler(parser, Start, End);
-XML_SetUserData(parser, &cp);
-
-int ret = 0;
-if ((ret = nt.Connect()) != st_ok)
-    {
-    errorMsg = nt.GetError();
-    return ret;
-    }
-if ((ret = nt.Transact(request.c_str())) != st_ok)
-    {
-    errorMsg = nt.GetError();
-    return ret;
-    }
-if ((ret = nt.Disconnect()) != st_ok)
-    {
-    errorMsg = nt.GetError();
-    return ret;
-    }
-
-return st_ok;
+int e = error;
+error = 0;
+return e;
 }
+//-----------------------------------------------------------------------------