X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/8383a049b4b6f7223dd833af18675696fc0663db..b57ccc81342188872041561b0336716ca7d2d8aa:/projects/sgconf/main.cpp diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp index 9025602e..b107ee95 100644 --- a/projects/sgconf/main.cpp +++ b/projects/sgconf/main.cpp @@ -16,320 +16,40 @@ /* * Author : Boris Mikhailenko - * Author : Maxim Mamontov */ -#include "request.h" -#include "common_sg.h" -#include "sg_error_codes.h" - -#include "xml.h" -#include "options.h" -#include "actions.h" -#include "config.h" + /* + $Author: faust $ + $Revision: 1.25 $ + $Date: 2010/03/25 14:37:43 $ + */ -#include "stg/user_conf.h" -#include "stg/user_stat.h" -#include "stg/common.h" +#include +#include +#include +#include #include #include #include -#include #include #include +#include #include -#include -#include -#include -#include - -namespace -{ - -template -struct ARRAY_TYPE -{ -typedef typename T::value_type type; -}; - -template -struct ARRAY_TYPE -{ -typedef T type; -}; - -template -struct ARRAY_TYPE -{ -typedef T type; -}; - -template -struct nullary_function -{ -typedef T result_type; -}; - -template -class binder0 : public nullary_function -{ - public: - binder0(const F & func, const typename F::argument_type & arg) - : m_func(func), m_arg(arg) {} - typename F::result_type operator()() const { return m_func(m_arg); } - private: - F m_func; - typename F::argument_type m_arg; -}; - -template -inline -binder0 bind0(const F & func, const typename F::argument_type & arg) -{ -return binder0(func, arg); -} - -template -class METHOD1_ADAPTER : public std::unary_function -{ - public: - METHOD1_ADAPTER(R (C::* func)(A), C & obj) : m_func(func), m_obj(obj) {} - R operator()(A arg) { return (m_obj.*m_func)(arg); } - private: - R (C::* m_func)(A); - C & m_obj; -}; - -template -class CONST_METHOD1_ADAPTER : public std::unary_function -{ - public: - CONST_METHOD1_ADAPTER(R (C::* func)(A) const, C & obj) : m_func(func), m_obj(obj) {} - R operator()(A arg) const { return (m_obj.*m_func)(arg); } - private: - R (C::* m_func)(A) const; - C & m_obj; -}; - -template -METHOD1_ADAPTER Method1Adapt(R (C::* func)(A), C & obj) -{ -return METHOD1_ADAPTER(func, obj); -} - -template -CONST_METHOD1_ADAPTER Method1Adapt(R (C::* func)(A) const, C & obj) -{ -return CONST_METHOD1_ADAPTER(func, obj); -} - -template -bool SetArrayItem(T & array, const char * index, const typename ARRAY_TYPE::type & value) -{ -size_t pos = 0; -if (str2x(index, pos)) - return false; -array[pos] = value; -return true; -} - -void RawXMLCallback(bool result, const std::string & reason, const std::string & response, void * data) -{ -if (!result) - { - std::cerr << "Failed to get raw XML response. Reason: '" << reason << "'." << std::endl; - return; - } -PrintXML(response); -} - -void Usage(); -void UsageAll(); -void UsageImpl(bool full); -void UsageConnection(); -void UsageAdmins(bool full); -void UsageTariffs(bool full); -void UsageUsers(bool full); -void UsageServices(bool full); -void UsageCorporations(bool full); - -void Version(); - -void ReadUserConfigFile(SGCONF::OPTION_BLOCK & block) -{ -std::vector paths; -const char * configHome = getenv("XDG_CONFIG_HOME"); -if (configHome == NULL) - { - const char * home = getenv("HOME"); - if (home == NULL) - return; - paths.push_back(std::string(home) + "/.config/sgconf/sgconf.conf"); - paths.push_back(std::string(home) + "/.sgconf/sgconf.conf"); - } -else - paths.push_back(std::string(configHome) + "/sgconf/sgconf.conf"); -for (std::vector::const_iterator it = paths.begin(); it != paths.end(); ++it) - if (access(it->c_str(), R_OK) == 0) - { - block.ParseFile(*it); - return; - } -} - -} // namespace anonymous - -namespace SGCONF -{ - -class CONFIG_ACTION : public ACTION -{ - public: - CONFIG_ACTION(CONFIG & config, - const std::string & paramDescription) - : m_config(config), - m_description(paramDescription) - {} - - virtual ACTION * Clone() const { return new CONFIG_ACTION(*this); } - - virtual std::string ParamDescription() const { return m_description; } - virtual std::string DefaultDescription() const { return ""; } - virtual OPTION_BLOCK & Suboptions() { return m_suboptions; } - virtual PARSER_STATE Parse(int argc, char ** argv); - - private: - CONFIG & m_config; - std::string m_description; - OPTION_BLOCK m_suboptions; - - void ParseCredentials(const std::string & credentials); - void ParseHostAndPort(const std::string & hostAndPort); -}; - -class COMMAND_FUNCTOR -{ - public: - virtual ~COMMAND_FUNCTOR() {} - virtual bool operator()(const std::string& arg, const std::map& options) = 0; -}; - -class COMMAND_ACTION : public ACTION -{ - public: - COMMAND_ACTION(CONFIG & config, - const std::string & paramDescription, - bool needArgument, - const OPTION_BLOCK& suboptions, - COMMAND_FUNCTOR* funPtr) - : m_config(config), - m_description(paramDescription), - m_argument(needArgument), - m_suboptions(suboptions), - m_funPtr(funPtr) - {} - - virtual ACTION * Clone() const { return new COMMAND_ACTION(*this); } - - virtual std::string ParamDescription() const { return m_description; } - virtual std::string DefaultDescription() const { return ""; } - virtual OPTION_BLOCK & Suboptions() { return m_suboptions; } - virtual PARSER_STATE Parse(int argc, char ** argv) - { - PARSER_STATE state(false, argc, argv); - if (m_argument) - { - if (argc == 0 || - argv == NULL || - *argv == NULL) - throw ERROR("Missing argument."); - m_argument = *argv; - --state.argc; - ++state.argv; - } - std::list::iterator it(m_suboptions.begin()); - while (!state.stop && it != m_suboptions.end()) - { - state = it->Parse(state.argc, state.argv); - ++it; - } - m_funPtr(m_argument, m_params); - return state; - } - - private: - CONFIG & m_config; - std::string m_description; - bool m_needArgument; - std::string m_argument; - OPTION_BLOCK m_suboptions; - std::map m_params; - COMMAND_FUNCTOR* m_funPtr; -}; - -PARSER_STATE CONFIG_ACTION::Parse(int argc, char ** argv) -{ -if (argc == 0 || - argv == NULL || - *argv == NULL) - throw ERROR("Missing argument."); -char * pos = strchr(*argv, '@'); -if (pos != NULL) - { - ParseCredentials(std::string(*argv, pos)); - ParseHostAndPort(std::string(pos + 1)); - } -else - { - ParseHostAndPort(std::string(*argv)); - } -return PARSER_STATE(false, --argc, ++argv); -} - -void CONFIG_ACTION::ParseCredentials(const std::string & credentials) -{ -std::string::size_type pos = credentials.find_first_of(':'); -if (pos != std::string::npos) - { - m_config.userName = credentials.substr(0, pos); - m_config.userPass = credentials.substr(pos + 1); - } -else - { - m_config.userName = credentials; - } -} - -void CONFIG_ACTION::ParseHostAndPort(const std::string & hostAndPort) -{ -std::string::size_type pos = hostAndPort.find_first_of(':'); -if (pos != std::string::npos) - { - m_config.server = hostAndPort.substr(0, pos); - uint16_t port = 0; - if (str2x(hostAndPort.substr(pos + 1), port)) - throw ERROR("Invalid port value: '" + hostAndPort.substr(pos + 1) + "'"); - m_config.port = port; - } -else - { - m_config.server = hostAndPort; - } -} - -inline -CONFIG_ACTION * MakeParamAction(CONFIG & config, - const std::string & paramDescription) -{ -return new CONFIG_ACTION(config, paramDescription); -} +#include "stg/common.h" +#include "stg/netunit.h" +#include "request.h" +#include "common_sg.h" +#include "sg_error_codes.h" -} // namespace SGCONF +using namespace std; time_t stgTime; +int ParseReplyGet(void * data, list * ans); +//int ParseReplySet(void * data, list * ans); + struct option long_options_get[] = { {"server", 1, 0, 's'}, //Server {"port", 1, 0, 'p'}, //Port @@ -346,12 +66,37 @@ struct option long_options_get[] = { {"passive", 0, 0, 'i'}, //passive {"disable-stat",0, 0, 'S'}, //disable detail stat {"always-online",0, 0, 'O'}, //always online -{"session-upload", 1, 0, 500}, //SU0 -{"session-download", 1, 0, 501}, //SD0 -{"month-upload", 1, 0, 502}, //MU0 -{"month-download", 1, 0, 503}, //MD0 - -{"user-data", 1, 0, 700}, //UserData0 +{"u0", 0, 0, 500}, //U0 +{"u1", 0, 0, 501}, //U1 +{"u2", 0, 0, 502}, //U2 +{"u3", 0, 0, 503}, //U3 +{"u4", 0, 0, 504}, //U4 +{"u5", 0, 0, 505}, //U5 +{"u6", 0, 0, 506}, //U6 +{"u7", 0, 0, 507}, //U7 +{"u8", 0, 0, 508}, //U8 +{"u9", 0, 0, 509}, //U9 +{"d0", 0, 0, 600}, //D0 +{"d1", 0, 0, 601}, //D1 +{"d2", 0, 0, 602}, //D2 +{"d3", 0, 0, 603}, //D3 +{"d4", 0, 0, 604}, //D4 +{"d5", 0, 0, 605}, //D5 +{"d6", 0, 0, 606}, //D6 +{"d7", 0, 0, 607}, //D7 +{"d8", 0, 0, 608}, //D8 +{"d9", 0, 0, 609}, //D9 + +{"ud0", 0, 0, 700}, //UserData0 +{"ud1", 0, 0, 701}, //UserData1 +{"ud2", 0, 0, 702}, //UserData2 +{"ud3", 0, 0, 703}, //UserData3 +{"ud4", 0, 0, 704}, //UserData4 +{"ud5", 0, 0, 705}, //UserData5 +{"ud6", 0, 0, 706}, //UserData6 +{"ud7", 0, 0, 707}, //UserData7 +{"ud8", 0, 0, 708}, //UserData8 +{"ud9", 0, 0, 709}, //UserData9 {"prepaid", 0, 0, 'e'}, //prepaid traff {"create", 0, 0, 'n'}, //create @@ -384,12 +129,37 @@ struct option long_options_set[] = { {"passive", 1, 0, 'i'}, //passive {"disable-stat",1, 0, 'S'}, //disable detail stat {"always-online",1, 0, 'O'}, //always online -{"session-upload", 1, 0, 500}, //U0 -{"session-download", 1, 0, 501}, //U1 -{"month-upload", 1, 0, 502}, //U2 -{"month-download", 1, 0, 503}, //U3 - -{"user-data", 1, 0, 700}, //UserData +{"u0", 1, 0, 500}, //U0 +{"u1", 1, 0, 501}, //U1 +{"u2", 1, 0, 502}, //U2 +{"u3", 1, 0, 503}, //U3 +{"u4", 1, 0, 504}, //U4 +{"u5", 1, 0, 505}, //U5 +{"u6", 1, 0, 506}, //U6 +{"u7", 1, 0, 507}, //U7 +{"u8", 1, 0, 508}, //U8 +{"u9", 1, 0, 509}, //U9 +{"d0", 1, 0, 600}, //D0 +{"d1", 1, 0, 601}, //D1 +{"d2", 1, 0, 602}, //D2 +{"d3", 1, 0, 603}, //D3 +{"d4", 1, 0, 604}, //D4 +{"d5", 1, 0, 605}, //D5 +{"d6", 1, 0, 606}, //D6 +{"d7", 1, 0, 607}, //D7 +{"d8", 1, 0, 608}, //D8 +{"d9", 1, 0, 609}, //D9 + +{"ud0", 1, 0, 700}, //UserData +{"ud1", 1, 0, 701}, //UserData1 +{"ud2", 1, 0, 702}, //UserData2 +{"ud3", 1, 0, 703}, //UserData3 +{"ud4", 1, 0, 704}, //UserData4 +{"ud5", 1, 0, 705}, //UserData5 +{"ud6", 1, 0, 706}, //UserData6 +{"ud7", 1, 0, 707}, //UserData7 +{"ud8", 1, 0, 708}, //UserData8 +{"ud9", 1, 0, 709}, //UserData9 {"prepaid", 1, 0, 'e'}, //prepaid traff {"create", 1, 0, 'n'}, //create @@ -401,33 +171,40 @@ struct option long_options_set[] = { {"email", 1, 0, 'L'}, //emaiL {"phone", 1, 0, 'P'}, //phone {"group", 1, 0, 'G'}, //Group -{"ip", 0, 0, 'I'}, //IP-address of user +{"ip", 0, 0, 'I'}, //IP-address of user {0, 0, 0, 0}}; //----------------------------------------------------------------------------- -CASH_INFO ParseCash(const char * str) +double ParseCash(const char * c, string * message) { //-c 123.45:log message -std::string cashString; -std::string message; -const char * pos = strchr(str, ':'); -if (pos != NULL) +double cash; +char * msg; +char * str; +str = new char[strlen(c) + 1]; + +strncpy(str, c, strlen(c)); +str[strlen(c)] = 0; + +msg = strchr(str, ':'); + +if (msg) { - cashString.append(str, pos); - message.append(pos + 1); + *message = msg + 1; + str[msg - str] = 0; } else - cashString = str; + *message = ""; -double cash = 0; -if (strtodouble2(cashString, cash) != 0) +if (strtodouble2(str, cash) != 0) { - printf("Incorrect cash value %s\n", str); + printf("Incorrect cash value %s\n", c); exit(PARAMETER_PARSING_ERR_CODE); } -return CASH_INFO(cash, message); +delete[] str; +return cash; } //----------------------------------------------------------------------------- double ParseCredit(const char * c) @@ -477,24 +254,63 @@ if (!(dp[1] == 0 && (dp[0] == '1' || dp[0] == '0'))) return dp[0] - '0'; } //----------------------------------------------------------------------------- -void ParseTariff(const char * str, RESETABLE & tariffName, RESETABLE & nextTariff) +string ParseTariff(const char * t, int &chgType) { -const char * pos = strchr(str, ':'); -if (pos != NULL) +int l = strlen(t); +char * s; +s = new char[l]; +char * s1, * s2; +string ss; + +strcpy(s, t); + +s1 = strtok(s, ":"); + +if (strlen(s1) >= TARIFF_NAME_LEN) { - std::string tariff(str, pos); - if (strcmp(pos + 1, "now") == 0) - tariffName = tariff; - else if (strcmp(pos + 1, "delayed") == 0) - nextTariff = tariff; - else - { - printf("Incorrect tariff value '%s'. Should be '', ':now' or ':delayed'.\n", str); - exit(PARAMETER_PARSING_ERR_CODE); - } + printf("Tariff name too big %s\n", s1); + exit(PARAMETER_PARSING_ERR_CODE); } -else - tariffName = str; + +//*tariff = s; + +if (CheckLogin(s1)) + { + printf("Incorrect tariff value %s\n", t); + exit(PARAMETER_PARSING_ERR_CODE); + } + +s2 = strtok(NULL, ":"); + +chgType = -1; + +if (s2 == NULL) + { + chgType = TARIFF_NOW; + ss = s; + delete[] s; + return ss; + } + + +if (strcmp(s2, "now") == 0) + chgType = TARIFF_NOW; + +if (strcmp(s2, "delayed") == 0) + chgType = TARIFF_DEL; + +if (strcmp(s2, "recalc") == 0) + chgType = TARIFF_REC; + +if (chgType < 0) + { + printf("Incorrect tariff value %s\n", t); + exit(PARAMETER_PARSING_ERR_CODE); + } + +ss = s; +delete[] s; +return ss; } //----------------------------------------------------------------------------- time_t ParseCreditExpire(const char * str) @@ -553,7 +369,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); @@ -588,7 +404,7 @@ r[0] = 0; if (!req->usrMsg.empty()) { string msg; - Encode12str(msg, req->usrMsg.data()); + Encode12str(msg, req->usrMsg.const_data()); sprintf(str, "", req->login.const_data().c_str(), msg.c_str()); //sprintf(str, "\n", req->login, msg); strcat(r, str); @@ -635,7 +451,7 @@ if (!req->prepaidTraff.empty()) if (!req->cash.empty()) { string msg; - Encode12str(msg, req->message); + Encode12str(msg, req->message.c_str()); sprintf(str, "\n", req->cash.const_data(), msg.c_str()); strcat(r, str); } @@ -643,7 +459,7 @@ if (!req->cash.empty()) if (!req->setCash.empty()) { string msg; - Encode12str(msg, req->message); + Encode12str(msg, req->message.c_str()); sprintf(str, "\n", req->setCash.const_data(), msg.c_str()); strcat(r, str); } @@ -689,36 +505,7 @@ int uPresent = false; int dPresent = false; for (int i = 0; i < DIR_NUM; i++) { - if (!req->monthUpload[i].empty()) - { - if (!uPresent && !dPresent) - { - sprintf(str, "monthUpload[i].const_data(); - //sprintf(str, "MU%d=\"%lld\" ", i, req->u[i].const_data()); - sprintf(str, "MU%d=\"%s\" ", i, ss.str().c_str()); - strcat(r, str); - } - if (!req->monthDownload[i].empty()) - { - if (!uPresent && !dPresent) - { - sprintf(str, "monthDownload[i].const_data(); - sprintf(str, "MD%d=\"%s\" ", i, ss.str().c_str()); - strcat(r, str); - } - if (!req->sessionUpload[i].empty()) + if (!req->u[i].empty()) { if (!uPresent && !dPresent) { @@ -728,12 +515,12 @@ for (int i = 0; i < DIR_NUM; i++) } stringstream ss; - ss << req->sessionUpload[i].const_data(); + ss << req->u[i].const_data(); //sprintf(str, "MU%d=\"%lld\" ", i, req->u[i].const_data()); sprintf(str, "MU%d=\"%s\" ", i, ss.str().c_str()); strcat(r, str); } - if (!req->sessionDownload[i].empty()) + if (!req->d[i].empty()) { if (!uPresent && !dPresent) { @@ -743,7 +530,7 @@ for (int i = 0; i < DIR_NUM; i++) } stringstream ss; - ss << req->sessionDownload[i].const_data(); + ss << req->d[i].const_data(); sprintf(str, "MD%d=\"%s\" ", i, ss.str().c_str()); strcat(r, str); } @@ -778,7 +565,7 @@ if (!req->tariff.empty()) if (!req->note.empty()) { string note; - Encode12str(note, req->note.data()); + Encode12str(note, req->note.const_data()); sprintf(str, "", note.c_str()); strcat(r, str); } @@ -786,7 +573,7 @@ if (!req->note.empty()) if (!req->name.empty()) { string name; - Encode12str(name, req->name.data()); + Encode12str(name, req->name.const_data()); sprintf(str, "", name.c_str()); strcat(r, str); } @@ -794,7 +581,7 @@ if (!req->name.empty()) if (!req->address.empty()) { string address; - Encode12str(address, req->address.data()); + Encode12str(address, req->address.const_data()); sprintf(str, "
", address.c_str()); strcat(r, str); } @@ -802,7 +589,7 @@ if (!req->address.empty()) if (!req->email.empty()) { string email; - Encode12str(email, req->email.data()); + Encode12str(email, req->email.const_data()); sprintf(str, "", email.c_str()); strcat(r, str); } @@ -810,7 +597,7 @@ if (!req->email.empty()) if (!req->phone.empty()) { string phone; - Encode12str(phone, req->phone.data()); + Encode12str(phone, req->phone.const_data()); sprintf(str, "", phone.c_str()); strcat(r, str); } @@ -818,17 +605,17 @@ if (!req->phone.empty()) if (!req->group.empty()) { string group; - Encode12str(group, req->group.data()); + Encode12str(group, req->group.const_data()); sprintf(str, "", group.c_str()); strcat(r, str); } for (int i = 0; i < USERDATA_NUM; i++) { - if (!req->userData[i].empty()) + if (!req->ud[i].empty()) { string ud; - Encode12str(ud, req->userData[i].data()); + Encode12str(ud, req->ud[i].const_data()); sprintf(str, "", i, ud.c_str()); strcat(r, str); } @@ -839,18 +626,16 @@ strcat(r, "\n"); //----------------------------------------------------------------------------- int CheckParameters(REQUEST * req) { -bool su = false; -bool sd = false; -bool mu = false; -bool md = false; -bool ud = false; -bool a = !req->admLogin.empty() +int u = false; +int d = false; +int ud = false; +int a = !req->admLogin.empty() && !req->admPasswd.empty() && !req->server.empty() && !req->port.empty() && !req->login.empty(); -bool b = !req->cash.empty() +int b = !req->cash.empty() || !req->setCash.empty() || !req->credit.empty() || !req->prepaidTraff.empty() @@ -864,7 +649,7 @@ bool b = !req->cash.empty() || !req->email.empty() || !req->phone.empty() || !req->group.empty() - || !req->ips.empty() // IP-address of user + || !req->ips.empty() // IP-address of user || !req->createUser || !req->deleteUser; @@ -872,43 +657,25 @@ bool b = !req->cash.empty() for (int i = 0; i < DIR_NUM; i++) { - if (req->sessionUpload[i].empty()) - { - su = true; - break; - } - } - -for (int i = 0; i < DIR_NUM; i++) - { - if (req->sessionDownload[i].empty()) + if (req->u[i].empty()) { - sd = true; + u = true; break; } } for (int i = 0; i < DIR_NUM; i++) { - if (req->monthUpload[i].empty()) + if (req->d[i].empty()) { - mu = true; + d = true; break; } } for (int i = 0; i < DIR_NUM; i++) { - if (req->monthDownload[i].empty()) - { - md = true; - break; - } - } - -for (int i = 0; i < DIR_NUM; i++) - { - if (req->userData[i].empty()) + if (req->ud[i].empty()) { ud = true; break; @@ -917,7 +684,7 @@ for (int i = 0; i < DIR_NUM; i++) //printf("a=%d, b=%d, u=%d, d=%d ud=%d\n", a, b, u, d, ud); -return a && (b || su || sd || mu || md || ud); +return a && (b || u || d || ud); } //----------------------------------------------------------------------------- int CheckParametersGet(REQUEST * req) @@ -930,7 +697,7 @@ int CheckParametersSet(REQUEST * req) return CheckParameters(req); } //----------------------------------------------------------------------------- -bool mainGet(int argc, char **argv) +int mainGet(int argc, char **argv) { int c; REQUEST req; @@ -1025,10 +792,10 @@ while (1) case 'G': //Group req.group = " "; break; - - case 'I': //IP-address of user - req.ips = " "; - break; + + case 'I': //IP-address of user + req.ips = " "; + break; case 'S': //Detail stat status req.disableDetailStat = " "; @@ -1039,25 +806,45 @@ while (1) break; case 500: //U - SetArrayItem(req.sessionUpload, optarg, 1); - //req.sessionUpload[optarg] = 1; - break; case 501: - SetArrayItem(req.sessionDownload, optarg, 1); - //req.sessionDownload[optarg] = 1; - break; case 502: - SetArrayItem(req.monthUpload, optarg, 1); - //req.monthUpload[optarg] = 1; - break; case 503: - SetArrayItem(req.monthDownload, optarg, 1); - //req.monthDownload[optarg] = 1; + case 504: + case 505: + case 506: + case 507: + case 508: + case 509: + //printf("U%d\n", c - 500); + req.u[c - 500] = 1; + break; + + case 600: //D + case 601: + case 602: + case 603: + case 604: + case 605: + case 606: + case 607: + case 608: + case 609: + //printf("D%d\n", c - 600); + req.d[c - 600] = 1; break; case 700: //UserData - SetArrayItem(req.userData, optarg, std::string(" ")); - //req.userData[optarg] = " "; + case 701: + case 702: + case 703: + case 704: + case 705: + case 706: + case 707: + case 708: + case 709: + //printf("UD%d\n", c - 700); + req.ud[c - 700] = " "; break; case 800: @@ -1066,6 +853,7 @@ while (1) case '?': case ':': + //printf ("Unknown option \n"); missedOptionArg = true; break; @@ -1091,12 +879,12 @@ if (missedOptionArg || !CheckParametersGet(&req)) } if (req.authBy) - return ProcessAuthBy(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data()); + return ProcessAuthBy(req.server.const_data(), req.port.const_data(), req.admLogin.const_data(), req.admPasswd.const_data(), req.login.const_data(), &req); else - return ProcessGetUser(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), req); + return ProcessGetUser(req.server.const_data(), req.port.const_data(), req.admLogin.const_data(), req.admPasswd.const_data(), req.login.const_data(), &req); } //----------------------------------------------------------------------------- -bool mainSet(int argc, char **argv) +int mainSet(int argc, char **argv) { string str; @@ -1110,8 +898,6 @@ const char * short_options_set = "s:p:a:w:u:c:r:t:m:o:d:i:e:v:nlN:A:D:L:P:G:I:S: int missedOptionArg = false; -USER_CONF_RES conf; -USER_STAT_RES stat; while (1) { int option_index = -1; @@ -1141,7 +927,7 @@ while (1) break; case 'o': //change user password - conf.password = ParsePassword(optarg); + req.usrPasswd = ParsePassword(optarg); break; case 'u': //user @@ -1149,31 +935,31 @@ while (1) break; case 'c': //add cash - stat.cashAdd = ParseCash(optarg); + req.cash = ParseCash(optarg, &req.message); break; case 'v': //set cash - stat.cashSet = ParseCash(optarg); + req.setCash = ParseCash(optarg, &req.message); break; case 'r': //credit - conf.credit = ParseCredit(optarg); + req.credit = ParseCredit(optarg); break; case 'E': //credit expire - conf.creditExpire = ParseCreditExpire(optarg); + req.creditExpire = ParseCreditExpire(optarg); break; case 'd': //down - conf.disabled = ParseDownPassive(optarg); + req.down = ParseDownPassive(optarg); break; case 'i': //passive - conf.passive = ParseDownPassive(optarg); + req.passive = ParseDownPassive(optarg); break; case 't': //tariff - ParseTariff(optarg, conf.tariffName, conf.nextTariff); + req.tariff = ParseTariff(optarg, req.chgTariff); break; case 'm': //message @@ -1183,7 +969,7 @@ while (1) break; case 'e': //Prepaid Traffic - stat.freeMb = ParsePrepaidTraffic(optarg); + req.prepaidTraff = ParsePrepaidTraffic(optarg); break; case 'n': //Create User @@ -1196,70 +982,98 @@ while (1) case 'N': //Note ParseAnyString(optarg, &str, "koi8-ru"); - conf.note = str; + req.note = str; break; case 'A': //nAme ParseAnyString(optarg, &str, "koi8-ru"); - conf.realName = str; + req.name = str; break; case 'D': //aDdress ParseAnyString(optarg, &str, "koi8-ru"); - conf.address = str; + req.address = str; break; case 'L': //emaiL ParseAnyString(optarg, &str, "koi8-ru"); - conf.email = str; + req.email = str; + //printf("EMAIL=%s\n", optarg); break; case 'P': //phone - ParseAnyString(optarg, &str); - conf.phone = str; + ParseAnyString(optarg, &str, "koi8-ru"); + req.phone = str; break; case 'G': //Group ParseAnyString(optarg, &str, "koi8-ru"); - conf.group = str; + req.group = str; break; case 'I': //IP-address of user ParseAnyString(optarg, &str); - conf.ips = StrToIPS(str); + req.ips = str; break; case 'S': - conf.disabledDetailStat = ParseDownPassive(optarg); + req.disableDetailStat = ParseDownPassive(optarg); break; case 'O': - conf.alwaysOnline = ParseDownPassive(optarg); + req.alwaysOnline = ParseDownPassive(optarg); break; case 500: //U - SetArrayItem(stat.sessionUp, optarg, ParseTraff(argv[optind++])); - break; case 501: - SetArrayItem(stat.sessionDown, optarg, ParseTraff(argv[optind++])); - break; case 502: - SetArrayItem(stat.monthUp, optarg, ParseTraff(argv[optind++])); - break; case 503: - SetArrayItem(stat.monthDown, optarg, ParseTraff(argv[optind++])); + case 504: + case 505: + case 506: + case 507: + case 508: + case 509: + //printf("U%d\n", c - 500); + req.u[c - 500] = ParseTraff(optarg); + break; + + case 600: //D + case 601: + case 602: + case 603: + case 604: + case 605: + case 606: + case 607: + case 608: + case 609: + //printf("D%d\n", c - 600); + req.d[c - 600] = ParseTraff(optarg); break; case 700: //UserData - ParseAnyString(argv[optind++], &str); - SetArrayItem(conf.userdata, optarg, str); + case 701: + case 702: + case 703: + case 704: + case 705: + case 706: + case 707: + case 708: + case 709: + ParseAnyString(optarg, &str, "koi8-ru"); + //printf("UD%d\n", c - 700); + req.ud[c - 700] = str; break; case '?': + //printf("Missing option argument\n"); missedOptionArg = true; break; case ':': + //printf("Missing option argument\n"); missedOptionArg = true; break; @@ -1288,93 +1102,12 @@ const int rLen = 20000; char rstr[rLen]; memset(rstr, 0, rLen); -if (isMessage) - return ProcessSendMessage(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), req.usrMsg.data()); - -return ProcessSetUser(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), conf, stat); +CreateRequestSet(&req, rstr); +return ProcessSetUser(req.server.const_data(), req.port.const_data(), req.admLogin.const_data(), req.admPasswd.const_data(), rstr, NULL, isMessage); } //----------------------------------------------------------------------------- int main(int argc, char **argv) { -SGCONF::CONFIG config; - -SGCONF::OPTION_BLOCKS blocks; -blocks.Add("General options") - .Add("c", "config", SGCONF::MakeParamAction(config.configFile, std::string("~/.config/stg/sgconf.conf"), ""), "override default config file") - .Add("h", "help", SGCONF::MakeFunc0Action(bind0(Method1Adapt(&SGCONF::OPTION_BLOCKS::Help, blocks), 0)), "\t\tshow this help and exit") - .Add("help-all", SGCONF::MakeFunc0Action(UsageAll), "\t\tshow full help and exit") - .Add("v", "version", SGCONF::MakeFunc0Action(Version), "\t\tshow version information and exit"); -SGCONF::OPTION_BLOCK & block = blocks.Add("Connection options") - .Add("s", "server", SGCONF::MakeParamAction(config.server, std::string("localhost"), "
"), "\t\thost to connect") - .Add("p", "port", SGCONF::MakeParamAction(config.port, uint16_t(5555), ""), "\t\tport to connect") - .Add("u", "username", SGCONF::MakeParamAction(config.userName, std::string("admin"), ""), "\tadministrative login") - .Add("w", "userpass", SGCONF::MakeParamAction(config.userPass, ""), "\tpassword for the administrative login") - .Add("a", "address", SGCONF::MakeParamAction(config, ""), "connection params as a single string in format: :@:"); -blocks.Add("Raw XML") - .Add("r", "raw", SGCONF::MakeFunc1Action(), "\t\tmake raw XML request") -/*blocks.Add("Admins management options") - .Add("get-admins", SGCONF::MakeConfAction()) - .Add("get-admin", SGCONF::MakeConfAction()) - .Add("add-admin", SGCONF::MakeConfAction()) - .Add("del-admin", SGCONF::MakeConfAction()) - .Add("chg-admin", SGCONF::MakeConfAction());*/ - - -SGCONF::PARSER_STATE state(false, argc, argv); - -try -{ -state = blocks.Parse(--argc, ++argv); // Skipping self name -} -catch (const SGCONF::OPTION::ERROR& ex) -{ -std::cerr << ex.what() << "\n"; -return -1; -} - -if (state.stop) - return 0; - -if (state.argc > 0) - { - std::cerr << "Unknown option: '" << *state.argv << "'\n"; - return -1; - } - -try -{ -SGCONF::CONFIG configOverride(config); - -if (config.configFile.empty()) - { - const char * mainConfigFile = "/etc/sgconf/sgconf.conf"; - if (access(mainConfigFile, R_OK) == 0) - block.ParseFile(mainConfigFile); - ReadUserConfigFile(block); - } -else - { - block.ParseFile(config.configFile.data()); - } - -config = configOverride; -} -catch (const std::exception& ex) -{ -std::cerr << ex.what() << "\n"; -return -1; -} - -std::cerr << "Config: " << config.Serialize() << std::endl; - -return 0; - -if (argc < 2) - { - Usage(); - return 1; - } - if (argc <= 2) { UsageConf(); @@ -1389,9 +1122,7 @@ if (strcmp(argv[1], "get") == 0) else if (strcmp(argv[1], "set") == 0) { //printf("set\n"); - if (mainSet(argc - 1, argv + 1) ) - return 0; - return -1; + return mainSet(argc - 1, argv + 1); } else { @@ -1402,213 +1133,3 @@ return UNKNOWN_ERR_CODE; } //----------------------------------------------------------------------------- -namespace -{ - -void Usage() -{ -UsageImpl(false); -} - -void UsageAll() -{ -UsageImpl(true); -} - -void UsageImpl(bool full) -{ -std::cout << "sgconf is the Stargazer management utility.\n\n" - << "Usage:\n" - << "\tsgconf [options]\n\n" - << "General options:\n" - << "\t-c, --config \t\toverride default config file (default: \"~/.config/stg/sgconf.conf\")\n" - << "\t-h, --help\t\t\t\tshow this help and exit\n" - << "\t--help-all\t\t\t\tshow full help and exit\n" - << "\t-v, --version\t\t\t\tshow version information and exit\n\n"; -UsageConnection(); -UsageAdmins(full); -UsageTariffs(full); -UsageUsers(full); -UsageServices(full); -UsageCorporations(full); -} -//----------------------------------------------------------------------------- -void UsageConnection() -{ -std::cout << "Connection options:\n" - << "\t-s, --server
\t\t\thost to connect (ip or domain name, default: \"localhost\")\n" - << "\t-p, --port \t\t\tport to connect (default: \"5555\")\n" - << "\t-u, --username \t\tadministrative login (default: \"admin\")\n" - << "\t-w, --userpass \t\tpassword for administrative login\n" - << "\t-a, --address \tconnection params as a single string in format: :@:\n\n"; -} -//----------------------------------------------------------------------------- -void UsageAdmins(bool full) -{ -std::cout << "Admins management options:\n" - << "\t--get-admins\t\t\t\tget a list of admins (subsequent options will define what to show)\n"; -if (full) - std::cout << "\t\t--login\t\t\t\tshow admin's login\n" - << "\t\t--priv\t\t\t\tshow admin's priviledges\n\n"; -std::cout << "\t--get-admin\t\t\t\tget the information about admin\n"; -if (full) - std::cout << "\t\t--login \t\t\tlogin of the admin to show\n" - << "\t\t--priv\t\t\t\tshow admin's priviledges\n\n"; -std::cout << "\t--add-admin\t\t\t\tadd a new admin\n"; -if (full) - std::cout << "\t\t--login \t\t\tlogin of the admin to add\n" - << "\t\t--password \t\tpassword of the admin to add\n" - << "\t\t--priv \t\tpriviledges of the admin to add\n\n"; -std::cout << "\t--del-admin\t\t\t\tdelete an existing admin\n"; -if (full) - std::cout << "\t\t--login \t\t\tlogin of the admin to delete\n\n"; -std::cout << "\t--chg-admin\t\t\t\tchange an existing admin\n"; -if (full) - std::cout << "\t\t--login \t\t\tlogin of the admin to change\n" - << "\t\t--priv \t\tnew priviledges\n\n"; -} -//----------------------------------------------------------------------------- -void UsageTariffs(bool full) -{ -std::cout << "Tariffs management options:\n" - << "\t--get-tariffs\t\t\t\tget a list of tariffs (subsequent options will define what to show)\n"; -if (full) - std::cout << "\t\t--name\t\t\t\tshow tariff's name\n" - << "\t\t--fee\t\t\t\tshow tariff's fee\n" - << "\t\t--free\t\t\t\tshow tariff's prepaid traffic in terms of cost\n" - << "\t\t--passive-cost\t\t\tshow tariff's cost of \"freeze\"\n" - << "\t\t--traff-type\t\t\tshow what type of traffix will be accounted by the tariff\n" - << "\t\t--dirs\t\t\t\tshow tarification rules for directions\n\n"; -std::cout << "\t--get-tariff\t\t\t\tget the information about tariff\n"; -if (full) - std::cout << "\t\t--name \t\t\tname of the tariff to show\n" - << "\t\t--fee\t\t\t\tshow tariff's fee\n" - << "\t\t--free\t\t\t\tshow tariff's prepaid traffic in terms of cost\n" - << "\t\t--passive-cost\t\t\tshow tariff's cost of \"freeze\"\n" - << "\t\t--traff-type\t\t\tshow what type of traffix will be accounted by the tariff\n" - << "\t\t--dirs\t\t\t\tshow tarification rules for directions\n\n"; -std::cout << "\t--add-tariff\t\t\t\tadd a new tariff\n"; -if (full) - std::cout << "\t\t--name \t\t\tname of the tariff to add\n" - << "\t\t--fee \t\t\tstariff's fee\n" - << "\t\t--free \t\t\ttariff's prepaid traffic in terms of cost\n" - << "\t\t--passive-cost \t\ttariff's cost of \"freeze\"\n" - << "\t\t--traff-type \t\twhat type of traffi will be accounted by the tariff\n" - << "\t\t--times \t\t\tslash-separated list of \"day\" time-spans (in form \"hh:mm-hh:mm\") for each direction\n" - << "\t\t--prices-day-a \t\tslash-separated list of prices for \"day\" traffic before threshold for each direction\n" - << "\t\t--prices-night-a \tslash-separated list of prices for \"night\" traffic before threshold for each direction\n" - << "\t\t--prices-day-b \t\tslash-separated list of prices for \"day\" traffic after threshold for each direction\n" - << "\t\t--prices-night-b \tslash-separated list of prices for \"night\" traffic after threshold for each direction\n" - << "\t\t--single-prices \tslash-separated list of \"single price\" flags for each direction\n" - << "\t\t--no-discounts \t\tslash-separated list of \"no discount\" flags for each direction\n" - << "\t\t--thresholds \tslash-separated list of thresholds (in Mb) for each direction\n\n"; -std::cout << "\t--del-tariff\t\t\t\tdelete an existing tariff\n"; -if (full) - std::cout << "\t\t--name \t\t\tname of the tariff to delete\n\n"; -std::cout << "\t--chg-tariff\t\t\t\tchange an existing tariff\n"; -if (full) - std::cout << "\t\t--name \t\t\tname of the tariff to change\n" - << "\t\t--fee \t\t\tstariff's fee\n" - << "\t\t--free \t\t\ttariff's prepaid traffic in terms of cost\n" - << "\t\t--passive-cost \t\ttariff's cost of \"freeze\"\n" - << "\t\t--traff-type \t\twhat type of traffix will be accounted by the tariff\n" - << "\t\t--dir \t\t\tnumber of direction data to change\n" - << "\t\t\t--time