X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/ad7b95181d5d66817aac46801cd80adbc4f2fac7..29e9a2de0b45893850bbf56ee38e7fd235a6df15:/stglibs/srvconf.lib/servconf.cpp

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 06a31a81..2f4afaba 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -18,164 +18,420 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
-#include "stg/servconf.h"
-
-#include "stg/common.h"
+ /*
+ $Revision: 1.8 $
+ $Date: 2010/08/04 00:40:38 $
+ $Author: faust $
+ */
 
 #include <cstdio>
 #include <cstring>
 
-namespace
-{
+#include "stg/common.h"
+#include "stg/servconf.h"
+
+using namespace std;
 
 //-----------------------------------------------------------------------------
-void ElementStart(void *data, const char *el, const char **attr)
-{
-SERVCONF * sc = static_cast<SERVCONF *>(data);
-sc->Start(el, attr);
-}
-//-----------------------------------------------------------------------------
-void ElementEnd(void * data, const char * el)
+int AnsRecv(void * data, list<string> * list1)
 {
-SERVCONF * sc = static_cast<SERVCONF *>(data);
-sc->End(el);
-}
+//NODE * node;
+SERVCONF * sc;
+char ans[ENC_MSG_LEN + 1];
+int len, done = 0;
 
-} // namespace anonymous
+sc = (SERVCONF*)data;
 
-bool AnsRecv(void * data, const std::string & chunk, bool final)
-{
-SERVCONF * sc = static_cast<SERVCONF *>(data);
-printf("Chunk: '%s', length: %d, final: %d\n", chunk.c_str(), chunk.length(), final);
+XML_ParserReset(sc->parser, NULL);
+XML_SetElementHandler(sc->parser, Start, End);
+XML_SetUserData(sc->parser, data);
 
-if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ERROR)
+//loop parsing
+list<string>::iterator node;
+node = list1->begin();
+
+if (node == list1->end())
     {
-    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 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;
 
+    }
+
+return 0;
+}
 //-----------------------------------------------------------------------------
-SERVCONF::SERVCONF(const std::string & server, uint16_t port,
-                   const std::string & login, const std::string & password)
+void Start(void *data, const char *el, const char **attr)
+{
+SERVCONF * sc;
+sc = (SERVCONF*)data;
+sc->Start(el, attr);
+}
+//-----------------------------------------------------------------------------
+void End(void *data, const char *el)
+{
+SERVCONF * sc;
+sc = (SERVCONF*)data;
+sc->End(el);
+}
+//-----------------------------------------------------------------------------
+SERVCONF::SERVCONF()
     : currParser(NULL),
-      nt( server, port, login, password )
+      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);
-nt.SetRxCallback(this, AnsRecv);
+}
+//-----------------------------------------------------------------------------
+SERVCONF::~SERVCONF()
+{
+XML_ParserFree(parser);
+}
+//-----------------------------------------------------------------------------
+void SERVCONF::SetServer(const char * server)
+{
+nt.SetServer(server);
+}
+//-----------------------------------------------------------------------------
+void SERVCONF::SetPort(uint16_t port)
+{
+nt.SetServerPort(port);
+}
+//-----------------------------------------------------------------------------
+void SERVCONF::SetAdmLogin(const char * login)
+{
+nt.SetLogin(login);
+}
+//-----------------------------------------------------------------------------
+void SERVCONF::SetAdmPassword(const char * password)
+{
+nt.SetPassword(password);
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::GetUser(const char * l)
 {
 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;
+    }
 
-return Exec(request);
+return st_ok;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::AuthBy(const char * l)
+int SERVCONF::GetUserAuthBy(const char * l)
 {
 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);
 
-return Exec(request);
+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);
 
-return Exec(request);
+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::ServerInfo()
+int SERVCONF::SendMessage(const char * login, const char * message, int prio)
+{
+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;
 
 currParser = &parserServerInfo;
+((PARSER_GET_SERVER_INFO*)currParser)->SetServerInfoRecvCb(RecvServerInfoDataCb, getServerInfoDataCb);
 
-return Exec(request);
+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)
 {
+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 Exec(request);
+return st_ok;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::SendMessage(const char * request)
+//  TODO: remove this shit!
+//-----------------------------------------------------------------------------
+int SERVCONF::MsgUser(const char * request)
 {
+int ret;
+
 currParser = &parserSendMessage;
+parserSendMessage.SetSendMessageRecvCb(RecvSendMessageCb, sendMessageDataCb);
 
-return Exec(request);
+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::CheckUser(const char * login, const char * password)
 {
 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 Exec(request);
+return st_ok;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::Start(const char * el, const char ** attr)
+int SERVCONF::Start(const char *el, const char **attr)
 {
 currParser->ParseStart(el, attr);
 return 0;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::End(const char * el)
+void SERVCONF::End(const char *el)
 {
 currParser->ParseEnd(el);
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data)
+void SERVCONF::SetUserDataRecvCb(RecvUserDataCb_t f, void * data)
 {
-parserGetUsers.SetCallback(f, data);
+RecvUserDataCb = f;
+getUsersDataDataCb = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetGetUserCallback(PARSER_GET_USER::CALLBACK f, void * data)
+void SERVCONF::SetGetUserDataRecvCb(RecvUserDataCb_t f, void * data)
 {
-parserGetUser.SetCallback(f, data);
+RecvGetUserDataCb = f;            //GET_USER
+getUserDataDataCb = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data)
+void SERVCONF::SetGetUserAuthByRecvCb(RecvAuthByDataCb_t f, void * data)
 {
-parserAuthBy.SetCallback(f, data);
+RecvAuthByCb = f;
+getUserAuthByDataCb = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetServerInfoCallback(PARSER_SERVER_INFO::CALLBACK f, void * data)
+void SERVCONF::SetServerInfoRecvCb(RecvServerInfoDataCb_t f, void * data)
 {
-parserServerInfo.SetCallback(f, data);
+RecvServerInfoDataCb = f;
+getServerInfoDataCb = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetChgUserCallback(PARSER_CHG_USER::CALLBACK f, void * data)
+void SERVCONF::SetChgUserCb(RecvChgUserCb_t f, void * data)
 {
-parserChgUser.SetCallback(f, data);
+RecvChgUserCb = f;
+chgUserDataCb = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetCheckUserCallback(PARSER_CHECK_USER::CALLBACK f, void * data)
+void SERVCONF::SetCheckUserCb(RecvCheckUserCb_t f, void * data)
 {
-parserCheckUser.SetCallback(f, data);
+RecvCheckUserCb = f;
+checkUserDataCb = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetSendMessageCallback(PARSER_SEND_MESSAGE::CALLBACK f, void * data)
+void SERVCONF::SetSendMessageCb(RecvSendMessageCb_t f, void * data)
 {
-parserSendMessage.SetCallback(f, data);
+RecvSendMessageCb = f;
+sendMessageDataCb = data;
 }
 //-----------------------------------------------------------------------------
 const std::string & SERVCONF::GetStrError() const
@@ -183,28 +439,10 @@ const std::string & SERVCONF::GetStrError() const
 return errorMsg;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::Exec(const char * request)
+int SERVCONF::GetError()
 {
-XML_ParserReset(parser, NULL);
-XML_SetElementHandler(parser, ElementStart, ElementEnd);
-XML_SetUserData(parser, this);
-
-int ret = 0;
-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 e = error;
+error = 0;
+return e;
 }
+//-----------------------------------------------------------------------------