Changes in SendMessage method.

diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index cf0469a35ffa764ab03cf4d686fffe937e192a40..b899fc063795fb72be5b6c1a1ef2d2908e78ce1e 100644 (file)
--- a/projects/sgconf/common_sg.cpp
+++ b/projects/sgconf/common_sg.cpp
@@ -460,12 +460,12 @@ return true;
 //-----------------------------------------------------------------------------
 bool ProcessSendMessage(const std::string & server, uint16_t port,
                         const std::string & login, const std::string & password,
-                        const std::string & requestString)
+                        const std::string & user, const std::string & text)
 {
 SERVCONF sc(server, port, login, password);
 
 ResultData data;
-int res = sc.SendMessage(requestString.c_str(), ResultCallback, &data);
+int res = sc.SendMessage(user, text, ResultCallback, &data);
 
 if (res == st_ok && data.result)
     {

diff --git a/projects/sgconf/common_sg.h b/projects/sgconf/common_sg.h
index 87b8509b4e2e4ec4e962c29bfa76749fd86ab8cc..59e27a3705dbfcafcd9a57c435d73a23aa3116f0 100644 (file)
--- a/projects/sgconf/common_sg.h
+++ b/projects/sgconf/common_sg.h
@@ -67,6 +67,6 @@ bool ProcessSetUser(const std::string & server,
 
 bool ProcessSendMessage(const std::string & server, uint16_t port,
                         const std::string & login, const std::string & password,
-                        const std::string & requestString);
+                        const std::string & user, const std::string & text);
 
 #endif

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index df1cca4ba1136d7e12828e6d6b5ef7d25aada2da..8fc66b5c62e193063361f6bfa3e20af5400d6d28 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -1084,7 +1084,7 @@ memset(rstr, 0, rLen);
 
 CreateRequestSet(&req, rstr);
 if (isMessage)
-    return ProcessSendMessage(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), rstr);
+    return ProcessSendMessage(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), req.usrMsg.data());
 
 return ProcessSetUser(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), rstr);
 }

diff --git a/stglibs/common.lib/common.cpp b/stglibs/common.lib/common.cpp
index 763df5327976b77c141830d310def3999d8b2917..b871b36b61daa40054b3b99087243b5b7dc3dd50 100644 (file)
--- a/stglibs/common.lib/common.cpp
+++ b/stglibs/common.lib/common.cpp
@@ -347,6 +347,20 @@ for (size_t i = 0; i < src.length() / 2; i++)
     }
 }
 //---------------------------------------------------------------------------
+std::string Encode12str(const std::string & src)
+{
+std::string res;
+Encode12str(res, src);
+return res;
+}
+//---------------------------------------------------------------------------
+std::string Decode21str(const std::string & src)
+{
+std::string res;
+Decode21str(res, src);
+return res;
+}
+//---------------------------------------------------------------------------
 void Encode12(char * dst, const char * src, size_t srcLen)
 {
 for (size_t i = 0; i <= srcLen; i++)

diff --git a/stglibs/common.lib/include/stg/common.h b/stglibs/common.lib/include/stg/common.h
index 6c71289b1efc9bcd5814d52f59e40fc03bf8df8b..524a3431a6ea3112d86af0f9846926c1bc6a16cf 100644 (file)
--- a/stglibs/common.lib/include/stg/common.h
+++ b/stglibs/common.lib/include/stg/common.h
@@ -65,6 +65,8 @@ void            Decode21(char * dst, const char * src);
 
 void            Encode12str(std::string & dst, const std::string & src);
 void            Decode21str(std::string & dst, const std::string & src);
+std::string     Encode12str(const std::string & src);
+std::string     Decode21str(const std::string & src);
 
 int             ParseIPString(const char * str, uint32_t * ips, int maxIP);
 void            KOIToWin(const char * s1, char * s2, int l);

diff --git a/stglibs/srvconf.lib/include/stg/servconf.h b/stglibs/srvconf.lib/include/stg/servconf.h
index 0b929317916df1deebcc066d4e71b7ddee7648a7..63987fd81464297727e5ff0b1bdc62bce75fc1e0 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/servconf.h
+++ b/stglibs/srvconf.lib/include/stg/servconf.h
@@ -55,8 +55,10 @@ public:
     int GetUsers(GET_USERS::CALLBACK f, void * data);
     int GetUser(const std::string & login, GET_USER::CALLBACK f, void * data);
     int ChgUser(const std::string & request, SIMPLE::CALLBACK f, void * data);
+    int DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data);
+    int AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data);
     int AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data);
-    int SendMessage(const std::string & request, SIMPLE::CALLBACK f, void * data);
+    int SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data);
     int CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data);
 
     const std::string & GetStrError() const;

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index d885fae6275f4e730ba04b9f15a1507ac526ee53..950669f2c5fd79c29c5731bf2392fe52df3b7675 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -159,14 +159,24 @@ int SERVCONF::ChgUser(const std::string & request, SIMPLE::CALLBACK f, void * da
 return pImpl->Exec<CHG_USER::PARSER>(request, f, data);
 }
 
+int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data)
+{
+return pImpl->Exec<SIMPLE::PARSER>("DelUser", "<DelUser login=\"" + login + "\"/>", f, data);
+}
+
+int SERVCONF::AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data)
+{
+return pImpl->Exec<SIMPLE::PARSER>("AddUser", "<AddUser><Login value=\"" + login + "\"/></AddUser>", f, data);
+}
+
 int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)
 {
 return pImpl->Exec<AUTH_BY::PARSER>("<GetUserAuthBy login=\"" + login + "\"/>", f, data);
 }
 
-int SERVCONF::SendMessage(const std::string & request, 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", request, f, 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);
 }
 
 int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data)