Fixed mutex locking.

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

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index a28e2e861f1734b91ae19bf657279b63bc012dfb..2f4afaba147bc7132d33bddfba5331197b9cb877 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;
 


@@ -92,7 +92,6 @@ sc->End(el);
 //-----------------------------------------------------------------------------
 SERVCONF::SERVCONF()
     : currParser(NULL),
 //-----------------------------------------------------------------------------
 SERVCONF::SERVCONF()
     : currParser(NULL),

-      parseDepth(0),

       error(0),
       RecvUserDataCb(NULL),
       RecvGetUserDataCb(NULL),
       error(0),
       RecvUserDataCb(NULL),
       RecvGetUserDataCb(NULL),


@@ -101,6 +100,7 @@ SERVCONF::SERVCONF()
       RecvCheckUserCb(NULL),
       RecvSendMessageCb(NULL),
       getUserDataDataCb(NULL),
       RecvCheckUserCb(NULL),
       RecvSendMessageCb(NULL),
       getUserDataDataCb(NULL),

+      getUserAuthByDataCb(NULL),

       getUsersDataDataCb(NULL),
       getServerInfoDataCb(NULL),
       chgUserDataCb(NULL),
       getUsersDataDataCb(NULL),
       getServerInfoDataCb(NULL),
       chgUserDataCb(NULL),


@@ -110,6 +110,11 @@ SERVCONF::SERVCONF()
 parser = XML_ParserCreate(NULL);
 }
 //-----------------------------------------------------------------------------
 parser = XML_ParserCreate(NULL);
 }
 //-----------------------------------------------------------------------------

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

 void SERVCONF::SetServer(const char * server)
 {
 nt.SetServer(server);
 void SERVCONF::SetServer(const char * server)
 {
 nt.SetServer(server);


@@ -142,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();


@@ -368,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;