Fixed merge issues.

[stg.git] / projects / sgconf / common_sg.cpp

diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index 48eaac35026ecd98bd6ad858a6f07fd484db59fb..e407a7165c6e560c1a85fb528b28e285d5de8930 100644 (file)
--- a/projects/sgconf/common_sg.cpp
+++ b/projects/sgconf/common_sg.cpp
@@ -43,6 +43,8 @@
 #include <langinfo.h>
 #include <iconv.h>
 
 #include <langinfo.h>
 #include <iconv.h>
 

+using namespace STG;
+

 const int usageConf = 0;
 const int usageInfo = 1;
 
 const int usageConf = 0;
 const int usageInfo = 1;
 


@@ -294,14 +296,7 @@ void ConvertFromKOI8(const std::string & src, std::string * dst)
 ConvertKOI8(src, dst, FROM_KOI8);
 }
 //-----------------------------------------------------------------------------
 ConvertKOI8(src, dst, FROM_KOI8);
 }
 //-----------------------------------------------------------------------------

-void SendMessageCallback(bool result, const std::string & reason, void * d)
-{
-ResultData * data = static_cast<ResultData *>(d);
-data->result = result;
-data->reason = reason;
-}
-//-----------------------------------------------------------------------------
-void RecvSetUserAnswer(bool result, const std::string & reason, void * d)
+void ResultCallback(bool result, const std::string & reason, void * d)

 {
 ResultData * data = static_cast<ResultData *>(d);
 data->result = result;
 {
 ResultData * data = static_cast<ResultData *>(d);
 data->result = result;


@@ -309,7 +304,7 @@ data->reason = reason;
 }
 //-----------------------------------------------------------------------------
 void RecvAuthByData(bool result, const std::string & reason,
 }
 //-----------------------------------------------------------------------------
 void RecvAuthByData(bool result, const std::string & reason,

-                    const PARSER_AUTH_BY::INFO & list, void * d)
+                    const AUTH_BY::INFO & list, void * d)

 {
 ResultData * data = static_cast<ResultData *>(d);
 data->result = result;
 {
 ResultData * data = static_cast<ResultData *>(d);
 data->result = result;


@@ -331,7 +326,7 @@ struct StringReqParams
     const std::string * value;
 };
 //-----------------------------------------------------------------------------
     const std::string * value;
 };
 //-----------------------------------------------------------------------------

-void GetUserCallback(bool result, const std::string& reason, const PARSER_GET_USER::INFO & info, void * d)
+void GetUserCallback(bool result, const std::string& reason, const GET_USER::INFO & info, void * d)

 {
 GetUserData * data = static_cast<GetUserData *>(d);
 data->result = false;
 {
 GetUserData * data = static_cast<GetUserData *>(d);
 data->result = false;


@@ -347,13 +342,13 @@ if (info.login == "")
     return;
     }
 
     return;
     }
 

-if (!data->request.cash.res_empty())
+if (!data->request.cash.empty())

     cout << "cash = " << info.cash << endl;
 
     cout << "cash = " << info.cash << endl;
 

-if (!data->request.credit.res_empty())
+if (!data->request.credit.empty())

     cout << "credit = " << info.credit << endl;
 
     cout << "credit = " << info.credit << endl;
 

-if (!data->request.creditExpire.res_empty())
+if (!data->request.creditExpire.empty())

     {
     char buf[32];
     struct tm brokenTime;
     {
     char buf[32];
     struct tm brokenTime;


@@ -373,40 +368,40 @@ if (!data->request.creditExpire.res_empty())
     cout << "creditExpire = " << buf << endl;
     }
 
     cout << "creditExpire = " << buf << endl;
     }
 

-if (!data->request.down.res_empty())
+if (!data->request.down.empty())

     cout << "down = " << info.down << endl;
 
     cout << "down = " << info.down << endl;
 

-if (!data->request.passive.res_empty())
+if (!data->request.passive.empty())

     cout << "passive = " << info.passive << endl;
 
     cout << "passive = " << info.passive << endl;
 

-if (!data->request.disableDetailStat.res_empty())
+if (!data->request.disableDetailStat.empty())

     cout << "disableDetailStat = " << info.disableDetailStat << endl;
 
     cout << "disableDetailStat = " << info.disableDetailStat << endl;
 

-if (!data->request.alwaysOnline.res_empty())
+if (!data->request.alwaysOnline.empty())

     cout << "alwaysOnline = " << info.alwaysOnline << endl;
 
     cout << "alwaysOnline = " << info.alwaysOnline << endl;
 

