X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/b463b9f9a916554458fc576342125ff2f22efdac..73bee151e048054bde9a39c5ad2efec25af9c77b:/projects/sgconf/main.cpp?ds=inline diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp index fae181f6..60cc15fa 100644 --- a/projects/sgconf/main.cpp +++ b/projects/sgconf/main.cpp @@ -16,1030 +16,308 @@ /* * Author : Boris Mikhailenko + * Author : Maxim Mamontov */ - /* - $Author: faust $ - $Revision: 1.25 $ - $Date: 2010/03/25 14:37:43 $ - */ +#include "xml.h" +#include "admins.h" +#include "tariffs.h" +#include "users.h" +#include "services.h" +#include "corps.h" +#include "info.h" -#include -#include -#include -#include +#include "api_action.h" +#include "options.h" +#include "actions.h" +#include "config.h" -#include -#include -#include -#include #include -#include -#include - -#include "stg/common.h" -#include "stg/netunit.h" -#include "request.h" -#include "common_sg.h" -#include "sg_error_codes.h" - -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 -{"admin", 1, 0, 'a'}, //Admin -{"admin_pass", 1, 0, 'w'}, //passWord -{"user", 1, 0, 'u'}, //User -{"addcash", 0, 0, 'c'}, //Add Cash -//{"setcash", 0, 0, 'v'}, //Set Cash -{"credit", 0, 0, 'r'}, //cRedit -{"tariff", 0, 0, 't'}, //Tariff -{"message", 0, 0, 'm'}, //message -{"password", 0, 0, 'o'}, //password -{"down", 0, 0, 'd'}, //down -{"passive", 0, 0, 'i'}, //passive -{"disable-stat",0, 0, 'S'}, //disable detail stat -{"always-online",0, 0, 'O'}, //always online -{"session-upload-dir", 1, 0, 500}, //SU0 -{"session-download-dir", 1, 0, 501}, //SD0 -{"month-upload-dir", 1, 0, 502}, //MU0 -{"month-download-dir", 1, 0, 503}, //MD0 - -{"user-data", 1, 0, 700}, //UserData0 - -{"prepaid", 0, 0, 'e'}, //prepaid traff -{"create", 0, 0, 'n'}, //create -{"delete", 0, 0, 'l'}, //delete - -{"note", 0, 0, 'N'}, //Note -{"name", 0, 0, 'A'}, //nAme -{"address", 0, 0, 'D'}, //aDdress -{"email", 0, 0, 'L'}, //emaiL -{"phone", 0, 0, 'P'}, //phone -{"group", 0, 0, 'G'}, //Group -{"ip", 0, 0, 'I'}, //IP-address of user -{"authorized-by",0, 0, 800}, //always online - -{0, 0, 0, 0}}; +#include -struct option long_options_set[] = { -{"server", 1, 0, 's'}, //Server -{"port", 1, 0, 'p'}, //Port -{"admin", 1, 0, 'a'}, //Admin -{"admin_pass", 1, 0, 'w'}, //passWord -{"user", 1, 0, 'u'}, //User -{"addcash", 1, 0, 'c'}, //Add Cash -{"setcash", 1, 0, 'v'}, //Set Cash -{"credit", 1, 0, 'r'}, //cRedit -{"tariff", 1, 0, 't'}, //Tariff -{"message", 1, 0, 'm'}, //message -{"password", 1, 0, 'o'}, //password -{"down", 1, 0, 'd'}, //down -{"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 +#include // getenv +#include // str* -{"user-data", 1, 0, 700}, //UserData +#include // access +#include // basename -{"prepaid", 1, 0, 'e'}, //prepaid traff -{"create", 1, 0, 'n'}, //create -{"delete", 1, 0, 'l'}, //delete - -{"note", 1, 0, 'N'}, //Note -{"name", 1, 0, 'A'}, //nAme -{"address", 1, 0, 'D'}, //aDdress -{"email", 1, 0, 'L'}, //emaiL -{"phone", 1, 0, 'P'}, //phone -{"group", 1, 0, 'G'}, //Group -{"ip", 0, 0, 'I'}, //IP-address of user - -{0, 0, 0, 0}}; - -//----------------------------------------------------------------------------- -double ParseCash(const char * c, string * message) +namespace { -//-c 123.45:log message -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) - { - *message = msg + 1; - str[msg - str] = 0; - } -else - *message = ""; - -if (strtodouble2(str, cash) != 0) - { - printf("Incorrect cash value %s\n", c); - exit(PARAMETER_PARSING_ERR_CODE); - } - -delete[] str; -return cash; -} -//----------------------------------------------------------------------------- -double ParseCredit(const char * c) +template +struct nullary_function { -double credit; -if (strtodouble2(c, credit) != 0) - { - printf("Incorrect credit value %s\n", c); - exit(PARAMETER_PARSING_ERR_CODE); - } +typedef T result_type; +}; -return credit; -} -//----------------------------------------------------------------------------- -double ParsePrepaidTraffic(const char * c) +template +class binder0 : public nullary_function { -double credit; -if (strtodouble2(c, credit) != 0) - { - printf("Incorrect prepaid traffic value %s\n", c); - exit(PARAMETER_PARSING_ERR_CODE); - } - -return credit; -} -//----------------------------------------------------------------------------- -int64_t ParseTraff(const char * c) + 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) { -int64_t traff; -if (str2x(c, traff) != 0) - { - printf("Incorrect credit value %s\n", c); - exit(PARAMETER_PARSING_ERR_CODE); - } - -return traff; +return binder0(func, arg); } -//----------------------------------------------------------------------------- -bool ParseDownPassive(const char * dp) -{ -if (!(dp[1] == 0 && (dp[0] == '1' || dp[0] == '0'))) - { - printf("Incorrect value %s\n", dp); - exit(PARAMETER_PARSING_ERR_CODE); - } -return dp[0] - '0'; -} -//----------------------------------------------------------------------------- -string ParseTariff(const char * t, int &chgType) +template +class FUNC1_ADAPTER : public std::unary_function { -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) - { - printf("Tariff name too big %s\n", s1); - exit(PARAMETER_PARSING_ERR_CODE); - } - -//*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) + public: + explicit FUNC1_ADAPTER(R (*func)(A)) : m_func(func) {} + const R operator()(A arg) const { return (m_func)(arg); } + private: + R (*m_func)(A); +}; + +template +class METHOD1_ADAPTER : public std::unary_function { -struct tm brokenTime; - -brokenTime.tm_wday = 0; -brokenTime.tm_yday = 0; -brokenTime.tm_isdst = 0; -brokenTime.tm_hour = 0; -brokenTime.tm_min = 0; -brokenTime.tm_sec = 0; - -stg_strptime(str, "%Y-%m-%d", &brokenTime); - -return stg_timegm(&brokenTime); -} -//----------------------------------------------------------------------------- -void ParseAnyString(const char * c, string * msg, const char * enc) + 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 { -iconv_t cd; -char * ob = new char[strlen(c) + 1]; -char * ib = new char[strlen(c) + 1]; - -strcpy(ib, c); - -char * outbuf = ob; -char * inbuf = ib; - -setlocale(LC_ALL, ""); - -char charsetF[255]; -strncpy(charsetF, nl_langinfo(CODESET), 255); - -const char * charsetT = enc; + 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 +FUNC1_ADAPTER Func1Adapt(R (func)(A)) +{ +return FUNC1_ADAPTER(func); +} -size_t nconv = 1; +template +METHOD1_ADAPTER Method1Adapt(R (C::* func)(A), C & obj) +{ +return METHOD1_ADAPTER(func, obj); +} -size_t insize = strlen(ib); -size_t outsize = strlen(ib); +template +CONST_METHOD1_ADAPTER Method1Adapt(R (C::* func)(A) const, C & obj) +{ +return CONST_METHOD1_ADAPTER(func, obj); +} -insize = strlen(c); +void Version(const std::string & self) +{ +std::cout << self << ", version: 2.0.0.\n"; +} -cd = iconv_open(charsetT, charsetF); -if (cd == (iconv_t) -1) +void ReadUserConfigFile(SGCONF::OPTION_BLOCK & block) +{ +std::vector paths; +const char * configHome = getenv("XDG_CONFIG_HOME"); +if (configHome == NULL) { - if (errno == EINVAL) - { - printf("Warning: iconv from %s to %s failed\n", charsetF, charsetT); - *msg = c; + const char * home = getenv("HOME"); + if (home == NULL) return; - } - else - printf("error iconv_open\n"); - - exit(ICONV_ERR_CODE); + paths.push_back(std::string(home) + "/.config/sgconf/sgconf.conf"); + paths.push_back(std::string(home) + "/.sgconf/sgconf.conf"); } - -#if defined(FREE_BSD) || defined(FREE_BSD5) -nconv = iconv (cd, (const char**)&inbuf, &insize, &outbuf, &outsize); -#else -nconv = iconv (cd, &inbuf, &insize, &outbuf, &outsize); -#endif -//printf("nconv=%d outsize=%d\n", nconv, outsize); -if (nconv == (size_t) -1) - { - if (errno != EINVAL) +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) { - printf("iconv error\n"); - exit(ICONV_ERR_CODE); + block.ParseFile(*it); + return; } - } - -*outbuf = L'\0'; - -iconv_close(cd); -*msg = ob; - -delete[] ob; -delete[] ib; } -//----------------------------------------------------------------------------- -void CreateRequestSet(REQUEST * req, char * r) -{ -const int strLen = 10024; -char str[strLen]; -memset(str, 0, strLen); - -r[0] = 0; - -if (!req->usrMsg.res_empty()) - { - string msg; - Encode12str(msg, req->usrMsg); - sprintf(str, "", req->login.const_data().c_str(), msg.c_str()); - //sprintf(str, "\n", req->login, msg); - strcat(r, str); - return; - } -if (req->deleteUser) - { - sprintf(str, "", req->login.const_data().c_str()); - strcat(r, str); - //printf("%s\n", r); - return; - } - -if (req->createUser) - { - sprintf(str, " ", req->login.const_data().c_str()); - strcat(r, str); - //printf("%s\n", r); - return; - } - -strcat(r, "\n"); -sprintf(str, "\n", req->login.const_data().c_str()); -strcat(r, str); -if (!req->credit.res_empty()) - { - sprintf(str, "\n", req->credit.const_data()); - strcat(r, str); - } +} // namespace anonymous -if (!req->creditExpire.res_empty()) - { - sprintf(str, "\n", req->creditExpire.const_data()); - strcat(r, str); - } +namespace SGCONF +{ -if (!req->prepaidTraff.res_empty()) - { - sprintf(str, "\n", req->prepaidTraff.const_data()); - strcat(r, str); - } +class CONFIG_ACTION : public ACTION +{ + public: + CONFIG_ACTION(SGCONF::CONFIG & config, + const std::string & paramDescription) + : m_config(config), + m_description(paramDescription) + {} -if (!req->cash.res_empty()) - { - string msg; - Encode12str(msg, req->message); - sprintf(str, "\n", req->cash.const_data(), msg.c_str()); - strcat(r, str); - } + std::string ParamDescription() const override { return m_description; } + std::string DefaultDescription() const override { return ""; } + OPTION_BLOCK & Suboptions() override { return m_suboptions; } + PARSER_STATE Parse(int argc, char ** argv, void * /*data*/) override; -if (!req->setCash.res_empty()) - { - string msg; - Encode12str(msg, req->message); - sprintf(str, "\n", req->setCash.const_data(), msg.c_str()); - strcat(r, str); - } + private: + SGCONF::CONFIG & m_config; + std::string m_description; + OPTION_BLOCK m_suboptions; -if (!req->usrPasswd.res_empty()) - { - sprintf(str, "\n", req->usrPasswd.const_data().c_str()); - strcat(r, str); - } + void ParseCredentials(const std::string & credentials); + void ParseHostAndPort(const std::string & hostAndPort); +}; -if (!req->down.res_empty()) - { - sprintf(str, "\n", req->down.const_data()); - strcat(r, str); - } -if (!req->passive.res_empty()) +PARSER_STATE CONFIG_ACTION::Parse(int argc, char ** argv, void * /*data*/) +{ +if (argc == 0 || + argv == NULL || + *argv == NULL) + throw ERROR("Missing argument."); +char * pos = strchr(*argv, '@'); +if (pos != NULL) { - sprintf(str, "\n", req->passive.const_data()); - strcat(r, str); + ParseCredentials(std::string(*argv, pos)); + ParseHostAndPort(std::string(pos + 1)); } - -if (!req->disableDetailStat.res_empty()) +else { - sprintf(str, "\n", req->disableDetailStat.const_data()); - strcat(r, str); + ParseHostAndPort(std::string(*argv)); } +return PARSER_STATE(false, --argc, ++argv); +} -if (!req->alwaysOnline.res_empty()) +void CONFIG_ACTION::ParseCredentials(const std::string & credentials) +{ +std::string::size_type pos = credentials.find_first_of(':'); +if (pos != std::string::npos) { - sprintf(str, "\n", req->alwaysOnline.const_data()); - strcat(r, str); + m_config.userName = credentials.substr(0, pos); + m_config.userPass = credentials.substr(pos + 1); } - -// IP-address of user -if (!req->ips.res_empty()) +else { - sprintf(str, "\n", req->ips.const_data().c_str()); - strcat(r, str); + m_config.userName = credentials; } +} -int uPresent = false; -int dPresent = false; -for (int i = 0; i < DIR_NUM; i++) +void CONFIG_ACTION::ParseHostAndPort(const std::string & hostAndPort) +{ +std::string::size_type pos = hostAndPort.find_first_of(':'); +if (pos != std::string::npos) { - if (!req->u[i].res_empty()) - { - if (!uPresent && !dPresent) - { - sprintf(str, "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->d[i].res_empty()) - { - if (!uPresent && !dPresent) - { - sprintf(str, "d[i].const_data(); - sprintf(str, "MD%d=\"%s\" ", i, ss.str().c_str()); - strcat(r, str); - } + 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; } -if (uPresent || dPresent) +else { - strcat(r, "/>"); - } - -//printf("%s\n", r); - -if (!req->tariff.res_empty()) - { - switch (req->chgTariff) - { - case TARIFF_NOW: - sprintf(str, "\n", req->tariff.const_data().c_str()); - strcat(r, str); - break; - case TARIFF_REC: - sprintf(str, "\n", req->tariff.const_data().c_str()); - strcat(r, str); - break; - case TARIFF_DEL: - sprintf(str, "\n", req->tariff.const_data().c_str()); - strcat(r, str); - break; - } - + m_config.server = hostAndPort; } +} -if (!req->note.res_empty()) - { - string note; - Encode12str(note, req->note); - sprintf(str, "", note.c_str()); - strcat(r, str); - } +std::unique_ptr MakeParamAction(SGCONF::CONFIG & config, + const std::string & paramDescription) +{ +return std::make_unique(config, paramDescription); +} -if (!req->name.res_empty()) - { - string name; - Encode12str(name, req->name); - sprintf(str, "", name.c_str()); - strcat(r, str); - } +} // namespace SGCONF -if (!req->address.res_empty()) - { - string address; - Encode12str(address, req->address); - sprintf(str, "
", address.c_str()); - strcat(r, str); - } +//----------------------------------------------------------------------------- +int main(int argc, char **argv) +{ + std::string self(basename(argv[0])); + SGCONF::CONFIG config; + SGCONF::COMMANDS commands; -if (!req->email.res_empty()) - { - string email; - Encode12str(email, req->email); - sprintf(str, "", email.c_str()); - strcat(r, str); - } + 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(bind0(Func1Adapt(Version), self)), "\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("local-address", SGCONF::MakeParamAction(config.localAddress, std::string(""), "
"), "\tlocal address to bind") + .Add("local-port", SGCONF::MakeParamAction(config.localPort, uint16_t(0), ""), "\t\tlocal port to bind") + .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("Debug options") + .Add("show-config", SGCONF::MakeParamAction(config.showConfig), "\tshow config and exit"); + SGCONF::AppendXMLOptionBlock(commands, blocks); + SGCONF::AppendServerInfoBlock(commands, blocks); + SGCONF::AppendAdminsOptionBlock(commands, blocks); + SGCONF::AppendTariffsOptionBlock(commands, blocks); + SGCONF::AppendUsersOptionBlock(commands, blocks); + SGCONF::AppendServicesOptionBlock(commands, blocks); + SGCONF::AppendCorpsOptionBlock(commands, blocks); -if (!req->phone.res_empty()) - { - string phone; - Encode12str(phone, req->phone); - sprintf(str, "", phone.c_str()); - strcat(r, str); - } + SGCONF::PARSER_STATE state(false, argc, argv); -if (!req->group.res_empty()) + try { - string group; - Encode12str(group, req->group); - sprintf(str, "", group.c_str()); - strcat(r, str); + state = blocks.Parse(--argc, ++argv); // Skipping self name } - -for (int i = 0; i < USERDATA_NUM; i++) + catch (const SGCONF::OPTION::ERROR& ex) { - if (!req->ud[i].res_empty()) - { - string ud; - Encode12str(ud, req->ud[i]); - sprintf(str, "", i, ud.c_str()); - strcat(r, str); - } + std::cerr << ex.what() << "\n"; + return -1; } -strcat(r, "\n"); -} -//----------------------------------------------------------------------------- -int CheckParameters(REQUEST * req) -{ -int u = false; -int d = false; -int ud = false; -int a = !req->admLogin.res_empty() - && !req->admPasswd.res_empty() - && !req->server.res_empty() - && !req->port.res_empty() - && !req->login.res_empty(); - -int b = !req->cash.res_empty() - || !req->setCash.res_empty() - || !req->credit.res_empty() - || !req->prepaidTraff.res_empty() - || !req->tariff.res_empty() - || !req->usrMsg.res_empty() - || !req->usrPasswd.res_empty() + if (state.stop) + return 0; - || !req->note.res_empty() - || !req->name.res_empty() - || !req->address.res_empty() - || !req->email.res_empty() - || !req->phone.res_empty() - || !req->group.res_empty() - || !req->ips.res_empty() // IP-address of user - - || !req->createUser - || !req->deleteUser; - - -for (int i = 0; i < DIR_NUM; i++) + if (state.argc > 0) { - if (req->u[i].res_empty()) - { - u = true; - break; - } + std::cerr << "Unknown option: '" << *state.argv << "'\n"; + return -1; } -for (int i = 0; i < DIR_NUM; i++) + try { - if (req->d[i].res_empty()) - { - d = true; - break; - } - } + // Preserve config values parsed from the command line + SGCONF::CONFIG configOverride(config); -for (int i = 0; i < DIR_NUM; i++) - { - if (req->ud[i].res_empty()) + if (!config.configFile) { - ud = true; - break; + // Read main config file. + const char * mainConfigFile = "/etc/sgconf/sgconf.conf"; + if (access(mainConfigFile, R_OK) == 0) + block.ParseFile(mainConfigFile); + // Read XDG-stuff. + ReadUserConfigFile(block); } - } - - -//printf("a=%d, b=%d, u=%d, d=%d ud=%d\n", a, b, u, d, ud); -return a && (b || u || d || ud); -} -//----------------------------------------------------------------------------- -int CheckParametersGet(REQUEST * req) -{ -return CheckParameters(req); -} -//----------------------------------------------------------------------------- -int CheckParametersSet(REQUEST * req) -{ -return CheckParameters(req); -} -//----------------------------------------------------------------------------- -int mainGet(int argc, char **argv) -{ -int c; -REQUEST req; -RESETABLE t1; -int missedOptionArg = false; - -const char * short_options_get = "s:p:a:w:u:crtmodieNADLPGISOE"; -int option_index = -1; - -while (1) - { - option_index = -1; - c = getopt_long(argc, argv, short_options_get, long_options_get, &option_index); - if (c == -1) - break; - - switch (c) + else { - case 's': //server - req.server = optarg; - break; - - case 'p': //port - req.port = ParseServerPort(optarg); - //req.portReq = 1; - break; - - case 'a': //admin - req.admLogin = ParseAdminLogin(optarg); - break; - - case 'w': //admin password - req.admPasswd = ParsePassword(optarg); - break; - - case 'o': //change user password - req.usrPasswd = " "; - break; - - case 'u': //user - req.login = ParseUser(optarg); - break; - - case 'c': //get cash - req.cash = 1; - break; - - case 'r': //credit - req.credit = 1; - break; - - case 'E': //credit expire - req.creditExpire = 1; - break; - - case 'd': //down - req.down = 1; - break; - - case 'i': //passive - req.passive = 1; - break; - - case 't': //tariff - req.tariff = " "; - break; - - case 'e': //Prepaid Traffic - req.prepaidTraff = 1; - break; - - case 'N': //Note - req.note = " "; - break; - - case 'A': //nAme - req.name = " "; - break; - - case 'D': //aDdress - req.address =" "; - break; - - case 'L': //emaiL - req.email = " "; - break; - - case 'P': //phone - req.phone = " "; - break; - - case 'G': //Group - req.group = " "; - break; - - case 'I': //IP-address of user - req.ips = " "; - break; - - case 'S': //Detail stat status - req.disableDetailStat = " "; - break; - - case 'O': //Always online status - req.alwaysOnline = " "; - break; - - case 500: //U - //printf("U%d\n", c - 500); - req.sessionUp[optarg] = 1; - break; - case 501: - //printf("U%d\n", c - 500); - req.sessionDown[optarg] = 1; - break; - case 502: - //printf("U%d\n", c - 500); - req.monthUp[optarg] = 1; - break; - case 503: - //printf("U%d\n", c - 500); - req.monthDown[optarg] = 1; - break; - - case 700: //UserData - //printf("UD%d\n", c - 700); - req.ud[optarg] = " "; - break; - - case 800: - req.authBy = true; - break; - - case '?': - case ':': - //printf ("Unknown option \n"); - missedOptionArg = true; - break; - - default: - printf ("?? getopt returned character code 0%o ??\n", c); + // Read user-supplied file. + block.ParseFile(config.configFile.value()); } - } - -if (optind < argc) - { - printf ("non-option ARGV-elements: "); - while (optind < argc) - printf ("%s ", argv[optind++]); - UsageInfo(); - exit(PARAMETER_PARSING_ERR_CODE); - } -if (missedOptionArg || !CheckParametersGet(&req)) - { - //printf("Parameter needed\n"); - UsageInfo(); - exit(PARAMETER_PARSING_ERR_CODE); - } - -if (req.authBy) - return ProcessAuthBy(req.server, req.port, req.admLogin, req.admPasswd, req.login, req); -else - return ProcessGetUser(req.server, req.port, req.admLogin, req.admPasswd, req.login, req); -} -//----------------------------------------------------------------------------- -int mainSet(int argc, char **argv) -{ -string str; - -int c; -bool isMessage = false; -REQUEST req; - -RESETABLE t1; - -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:O:E:"; - -int missedOptionArg = false; - -while (1) - { - int option_index = -1; + // Apply overrides from the command line + config.splice(configOverride); - c = getopt_long(argc, argv, short_options_set, long_options_set, &option_index); - - if (c == -1) - break; - - switch (c) + if (config.showConfig && config.showConfig.value()) { - case 's': //server - req.server = optarg; - break; - - case 'p': //port - req.port = ParseServerPort(optarg); - //req.portReq = 1; - break; - - case 'a': //admin - req.admLogin = ParseAdminLogin(optarg); - break; - - case 'w': //admin password - req.admPasswd = ParsePassword(optarg); - break; - - case 'o': //change user password - req.usrPasswd = ParsePassword(optarg); - break; - - case 'u': //user - req.login = ParseUser(optarg); - break; - - case 'c': //add cash - req.cash = ParseCash(optarg, &req.message); - break; - - case 'v': //set cash - req.setCash = ParseCash(optarg, &req.message); - break; - - case 'r': //credit - req.credit = ParseCredit(optarg); - break; - - case 'E': //credit expire - req.creditExpire = ParseCreditExpire(optarg); - break; - - case 'd': //down - req.down = ParseDownPassive(optarg); - break; - - case 'i': //passive - req.passive = ParseDownPassive(optarg); - break; - - case 't': //tariff - req.tariff = ParseTariff(optarg, req.chgTariff); - break; - - case 'm': //message - ParseAnyString(optarg, &str); - req.usrMsg = str; - isMessage = true; - break; - - case 'e': //Prepaid Traffic - req.prepaidTraff = ParsePrepaidTraffic(optarg); - break; - - case 'n': //Create User - req.createUser = true; - break; - - case 'l': //Delete User - req.deleteUser = true; - break; - - case 'N': //Note - ParseAnyString(optarg, &str, "koi8-ru"); - req.note = str; - break; - - case 'A': //nAme - ParseAnyString(optarg, &str, "koi8-ru"); - req.name = str; - break; - - case 'D': //aDdress - ParseAnyString(optarg, &str, "koi8-ru"); - req.address = str; - break; - - case 'L': //emaiL - ParseAnyString(optarg, &str, "koi8-ru"); - req.email = str; - //printf("EMAIL=%s\n", optarg); - break; - - case 'P': //phone - ParseAnyString(optarg, &str); - req.phone = str; - break; - - case 'G': //Group - ParseAnyString(optarg, &str, "koi8-ru"); - req.group = str; - break; - - case 'I': //IP-address of user - ParseAnyString(optarg, &str); - req.ips = str; - break; - - case 'S': - req.disableDetailStat = ParseDownPassive(optarg); - break; - - case 'O': - req.alwaysOnline = ParseDownPassive(optarg); - break; - - case 500: //U - //printf("U%d\n", c - 500); - req.sesionUpload[optarg] = ParseTraff(argv[optind++]); - break; - case 501: - //printf("U%d\n", c - 500); - req.sessionDownload[optarg] = ParseTraff(argv[optind++]); - break; - case 502: - //printf("U%d\n", c - 500); - req.monthUpload[optarg] = ParseTraff(argv[optind++]); - break; - case 503: - //printf("U%d\n", c - 500); - req.monthDownload[optarg] = ParseTraff(argv[optind++]); - break; - - case 700: //UserData - ParseAnyString(argv[optind++], &str); - //printf("UD%d\n", c - 700); - req.userData[optarg] = str; - break; - - case '?': - //printf("Missing option argument\n"); - missedOptionArg = true; - break; - - case ':': - //printf("Missing option argument\n"); - missedOptionArg = true; - break; - - default: - printf("?? getopt returned character code 0%o ??\n", c); + std::cout << config.Serialize() << std::endl; + return 0; } + return commands.Execute(config) ? 0 : -1; } - -if (optind < argc) - { - printf ("non-option ARGV-elements: "); - while (optind < argc) - printf ("%s ", argv[optind++]); - UsageConf(); - exit(PARAMETER_PARSING_ERR_CODE); - } - -if (missedOptionArg || !CheckParametersSet(&req)) - { - //printf("Parameter needed\n"); - UsageConf(); - exit(PARAMETER_PARSING_ERR_CODE); - } - -const int rLen = 20000; -char rstr[rLen]; -memset(rstr, 0, rLen); - -CreateRequestSet(&req, rstr); -return ProcessSetUser(req.server, req.port, req.admLogin, req.admPasswd, rstr, NULL, isMessage); -} -//----------------------------------------------------------------------------- -int main(int argc, char **argv) -{ -if (argc <= 2) - { - UsageConf(); - exit(PARAMETER_PARSING_ERR_CODE); - } - -if (strcmp(argv[1], "get") == 0) + catch (const std::exception& ex) { - //printf("get\n"); - return mainGet(argc - 1, argv + 1); + std::cerr << ex.what() << "\n"; + return -1; } -else if (strcmp(argv[1], "set") == 0) - { - //printf("set\n"); - return mainSet(argc - 1, argv + 1); - } -else - { - UsageConf(); - exit(PARAMETER_PARSING_ERR_CODE); - } -return UNKNOWN_ERR_CODE; } -//----------------------------------------------------------------------------- -