Fixed stupid bug in case conversion functions.

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

diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index 09fcfd776cbe618c3dbd9e47557997f516e1916f..c0a4fd252bca0f6524eae00b46ce291ded75e2d6 100644 (file)
--- a/projects/sgconf/common_sg.cpp
+++ b/projects/sgconf/common_sg.cpp
@@ -34,10 +34,10 @@
 #include <iostream>
 #include <iconv.h>
 
 #include <iostream>
 #include <iconv.h>
 

+#include "stg/common.h"
+#include "sg_error_codes.h"

 #include "common_sg.h"
 #include "version_sg.h"
 #include "common_sg.h"
 #include "version_sg.h"

-#include "common.h"
-#include "sg_error_codes.h"

 
 using namespace std;
 
 
 using namespace std;
 


@@ -47,10 +47,11 @@ 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 GetUserCbData
+struct GetUserData

 {
 {

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

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


@@ -81,9 +82,10 @@ HelpParams hp[] =
 {
     {"set tariff",              "get tariff",           "-t",   "<tariff:now|delayed>"},
     {"set credit",              "get credit",           "-r",   "<credit>"},
 {
     {"set tariff",              "get tariff",           "-t",   "<tariff:now|delayed>"},
     {"set credit",              "get credit",           "-r",   "<credit>"},

+    {"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 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>"},


@@ -121,6 +123,9 @@ printf("sgconf set -s <server> -p <port> -a <admin> -w <admin_pass> -u <user> --
 printf("To get userdata<0...9> use:\n");
 printf("sgconf get -s <server> -p <port> -a <admin> -w <admin_pass> -u <user> --ud0 [--ud1 ...]\n\n");
 
 printf("To get userdata<0...9> use:\n");
 printf("sgconf get -s <server> -p <port> -a <admin> -w <admin_pass> -u <user> --ud0 [--ud1 ...]\n\n");
 

+printf("To get user's authorizers list use:\n");
+printf("sgconf get -s <server> -p <port> -a <admin> -w <admin_pass> -u <user> --authorized-by\n\n");
+

 printf("To send message use:\n");
 printf("sgconf set -s <server> -p <port> -a <admin> -w <admin_pass> -u <user> -m <message>\n\n");
 
 printf("To send message use:\n");
 printf("sgconf set -s <server> -p <port> -a <admin> -w <admin_pass> -u <user> -m <message>\n\n");
 


@@ -148,6 +153,7 @@ for (int i = 0; i < (int)strlen(login); i++)
     if (!(( login[i] >= 'a' && login[i] <= 'z')
         || (login[i] >= 'A' && login[i] <= 'Z')
         || (login[i] >= '0' && login[i] <= '9')
     if (!(( login[i] >= 'a' && login[i] <= 'z')
         || (login[i] >= 'A' && login[i] <= 'Z')
         || (login[i] >= '0' && login[i] <= '9')

+        ||  login[i] == '.'

         ||  login[i] == '_'
         ||  login[i] == '-'))
         {
         ||  login[i] == '_'
         ||  login[i] == '-'))
         {


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

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

 
 

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

 
 return 0;
 }
 
 return 0;
 }


@@ -306,74 +303,97 @@ struct StringReqParams
 {
     string name;
     RESETABLE<string> reqParam;
 {
     string name;
     RESETABLE<string> reqParam;

-    string * value;
+    const string * value;

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

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

 {
 {

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

 
 

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

     {
     {

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

     return;
     }
 
     return;
     }
 

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

 
 

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

 
 

-if (!req->down.res_empty())
-    cout << "down=" << ud->down << endl;
+if (!data->request.creditExpire.res_empty())
+    {
+    char buf[32];
+    struct tm brokenTime;
+    time_t tt = info.creditExpire;

 
 

-if (!req->passive.res_empty())
-    cout << "passive=" << ud->passive << endl;
+    brokenTime.tm_wday = 0;
+    brokenTime.tm_yday = 0;
+    brokenTime.tm_isdst = 0;
+    brokenTime.tm_hour = 0;
+    brokenTime.tm_min = 0;
+    brokenTime.tm_sec = 0;

 
 

-if (!req->disableDetailStat.res_empty())
-    cout << "disableDetailStat=" << ud->disableDetailStat << endl;
+    gmtime_r(&tt, &brokenTime);

 
 

-if (!req->alwaysOnline.res_empty())
-    cout << "alwaysOnline=" << ud->alwaysOnline << endl;
+    strftime(buf, 32, "%Y-%m-%d", &brokenTime);
+
+    cout << "creditExpire=" << buf << endl;
+    }

 
 

-if (!req->prepaidTraff.res_empty())
-    cout << "prepaidTraff=" << ud->prepaidTraff << endl;
+if (!data->request.down.res_empty())
+    cout << "down=" << info.down << endl;
+
+if (!data->request.passive.res_empty())
+    cout << "passive=" << info.passive << endl;
+
+if (!data->request.disableDetailStat.res_empty())
+    cout << "disableDetailStat=" << info.disableDetailStat << endl;
+
+if (!data->request.alwaysOnline.res_empty())
+    cout << "alwaysOnline=" << info.alwaysOnline << endl;
+
+if (!data->request.prepaidTraff.res_empty())
+    cout << "prepaidTraff=" << info.prepaidTraff << endl;
+
+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++)
     {
 
 for (int i = 0; i < DIR_NUM; i++)
     {

-    if (!req->u[i].res_empty())
-        cout << "u" << i << "=" << ud->stat.mu[i] << endl;
-    if (!req->d[i].res_empty())
-        cout << "d" << i << "=" << ud->stat.md[i] << endl;
+    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;

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

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

         {
         string str;
         {
         string str;

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

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

-    {"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
+    {"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

 };
 for (unsigned i = 0; i < sizeof(strReqParams) / sizeof(StringReqParams); i++)
     {
 };
 for (unsigned i = 0; i < sizeof(strReqParams) / sizeof(StringReqParams); i++)
     {


@@ -384,7 +404,14 @@ for (unsigned i = 0; i < sizeof(strReqParams) / sizeof(StringReqParams); i++)
         cout << strReqParams[i].name << "=" << str << endl;
         }
     }
         cout << strReqParams[i].name << "=" << str << endl;
         }
     }

-*result = true;
+data->result = true;
+}
+//-----------------------------------------------------------------------------
+void RecvAuthByData(const PARSER_AUTH_BY::INFO & list, void *)
+{
+for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
+    cout << *it << "\n";
+cout << endl;

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


@@ -399,26 +426,22 @@ 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());
 

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

 
 if (isMessage)
     {
 
 if (isMessage)
     {

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

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

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

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


@@ -441,27 +464,22 @@ 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,

-                   void * data)
+                   REQUEST & request)

 {
 SERVCONF sc;
 
 {
 SERVCONF sc;
 

-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());
 
 // TODO Good variable name :)
 sc.SetAdmPassword(admPasswd.c_str());
 
 // TODO Good variable name :)

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

 
 

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

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

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

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


@@ -475,5 +493,30 @@ else
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

+int ProcessAuthBy(const std::string &server,
+                  int port,
+                  const std::string &admLogin,
+                  const std::string &admPasswd,
+                  const std::string &login,
+                  REQUEST & request)
+{
+SERVCONF sc;

 
 

+sc.SetServer(server.c_str());
+sc.SetPort(port);
+sc.SetAdmLogin(admLogin.c_str());
+sc.SetAdmPassword(admPasswd.c_str());
+
+sc.SetAuthByCallback(RecvAuthByData, NULL);
+sc.AuthBy(login.c_str());
+
+if (sc.GetError())
+    {
+    printf("Error\n");
+    return -1;
+    }

 
 

+printf("Ok\n");
+return 0;
+}
+//-----------------------------------------------------------------------------