-if (!data->request.prepaidTraff.res_empty())
+if (!data->request.prepaidTraff.empty())

     cout << "prepaidTraff = " << info.prepaidTraff << endl;
 
 for (int i = 0; i < DIR_NUM; i++)
     {
     cout << "prepaidTraff = " << info.prepaidTraff << endl;
 
 for (int i = 0; i < DIR_NUM; i++)
     {

-    if (!data->request.sessionUpload[i].res_empty())
+    if (!data->request.sessionUpload[i].empty())

         cout << "session upload for dir " << i << " = " << info.stat.su[i] << endl;
         cout << "session upload for dir " << i << " = " << info.stat.su[i] << endl;

-    if (!data->request.sessionDownload[i].res_empty())
+    if (!data->request.sessionDownload[i].empty())

         cout << "session download for dir " << i << "=" << info.stat.sd[i] << endl;
     }
 
 for (int i = 0; i < DIR_NUM; i++)
     {
         cout << "session download for dir " << i << "=" << info.stat.sd[i] << endl;
     }
 
 for (int i = 0; i < DIR_NUM; i++)
     {

-    if (!data->request.monthUpload[i].res_empty())
+    if (!data->request.monthUpload[i].empty())

         cout << "month upload for dir " << i << " = " << info.stat.mu[i] << endl;
         cout << "month upload for dir " << i << " = " << info.stat.mu[i] << endl;

-    if (!data->request.monthDownload[i].res_empty())
+    if (!data->request.monthDownload[i].empty())

         cout << "month download for dir " << i << " = " << info.stat.md[i] << endl;
     }
 
 for (int i = 0; i < USERDATA_NUM; i++)
     {
         cout << "month download for dir " << i << " = " << info.stat.md[i] << endl;
     }
 
 for (int i = 0; i < USERDATA_NUM; i++)
     {

-    if (!data->request.userData[i].res_empty())
+    if (!data->request.userData[i].empty())

         {
         std::string str;
         ConvertFromKOI8(info.userData[i], &str);
         {
         std::string str;
         ConvertFromKOI8(info.userData[i], &str);


@@ -428,7 +423,7 @@ StringReqParams strReqParams[] =
 };
 for (unsigned i = 0; i < sizeof(strReqParams) / sizeof(StringReqParams); i++)
     {
 };
 for (unsigned i = 0; i < sizeof(strReqParams) / sizeof(StringReqParams); i++)
     {

-    if (!strReqParams[i].reqParam.res_empty())
+    if (!strReqParams[i].reqParam.empty())

         {
         string str;
         ConvertFromKOI8(*strReqParams[i].value, &str);
         {
         string str;
         ConvertFromKOI8(*strReqParams[i].value, &str);


@@ -442,13 +437,14 @@ bool ProcessSetUser(const std::string & server,
                     int port,
                     const std::string & login,
                     const std::string & password,
                     int port,
                     const std::string & login,
                     const std::string & password,

-                    const std::string & str)
+                    const std::string & user,
+                    const USER_CONF_RES & conf,
+                    const USER_STAT_RES & stat)

 {
 SERVCONF sc(server, port, login, password);
 
 ResultData data;
 {
 SERVCONF sc(server, port, login, password);
 
 ResultData data;

-sc.SetChgUserCallback(RecvSetUserAnswer, &data);
-int res = sc.ChgUser(str.c_str());
+int res = sc.ChgUser(user, conf, stat, ResultCallback, &data);

 
 if (res == st_ok && data.result)
     {
 
 if (res == st_ok && data.result)
     {


@@ -466,13 +462,12 @@ return true;
 //-----------------------------------------------------------------------------
 bool ProcessSendMessage(const std::string & server, uint16_t port,
                         const std::string & login, const std::string & password,
 //-----------------------------------------------------------------------------
 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;
 {
 SERVCONF sc(server, port, login, password);
 
 ResultData data;

-sc.SetSendMessageCallback(SendMessageCallback, &data);
-int res = sc.SendMessage(requestString.c_str());
+int res = sc.SendMessage(user, text, ResultCallback, &data);

 
 if (res == st_ok && data.result)
     {
 
 if (res == st_ok && data.result)
     {


@@ -498,9 +493,7 @@ bool ProcessGetUser(const std::string &server,
 SERVCONF sc(server, port, admLogin, admPasswd);
 
 GetUserData data(request, false);
 SERVCONF sc(server, port, admLogin, admPasswd);
 
 GetUserData data(request, false);

-
-sc.SetGetUserCallback(GetUserCallback, &data);
-bool res = (sc.GetUser(login.c_str()) == st_ok);
+bool res = (sc.GetUser(login.c_str(), GetUserCallback, &data) == st_ok);

 
 if (res && data.result)
     {
 
 if (res && data.result)
     {


@@ -525,8 +518,7 @@ bool ProcessAuthBy(const std::string &server,
 SERVCONF sc(server, port, admLogin, admPasswd);
 
 ResultData data;
 SERVCONF sc(server, port, admLogin, admPasswd);
 
 ResultData data;

-sc.SetAuthByCallback(RecvAuthByData, &data);
-bool res = (sc.AuthBy(login.c_str()) == st_ok);
+bool res = (sc.AuthBy(login.c_str(), RecvAuthByData, &data) == st_ok);

 
 if (res && data.result)
     {
 
 if (res && data.result)
     {