X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/2e4de7bb1dcdf34bce1769c34c7cd42fb64637e2..a8689998a9b2cfc17dc260b423cce8ff2e407adb:/stglibs/srvconf.lib/servconf.cpp

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 078466d7..83f087b3 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -96,16 +96,17 @@ SERVCONF::SERVCONF()
       error(0),
       RecvUserDataCb(NULL),
       RecvGetUserDataCb(NULL),
-      RecvServerInfoDataCb(NULL),
+      authByCallback(NULL),
+      serverInfoCallback(NULL),
       RecvChgUserCb(NULL),
-      RecvCheckUserCb(NULL),
+      checkUserCallback(NULL),
       RecvSendMessageCb(NULL),
       getUserDataDataCb(NULL),
-      getUserAuthByDataCb(NULL),
+      authByData(NULL),
       getUsersDataDataCb(NULL),
-      getServerInfoDataCb(NULL),
+      serverInfoData(NULL),
       chgUserDataCb(NULL),
-      checkUserDataCb(NULL),
+      checkUserData(NULL),
       sendMessageDataCb(NULL)
 {
 parser = XML_ParserCreate(NULL);
@@ -162,18 +163,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();
@@ -256,13 +257,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 +354,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);
@@ -379,7 +380,6 @@ return st_ok;
 //-----------------------------------------------------------------------------
 int SERVCONF::Start(const char *el, const char **attr)
 {
-printfd(__FILE__, "<%s>\n", el);
 currParser->ParseStart(el, attr);
 return 0;
 }
@@ -395,22 +395,22 @@ RecvUserDataCb = f;
 getUsersDataDataCb = 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)
@@ -419,10 +419,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)