X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9977f098136de2dd74a62de2fc535cbdfafcda1f..9447011b1029f3fcd82f05632673d3a85a4ae5d4:/projects/sgconf/main.cpp?ds=inline diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp index c1fc4c3e..a93233f2 100644 --- a/projects/sgconf/main.cpp +++ b/projects/sgconf/main.cpp @@ -19,51 +19,29 @@ * Author : Maxim Mamontov */ -#include "request.h" -#include "common_sg.h" -#include "sg_error_codes.h" - +#include "xml.h" +#include "admins.h" +#include "tariffs.h" +#include "users.h" +#include "services.h" +#include "corps.h" + +#include "api_action.h" #include "options.h" #include "actions.h" #include "config.h" -#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 // getenv +#include // str* -namespace -{ +#include // access +#include // basename -template -struct ARRAY_TYPE +namespace { -typedef typename T::value_type type; -}; - -template -struct ARRAY_TYPE -{ -typedef T type; -}; - -template -struct ARRAY_TYPE -{ -typedef T type; -}; template struct nullary_function @@ -90,6 +68,16 @@ binder0 bind0(const F & func, const typename F::argument_type & arg) return binder0(func, arg); } +template +class FUNC1_ADAPTER : public std::unary_function +{ + public: + 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 { @@ -112,6 +100,12 @@ class CONST_METHOD1_ADAPTER : public std::unary_function C & m_obj; }; +template +FUNC1_ADAPTER Func1Adapt(R (func)(A)) +{ +return FUNC1_ADAPTER(func); +} + template METHOD1_ADAPTER Method1Adapt(R (C::* func)(A), C & obj) { @@ -124,27 +118,32 @@ 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) +void Version(const std::string & self) { -size_t pos = 0; -if (str2x(index, pos)) - return false; -array[pos] = value; -return true; +std::cout << self << ", version: 2.0.0-alpha.\n"; } -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 @@ -154,7 +153,7 @@ namespace SGCONF class CONFIG_ACTION : public ACTION { public: - CONFIG_ACTION(CONFIG & config, + CONFIG_ACTION(SGCONF::CONFIG & config, const std::string & paramDescription) : m_config(config), m_description(paramDescription) @@ -165,10 +164,10 @@ class CONFIG_ACTION : public ACTION 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); + virtual PARSER_STATE Parse(int argc, char ** argv, void * /*data*/); private: - CONFIG & m_config; + SGCONF::CONFIG & m_config; std::string m_description; OPTION_BLOCK m_suboptions; @@ -176,7 +175,8 @@ class CONFIG_ACTION : public ACTION void ParseHostAndPort(const std::string & hostAndPort); }; -PARSER_STATE CONFIG_ACTION::Parse(int argc, char ** argv) + +PARSER_STATE CONFIG_ACTION::Parse(int argc, char ** argv, void * /*data*/) { if (argc == 0 || argv == NULL || @@ -227,7 +227,7 @@ else } inline -CONFIG_ACTION * MakeParamAction(CONFIG & config, +CONFIG_ACTION * MakeParamAction(SGCONF::CONFIG & config, const std::string & paramDescription) { return new CONFIG_ACTION(config, paramDescription); @@ -235,989 +235,33 @@ return new CONFIG_ACTION(config, paramDescription); } // namespace SGCONF -time_t stgTime; - -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", 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 - -{"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}}; - -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 - -{"user-data", 1, 0, 700}, //UserData - -{"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}}; - -//----------------------------------------------------------------------------- -CASH_INFO ParseCash(const char * str) -{ -//-c 123.45:log message -std::string cashString; -std::string message; -const char * pos = strchr(str, ':'); -if (pos != NULL) - { - cashString.append(str, pos); - message.append(pos + 1); - } -else - cashString = str; - -double cash = 0; -if (strtodouble2(cashString, cash) != 0) - { - printf("Incorrect cash value %s\n", str); - exit(PARAMETER_PARSING_ERR_CODE); - } - -return CASH_INFO(cash, message); -} -//----------------------------------------------------------------------------- -double ParseCredit(const char * c) -{ -double credit; -if (strtodouble2(c, credit) != 0) - { - printf("Incorrect credit value %s\n", c); - exit(PARAMETER_PARSING_ERR_CODE); - } - -return credit; -} -//----------------------------------------------------------------------------- -double ParsePrepaidTraffic(const char * c) -{ -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) -{ -int64_t traff; -if (str2x(c, traff) != 0) - { - printf("Incorrect credit value %s\n", c); - exit(PARAMETER_PARSING_ERR_CODE); - } - -return traff; -} -//----------------------------------------------------------------------------- -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'; -} -//----------------------------------------------------------------------------- -void ParseTariff(const char * str, RESETABLE & tariffName, RESETABLE & nextTariff) -{ -const char * pos = strchr(str, ':'); -if (pos != NULL) - { - 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); - } - } -else - tariffName = str; -} -//----------------------------------------------------------------------------- -time_t ParseCreditExpire(const char * str) -{ -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) -{ -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; - -size_t nconv = 1; - -size_t insize = strlen(ib); -size_t outsize = strlen(ib); - -insize = strlen(c); - -cd = iconv_open(charsetT, charsetF); -if (cd == (iconv_t) -1) - { - if (errno == EINVAL) - { - printf("Warning: iconv from %s to %s failed\n", charsetF, charsetT); - *msg = c; - return; - } - else - printf("error iconv_open\n"); - - exit(ICONV_ERR_CODE); - } - -#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) - { - printf("iconv error\n"); - exit(ICONV_ERR_CODE); - } - } - -*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.empty()) - { - string msg; - Encode12str(msg, req->usrMsg.data()); - 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.empty()) - { - sprintf(str, "\n", req->credit.const_data()); - strcat(r, str); - } - -if (!req->creditExpire.empty()) - { - sprintf(str, "\n", req->creditExpire.const_data()); - strcat(r, str); - } - -if (!req->prepaidTraff.empty()) - { - sprintf(str, "\n", req->prepaidTraff.const_data()); - strcat(r, str); - } - -if (!req->cash.empty()) - { - string msg; - Encode12str(msg, req->message); - sprintf(str, "\n", req->cash.const_data(), msg.c_str()); - strcat(r, str); - } - -if (!req->setCash.empty()) - { - string msg; - Encode12str(msg, req->message); - sprintf(str, "\n", req->setCash.const_data(), msg.c_str()); - strcat(r, str); - } - -if (!req->usrPasswd.empty()) - { - sprintf(str, "\n", req->usrPasswd.const_data().c_str()); - strcat(r, str); - } - -if (!req->down.empty()) - { - sprintf(str, "\n", req->down.const_data()); - strcat(r, str); - } - -if (!req->passive.empty()) - { - sprintf(str, "\n", req->passive.const_data()); - strcat(r, str); - } - -if (!req->disableDetailStat.empty()) - { - sprintf(str, "\n", req->disableDetailStat.const_data()); - strcat(r, str); - } - -if (!req->alwaysOnline.empty()) - { - sprintf(str, "\n", req->alwaysOnline.const_data()); - strcat(r, str); - } - -// IP-address of user -if (!req->ips.empty()) - { - sprintf(str, "\n", req->ips.const_data().c_str()); - strcat(r, str); - } - -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 (!uPresent && !dPresent) - { - sprintf(str, "sessionUpload[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 (!uPresent && !dPresent) - { - sprintf(str, "sessionDownload[i].const_data(); - sprintf(str, "MD%d=\"%s\" ", i, ss.str().c_str()); - strcat(r, str); - } - } -if (uPresent || dPresent) - { - strcat(r, "/>"); - } - -//printf("%s\n", r); - -if (!req->tariff.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; - } - - } - -if (!req->note.empty()) - { - string note; - Encode12str(note, req->note.data()); - sprintf(str, "", note.c_str()); - strcat(r, str); - } - -if (!req->name.empty()) - { - string name; - Encode12str(name, req->name.data()); - sprintf(str, "", name.c_str()); - strcat(r, str); - } - -if (!req->address.empty()) - { - string address; - Encode12str(address, req->address.data()); - sprintf(str, "
", address.c_str()); - strcat(r, str); - } - -if (!req->email.empty()) - { - string email; - Encode12str(email, req->email.data()); - sprintf(str, "", email.c_str()); - strcat(r, str); - } - -if (!req->phone.empty()) - { - string phone; - Encode12str(phone, req->phone.data()); - sprintf(str, "", phone.c_str()); - strcat(r, str); - } - -if (!req->group.empty()) - { - string group; - Encode12str(group, req->group.data()); - sprintf(str, "", group.c_str()); - strcat(r, str); - } - -for (int i = 0; i < USERDATA_NUM; i++) - { - if (!req->userData[i].empty()) - { - string ud; - Encode12str(ud, req->userData[i].data()); - sprintf(str, "", i, ud.c_str()); - strcat(r, str); - } - } - -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() - && !req->admPasswd.empty() - && !req->server.empty() - && !req->port.empty() - && !req->login.empty(); - -bool b = !req->cash.empty() - || !req->setCash.empty() - || !req->credit.empty() - || !req->prepaidTraff.empty() - || !req->tariff.empty() - || !req->usrMsg.empty() - || !req->usrPasswd.empty() - - || !req->note.empty() - || !req->name.empty() - || !req->address.empty() - || !req->email.empty() - || !req->phone.empty() - || !req->group.empty() - || !req->ips.empty() // IP-address of user - - || !req->createUser - || !req->deleteUser; - - -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()) - { - sd = true; - break; - } - } - -for (int i = 0; i < DIR_NUM; i++) - { - if (req->monthUpload[i].empty()) - { - mu = 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()) - { - ud = true; - break; - } - } - - -//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); -} -//----------------------------------------------------------------------------- -int CheckParametersGet(REQUEST * req) -{ -return CheckParameters(req); -} -//----------------------------------------------------------------------------- -int CheckParametersSet(REQUEST * req) -{ -return CheckParameters(req); -} -//----------------------------------------------------------------------------- -bool 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) - { - 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 - 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; - break; - - case 700: //UserData - SetArrayItem(req.userData, optarg, std::string(" ")); - //req.userData[optarg] = " "; - break; - - case 800: - req.authBy = true; - break; - - case '?': - case ':': - missedOptionArg = true; - break; - - default: - printf ("?? getopt returned character code 0%o ??\n", c); - } - } - -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.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data()); -else - return ProcessGetUser(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), req); -} -//----------------------------------------------------------------------------- -bool 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; - -USER_CONF_RES conf; -USER_STAT_RES stat; -while (1) - { - int option_index = -1; - - c = getopt_long(argc, argv, short_options_set, long_options_set, &option_index); - - if (c == -1) - break; - - switch (c) - { - 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 - conf.password = ParsePassword(optarg); - break; - - case 'u': //user - req.login = ParseUser(optarg); - break; - - case 'c': //add cash - stat.cashAdd = ParseCash(optarg); - break; - - case 'v': //set cash - stat.cashSet = ParseCash(optarg); - break; - - case 'r': //credit - conf.credit = ParseCredit(optarg); - break; - - case 'E': //credit expire - conf.creditExpire = ParseCreditExpire(optarg); - break; - - case 'd': //down - conf.disabled = ParseDownPassive(optarg); - break; - - case 'i': //passive - conf.passive = ParseDownPassive(optarg); - break; - - case 't': //tariff - ParseTariff(optarg, conf.tariffName, conf.nextTariff); - break; - - case 'm': //message - ParseAnyString(optarg, &str); - req.usrMsg = str; - isMessage = true; - break; - - case 'e': //Prepaid Traffic - stat.freeMb = 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"); - conf.note = str; - break; - - case 'A': //nAme - ParseAnyString(optarg, &str, "koi8-ru"); - conf.realName = str; - break; - - case 'D': //aDdress - ParseAnyString(optarg, &str, "koi8-ru"); - conf.address = str; - break; - - case 'L': //emaiL - ParseAnyString(optarg, &str, "koi8-ru"); - conf.email = str; - break; - - case 'P': //phone - ParseAnyString(optarg, &str); - conf.phone = str; - break; - - case 'G': //Group - ParseAnyString(optarg, &str, "koi8-ru"); - conf.group = str; - break; - - case 'I': //IP-address of user - ParseAnyString(optarg, &str); - conf.ips = StrToIPS(str); - break; - - case 'S': - conf.disabledDetailStat = ParseDownPassive(optarg); - break; - - case 'O': - conf.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++])); - break; - - case 700: //UserData - ParseAnyString(argv[optind++], &str); - SetArrayItem(conf.userdata, optarg, str); - break; - - case '?': - missedOptionArg = true; - break; - - case ':': - missedOptionArg = true; - break; - - default: - printf("?? getopt returned character code 0%o ??\n", c); - } - } - -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); - -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); -} //----------------------------------------------------------------------------- int main(int argc, char **argv) { +std::string self(basename(argv[0])); SGCONF::CONFIG config; +SGCONF::COMMANDS commands; 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"); -blocks.Add("Connection options") + //.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: :@:"); - +SGCONF::AppendXMLOptionBlock(commands, blocks); +SGCONF::AppendAdminsOptionBlock(commands, blocks); +SGCONF::AppendTariffsOptionBlock(commands, blocks); +SGCONF::AppendUsersOptionBlock(commands, blocks); +SGCONF::AppendServicesOptionBlock(commands, blocks); +SGCONF::AppendCorpsOptionBlock(commands, blocks); SGCONF::PARSER_STATE state(false, argc, argv); @@ -1240,108 +284,39 @@ if (state.argc > 0) return -1; } -return 0; - -if (argc < 2) - { - Usage(); - return 1; - } - -if (argc <= 2) - { - UsageConf(); - exit(PARAMETER_PARSING_ERR_CODE); - } +try +{ +SGCONF::CONFIG configOverride(config); -if (strcmp(argv[1], "get") == 0) +if (config.configFile.empty()) { - //printf("get\n"); - return mainGet(argc - 1, argv + 1); - } -else if (strcmp(argv[1], "set") == 0) - { - //printf("set\n"); - if (mainSet(argc - 1, argv + 1) ) - return 0; - return -1; + const char * mainConfigFile = "/etc/sgconf/sgconf.conf"; + if (access(mainConfigFile, R_OK) == 0) + block.ParseFile(mainConfigFile); + ReadUserConfigFile(block); } else { - UsageConf(); - exit(PARAMETER_PARSING_ERR_CODE); + block.ParseFile(config.configFile.data()); } -return UNKNOWN_ERR_CODE; -} -//----------------------------------------------------------------------------- -namespace -{ - -void Usage() -{ -UsageImpl(false); -} +config = configOverride; -void UsageAll() -{ -UsageImpl(true); +std::cerr << "Config: " << config.Serialize() << std::endl; +return commands.Execute(config) ? 0 : -1; } - -void UsageImpl(bool full) +catch (const std::exception& ex) { -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); +std::cerr << ex.what() << "\n"; +return -1; } -//----------------------------------------------------------------------------- -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) + +namespace { -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) + +/*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"; @@ -1477,11 +452,6 @@ if (full) std::cout << "\t\t--name \t\t\tname of the corporation to change\n" << "\t\t--add-cash [:]\tadd cash to the corporation's account and optional comment message\n" << "\t\t--set-cash [:]\tnew corporation's cash and optional comment message\n\n"; -} - -void Version() -{ -std::cout << "sgconf, version: 2.0.0-alpha.\n"; -} +}*/ } // namespace anonymous