Merge remote-tracking branch 'origin/stg-2.409' into ticket37

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

diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index c0a4fd252bca0f6524eae00b46ce291ded75e2d6..9c1b7283705bdf3cbc1652811e847c463b55cab9 100644 (file)
--- a/projects/sgconf/common_sg.cpp
+++ b/projects/sgconf/common_sg.cpp
@@ -47,11 +47,16 @@ const int usageInfo = 1;
 const int TO_KOI8 = 0;
 const int FROM_KOI8 = 1;
 //-----------------------------------------------------------------------------
 const int TO_KOI8 = 0;
 const int FROM_KOI8 = 1;
 //-----------------------------------------------------------------------------

-struct GetUserData
+struct GetUserCbData

 {
 {

-    GetUserData(REQUEST & req, bool res) : request(req), result(res) {}
-    REQUEST & request;
-    bool result;
+    void * data;
+    bool * result;
+};
+//-----------------------------------------------------------------------------
+struct AuthByCbData
+{
+    void * data;
+    bool * result;

 };
 //---------------------------------------------------------------------------
 struct HelpParams
 };
 //---------------------------------------------------------------------------
 struct HelpParams


@@ -85,7 +90,7 @@ HelpParams hp[] =
     {"set credit expire",       "get credit expire",    "-E",   "<credit_expire_date>"},
     {"set password",            "get password",         "-o",   "<new_password>"},
     {"set prepaid traffic",     "get prepaid traffic",  "-e",   "<prepaid>"},
     {"set credit expire",       "get credit expire",    "-E",   "<credit_expire_date>"},
     {"set password",            "get password",         "-o",   "<new_password>"},
     {"set prepaid traffic",     "get prepaid traffic",  "-e",   "<prepaid>"},

-    {"set IP-addresses",        "get IP-addresses",     "-I",   "<*|ip_addr[,ip_addr...]>"},
+    {"set IP-addresses",       "get IP-addresses",     "-I",   "<*|ip_addr[,ip_addr...]>"},

     {"set name",                "get name",             "-A",   "<name>"},
     {"set note",                "get note",             "-N",   "<note>"},
     {"set street address",      "get street address",   "-D",   "<address>"},
     {"set name",                "get name",             "-A",   "<name>"},
     {"set note",                "get note",             "-N",   "<note>"},
     {"set street address",      "get street address",   "-D",   "<address>"},


@@ -254,7 +259,7 @@ if (cd == (iconv_t) -1)
     exit(ICONV_ERR_CODE);
     }
 
     exit(ICONV_ERR_CODE);
     }
 

-#if defined(FREE_BSD) || defined(FREE_BSD5)
+#if defined(CONST_ICONV)

 nconv = iconv(cd, (const char **)&inbuf, &insize, &outbuf, &outsize);
 #else
 nconv = iconv(cd, &inbuf, &insize, &outbuf, &outsize);
 nconv = iconv(cd, (const char **)&inbuf, &insize, &outbuf, &outsize);
 #else
 nconv = iconv(cd, &inbuf, &insize, &outbuf, &outsize);


@@ -292,9 +297,18 @@ ConvertKOI8(src, dst, TO_KOI8);
 //-----------------------------------------------------------------------------
 int RecvSetUserAnswer(const char * ans, void * d)
 {
 //-----------------------------------------------------------------------------
 int RecvSetUserAnswer(const char * ans, void * d)
 {

-GetUserData * data = static_cast<GetUserData *>(d);
+GetUserCbData * gucbd;
+gucbd = (GetUserCbData *)d;

 
 

-data->result = (strcasecmp("Ok", ans) == 0);
+bool * result = gucbd->result;
+
+//REQUEST * req = (REQUEST *)gucbd->data;
+
+//printf("ans=%s\n", ans);
+if (strcasecmp("Ok", ans) == 0)
+    *result = true;
+else
+    *result = false;

 
 return 0;
 }
 
 return 0;
 }


