Small name fixes.

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

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index a28e2e861f1734b91ae19bf657279b63bc012dfb..3d82860b2895556dd2c52e842035f8fa20c26d5c 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -28,7 +28,7 @@
 #include <cstring>
 
 #include "stg/common.h"
 #include <cstring>
 
 #include "stg/common.h"

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

 
 using namespace std;
 
 
 using namespace std;
 


@@ -94,17 +94,19 @@ SERVCONF::SERVCONF()
     : currParser(NULL),
       parseDepth(0),
       error(0),
     : currParser(NULL),
       parseDepth(0),
       error(0),

-      RecvUserDataCb(NULL),
-      RecvGetUserDataCb(NULL),
-      RecvServerInfoDataCb(NULL),
+      getUsersCallback(NULL),
+      getUserCallback(NULL),
+      authByCallback(NULL),
+      serverInfoCallback(NULL),

       RecvChgUserCb(NULL),
       RecvChgUserCb(NULL),

-      RecvCheckUserCb(NULL),
+      checkUserCallback(NULL),

       RecvSendMessageCb(NULL),
       RecvSendMessageCb(NULL),

-      getUserDataDataCb(NULL),
-      getUsersDataDataCb(NULL),
-      getServerInfoDataCb(NULL),
+      getUsersData(NULL),
+      getUserData(NULL),
+      authByData(NULL),
+      serverInfoData(NULL),

       chgUserDataCb(NULL),
       chgUserDataCb(NULL),

-      checkUserDataCb(NULL),
+      checkUserData(NULL),

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


@@ -137,11 +139,42 @@ snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
 int ret;
 
 currParser = &parserGetUser;
 int ret;
 
 currParser = &parserGetUser;

-((PARSER_GET_USER*)currParser)->SetUserDataRecvCb(RecvGetUserDataCb, getUserDataDataCb);
+((PARSER_GET_USER*)currParser)->SetCallback(getUserCallback, getUserData);

 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
 
 
 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::AuthBy(const char * l)
+{
+char request[255];
+snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);
+
+currParser = &parserAuthBy;
+((PARSER_AUTH_BY*)currParser)->SetCallback(authByCallback, authByData);
+
+nt.Reset();
+nt.SetRxCallback(this, AnsRecv);
+
+int ret;

 if ((ret = nt.Connect()) != st_ok)
     {
     errorMsg = nt.GetError();
 if ((ret = nt.Connect()) != st_ok)
     {
     errorMsg = nt.GetError();


@@ -167,7 +200,7 @@ char request[] = "<GetUsers/>";
 int ret;
 
 currParser = &parserGetUsers;
 int ret;
 
 currParser = &parserGetUsers;

-((PARSER_GET_USERS*)currParser)->SetUserDataRecvCb(RecvUserDataCb, getUsersDataDataCb);
+((PARSER_GET_USERS*)currParser)->SetCallback(getUsersCallback, getUsersData);

 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);


@@ -224,13 +257,13 @@ if ((ret = nt.Disconnect()) != st_ok)
 return st_ok;
 }
 //-----------------------------------------------------------------------------
 return st_ok;
 }
 //-----------------------------------------------------------------------------

-int SERVCONF::GetServerInfo()
+int SERVCONF::ServerInfo()

 {
 char request[] = "<GetServerInfo/>";
 int ret;
 
 currParser = &parserServerInfo;
 {
 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);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);


@@ -321,7 +354,7 @@ snprintf(request, 255, "<CheckUser login=\"%s\" password=\"%s\"/>", login, passw
 int ret;
 
 currParser = &parserCheckUser;
 int ret;
 
 currParser = &parserCheckUser;

-((PARSER_CHECK_USER*)currParser)->SetCheckUserRecvCb(RecvCheckUserCb, checkUserDataCb);
+((PARSER_CHECK_USER*)currParser)->SetCallback(checkUserCallback, checkUserData);

 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);


@@ -356,22 +389,28 @@ void SERVCONF::End(const char *el)
 currParser->ParseEnd(el);
 }
 //-----------------------------------------------------------------------------
 currParser->ParseEnd(el);
 }
 //-----------------------------------------------------------------------------

-void SERVCONF::SetUserDataRecvCb(RecvUserDataCb_t f, void * data)
+void SERVCONF::SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data)
+{
+getUsersCallback = f;
+getUsersData = data;
+}
+//-----------------------------------------------------------------------------
+void SERVCONF::SetGetUserCallback(PARSER_GET_USER::CALLBACK f, void * data)

 {
 {

-RecvUserDataCb = f;
-getUsersDataDataCb = data;
+getUserCallback = f;
+getUserData = data;

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void SERVCONF::SetGetUserDataRecvCb(RecvUserDataCb_t f, void * data)
+void SERVCONF::SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data)

 {
 {

-RecvGetUserDataCb = f;            //GET_USER
-getUserDataDataCb = 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)
 }
 //-----------------------------------------------------------------------------
 void SERVCONF::SetChgUserCb(RecvChgUserCb_t f, void * data)


@@ -380,10 +419,10 @@ RecvChgUserCb = f;
 chgUserDataCb = data;
 }
 //-----------------------------------------------------------------------------
 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)
 }
 //-----------------------------------------------------------------------------
 void SERVCONF::SetSendMessageCb(RecvSendMessageCb_t f, void * data)