X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/61b5cf35c82a5850ceb07fca5232a409e249444c..refs/heads/ticket37:/projects/sgconf/common_sg.cpp?ds=sidebyside diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp index 898c334f..9c1b7283 100644 --- a/projects/sgconf/common_sg.cpp +++ b/projects/sgconf/common_sg.cpp @@ -25,23 +25,21 @@ */ +#include +#include +#include +#include +#include +#include +#include +#include + +#include "stg/common.h" #include "sg_error_codes.h" #include "common_sg.h" #include "version_sg.h" -#include "stg/common.h" - -#include -#include - -#include -#include -#include -#include -#include - -#include -#include +using namespace std; const int usageConf = 0; const int usageInfo = 1; @@ -49,19 +47,24 @@ const int usageInfo = 1; const int TO_KOI8 = 0; const int FROM_KOI8 = 1; //----------------------------------------------------------------------------- -struct GetUserData +struct GetUserCbData +{ + void * data; + bool * result; +}; +//----------------------------------------------------------------------------- +struct AuthByCbData { - GetUserData(REQUEST & req, bool res) : request(req), result(res) {} - REQUEST & request; - bool result; + void * data; + bool * result; }; //--------------------------------------------------------------------------- struct HelpParams { - std::string setActionName; - std::string getActionName; - std::string valueName; - std::string valueParam; + string setActionName; + string getActionName; + string valueName; + string valueParam; }; //--------------------------------------------------------------------------- void Usage(int usageType) @@ -87,7 +90,7 @@ HelpParams hp[] = {"set credit expire", "get credit expire", "-E", ""}, {"set password", "get password", "-o", ""}, {"set prepaid traffic", "get prepaid traffic", "-e", ""}, - {"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", ""}, {"set note", "get note", "-N", ""}, {"set street address", "get street address", "-D", "
"}, @@ -170,7 +173,7 @@ short int ParseServerPort(const char * p) int port; if (str2x(p, port) != 0) { - printf("Incorrect server port %s\n", p); + printf("Incorresct server port %s\n", p); exit(NETWORK_ERR_CODE); } return (short)port; @@ -180,7 +183,7 @@ char * ParseAdminLogin(char * adm) { if (CheckLogin(adm)) { - printf("Incorrect admin login %s\n", adm); + printf("Incorresct admin login %s\n", adm); exit(PARAMETER_PARSING_ERR_CODE); } return adm; @@ -201,13 +204,13 @@ char * ParseUser(char * usr) { if (CheckLogin(usr)) { - printf("Incorrect user login %s\n", usr); + printf("Incorresct user login %s\n", usr); exit(PARAMETER_PARSING_ERR_CODE); } return usr; } //----------------------------------------------------------------------------- -void ConvertKOI8(const std::string & src, std::string * dst, int encType) +void ConvertKOI8(const string & src, string * dst, int encType) { iconv_t cd; char * ob = new char[src.size() * 2 + 1]; @@ -256,7 +259,7 @@ if (cd == (iconv_t) -1) 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); @@ -282,50 +285,67 @@ delete[] ob; delete[] ib; } //----------------------------------------------------------------------------- -void ConvertFromKOI8(const std::string & src, std::string * dst) +void ConvertFromKOI8(const string & src, string * dst) { ConvertKOI8(src, dst, FROM_KOI8); } //----------------------------------------------------------------------------- +void ConvertToKOI8(const string & src, string * dst) +{ +ConvertKOI8(src, dst, TO_KOI8); +} +//----------------------------------------------------------------------------- int RecvSetUserAnswer(const char * ans, void * d) { -GetUserData * data = static_cast(d); +GetUserCbData * gucbd; +gucbd = (GetUserCbData *)d; + +bool * result = gucbd->result; -std::cout << ans << std::endl; +//REQUEST * req = (REQUEST *)gucbd->data; -data->result = (strcasecmp("Ok", ans) == 0); +//printf("ans=%s\n", ans); +if (strcasecmp("Ok", ans) == 0) + *result = true; +else + *result = false; return 0; } //----------------------------------------------------------------------------- struct StringReqParams { - std::string name; - RESETABLE reqParam; - const std::string * value; + string name; + RESETABLE reqParam; + string * value; }; //----------------------------------------------------------------------------- -void GetUserCallback(const PARSER_GET_USER::INFO & info, void * d) +void RecvUserData(USERDATA * ud, void * d) { -GetUserData * data = static_cast(d); +GetUserCbData * gucbd; +gucbd = (GetUserCbData *)d; + +bool * result = gucbd->result; + +REQUEST * req = (REQUEST *)gucbd->data; -if (info.login == "") +if (ud->login == "") { - data->result = false; + *result = false; 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; - time_t tt = info.creditExpire; + time_t tt = ud->creditExpire; brokenTime.tm_wday = 0; brokenTime.tm_yday = 0; @@ -338,79 +358,78 @@ if (!data->request.creditExpire.res_empty()) strftime(buf, 32, "%Y-%m-%d", &brokenTime); - 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++) { - 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++) { - if (!data->request.userData[i].res_empty()) + if (!req->ud[i].empty()) { - std::string str; - ConvertFromKOI8(info.userData[i], &str); - cout << "user data " << i << " = " << str << endl; + string str; + ConvertFromKOI8(ud->userData[i], &str); + 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++) { - if (!strReqParams[i].reqParam.res_empty()) + if (!strReqParams[i].reqParam.empty()) { string str; ConvertFromKOI8(*strReqParams[i].value, &str); - cout << strReqParams[i].name << " = " << str << endl; + 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 & list, void * d) { +AuthByCbData * abcbd; +abcbd = (AuthByCbData *)d; + +bool * result = abcbd->result; + for (std::vector::const_iterator it = list.begin(); it != list.end(); ++it) cout << *it << "\n"; cout << endl; + +*result = true; } //----------------------------------------------------------------------------- int ProcessSetUser(const std::string &server, @@ -418,31 +437,37 @@ int ProcessSetUser(const std::string &server, const std::string &admLogin, const std::string &admPasswd, const std::string &str, + void * data, bool isMessage) { 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()); -REQUEST request; -GetUserData cbdata(request, false); +// TODO Good variable name :) +GetUserCbData gucbd; + +gucbd.data = data; +gucbd.result = &result; -int res = 0; if (isMessage) { - sc.SetSendMessageCallback(RecvSetUserAnswer, &cbdata); - res = sc.SendMessage(str.c_str()); + sc.SetSendMessageCb(RecvSetUserAnswer, &gucbd); + sc.MsgUser(str.c_str()); } else { - sc.SetChgUserCallback(RecvSetUserAnswer, &cbdata); - res = sc.ChgUser(str.c_str()); + sc.SetChgUserCb(RecvSetUserAnswer, &gucbd); + sc.ChgUser(str.c_str()); } -if (res == st_ok && cbdata.result) +if (result) { printf("Ok\n"); return 0; @@ -450,8 +475,6 @@ if (res == st_ok && cbdata.result) else { printf("Error\n"); - if (res != st_ok) - printf("%s\n", sc.GetStrError().c_str()); return -1; } @@ -463,21 +486,27 @@ int ProcessGetUser(const std::string &server, const std::string &admLogin, const std::string &admPasswd, const std::string &login, - REQUEST & request) + void * data) { 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()); -GetUserData data(request, false); +// TODO Good variable name :) +GetUserCbData gucbd; + +gucbd.data = data; +gucbd.result = &result; -sc.SetGetUserCallback(GetUserCallback, &data); -bool res = (sc.GetUser(login.c_str()) == st_ok); +sc.SetGetUserDataRecvCb(RecvUserData, &gucbd); +sc.GetUser(login.c_str()); -if (res && data.result) +if (result) { printf("Ok\n"); return 0; @@ -495,25 +524,38 @@ int ProcessAuthBy(const std::string &server, int port, const std::string &admLogin, const std::string &admPasswd, - const std::string &login) + const std::string &login, + void * data) { 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.SetAuthByCallback(RecvAuthByData, NULL); -bool res = (sc.AuthBy(login.c_str()) == st_ok); +// TODO Good variable name :) +AuthByCbData abcbd; + +abcbd.data = data; +abcbd.result = &result; + +sc.SetGetUserAuthByRecvCb(RecvAuthByData, &abcbd); +sc.GetUserAuthBy(login.c_str()); -if (!res) +if (result) + { + printf("Ok\n"); + return 0; + } +else { printf("Error\n"); return -1; } -printf("Ok\n"); return 0; } //-----------------------------------------------------------------------------