@@ -303,30 +317,35 @@ struct StringReqParams
 {
     string name;
     RESETABLE<string> reqParam;
 {
     string name;
     RESETABLE<string> reqParam;

-    const string * value;
+    string * value;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-void GetUserCallback(const PARSER_GET_USER::INFO & info, void * d)
+void RecvUserData(USERDATA * ud, void * d)

 {
 {

-GetUserData * data = static_cast<GetUserData *>(d);
+GetUserCbData * gucbd;
+gucbd = (GetUserCbData *)d;
+
+bool * result = gucbd->result;

 
 

-if (info.login == "")
+REQUEST * req = (REQUEST *)gucbd->data;
+
+if (ud->login == "")

     {
     {

-    data->result = false;
+    *result = false;

     return;
     }
 
     return;
     }
 

-if (!data->request.cash.res_empty())
-    cout << "cash=" << info.cash << endl;
+if (!req->cash.empty())
+    cout << "cash=" << ud->cash << endl;

 
 

-if (!data->request.credit.res_empty())
-    cout << "credit=" << info.credit << endl;
+if (!req->credit.empty())
+    cout << "credit=" << ud->credit << endl;

 
 

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

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

-    time_t tt = info.creditExpire;
+    time_t tt = ud->creditExpire;

 
     brokenTime.tm_wday = 0;
     brokenTime.tm_yday = 0;
 
     brokenTime.tm_wday = 0;
     brokenTime.tm_yday = 0;


@@ -342,76 +361,75 @@ if (!data->request.creditExpire.res_empty())
     cout << "creditExpire=" << buf << endl;
     }
 
     cout << "creditExpire=" << buf << endl;
     }
 

-if (!data->request.down.res_empty())
-    cout << "down=" << info.down << endl;
+if (!req->down.empty())
+    cout << "down=" << ud->down << endl;

 
 

-if (!data->request.passive.res_empty())
-    cout << "passive=" << info.passive << endl;
+if (!req->passive.empty())
+    cout << "passive=" << ud->passive << endl;

 
 

-if (!data->request.disableDetailStat.res_empty())
-    cout << "disableDetailStat=" << info.disableDetailStat << endl;
+if (!req->disableDetailStat.empty())
+    cout << "disableDetailStat=" << ud->disableDetailStat << endl;

 
 

-if (!data->request.alwaysOnline.res_empty())
-    cout << "alwaysOnline=" << info.alwaysOnline << endl;
+if (!req->alwaysOnline.empty())
+    cout << "alwaysOnline=" << ud->alwaysOnline << endl;

 
 

-if (!data->request.prepaidTraff.res_empty())
-    cout << "prepaidTraff=" << info.prepaidTraff << endl;
+if (!req->prepaidTraff.empty())
+    cout << "prepaidTraff=" << ud->prepaidTraff << endl;

 
 for (int i = 0; i < DIR_NUM; i++)
     {
 
 for (int i = 0; i < DIR_NUM; i++)
     {

-    if (!data->request.sessionUpload[i].res_empty())
-        cout << "session upload for dir" << i << "=" << info.stat.su[i] << endl;
-    if (!data->request.sessionDownload[i].res_empty())
-        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())
-        cout << "month upload for dir" << i << "=" << info.stat.mu[i] << endl;
-    if (!data->request.monthDownload[i].res_empty())
-        cout << "month download for dir" << i << "=" << info.stat.md[i] << endl;
+    if (!req->u[i].empty())
+        cout << "u" << i << "=" << ud->stat.mu[i] << endl;
+    if (!req->d[i].empty())
+        cout << "d" << i << "=" << ud->stat.md[i] << endl;

     }
 
 for (int i = 0; i < USERDATA_NUM; i++)
     {
     }
 
 for (int i = 0; i < USERDATA_NUM; i++)
     {

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

         {
         string str;
         {
         string str;

-        ConvertFromKOI8(info.userData[i], &str);
+        ConvertFromKOI8(ud->userData[i], &str);

         cout << "userdata" << i << "=" << str << endl;
         }
     }
 
 StringReqParams strReqParams[] =
 {
         cout << "userdata" << i << "=" << str << endl;
         }
     }
 
 StringReqParams strReqParams[] =
 {

-    {"note",     data->request.note,        &info.note},
-    {"name",     data->request.name,        &info.name},
-    {"address",  data->request.address,     &info.address},
-    {"email",    data->request.email,       &info.email},
-    {"phone",    data->request.phone,       &info.phone},
-    {"group",    data->request.group,       &info.group},
-    {"tariff",   data->request.tariff,      &info.tariff},
-    {"password", data->request.usrPasswd,   &info.password},
-    {"ip",       data->request.ips,         &info.ips} // IP-address of user
+    {"note",     req->note,        &ud->note},
+    {"name",     req->name,        &ud->name},
+    {"address",  req->address,     &ud->address},
+    {"email",    req->email,       &ud->email},
+    {"phone",    req->phone,       &ud->phone},
+    {"group",    req->group,       &ud->group},
+    {"tariff",   req->tariff,      &ud->tariff},
+    {"password", req->usrPasswd,   &ud->password},
+    {"ip",      req->ips,         &ud->ips}    // IP-address of user

 };
 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);
         cout << strReqParams[i].name << "=" << str << endl;
         }
     }
         {
         string str;
         ConvertFromKOI8(*strReqParams[i].value, &str);
         cout << strReqParams[i].name << "=" << str << endl;
         }
     }

