X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c4456f2cae7261f7263e3708ff995bade7da722f..02d8ff35c9a854ffd15a701e46a118bc51be3b7d:/stglibs/srvconf.lib/servconf.cpp?ds=inline

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 0ca3028c..7848787b 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -35,31 +35,23 @@ using namespace std;
 //-----------------------------------------------------------------------------
 int AnsRecv(void * data, list<string> * list1)
 {
-//NODE * node;
-SERVCONF * sc;
-char ans[ENC_MSG_LEN + 1];
-int len, done = 0;
-
-sc = (SERVCONF*)data;
+SERVCONF * sc = static_cast<SERVCONF *>(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();
 
-if (node == list1->end())
-    {
-    return st_ok;
-    }
-
 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)
@@ -67,13 +59,14 @@ 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)));
+        printf("%s\n", sc->errorMsg.c_str());
         return st_xml_parse_error;
         }
     ++node;
 
     }
 
-return 0;
+return st_ok;
 }
 //-----------------------------------------------------------------------------
 void Start(void *data, const char *el, const char **attr)
@@ -94,18 +87,19 @@ SERVCONF::SERVCONF()
     : currParser(NULL),
       parseDepth(0),
       error(0),
-      RecvUserDataCb(NULL),
-      RecvGetUserDataCb(NULL),
-      RecvServerInfoDataCb(NULL),
+      getUsersCallback(NULL),
+      getUserCallback(NULL),
+      authByCallback(NULL),
+      serverInfoCallback(NULL),
       RecvChgUserCb(NULL),
-      RecvCheckUserCb(NULL),
+      checkUserCallback(NULL),
       RecvSendMessageCb(NULL),
-      getUserDataDataCb(NULL),
-      getUserAuthByDataCb(NULL),
-      getUsersDataDataCb(NULL),
-      getServerInfoDataCb(NULL),
+      getUsersData(NULL),
+      getUserData(NULL),
+      authByData(NULL),
+      serverInfoData(NULL),
       chgUserDataCb(NULL),
-      checkUserDataCb(NULL),
+      checkUserData(NULL),
       sendMessageDataCb(NULL)
 {
 parser = XML_ParserCreate(NULL);
@@ -138,7 +132,7 @@ snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
 int ret;
 
 currParser = &parserGetUser;
-((PARSER_GET_USER*)currParser)->SetUserDataRecvCb(RecvGetUserDataCb, getUserDataDataCb);
+((PARSER_GET_USER*)currParser)->SetCallback(getUserCallback, getUserData);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
@@ -162,18 +156,18 @@ if ((ret = nt.Disconnect()) != st_ok)
 return st_ok;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::GetUserAuthBy(const char * l)
+int SERVCONF::AuthBy(const char * l)
 {
 char request[255];
 snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);
-int ret;
 
 currParser = &parserAuthBy;
-((PARSER_AUTH_BY*)currParser)->SetRecvCb(RecvAuthByCb, getUserAuthByDataCb);
+((PARSER_AUTH_BY*)currParser)->SetCallback(authByCallback, authByData);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
 
+int ret;
 if ((ret = nt.Connect()) != st_ok)
     {
     errorMsg = nt.GetError();
@@ -199,7 +193,7 @@ char request[] = "<GetUsers/>";
 int ret;
 
 currParser = &parserGetUsers;
-((PARSER_GET_USERS*)currParser)->SetUserDataRecvCb(RecvUserDataCb, getUsersDataDataCb);
+((PARSER_GET_USERS*)currParser)->SetCallback(getUsersCallback, getUsersData);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
@@ -256,13 +250,13 @@ if ((ret = nt.Disconnect()) != st_ok)
 return st_ok;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::GetServerInfo()
+int SERVCONF::ServerInfo()
 {
 char request[] = "<GetServerInfo/>";
 int ret;
 
 currParser = &parserServerInfo;
-((PARSER_GET_SERVER_INFO*)currParser)->SetServerInfoRecvCb(RecvServerInfoDataCb, getServerInfoDataCb);
+((PARSER_SERVER_INFO*)currParser)->SetCallback(serverInfoCallback, serverInfoData);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
@@ -353,7 +347,7 @@ snprintf(request, 255, "<CheckUser login=\"%s\" password=\"%s\"/>", login, passw
 int ret;
 
 currParser = &parserCheckUser;
-((PARSER_CHECK_USER*)currParser)->SetCheckUserRecvCb(RecvCheckUserCb, checkUserDataCb);
+((PARSER_CHECK_USER*)currParser)->SetCallback(checkUserCallback, checkUserData);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
@@ -388,28 +382,28 @@ void SERVCONF::End(const char *el)
 currParser->ParseEnd(el);
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetUserDataRecvCb(RecvUserDataCb_t f, void * data)
+void SERVCONF::SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data)
 {
-RecvUserDataCb = f;
-getUsersDataDataCb = data;
+getUsersCallback = f;
+getUsersData = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetGetUserDataRecvCb(RecvUserDataCb_t f, void * data)
+void SERVCONF::SetGetUserCallback(PARSER_GET_USER::CALLBACK f, void * data)
 {
-RecvGetUserDataCb = f;            //GET_USER
-getUserDataDataCb = data;
+getUserCallback = f;
+getUserData = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetGetUserAuthByRecvCb(RecvAuthByDataCb_t f, void * data)
+void SERVCONF::SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data)
 {
-RecvAuthByCb = f;
-getUserAuthByDataCb = data;
+authByCallback = f;
+authByData = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetServerInfoRecvCb(RecvServerInfoDataCb_t f, void * data)
+void SERVCONF::SetServerInfoCallback(PARSER_SERVER_INFO::CALLBACK f, void * data)
 {
-RecvServerInfoDataCb = f;
-getServerInfoDataCb = data;
+serverInfoCallback = f;
+serverInfoData = data;
 }
 //-----------------------------------------------------------------------------
 void SERVCONF::SetChgUserCb(RecvChgUserCb_t f, void * data)
@@ -418,10 +412,10 @@ RecvChgUserCb = f;
 chgUserDataCb = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetCheckUserCb(RecvCheckUserCb_t f, void * data)
+void SERVCONF::SetCheckUserCallback(PARSER_CHECK_USER::CALLBACK f, void * data)
 {
-RecvCheckUserCb = f;
-checkUserDataCb = data;
+checkUserCallback = f;
+checkUserData = data;
 }
 //-----------------------------------------------------------------------------
 void SERVCONF::SetSendMessageCb(RecvSendMessageCb_t f, void * data)