Merge remote-tracking branch 'origin/stg-2.409' into ticket37

[stg.git] / stglibs / srvconf.lib / servconf.cpp

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index b8507098e2790425cfdfc7470c458d6a1facebd6..2f4afaba147bc7132d33bddfba5331197b9cb877 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -24,35 +24,42 @@
  $Author: faust $
  */
 
  $Author: faust $
  */
 

-#include "stg/servconf.h"
-
-#include "stg/common.h"
-

 #include <cstdio>
 #include <cstring>
 
 #include <cstdio>
 #include <cstring>
 

+#include "stg/common.h"
+#include "stg/servconf.h"
+

 using namespace std;
 
 //-----------------------------------------------------------------------------
 int AnsRecv(void * data, list<string> * list1)
 {
 using namespace std;
 
 //-----------------------------------------------------------------------------
 int AnsRecv(void * data, list<string> * list1)
 {

-SERVCONF * sc = static_cast<SERVCONF *>(data);
+//NODE * node;
+SERVCONF * sc;
+char ans[ENC_MSG_LEN + 1];
+int len, done = 0;
+
+sc = (SERVCONF*)data;

 
 XML_ParserReset(sc->parser, NULL);
 XML_SetElementHandler(sc->parser, Start, End);
 XML_SetUserData(sc->parser, data);
 
 
 XML_ParserReset(sc->parser, NULL);
 XML_SetElementHandler(sc->parser, Start, End);
 XML_SetUserData(sc->parser, data);
 

-char ans[ENC_MSG_LEN + 1];
-int len, done = 0;
-

 //loop parsing
 list<string>::iterator node;
 node = list1->begin();
 
 //loop parsing
 list<string>::iterator node;
 node = list1->begin();
 

+if (node == list1->end())
+    {
+    return st_ok;
+    }
+

 while (node != list1->end())
     {
     strncpy(ans, node->c_str(), ENC_MSG_LEN);
     ans[ENC_MSG_LEN] = 0;
 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)
     len = strlen(ans);
 
     if (XML_Parse(sc->parser, ans, len, done) == XML_STATUS_ERROR)


@@ -60,14 +67,13 @@ while (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)));
         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 st_xml_parse_error;
         }
     ++node;
 
     }
 
         return st_xml_parse_error;
         }
     ++node;
 
     }
 

-return st_ok;
+return 0;

 }
 //-----------------------------------------------------------------------------
 void Start(void *data, const char *el, const char **attr)
 }
 //-----------------------------------------------------------------------------
 void Start(void *data, const char *el, const char **attr)


@@ -86,11 +92,27 @@ sc->End(el);
 //-----------------------------------------------------------------------------
 SERVCONF::SERVCONF()
     : currParser(NULL),
 //-----------------------------------------------------------------------------
 SERVCONF::SERVCONF()
     : currParser(NULL),

+      error(0),
+      RecvUserDataCb(NULL),
+      RecvGetUserDataCb(NULL),
+      RecvServerInfoDataCb(NULL),
+      RecvChgUserCb(NULL),
+      RecvCheckUserCb(NULL),

       RecvSendMessageCb(NULL),
       RecvSendMessageCb(NULL),

+      getUserDataDataCb(NULL),
+      getUserAuthByDataCb(NULL),
+      getUsersDataDataCb(NULL),
+      getServerInfoDataCb(NULL),
+      chgUserDataCb(NULL),
+      checkUserDataCb(NULL),

       sendMessageDataCb(NULL)
 {
 parser = XML_ParserCreate(NULL);
       sendMessageDataCb(NULL)
 {
 parser = XML_ParserCreate(NULL);

-nt.SetRxCallback(this, AnsRecv);
+}
+//-----------------------------------------------------------------------------
+SERVCONF::~SERVCONF()
+{
+XML_ParserFree(parser);

 }
 //-----------------------------------------------------------------------------
 void SERVCONF::SetServer(const char * server)
 }
 //-----------------------------------------------------------------------------
 void SERVCONF::SetServer(const char * server)


@@ -117,29 +139,92 @@ int SERVCONF::GetUser(const char * l)
 {
 char request[255];
 snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
 {
 char request[255];
 snprintf(request, 255, "<GetUser login=\"%s\"/>", l);

+int ret;

 
 currParser = &parserGetUser;
 
 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);
 {
 char request[255];
 snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);

+int ret;

 
 currParser = &parserAuthBy;
 
 currParser = &parserAuthBy;

+((PARSER_AUTH_BY*)currParser)->SetRecvCb(RecvAuthByCb, getUserAuthByDataCb);

 
 

-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::GetUsers()
 {
 char request[] = "<GetUsers/>";
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::GetUsers()
 {
 char request[] = "<GetUsers/>";

+int ret;

 
 currParser = &parserGetUsers;
 
 currParser = &parserGetUsers;

+((PARSER_GET_USERS*)currParser)->SetUserDataRecvCb(RecvUserDataCb, getUsersDataDataCb);
+
+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::SendMessage(const char * login, const char * message, int prio)
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::SendMessage(const char * login, const char * message, int prio)


@@ -148,47 +233,152 @@ char request[1000];
 char msg[500];
 Encode12(msg, message, strlen(message));
 snprintf(request, 1000, "<Message login=\"%s\" priority=\"%d\" text=\"%s\"/>", login, prio, msg);
 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);
 
 
 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::ServerInfo()
+int SERVCONF::GetServerInfo()

 {
 char request[] = "<GetServerInfo/>";
 {
 char request[] = "<GetServerInfo/>";

+int ret;

 
 currParser = &parserServerInfo;
 
 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 Exec(request);
+return st_ok;

 }
 //-----------------------------------------------------------------------------
 int SERVCONF::ChgUser(const char * request)
 {
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::ChgUser(const char * request)
 {

+int ret;
+

 currParser = &parserChgUser;
 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;

 }
 //-----------------------------------------------------------------------------
 //  TODO: remove this shit!
 //-----------------------------------------------------------------------------
 int SERVCONF::MsgUser(const char * request)
 {
 }
 //-----------------------------------------------------------------------------
 //  TODO: remove this shit!
 //-----------------------------------------------------------------------------
 int SERVCONF::MsgUser(const char * request)
 {

+int ret;
+

 currParser = &parserSendMessage;
 parserSendMessage.SetSendMessageRecvCb(RecvSendMessageCb, sendMessageDataCb);
 
 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 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;
 
 currParser = &parserCheckUser;

+((PARSER_CHECK_USER*)currParser)->SetCheckUserRecvCb(RecvCheckUserCb, checkUserDataCb);
+
+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::Start(const char *el, const char **attr)
 }
 //-----------------------------------------------------------------------------
 int SERVCONF::Start(const char *el, const char **attr)


@@ -202,34 +392,40 @@ void SERVCONF::End(const char *el)
 currParser->ParseEnd(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::SetSendMessageCb(RecvSendMessageCb_t f, void * data)
 }
 //-----------------------------------------------------------------------------
 void SERVCONF::SetSendMessageCb(RecvSendMessageCb_t f, void * data)


@@ -243,26 +439,10 @@ const std::string & SERVCONF::GetStrError() const
 return errorMsg;
 }
 //-----------------------------------------------------------------------------
 return errorMsg;
 }
 //-----------------------------------------------------------------------------

-int SERVCONF::Exec(const char * request)
+int SERVCONF::GetError()

 {
 {

-nt.Reset();
-
-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;

 }
 }

+//-----------------------------------------------------------------------------