Minor fix.

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

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 16878f18112300b1bcee12f8ee13e1681ff32e6d..4f74ae8f7d4d0b80b6ae24e73c399522bdc085eb 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -60,6 +60,10 @@ class SERVCONF::IMPL
 public:
     IMPL(const std::string & server, uint16_t port,
          const std::string & login, const std::string & password);
 public:
     IMPL(const std::string & server, uint16_t port,
          const std::string & login, const std::string & password);

+    IMPL(const std::string & server, uint16_t port,
+         const std::string & localAddress, uint16_t localPort,
+         const std::string & login, const std::string & password);
+    ~IMPL() { XML_ParserFree(parser); }

 
     const std::string & GetStrError() const;
     static void Start(void * data, const char * el, const char ** attr);
 
     const std::string & GetStrError() const;
     static void Start(void * data, const char * el, const char ** attr);


@@ -120,6 +124,13 @@ SERVCONF::SERVCONF(const std::string & server, uint16_t port,
 {
 }
 
 {
 }
 

+SERVCONF::SERVCONF(const std::string & server, uint16_t port,
+                   const std::string & localAddress, uint16_t localPort,
+                   const std::string & login, const std::string & password)
+    : pImpl(new IMPL(server, port, localAddress, localPort, login, password))
+{
+}
+

 SERVCONF::~SERVCONF()
 {
 delete pImpl;
 SERVCONF::~SERVCONF()
 {
 delete pImpl;


@@ -224,9 +235,15 @@ int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data
 return pImpl->Exec<SIMPLE::PARSER>("DelUser", "<DelUser login=\"" + login + "\"/>", f, data);
 }
 
 return pImpl->Exec<SIMPLE::PARSER>("DelUser", "<DelUser login=\"" + login + "\"/>", f, data);
 }
 

-int SERVCONF::AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data)
+int SERVCONF::AddUser(const std::string & login,
+                      const USER_CONF_RES & conf,
+                      const USER_STAT_RES & stat,
+                      SIMPLE::CALLBACK f, void * data)

 {
 {

-return pImpl->Exec<SIMPLE::PARSER>("AddUser", "<AddUser><Login value=\"" + login + "\"/></AddUser>", f, data);
+int res = pImpl->Exec<SIMPLE::PARSER>("AddUser", "<AddUser><Login value=\"" + login + "\"/></AddUser>", f, data);
+if (res != st_ok)
+    return res;
+return pImpl->Exec<CHG_USER::PARSER>("<SetUser><Login value=\"" + login + "\"/>" + CHG_USER::Serialize(conf, stat) + "</SetUser>", f, data);

 }
 
 int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)
 }
 
 int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)


@@ -236,7 +253,7 @@ return pImpl->Exec<AUTH_BY::PARSER>("<GetUserAuthBy login=\"" + login + "\"/>",
 
 int SERVCONF::SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data)
 {
 
 int SERVCONF::SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data)
 {

-return pImpl->Exec<SIMPLE::PARSER>("SendMessage", "<Message login=\"" + login + "\" msgver=\"1\" msgtype=\"1\" repeat=\"0\" repeatperiod=\"0\" showtime=\"0\" text=\"" + Encode12str(text) + "\"/>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("SendMessageResult", "<Message login=\"" + login + "\" msgver=\"1\" msgtype=\"1\" repeat=\"0\" repeatperiod=\"0\" showtime=\"0\" text=\"" + Encode12str(text) + "\"/>", f, data);

 }
 
 int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data)
 }
 
 int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data)


@@ -316,7 +333,15 @@ return pImpl->GetStrError();
 //-----------------------------------------------------------------------------
 SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port,
                      const std::string & login, const std::string & password)
 //-----------------------------------------------------------------------------
 SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port,
                      const std::string & login, const std::string & password)

-    : nt( server, port, login, password )
+    : nt(server, port, login, password)
+{
+parser = XML_ParserCreate(NULL);
+}
+//-----------------------------------------------------------------------------
+SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port,
+                     const std::string & localAddress, uint16_t localPort,
+                     const std::string & login, const std::string & password)
+    : nt(server, port, localAddress, localPort, login, password)

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


@@ -348,11 +373,13 @@ int ret = 0;
 if ((ret = nt.Connect()) != st_ok)
     {
     errorMsg = nt.GetError();
 if ((ret = nt.Connect()) != st_ok)
     {
     errorMsg = nt.GetError();

+    cp.Failure(errorMsg);

     return ret;
     }
     return ret;
     }

-if ((ret = nt.Transact(request.c_str(), ParserRecv, this)) != st_ok)
+if ((ret = nt.Transact(request, ParserRecv, this)) != st_ok)

     {
     errorMsg = nt.GetError();
     {
     errorMsg = nt.GetError();

+    cp.Failure(errorMsg);

     return ret;
     }
 
     return ret;
     }
 


@@ -370,7 +397,7 @@ if ((ret = nt.Connect()) != st_ok)
     return ret;
     }
 std::string response;
     return ret;
     }
 std::string response;

-if ((ret = nt.Transact(request.c_str(), SimpleRecv, &response)) != st_ok)
+if ((ret = nt.Transact(request, SimpleRecv, &response)) != st_ok)

     {
     errorMsg = nt.GetError();
     callback(false, errorMsg, "", data);
     {
     errorMsg = nt.GetError();
     callback(false, errorMsg, "", data);