Ticket 37. The time_t currentTime parameter added in

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

diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index a15f75881f15b8065f0a404d00858f158044a3fa..9c1b7283705bdf3cbc1652811e847c463b55cab9 100644 (file)
--- a/projects/sgconf/common_sg.cpp
+++ b/projects/sgconf/common_sg.cpp
@@ -52,6 +52,12 @@ struct GetUserCbData
     void * data;
     bool * result;
 };
     void * data;
     bool * result;
 };

+//-----------------------------------------------------------------------------
+struct AuthByCbData
+{
+    void * data;
+    bool * result;
+};

 //---------------------------------------------------------------------------
 struct HelpParams
 {
 //---------------------------------------------------------------------------
 struct HelpParams
 {


@@ -84,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>"},


@@ -253,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);


@@ -329,13 +335,13 @@ if (ud->login == "")
     return;
     }
 
     return;
     }
 

-if (!req->cash.res_empty())
+if (!req->cash.empty())

     cout << "cash=" << ud->cash << endl;
 
     cout << "cash=" << ud->cash << endl;
 

-if (!req->credit.res_empty())
+if (!req->credit.empty())

     cout << "credit=" << ud->credit << endl;
 
     cout << "credit=" << ud->credit << endl;
 

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

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


@@ -355,32 +361,32 @@ if (!req->creditExpire.res_empty())
     cout << "creditExpire=" << buf << endl;
     }
 
     cout << "creditExpire=" << buf << endl;
     }
 

-if (!req->down.res_empty())
+if (!req->down.empty())

     cout << "down=" << ud->down << endl;
 
     cout << "down=" << ud->down << endl;
 

-if (!req->passive.res_empty())
+if (!req->passive.empty())

     cout << "passive=" << ud->passive << endl;
 
     cout << "passive=" << ud->passive << endl;
 

-if (!req->disableDetailStat.res_empty())
+if (!req->disableDetailStat.empty())

     cout << "disableDetailStat=" << ud->disableDetailStat << endl;
 
     cout << "disableDetailStat=" << ud->disableDetailStat << endl;
 

-if (!req->alwaysOnline.res_empty())
+if (!req->alwaysOnline.empty())

     cout << "alwaysOnline=" << ud->alwaysOnline << endl;
 
     cout << "alwaysOnline=" << ud->alwaysOnline << endl;
 

-if (!req->prepaidTraff.res_empty())
+if (!req->prepaidTraff.empty())

     cout << "prepaidTraff=" << ud->prepaidTraff << endl;
 
 for (int i = 0; i < DIR_NUM; i++)
     {
     cout << "prepaidTraff=" << ud->prepaidTraff << endl;
 
 for (int i = 0; i < DIR_NUM; i++)
     {

-    if (!req->u[i].res_empty())
+    if (!req->u[i].empty())

         cout << "u" << i << "=" << ud->stat.mu[i] << endl;
         cout << "u" << i << "=" << ud->stat.mu[i] << endl;

-    if (!req->d[i].res_empty())
+    if (!req->d[i].empty())

         cout << "d" << i << "=" << ud->stat.md[i] << endl;
     }
 
 for (int i = 0; i < USERDATA_NUM; i++)
     {
         cout << "d" << i << "=" << ud->stat.md[i] << endl;
     }
 
 for (int i = 0; i < USERDATA_NUM; i++)
     {

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

         {
         string str;
         ConvertFromKOI8(ud->userData[i], &str);
         {
         string str;
         ConvertFromKOI8(ud->userData[i], &str);


@@ -398,11 +404,11 @@ StringReqParams strReqParams[] =
     {"group",    req->group,       &ud->group},
     {"tariff",   req->tariff,      &ud->tariff},
     {"password", req->usrPasswd,   &ud->password},
     {"group",    req->group,       &ud->group},
     {"tariff",   req->tariff,      &ud->tariff},
     {"password", req->usrPasswd,   &ud->password},

-    {"ip",       req->ips,         &ud->ips} // IP-address of user
+    {"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);
         {
         string str;
         ConvertFromKOI8(*strReqParams[i].value, &str);


@@ -412,11 +418,18 @@ for (unsigned i = 0; i < sizeof(strReqParams) / sizeof(StringReqParams); i++)
 *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,


@@ -516,21 +529,33 @@ int ProcessAuthBy(const std::string &server,
 {
 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;
 }
 //-----------------------------------------------------------------------------