-data->result = true;
+*result = true;

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void RecvAuthByData(const PARSER_AUTH_BY::INFO & list, void *)
+void RecvAuthByData(const std::vector<std::string> & list, void * d)

 {
 {

+AuthByCbData * abcbd;
+abcbd = (AuthByCbData *)d;
+
+bool * result = abcbd->result;
+

 for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
     cout << *it << "\n";
 cout << endl;
 for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
     cout << *it << "\n";
 cout << endl;

+
+*result = true;

 }
 //-----------------------------------------------------------------------------
 int ProcessSetUser(const std::string &server,
 }
 //-----------------------------------------------------------------------------
 int ProcessSetUser(const std::string &server,


@@ -426,22 +444,26 @@ SERVCONF sc;
 
 bool result = false;
 
 
 bool result = false;
 

-sc.SetServer(server.c_str());
-sc.SetPort(port);
-sc.SetAdmLogin(admLogin.c_str());
+
+sc.SetServer(server.c_str());  // õÓÔÁÎÁ×ÌÉ×ÁÅÍ ÉÍÑ ÓÅÒ×ÅÒÁ Ó ËÏÔÏÒÇÏ ÚÁÂÉÒÁÔØ ÉÎÆÕ
+sc.SetPort(port);           // ÁÄÍÉÎÓËÉÊ ÐÏÒÔ ÓÅÒ×ÅÒÁÐÏÒÔ
+sc.SetAdmLogin(admLogin.c_str());    // ÷ÙÓÔÁ×ÌÑÅÍ ÌÏÇÉÎ É ÐÁÒÏÌØ ÁÄÍÉÎÁ

 sc.SetAdmPassword(admPasswd.c_str());
 
 sc.SetAdmPassword(admPasswd.c_str());
 

-REQUEST request;
-GetUserData cbdata(request, false);
+// TODO Good variable name :)
+GetUserCbData gucbd;
+
+gucbd.data = data;
+gucbd.result = &result;

 
 if (isMessage)
     {
 
 if (isMessage)
     {

-    sc.SetSendMessageCb(RecvSetUserAnswer, &cbdata);
+    sc.SetSendMessageCb(RecvSetUserAnswer, &gucbd);

     sc.MsgUser(str.c_str());
     }
 else
     {
     sc.MsgUser(str.c_str());
     }
 else
     {

-    sc.SetChgUserCb(RecvSetUserAnswer, &cbdata);
+    sc.SetChgUserCb(RecvSetUserAnswer, &gucbd);

     sc.ChgUser(str.c_str());
     }
 
     sc.ChgUser(str.c_str());
     }
 


@@ -464,22 +486,27 @@ int ProcessGetUser(const std::string &server,
                    const std::string &admLogin,
                    const std::string &admPasswd,
                    const std::string &login,
                    const std::string &admLogin,
                    const std::string &admPasswd,
                    const std::string &login,

-                   REQUEST & request)
+                   void * data)

 {
 SERVCONF sc;
 
 {
 SERVCONF sc;
 

-sc.SetServer(server.c_str());
-sc.SetPort(port);
-sc.SetAdmLogin(admLogin.c_str());
+bool result = false;
+
+sc.SetServer(server.c_str());  // õÓÔÁÎÁ×ÌÉ×ÁÅÍ ÉÍÑ ÓÅÒ×ÅÒÁ Ó ËÏÔÏÒÇÏ ÚÁÂÉÒÁÔØ ÉÎÆÕ
+sc.SetPort(port);           // ÁÄÍÉÎÓËÉÊ ÐÏÒÔ ÓÅÒ×ÅÒÁÐÏÒÔ
+sc.SetAdmLogin(admLogin.c_str());    // ÷ÙÓÔÁ×ÌÑÅÍ ÌÏÇÉÎ É ÐÁÒÏÌØ ÁÄÍÉÎÁ

 sc.SetAdmPassword(admPasswd.c_str());
 
 // TODO Good variable name :)
 sc.SetAdmPassword(admPasswd.c_str());
 
 // TODO Good variable name :)

-GetUserData data(request, false);
+GetUserCbData gucbd;
+
+gucbd.data = data;
+gucbd.result = &result;

 
 

-sc.SetGetUserCallback(GetUserCallback, &data);
+sc.SetGetUserDataRecvCb(RecvUserData, &gucbd);

 sc.GetUser(login.c_str());
 
 sc.GetUser(login.c_str());
 

-if (data.result)
+if (result)

     {
     printf("Ok\n");
     return 0;
     {
     printf("Ok\n");
     return 0;


@@ -498,25 +525,37 @@ int ProcessAuthBy(const std::string &server,
                   const std::string &admLogin,
                   const std::string &admPasswd,
                   const std::string &login,
                   const std::string &admLogin,
                   const std::string &admPasswd,
                   const std::string &login,

-                  REQUEST & request)
+                  void * data)

 {
 SERVCONF sc;
 
 {
 SERVCONF sc;
 

-sc.SetServer(server.c_str());
-sc.SetPort(port);
-sc.SetAdmLogin(admLogin.c_str());
+bool result = false;
+
+sc.SetServer(server.c_str());  // õÓÔÁÎÁ×ÌÉ×ÁÅÍ ÉÍÑ ÓÅÒ×ÅÒÁ Ó ËÏÔÏÒÇÏ ÚÁÂÉÒÁÔØ ÉÎÆÕ
+sc.SetPort(port);           // ÁÄÍÉÎÓËÉÊ ÐÏÒÔ ÓÅÒ×ÅÒÁÐÏÒÔ
+sc.SetAdmLogin(admLogin.c_str());    // ÷ÙÓÔÁ×ÌÑÅÍ ÌÏÇÉÎ É ÐÁÒÏÌØ ÁÄÍÉÎÁ

 sc.SetAdmPassword(admPasswd.c_str());
 
 sc.SetAdmPassword(admPasswd.c_str());
 

-sc.SetAuthByCallback(RecvAuthByData, NULL);
-sc.AuthBy(login.c_str());
+// TODO Good variable name :)
+AuthByCbData abcbd;
+
+abcbd.data = data;
+abcbd.result = &result;
+
+sc.SetGetUserAuthByRecvCb(RecvAuthByData, &abcbd);
+sc.GetUserAuthBy(login.c_str());

 
 

-if (sc.GetError())
+if (result)
+    {
+    printf("Ok\n");
+    return 0;
+    }
+else

     {
     printf("Error\n");
     return -1;
     }
 
     {
     printf("Error\n");
     return -1;
     }
 

-printf("Ok\n");

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------