Fixed deps between conn and proto.

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

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 8074801e54c1ea6900202e021e48c136f77f6e67..2f4afaba147bc7132d33bddfba5331197b9cb877 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -27,7 +27,8 @@
 #include <cstdio>
 #include <cstring>
 
 #include <cstdio>
 #include <cstring>
 

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

 
 using namespace std;
 
 
 using namespace std;
 


@@ -90,9 +91,28 @@ sc->End(el);
 }
 //-----------------------------------------------------------------------------
 SERVCONF::SERVCONF()
 }
 //-----------------------------------------------------------------------------
 SERVCONF::SERVCONF()

+    : currParser(NULL),
+      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);
 {
 parser = XML_ParserCreate(NULL);

-parseDepth = 0;
+}
+//-----------------------------------------------------------------------------
+SERVCONF::~SERVCONF()
+{
+XML_ParserFree(parser);

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


@@ -127,6 +147,37 @@ currParser = &parserGetUser;
 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::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);
+

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


@@ -353,6 +404,12 @@ RecvGetUserDataCb = f;            //GET_USER
 getUserDataDataCb = data;
 }
 //-----------------------------------------------------------------------------
 getUserDataDataCb = data;
 }
 //-----------------------------------------------------------------------------

+void SERVCONF::SetGetUserAuthByRecvCb(RecvAuthByDataCb_t f, void * data)
+{
+RecvAuthByCb = f;
+getUserAuthByDataCb = data;
+}
+//-----------------------------------------------------------------------------

 void SERVCONF::SetServerInfoRecvCb(RecvServerInfoDataCb_t f, void * data)
 {
 RecvServerInfoDataCb = f;
 void SERVCONF::SetServerInfoRecvCb(RecvServerInfoDataCb_t f, void * data)
 {
 RecvServerInfoDataCb = f;