X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9177beb0b910b03cecfa4ec5f98747cbb3d4280c..01ee16d4dc8527fce90f353b60d3df9c313f54ce:/projects/sgconf/common_sg.cpp diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp index 2901832a..48eaac35 100644 --- a/projects/sgconf/common_sg.cpp +++ b/projects/sgconf/common_sg.cpp @@ -25,21 +25,23 @@ */ -#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" -using namespace std; +#include "stg/common.h" + +#include +#include + +#include +#include +#include +#include +#include + +#include +#include const int usageConf = 0; const int usageInfo = 1; @@ -47,19 +49,26 @@ const int usageInfo = 1; const int TO_KOI8 = 0; const int FROM_KOI8 = 1; //----------------------------------------------------------------------------- +struct ResultData +{ + bool result; + std::string reason; +}; +//----------------------------------------------------------------------------- struct GetUserData { GetUserData(REQUEST & req, bool res) : request(req), result(res) {} REQUEST & request; bool result; + std::string reason; }; //--------------------------------------------------------------------------- struct HelpParams { - string setActionName; - string getActionName; - string valueName; - string valueParam; + std::string setActionName; + std::string getActionName; + std::string valueName; + std::string valueParam; }; //--------------------------------------------------------------------------- void Usage(int usageType) @@ -168,7 +177,7 @@ short int ParseServerPort(const char * p) int port; if (str2x(p, port) != 0) { - printf("Incorresct server port %s\n", p); + printf("Incorrect server port %s\n", p); exit(NETWORK_ERR_CODE); } return (short)port; @@ -178,7 +187,7 @@ char * ParseAdminLogin(char * adm) { if (CheckLogin(adm)) { - printf("Incorresct admin login %s\n", adm); + printf("Incorrect admin login %s\n", adm); exit(PARAMETER_PARSING_ERR_CODE); } return adm; @@ -199,13 +208,13 @@ char * ParseUser(char * usr) { if (CheckLogin(usr)) { - printf("Incorresct user login %s\n", usr); + printf("Incorrect user login %s\n", usr); exit(PARAMETER_PARSING_ERR_CODE); } return usr; } //----------------------------------------------------------------------------- -void ConvertKOI8(const string & src, string * dst, int encType) +void ConvertKOI8(const std::string & src, std::string * dst, int encType) { iconv_t cd; char * ob = new char[src.size() * 2 + 1]; @@ -280,39 +289,61 @@ delete[] ob; delete[] ib; } //----------------------------------------------------------------------------- -void ConvertFromKOI8(const string & src, string * dst) +void ConvertFromKOI8(const std::string & src, std::string * dst) { ConvertKOI8(src, dst, FROM_KOI8); } //----------------------------------------------------------------------------- -void ConvertToKOI8(const string & src, string * dst) +void SendMessageCallback(bool result, const std::string & reason, void * d) { -ConvertKOI8(src, dst, TO_KOI8); +ResultData * data = static_cast(d); +data->result = result; +data->reason = reason; } //----------------------------------------------------------------------------- -int RecvSetUserAnswer(const char * ans, void * d) +void RecvSetUserAnswer(bool result, const std::string & reason, void * d) { -GetUserData * data = static_cast(d); +ResultData * data = static_cast(d); +data->result = result; +data->reason = reason; +} +//----------------------------------------------------------------------------- +void RecvAuthByData(bool result, const std::string & reason, + const PARSER_AUTH_BY::INFO & list, void * d) +{ +ResultData * data = static_cast(d); +data->result = result; +data->reason = reason; + +if (!result) + return; -data->result = (strcasecmp("Ok", ans) == 0); +for (std::vector::const_iterator it = list.begin(); it != list.end(); ++it) + std::cout << *it << "\n"; -return 0; +std::cout << std::endl; } //----------------------------------------------------------------------------- struct StringReqParams { - string name; - RESETABLE reqParam; - const string * value; + std::string name; + RESETABLE reqParam; + const std::string * value; }; //----------------------------------------------------------------------------- -void GetUserCallback(const PARSER_GET_USER::INFO & info, void * d) +void GetUserCallback(bool result, const std::string& reason, const PARSER_GET_USER::INFO & info, void * d) { GetUserData * data = static_cast(d); +data->result = false; +data->reason = reason; + +if (!result) + return; if (info.login == "") { data->result = false; + data->reason = "Invalid login."; return; } @@ -377,7 +408,7 @@ for (int i = 0; i < USERDATA_NUM; i++) { if (!data->request.userData[i].res_empty()) { - string str; + std::string str; ConvertFromKOI8(info.userData[i], &str); cout << "user data " << i << " = " << str << endl; } @@ -407,116 +438,107 @@ for (unsigned i = 0; i < sizeof(strReqParams) / sizeof(StringReqParams); i++) data->result = true; } //----------------------------------------------------------------------------- -void RecvAuthByData(const PARSER_AUTH_BY::INFO & list, void *) +bool ProcessSetUser(const std::string & server, + int port, + const std::string & login, + const std::string & password, + const std::string & str) { -for (std::vector::const_iterator it = list.begin(); it != list.end(); ++it) - cout << *it << "\n"; -cout << endl; -} -//----------------------------------------------------------------------------- -int ProcessSetUser(const std::string &server, - int port, - const std::string &admLogin, - const std::string &admPasswd, - const std::string &str, - void * data, - bool isMessage) -{ -SERVCONF sc; - -bool result = false; +SERVCONF sc(server, port, login, password); -sc.SetServer(server.c_str()); -sc.SetPort(port); -sc.SetAdmLogin(admLogin.c_str()); -sc.SetAdmPassword(admPasswd.c_str()); +ResultData data; +sc.SetChgUserCallback(RecvSetUserAnswer, &data); +int res = sc.ChgUser(str.c_str()); -REQUEST request; -GetUserData cbdata(request, false); - -if (isMessage) +if (res == st_ok && data.result) { - sc.SetSendMessageCb(RecvSetUserAnswer, &cbdata); - sc.MsgUser(str.c_str()); + printf("Ok\n"); + return false; } + +printf("Error\n"); +if (res != st_ok) + printf("%s\n", sc.GetStrError().c_str()); else - { - sc.SetChgUserCb(RecvSetUserAnswer, &cbdata); - sc.ChgUser(str.c_str()); - } + printf("%s\n", data.reason.c_str()); +return true; +} +//----------------------------------------------------------------------------- +bool ProcessSendMessage(const std::string & server, uint16_t port, + const std::string & login, const std::string & password, + const std::string & requestString) +{ +SERVCONF sc(server, port, login, password); -if (result) +ResultData data; +sc.SetSendMessageCallback(SendMessageCallback, &data); +int res = sc.SendMessage(requestString.c_str()); + +if (res == st_ok && data.result) { printf("Ok\n"); - return 0; - } -else - { - printf("Error\n"); - return -1; + return true; } -return 0; +printf("Error\n"); +if (res != st_ok) + printf("%s\n", sc.GetStrError().c_str()); +else + printf("%s\n", data.reason.c_str()); +return false; } //----------------------------------------------------------------------------- -int ProcessGetUser(const std::string &server, - int port, - const std::string &admLogin, - const std::string &admPasswd, - const std::string &login, - REQUEST & request) +bool ProcessGetUser(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()); +SERVCONF sc(server, port, admLogin, admPasswd); -// TODO Good variable name :) GetUserData data(request, false); sc.SetGetUserCallback(GetUserCallback, &data); -sc.GetUser(login.c_str()); +bool res = (sc.GetUser(login.c_str()) == st_ok); -if (data.result) +if (res && data.result) { printf("Ok\n"); - return 0; - } -else - { - printf("Error\n"); - return -1; + return true; } -return 0; +printf("Error\n"); +if (!res) + printf("%s\n", sc.GetStrError().c_str()); +else + printf("%s\n", data.reason.c_str()); +return false; } //----------------------------------------------------------------------------- -int ProcessAuthBy(const std::string &server, - int port, - const std::string &admLogin, - const std::string &admPasswd, - const std::string &login, - REQUEST & request) +bool ProcessAuthBy(const std::string &server, + int port, + const std::string &admLogin, + const std::string &admPasswd, + const std::string &login) { -SERVCONF sc; +SERVCONF sc(server, port, admLogin, admPasswd); -sc.SetServer(server.c_str()); -sc.SetPort(port); -sc.SetAdmLogin(admLogin.c_str()); -sc.SetAdmPassword(admPasswd.c_str()); +ResultData data; +sc.SetAuthByCallback(RecvAuthByData, &data); +bool res = (sc.AuthBy(login.c_str()) == st_ok); -sc.SetAuthByCallback(RecvAuthByData, NULL); -sc.AuthBy(login.c_str()); - -if (sc.GetError()) +if (res && data.result) { - printf("Error\n"); - return -1; + printf("Ok\n"); + return true; } -printf("Ok\n"); -return 0; +printf("Error\n"); +if (!res) + printf("%s\n", sc.GetStrError().c_str()); +else + printf("%s\n", data.reason.c_str()); +return false; } //-----------------------------------------------------------------------------